diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-30 03:36:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-30 03:36:21 +0000 |
commit | e6a2fd03865862c81d79bd32249728f20ce99354 (patch) | |
tree | e2ba9ebe3405d7f7b4fb3528818e50ff0097a24c /app-emulation/gallium-nine-standalone/files | |
parent | 6769d991d1a040381ab263b2eef043e6f50190a6 (diff) |
gentoo auto-resync : 30:10:2023 - 03:36:20
Diffstat (limited to 'app-emulation/gallium-nine-standalone/files')
3 files changed, 12 insertions, 68 deletions
diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch deleted file mode 100644 index fed5c0403688..000000000000 --- a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in -index bfbe410..0064cf8 100644 ---- a/tools/cross-wine32.in -+++ b/tools/cross-wine32.in -@@ -5,9 +5,10 @@ strip = 'strip' - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m32'] --c_link_args = ['-m32', '-mwindows'] -+c_args = @CFLAGS@ + ['-m32'] -+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows'] - needs_exe_wrapper = true -+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' - - [host_machine] - system = 'linux' -diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in -index 5e19023..06b1f2a 100644 ---- a/tools/cross-wine64.in -+++ b/tools/cross-wine64.in -@@ -5,9 +5,10 @@ strip = 'strip' - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m64'] --c_link_args = ['-m64', '-mwindows'] -+c_args = @CFLAGS@ + ['-m64'] -+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows'] - needs_exe_wrapper = true -+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' - - [host_machine] - system = 'linux' diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch deleted file mode 100644 index abcf7ad4ea3b..000000000000 --- a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001 -From: Andre Heider <a.heider@gmail.com> -Date: Sun, 17 Jan 2021 11:42:57 +0100 -Subject: [PATCH] meson: stop checking for libwine - -From the WINE 6.0 release notes: -The libwine library is no longer used, but it's still provided to -support running Winelib modules built against older versions. It is -deprecated however, and will be removed in a future Wine release. - -libwine wasn't used anymore anyway, this just ensures that this tree can -be built against future WINE versions. ---- - meson.build | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 0969777..47ee51a 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__ - #error 1 - #endif''' - --if not cc.compiles(code, name: 'winelib check') -+if not cc.compiles(code, name: 'winegcc check') - error('A WINE cross compiler is required') - endif - --dep_wine = cc.find_library('wine') -- - if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name') - error('WINE headers not found') - endif diff --git a/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch b/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch new file mode 100644 index 000000000000..14c2b30a741f --- /dev/null +++ b/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch @@ -0,0 +1,12 @@ +diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c +--- a/ninewinecfg/main.c 2023-03-10 08:32:25.000000000 +0000 ++++ b/ninewinecfg/main.c 2023-10-29 22:49:15.919529033 +0000 +@@ -28,7 +28,7 @@ + #include "../common/registry.h" + #include "resource.h" + +-static const char * const fn_nine_dll = "d3d9-nine.dll"; ++static const char * const fn_nine_dll = G9DLL; + static const char * const fn_backup_dll = "d3d9-nine.bak"; + static const char * const fn_d3d9_dll = "d3d9.dll"; + static const char * const fn_nine_exe = "ninewinecfg.exe"; |