Rewrite of patch system to simplify mainting large patchsets.

2025-09-12 18:50:20 -07:00 · 2014-07-25 22:08:08 +02:00
parent a4d6e77557 208b3c1d25
commit ef427399da
79 changed files with 1722 additions and 545 deletions
--- a/patches/00-Commandline/1b7ac850-5040-4d9e-8fde-9c483c3baf33.def
+++ b/patches/00-Commandline/1b7ac850-5040-4d9e-8fde-9c483c3baf33.def
@@ -1,3 +0,0 @@
-Revision: 1
-Author: Sebastian Lackner
-Title: Add commandline option --patches to show the patch list.
--- a/patches/00-Commandline/9e9a58e1-b226-4d4d-943b-be9a4c1dc525.def
+++ b/patches/00-Commandline/9e9a58e1-b226-4d4d-943b-be9a4c1dc525.def
@@ -1,3 +0,0 @@
-Revision: 1
-Author: Michael Müller
-Title: Add commandline option --check-libs to test if shared libraries are installed.
--- a/patches/00-Commandline/definition
+++ b/patches/00-Commandline/definition
@@ -0,0 +1,7 @@
+Author: Sebastian Lackner
+Subject: Add commandline option --patches to show the patch list.
+Revision: 1
+
+Author: Michael Müller
+Subject: Add commandline option --check-libs to test if shared libraries are installed.
+Revision: 1
--- a/patches/01-Address_Change_Notification/8a366b6d-8ad6-4581-8aa9-66a03590a57b.def
+++ b/patches/01-Address_Change_Notification/8a366b6d-8ad6-4581-8aa9-66a03590a57b.def
@@ -1,3 +0,0 @@
-Revision: 2
-Author: Erich E. Hoover
-Title: Implement SIO_ADDRESS_LIST_CHANGE.
--- a/patches/01-Address_Change_Notification/definition
+++ b/patches/01-Address_Change_Notification/definition
@@ -0,0 +1,4 @@
+Author: Erich E. Hoover
+Subject: Implement SIO_ADDRESS_LIST_CHANGE.
+Revision: 2
+Fixes: [32328] Support for interface change notifications
--- a/patches/02-ACL_Extended_Attributes/92938b89-506b-430a-ba50-32de8b286e56.def
+++ b/patches/02-ACL_Extended_Attributes/92938b89-506b-430a-ba50-32de8b286e56.def
@@ -1,3 +0,0 @@
-Revision: 6
-Author: Erich E. Hoover
-Title: Store and return security attributes with extended file attributes.
--- a/patches/02-ACL_Extended_Attributes/definition
+++ b/patches/02-ACL_Extended_Attributes/definition
@@ -0,0 +1,5 @@
+Author: Erich E. Hoover
+Subject: Store and return security attributes with extended file attributes.
+Revision: 6
+Fixes: [31858] Support for stored file ACLs
+Fixes: [34406] Support for inherited file ACLs
--- a/patches/04-XEMBED/5d6bb7b5-ec88-4ed3-907d-9ad2173a2f88.def
+++ b/patches/04-XEMBED/5d6bb7b5-ec88-4ed3-907d-9ad2173a2f88.def
@@ -1,3 +0,0 @@
-Revision: 1
-Author: Sebastian Lackner
-Title: Enable/disable windows when they are (un)mapped by foreign applications.
--- a/patches/04-XEMBED/94186fff-6dbf-44d0-8eb1-2463d1608a0f.def
+++ b/patches/04-XEMBED/94186fff-6dbf-44d0-8eb1-2463d1608a0f.def
@@ -1,3 +0,0 @@
-Revision: 1
-Author: Sebastian Lackner
-Title: Update gl_drawable for embedded windows.
--- a/patches/04-XEMBED/definition
+++ b/patches/04-XEMBED/definition
@@ -0,0 +1,9 @@
+Author: Sebastian Lackner
+Subject: Enable/disable windows when they are (un)mapped by foreign applications.
+Revision: 1
+
+Author: Sebastian Lackner
+Subject: Update gl_drawable for embedded windows.
+Revision: 1
+
+Fixes: XEMBED support for embedding Wine windows inside Linux applications
--- a/patches/05-Named_Pipe/cbe240e8-2c58-430a-b61c-7fbb9d0e1e11.def
+++ b/patches/05-Named_Pipe/cbe240e8-2c58-430a-b61c-7fbb9d0e1e11.def
@@ -1,4 +0,0 @@
-Revision: 1
-Author: Sebastian Lackner
-Title: Change return value of stub SetNamedPipeHandleState to TRUE.
-
--- a/patches/05-Named_Pipe/definition
+++ b/patches/05-Named_Pipe/definition
@@ -0,0 +1,5 @@
+Author: Sebastian Lackner
+Subject: Change return value of stub SetNamedPipeHandleState to TRUE.
+Revision: 1
+
+Fixes: [17273] Workaround for TransactNamedPipe not being supported
--- a/patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch
+++ b/patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch
@@ -1,7 +1,7 @@
-From 8cb75a25d71c1ea659ce69fa74f725cd9b9a64f0 Mon Sep 17 00:00:00 2001
+From 9c64dcb14a77b7b1835bb06e03c90c502a1109f0 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Sat, 8 Feb 2014 16:08:53 +0100
-Subject: [PATCH 08/42] winmm: Load winealsa if winepulse is found
+Date: Tue, 24 Jun 2014 08:48:45 +0200
+Subject: [PATCH 08/43] winmm: Load winealsa if winepulse is found

 Fixes midi on winepulse
 ---
@@ -25,5 +25,5 @@ index c3b3674..56cfe35 100644
     HeapFree(GetProcessHeap(), 0, drvA);
     PropVariantClear(&pv);
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch
+++ b/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch
@@ -1,13 +1,12 @@
-From dac832bfc418de315808a109ab9adba0c5936be5 Mon Sep 17 00:00:00 2001
+From 182d5c5625ea79c4506daa6856de158558de24d8 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:53 +0100
-Subject: [PATCH 09/42] winepulse: Add initial stub for pulseaudio support
+Date: Tue, 24 Jun 2014 08:48:45 +0200
+Subject: [PATCH 09/43] winepulse: Add initial stub for pulseaudio support

 ---
 Just the basic of initialization and pulseaudio mainloop support is
 added here.
 ---
- configure                             |  99 +++++++++++-
 configure.ac                          |  32 +++-
 dlls/mmdevapi/main.c                  |   2 +-
 dlls/winepulse.drv/Makefile.in        |   7 +
@@ -18,171 +17,8 @@ added here.
 create mode 100644 dlls/winepulse.drv/mmdevdrv.c
 create mode 100644 dlls/winepulse.drv/winepulse.drv.spec

-diff --git a/configure b/configure
-index 246b888..d9f6ddd 100755
--- a/configure
-+++ b/configure
-@@ -653,6 +653,8 @@ OSS4_CFLAGS
- ALSA_LIBS
- GSTREAMER_LIBS
- GSTREAMER_CFLAGS
-+PULSEINCL
-+PULSELIBS
- GETTEXTPO_LIBS
- Z_LIBS
- FREETYPE_LIBS
-@@ -824,6 +826,7 @@ with_osmesa
- with_oss
- with_png
- with_pthread
-+with_pulse
- with_sane
- with_tiff
- with_v4l
-@@ -1253,6 +1256,7 @@ enable_winemapi
- enable_winemp3_acm
- enable_wineoss_drv
- enable_wineps_drv
-+enable_winepulse_drv
- enable_wineqtdecoder
- enable_winex11_drv
- enable_wing32
-@@ -2079,6 +2083,7 @@ Optional Packages:
-   --without-oss           do not use the OSS sound support
-   --without-png           do not use PNG
-   --without-pthread       do not use the pthread library
-+  --without-pulse         do not use PulseAudio sound support
-   --without-sane          do not use SANE (scanner support)
-   --without-tiff          do not use TIFF
-   --without-v4l           do not use v4l1 (v4l support)
-@@ -3320,6 +3325,12 @@ if test "${with_pthread+set}" = set; then :
- fi
- 
- 
-+# Check whether --with-pulse was given.
-+if test "${with_pulse+set}" = set; then :
-+  withval=$with_pulse;
-+fi
-+
-+
- # Check whether --with-sane was given.
- if test "${with_sane+set}" = set; then :
-   withval=$with_sane;
-@@ -12083,6 +12094,87 @@ esac
- fi
- fi
- 
-+PULSELIBS=""
-+
-+PULSEINCL=""
-+
-+if test "x$with_pulse" != "xno";
-+then
-+    ac_save_CPPFLAGS="$CPPFLAGS"
-+    if test "$PKG_CONFIG" != "false";
-+    then
-+        ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
-+        ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`"
-+
-+        CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
-+        for ac_header in pulse/pulseaudio.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "pulse/pulseaudio.h" "ac_cv_header_pulse_pulseaudio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_pulse_pulseaudio_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_PULSE_PULSEAUDIO_H 1
-+_ACEOF
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pa_stream_is_corked in -lpulse" >&5
-+$as_echo_n "checking for pa_stream_is_corked in -lpulse... " >&6; }
-+if ${ac_cv_lib_pulse_pa_stream_is_corked+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpulse $ac_pulse_libs $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pa_stream_is_corked ();
-+int
-+main ()
-+{
-+return pa_stream_is_corked ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_pulse_pa_stream_is_corked=yes
-+else
-+  ac_cv_lib_pulse_pa_stream_is_corked=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pulse_pa_stream_is_corked" >&5
-+$as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; }
-+if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then :
-+
-+$as_echo "#define HAVE_PULSEAUDIO 1" >>confdefs.h
-+
-+                 PULSELIBS="$ac_pulse_libs"
-+                 PULSEINCL="$ac_pulse_cflags"
-+fi
-+
-+
-+fi
-+
-+done
-+
-+    fi
-+    CPPFLAGS="$ac_save_CPPFLAGS"
-+fi
-+if test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"; then :
-+  case "x$with_pulse" in
-+  x)   as_fn_append wine_warnings "|libpulse ${notice_platform}development files not found or too old, Pulse won't be supported." ;;
-+  xno) ;;
-+  *)   as_fn_error $? "libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.
-+This is an error since --with-pulse was requested." "$LINENO" 5 ;;
-+esac
-+fi
-+
- if test "x$with_gstreamer" != "xno"
- then
-     if ${GSTREAMER_CFLAGS:+false} :; then :
-@@ -13394,12 +13486,14 @@ fi
- 
- test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
- test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
-+test -n "$PULSELIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no}
- test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
- test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
- 
-if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \
-+if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \
-+if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \
-         "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
-        "x$with_alsa$with_coreaudio$with_oss" != xnonono
-+        "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono
- then
-     as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
- fi
-@@ -17203,6 +17297,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm
- wine_fn_config_dll wineoss.drv enable_wineoss_drv
- wine_fn_config_dll wineps.drv enable_wineps_drv clean,po
- wine_fn_config_dll wineps16.drv16 enable_win16
-+wine_fn_config_dll winepulse.drv enable_winepulse_drv
- wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
- wine_fn_config_dll winex11.drv enable_winex11_drv
- wine_fn_config_dll wing.dll16 enable_win16
 diff --git a/configure.ac b/configure.ac
-index de807d2..ec3db46 100644
+index eccf19c..d4939c7 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -70,6 +70,7 @@ AC_ARG_WITH(oss,       AS_HELP_STRING([--without-oss],[do not use the OSS sound
@@ -193,7 +29,7 @@ index de807d2..ec3db46 100644
 AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
 AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
 AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
-@@ -1512,6 +1513,30 @@ then
+@@ -1516,6 +1517,30 @@ then
           [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
 fi
 
@@ -224,7 +60,7 @@ index de807d2..ec3db46 100644
 dnl **** Check for gstreamer ****
 if test "x$with_gstreamer" != "xno"
 then
-@@ -1730,13 +1755,15 @@ fi
+@@ -1734,13 +1759,15 @@ fi
 dnl **** Disable unsupported winmm drivers ****
 test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
 test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
@@ -242,7 +78,7 @@ index de807d2..ec3db46 100644
 then
     WINE_WARNING([No sound system was found. Windows applications will be silent.])
 fi
-@@ -3217,6 +3244,7 @@ WINE_CONFIG_DLL(winemp3.acm)
+@@ -3235,6 +3262,7 @@ WINE_CONFIG_DLL(winemp3.acm)
 WINE_CONFIG_DLL(wineoss.drv)
 WINE_CONFIG_DLL(wineps.drv,,[clean,po])
 WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
@@ -584,5 +420,5 @@ index 0000000..a089166
 +@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint
 +@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch
+++ b/patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch
@@ -1,7 +1,7 @@
-From ac6de861806e5692fa004cb2c449feba95287323 Mon Sep 17 00:00:00 2001
+From 66366363c2c99a359dfea648d2de409e362b5557 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:53 +0100
-Subject: [PATCH 10/42] winepulse: Add format and period probing
+Date: Tue, 24 Jun 2014 08:48:46 +0200
+Subject: [PATCH 10/43] winepulse: Add format and period probing

 ---
 dlls/winepulse.drv/mmdevdrv.c | 128 ++++++++++++++++++++++++++++++++++++++++++
@@ -168,5 +168,5 @@ index d187bdc..40db26d 100644
         UINT *num, UINT *def_index)
 {
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0004-winepulse-Add-audioclient.patch
+++ b/patches/06-winepulse/0004-winepulse-Add-audioclient.patch
@@ -1,7 +1,7 @@
-From 54c37abb982df8e5aefccfe2add2a05fa5707db8 Mon Sep 17 00:00:00 2001
+From 26cd0e172f299c7e63c51af9f67035f4e5865822 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:53 +0100
-Subject: [PATCH 11/42] winepulse: Add audioclient
+Date: Tue, 24 Jun 2014 08:48:46 +0200
+Subject: [PATCH 11/43] winepulse: Add audioclient

 ---
 Without AudioRenderClient and AudioCaptureClient it won't work,
@@ -1094,5 +1094,5 @@ index 40db26d..37d85ff 100644
         IAudioSessionManager2 **out)
 {
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch
+++ b/patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch
@@ -1,7 +1,7 @@
-From 4191de925518baace7ad4c13a0c72750a91f1abd Mon Sep 17 00:00:00 2001
+From 9cca5914bed2a12edcafc8cebf5918d51e2570de Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:54 +0100
-Subject: [PATCH 12/42] winepulse: Add IAudioRenderClient and
+Date: Tue, 24 Jun 2014 08:48:46 +0200
+Subject: [PATCH 12/43] winepulse: Add IAudioRenderClient and
 IAudioCaptureClient

 ---
@@ -348,5 +348,5 @@ index 37d85ff..01cfd25 100644
         IAudioSessionManager2 **out)
 {
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch
+++ b/patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch
@@ -1,7 +1,7 @@
-From 2e3b7073ee776ecbd5b186d8f146e80ef30775b8 Mon Sep 17 00:00:00 2001
+From 6b97d362c570ec4a813db1d58574a94ad61f9015 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:54 +0100
-Subject: [PATCH 13/42] winepulse: Add IAudioClock and IAudioClock2
+Date: Tue, 24 Jun 2014 08:48:46 +0200
+Subject: [PATCH 13/43] winepulse: Add IAudioClock and IAudioClock2

 ---
 dlls/winepulse.drv/mmdevdrv.c | 172 ++++++++++++++++++++++++++++++++++++++++++
@@ -205,5 +205,5 @@ index 01cfd25..3ed2288 100644
         IAudioSessionManager2 **out)
 {
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch
+++ b/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch
@@ -1,7 +1,7 @@
-From 85e33b703dd8c082af2b4a008215adca70308fc5 Mon Sep 17 00:00:00 2001
+From 0f827300a5f9d66de488f43fa5f544e97335ea35 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:54 +0100
-Subject: [PATCH 14/42] winepulse: Add audiostreamvolume
+Date: Tue, 24 Jun 2014 08:48:46 +0200
+Subject: [PATCH 14/43] winepulse: Add audiostreamvolume

 ---
 Pulse allows streams to set volume, but for various reasons it's
@@ -281,5 +281,5 @@ index 3ed2288..b7414c2 100644
         IAudioSessionManager2 **out)
 {
 -- 
-1.8.5.2
+2.0.0

--- a/patches/06-winepulse/0008-winepulse-Add-session-support.patch
+++ b/patches/06-winepulse/0008-winepulse-Add-session-support.patch
@@ -1,7 +1,7 @@
-From ca90d6371ca330a63447c4a67cda50d65d51a73b Mon Sep 17 00:00:00 2001
+From 313c40a06e4b535ea524c0393c466a52d9c1e8eb Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Sat, 8 Feb 2014 16:08:54 +0100
-Subject: [PATCH 15/42] winepulse: Add session support
+Date: Tue, 24 Jun 2014 08:48:46 +0200
+Subject: [PATCH 15/43] winepulse: Add session support

 ---
 Copied verbatim from winealsa
@@ -932,5 +932,5 @@ index b7414c2..64ee62e 100644
 +    return S_OK;
 }
 -- 
-1.8.5.2
+2.0.0

--- a/Show More
+++ b/Show More