diff --git a/xine-lib-alsa.patch b/xine-lib-alsa.patch new file mode 100644 index 0000000..5919bfa --- /dev/null +++ b/xine-lib-alsa.patch @@ -0,0 +1,11 @@ +--- a/src/audio_out/audio_alsa_out.c ++++ b/src/audio_out/audio_alsa_out.c +@@ -44,7 +44,7 @@ + + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API +-#include ++#include + + #include + #include diff --git a/xine-lib.changes b/xine-lib.changes index c778b6d..f667001 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 26 07:03:44 UTC 2019 - olaf@aepfle.de + +- Use alsa API properly with xine-lib-alsa.patch. Consumers are + expected to use instead of . + This is in preparation of an change to pkgconfig(alsa) to + not pollute CFLAGS with -I/usr/include/alsa anymore (bsc#1130333) + ------------------------------------------------------------------- Fri Feb 22 12:00:57 UTC 2019 - olaf@aepfle.de diff --git a/xine-lib.spec b/xine-lib.spec index 0efa6cd..a333a85 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -138,6 +138,7 @@ Patch0: xine-lib-libdvdread_udf.diff Patch1: xine-lib-v4l-2.6.38.patch # PATCH allow ffmpeg in openSUSE versions that have ffmpeg and still use the crippled tar ball to build with ffmpeg3. Patch2: xine-lib-without-ffmpeg.patch +Patch3: xine-lib-alsa.patch # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch # This should be fixed upstream, but this patch will not work for them. @@ -595,6 +596,7 @@ rm -rf src/combined/ffmpeg configure #%%patch5 %endif %endif +%patch3 -p1 %patch4 %patch6 %patch8 -p1