Accepting request 688593 from multimedia:xine

Fix changes

OBS-URL: https://build.opensuse.org/request/show/688593
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger 2019-03-26 14:45:32 +00:00 committed by Git OBS Bridge
commit 03d9f52977
3 changed files with 22 additions and 1 deletions

11
xine-lib-alsa.patch Normal file
View File

@ -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 <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <sys/ioctl.h>
#include <inttypes.h>

View File

@ -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 <alsa/asoundlib.h> instead of <asoundlib.h>.
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

View File

@ -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