wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Improved wined3d-DXTn patchset to search for dylib on OSX.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-06-27 23:52:23 +02:00
parent 135024f481
commit 74b6722150
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ wine-staging (1.7.46) UNRELEASED; urgency=low
* Added patch to improve output of '--check-libs' on OSX.
* Added patch to implement general tab for file property dialog.
* Improved nvcuda-CUDA_Support patchset to search for dylib on OSX.
* Improved wined3d-DXTn patchset to search for dylib on OSX.
* Updated kernel32-GetVolumePathName to fix several test failures.
* Updated ntoskrnl-Emulator patchset to implement emulation of MOVZX
instruction on x86_64.

2
patches/patchinstall.sh
View File

@ -2270,10 +2270,12 @@ if test "$enable_wined3d_DXTn" -eq 1; then
patch_apply wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch
patch_apply wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch
patch_apply wined3d-DXTn/0003-wined3d-add-DXT1-to-B4G4R4A4-DXT1-to-B5G5R5A1-and-DX.patch
patch_apply wined3d-DXTn/0004-wined3d-Load-dxtn-dylib-library-on-Mac-OS-X.patch
(
echo '+ { "Michael Müller", "wined3d: Add support for DXTn software decoding through libtxc_dxtn.", 3 },';
echo '+ { "Christian Costa", "wined3d: Improve DXTn support and export conversion functions for d3dx9_36.", 1 },';
echo '+ { "Michael Müller", "wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion.", 1 },';
echo '+ { "Michael Müller", "wined3d: Load dxtn dylib library on Mac OS X.", 1 },';
) >> "$patchlist"
fi

27
patches/wined3d-DXTn/0004-wined3d-Load-dxtn-dylib-library-on-Mac-OS-X.patch Normal file
View File

@ -0,0 +1,27 @@
From d8452914d07d7a24aa2647bf7c98383d962693f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 27 Jun 2015 22:26:14 +0200
Subject: wined3d: Load dxtn dylib library on Mac OS X.
---
dlls/wined3d/dxtn.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/wined3d/dxtn.c b/dlls/wined3d/dxtn.c
index 2639788..03e4b26 100644
--- a/dlls/wined3d/dxtn.c
+++ b/dlls/wined3d/dxtn.c
@@ -465,6 +465,10 @@ BOOL wined3d_dxtn_init(void)
#ifdef SONAME_LIBTXC_DXTN
SONAME_LIBTXC_DXTN,
#endif
+#ifdef __APPLE__
+ "libtxc_dxtn.dylib",
+ "libtxc_dxtn_s2tc.dylib",
+#endif
"libtxc_dxtn.so",
"libtxc_dxtn_s2tc.so.0"
};
--
2.4.3