From 47a27b0c9cd763860dd3dc35a3f07ef4b9155bf7f67dcbaf8f85425774e69608 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 12:19:59 +0000 Subject: [PATCH 01/14] - build the PE format modules with the MingW cross compiler. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=686 --- wine.changes | 1 + wine.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/wine.changes b/wine.changes index b6aba00..2b6404a 100644 --- a/wine.changes +++ b/wine.changes @@ -7,6 +7,7 @@ Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner - XAudio2 reimplementation. - Vulkan 1.1 support. - update staging to 5.0 release +- build the PE format modules with the MingW cross compiler. ------------------------------------------------------------------- Sun Jan 19 10:22:06 UTC 2020 - Marcus Meissner diff --git a/wine.spec b/wine.spec index b273553..dee272b 100644 --- a/wine.spec +++ b/wine.spec @@ -92,6 +92,12 @@ BuildRequires: pkgconfig BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel +%ifarch x86_64 +BuildRequires: mingw64-cross-gcc +%endif +%ifarch %ix86 +BuildRequires: mingw32-cross-gcc +%endif BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) From 9b2b87b3ecfa58ca528588927b615786914d2440fd5aa2afed6bb29726deaa8a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 13:12:35 +0000 Subject: [PATCH 02/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=687 --- baselibs.conf | 1 + wine.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index 6775308..79740b8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,6 +2,7 @@ wine +^/usr/bin/wine$ +^/usr/bin/wine-preloader$ + /usr/lib/wine/*.dll requires "libX11.so.6" requires "libXext.so.6" requires "libXcursor.so.1" diff --git a/wine.spec b/wine.spec index dee272b..18fcd2d 100644 --- a/wine.spec +++ b/wine.spec @@ -442,6 +442,7 @@ chmod 755 %winedir/my-find-requires.sh %{_bindir}/wine64-preloader %endif %{_libdir}/wine/*.so +%{_libdir}/wine/*.dll %{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls From 0512630dfd7b68ce2e462ba8ad6c314dd8254e30bf840c6072c81b0cbe92b079 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 14:16:35 +0000 Subject: [PATCH 03/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=688 --- wine.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wine.spec b/wine.spec index 18fcd2d..1e570ec 100644 --- a/wine.spec +++ b/wine.spec @@ -443,6 +443,10 @@ chmod 755 %winedir/my-find-requires.sh %endif %{_libdir}/wine/*.so %{_libdir}/wine/*.dll +%{_libdir}/wine/*.dll16 +%{_libdir}/wine/*.exe +%{_libdir}/wine/*.sys +%{_libdir}/wine/*.tlb %{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls From 0d5ce5fe7b0f1dcece18fad802e57d8f809c9a751700818986a980dc644427af Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 14:18:13 +0000 Subject: [PATCH 04/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=689 --- baselibs.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index 79740b8..502a96e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,6 +3,10 @@ wine +^/usr/bin/wine$ +^/usr/bin/wine-preloader$ /usr/lib/wine/*.dll + /usr/lib/wine/*.dll16 + /usr/lib/wine/*.exe + /usr/lib/wine/*.sys + /usr/lib/wine/*.tlb requires "libX11.so.6" requires "libXext.so.6" requires "libXcursor.so.1" From 1e276faaa8b15d970e4b7cca2338f4388376a6630b81ef7b911ef534ba505d6d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 16:21:36 +0000 Subject: [PATCH 05/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=690 --- wine.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wine.spec b/wine.spec index 1e570ec..a9b3a43 100644 --- a/wine.spec +++ b/wine.spec @@ -442,11 +442,16 @@ chmod 755 %winedir/my-find-requires.sh %{_bindir}/wine64-preloader %endif %{_libdir}/wine/*.so +%{_libdir}/wine/*.acm %{_libdir}/wine/*.dll %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.exe +%{_libdir}/wine/*.exe16 +%{_libdir}/wine/*.mod +%{_libdir}/wine/*.ocx %{_libdir}/wine/*.sys %{_libdir}/wine/*.tlb +%{_libdir}/wine/*.vxd %{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls From 6fff39e5304a1c4a34970ac87e4ea20688ae303aaa2925344ebcffa6183cb576 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 17:18:11 +0000 Subject: [PATCH 06/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=691 --- wine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wine.spec b/wine.spec index a9b3a43..7295a7c 100644 --- a/wine.spec +++ b/wine.spec @@ -447,7 +447,9 @@ chmod 755 %winedir/my-find-requires.sh %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.exe %{_libdir}/wine/*.exe16 +%if %ix86 %{_libdir}/wine/*.mod +%endif %{_libdir}/wine/*.ocx %{_libdir}/wine/*.sys %{_libdir}/wine/*.tlb From b116ef7fb7204128148e535e6f3caecd46f451a0c24f40c341b9dd154837e702 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 17:18:51 +0000 Subject: [PATCH 07/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=692 --- wine.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/wine.spec b/wine.spec index 7295a7c..da4537e 100644 --- a/wine.spec +++ b/wine.spec @@ -447,9 +447,6 @@ chmod 755 %winedir/my-find-requires.sh %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.exe %{_libdir}/wine/*.exe16 -%if %ix86 -%{_libdir}/wine/*.mod -%endif %{_libdir}/wine/*.ocx %{_libdir}/wine/*.sys %{_libdir}/wine/*.tlb From 74bf948a75c4daf311995354d40a6fc20cad2bd3ae69e26924bc61b04b300e7d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 18:37:37 +0000 Subject: [PATCH 08/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=693 --- wine.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wine.spec b/wine.spec index da4537e..69c09a7 100644 --- a/wine.spec +++ b/wine.spec @@ -443,10 +443,13 @@ chmod 755 %winedir/my-find-requires.sh %endif %{_libdir}/wine/*.so %{_libdir}/wine/*.acm +%{_libdir}/wine/*.cpl +%{_libdir}/wine/*.cpl16 %{_libdir}/wine/*.dll %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.exe %{_libdir}/wine/*.exe16 +%{_libdir}/wine/*.mod16 %{_libdir}/wine/*.ocx %{_libdir}/wine/*.sys %{_libdir}/wine/*.tlb From 50179af89336c96959c3b99cc1d511e52a3b4d8668be7d7f1097c8c24bd108a1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jan 2020 19:07:02 +0000 Subject: [PATCH 09/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=694 --- wine.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wine.spec b/wine.spec index 69c09a7..4a9e7dc 100644 --- a/wine.spec +++ b/wine.spec @@ -444,7 +444,6 @@ chmod 755 %winedir/my-find-requires.sh %{_libdir}/wine/*.so %{_libdir}/wine/*.acm %{_libdir}/wine/*.cpl -%{_libdir}/wine/*.cpl16 %{_libdir}/wine/*.dll %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.exe From 9fb27fafb9635c652056cf8a278409cf2b478a45096a0705e31cac7c139244e9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jan 2020 21:43:19 +0000 Subject: [PATCH 10/14] Updating link to change in openSUSE:Factory/wine revision 296.0 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=ca7368fb555ccc973743d58609d25311 --- wine.changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/wine.changes b/wine.changes index 2b6404a..7f53278 100644 --- a/wine.changes +++ b/wine.changes @@ -1,6 +1,16 @@ ------------------------------------------------------------------- Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner +- Updated to 5.0 release + - Builtin modules in PE format. + - Multi-monitor support. + - XAudio2 reimplementation. + - Vulkan 1.1 support. +- update staging to 5.0 release + +------------------------------------------------------------------- +Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner + - Updated to 5.0 release - Builtin modules in PE format. - Multi-monitor support. From 072f5c6519929aabed8425c98030083aa8b9af8d8fec9e7deccbce959ae862cb Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jan 2020 21:43:19 +0000 Subject: [PATCH 11/14] Accepting request 766212 from Emulators baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/766212 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=695 --- wine.changes | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/wine.changes b/wine.changes index 7f53278..2b6404a 100644 --- a/wine.changes +++ b/wine.changes @@ -1,16 +1,6 @@ ------------------------------------------------------------------- Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner -- Updated to 5.0 release - - Builtin modules in PE format. - - Multi-monitor support. - - XAudio2 reimplementation. - - Vulkan 1.1 support. -- update staging to 5.0 release - -------------------------------------------------------------------- -Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner - - Updated to 5.0 release - Builtin modules in PE format. - Multi-monitor support. From c38d569bcc384352e383cef6b329ce45ba2cda569fba695128efd062cceb1dc2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 23 Jan 2020 06:27:41 +0000 Subject: [PATCH 12/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=696 --- wine.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wine.spec b/wine.spec index 4a9e7dc..67cbe90 100644 --- a/wine.spec +++ b/wine.spec @@ -443,9 +443,12 @@ chmod 755 %winedir/my-find-requires.sh %endif %{_libdir}/wine/*.so %{_libdir}/wine/*.acm +%{_libdir}/wine/*.com %{_libdir}/wine/*.cpl %{_libdir}/wine/*.dll %{_libdir}/wine/*.dll16 +%{_libdir}/wine/*.drv +%{_libdir}/wine/*.drv16 %{_libdir}/wine/*.exe %{_libdir}/wine/*.exe16 %{_libdir}/wine/*.mod16 From f49507f85ed6d6952392b5b4f35dfbdb84fa02d30b1289f11af8fd3840f951ab Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 23 Jan 2020 07:07:42 +0000 Subject: [PATCH 13/14] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=697 --- baselibs.conf | 9 +++++++++ wine.spec | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 502a96e..ea7cd05 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,11 +2,20 @@ wine +^/usr/bin/wine$ +^/usr/bin/wine-preloader$ + /usr/lib/wine/*.acm + /usr/lib/wine/*.com + /usr/lib/wine/*.cpl /usr/lib/wine/*.dll /usr/lib/wine/*.dll16 + /usr/lib/wine/*.drv + /usr/lib/wine/*.drv16 /usr/lib/wine/*.exe + /usr/lib/wine/*.exe16 + /usr/lib/wine/*.mod16 + /usr/lib/wine/*.ocx /usr/lib/wine/*.sys /usr/lib/wine/*.tlb + /usr/lib/wine/*.vxd requires "libX11.so.6" requires "libXext.so.6" requires "libXcursor.so.1" diff --git a/wine.spec b/wine.spec index 67cbe90..0f6fcea 100644 --- a/wine.spec +++ b/wine.spec @@ -446,16 +446,18 @@ chmod 755 %winedir/my-find-requires.sh %{_libdir}/wine/*.com %{_libdir}/wine/*.cpl %{_libdir}/wine/*.dll +%ifarch %ix86 %{_libdir}/wine/*.dll16 -%{_libdir}/wine/*.drv %{_libdir}/wine/*.drv16 -%{_libdir}/wine/*.exe %{_libdir}/wine/*.exe16 %{_libdir}/wine/*.mod16 +%{_libdir}/wine/*.vxd +%endif +%{_libdir}/wine/*.drv +%{_libdir}/wine/*.exe %{_libdir}/wine/*.ocx %{_libdir}/wine/*.sys %{_libdir}/wine/*.tlb -%{_libdir}/wine/*.vxd %{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls From 99aa6e196cdc23f816c552caaf3a094103f7aa66657b3598007044477e785a12 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 23 Jan 2020 07:08:14 +0000 Subject: [PATCH 14/14] add /usr/lib/wine/* OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=698 --- wine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wine.spec b/wine.spec index 0f6fcea..c42cc83 100644 --- a/wine.spec +++ b/wine.spec @@ -277,6 +277,7 @@ echo "%name" >> %SOURCE7 echo " +^/usr/bin/wine\$" >> %SOURCE7 echo " +^/usr/bin/wine-preloader\$" >> %SOURCE7 echo " +^/usr/lib/wine/fakedlls" >> %SOURCE7 +echo " +^/usr/lib/wine/*" >> %SOURCE7 grep SONAME_ config.log grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7 echo " recommends \"libpulse0-32bit\"" >> %SOURCE7