[packages/xine-lib] - fix libdvdnav detection - update libva deps - fix building on x32 - rel 11

[baggins]

commit 1bafb47a9f5b95038d73b862266b160a1d19ee5e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 9 20:13:24 2015 +0100

    - fix libdvdnav detection
    - update libva deps
    - fix building on x32
    - rel 11

 libdvdnav5.patch | 17 +++++++++++++++++
 x32.patch        | 43 +++++++++++++++++++++++++++++++++++++++++++
 xine-lib.spec    |  8 +++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 4c72bc3..bcd4a52 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -40,7 +40,7 @@ Summary(pl.UTF-8):	Odtwarzacz filmów
 Summary(pt_BR.UTF-8):	Xine, um player de video
 Name:		xine-lib
 Version:	1.2.3
-Release:	10
+Release:	11
 Epoch:		2
 License:	GPL v2+
 Group:		Libraries
@@ -55,6 +55,8 @@ Patch4:		%{name}-vdpau-hooks.patch
 Patch5:		%{name}-missing.patch
 Patch6:		smbclient.patch
 Patch7:		%{name}-build.patch
+Patch8:		libdvdnav5.patch
+Patch9:		x32.patch
 URL:		http://xine.sourceforge.net/
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.22}
 %{?with_fusionsound:BuildRequires:	FusionSound-devel >= 0.9.23}
@@ -96,6 +98,8 @@ BuildRequires:	librsvg
 BuildRequires:	libtheora-devel
 BuildRequires:	libtool >= 0:1.4.2-9
 BuildRequires:	libva-devel
+BuildRequires:	libva-glx-devel
+BuildRequires:	libva-x11-devel
 BuildRequires:	libvdpau-devel
 BuildRequires:	libv4l-devel
 BuildRequires:	libvorbis-devel
@@ -956,6 +960,8 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %{__gettextize}
diff --git a/libdvdnav5.patch b/libdvdnav5.patch
new file mode 100644
index 0000000..b006470
--- /dev/null
+++ b/libdvdnav5.patch
@@ -0,0 +1,17 @@
+--- xine-lib-1.2.3/m4/input.m4~	2015-03-09 19:21:30.000000000 +0100
++++ xine-lib-1.2.3/m4/input.m4	2015-03-09 19:42:52.059143679 +0100
+@@ -126,9 +126,11 @@
+     dnl XXX: This could be cleaned up so that code does not have to ifdef so much
+     XINE_ARG_WITH([external-dvdnav], [Use external dvdnav library (not recommended)])
+     if test x"$with_external_dvdnav" != x"no"; then
+-        ACX_PACKAGE_CHECK([DVDNAV], [0.1.9], [dvdnav-config],
+-                          [AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])],
+-                          [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])])
++        no_dvdnav=no
++        PKG_CHECK_MODULES([DVDNAV], [dvdnav >= 0.1.9], [], [no_dvdnav=yes])
++	if test "$no_dvdnav" = 'no'; then
++            AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])
++	fi
+         AC_CHECK_LIB([dvdread], [navRead_DSI], [DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread"], [])
+     else
+         AC_MSG_RESULT([Using included DVDNAV support])
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..a6f38ac
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,43 @@
+--- xine-lib-1.2.3/src/post/planar/noise.c~	2012-02-05 20:17:02.000000000 +0100
++++ xine-lib-1.2.3/src/post/planar/noise.c	2015-03-09 19:48:57.305807701 +0100
+@@ -37,7 +37,7 @@
+ #  include <libavutil/mem.h>
+ #endif
+ 
+-#ifdef ARCH_X86_64
++#if defined(ARCH_X86_64) && !defined(__ILP32__)
+ #  define REG_a  "rax"
+ #  define intarch_t int64_t
+ #else
+--- xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame_template_sse2.c~	2012-06-30 20:02:39.000000000 +0200
++++ xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame_template_sse2.c	2015-03-09 20:01:38.315802192 +0100
+@@ -96,7 +96,7 @@
+                                          int bottom_field, int second_field,
+                                          int width, int height )
+ {
+-#if defined(ARCH_X86) || defined(ARCH_X86_64)
++#if defined(ARCH_X86) || (defined(ARCH_X86_64) && !defined(__ILP32__))
+     int Line;
+     int stride = width * 2;
+     register uint8_t* M1;
+--- xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame.c~	2012-05-26 22:49:59.000000000 +0200
++++ xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame.c	2015-03-09 20:03:08.535801540 +0100
+@@ -59,6 +59,10 @@
+                                     int bottom_field, int second_field, int width, int height )
+ 
+ {
++#if defined(ARCH_X86_64) && defined(__ILP32__)
++        DeinterlaceGreedy2Frame_MMXEXT(output, outstride, data,
++                                       bottom_field, second_field, width, height );
++#else
+     if (xine_mm_accel() & MM_ACCEL_X86_SSE2) {
+         if (((uintptr_t)output & 15) || (outstride & 15) ||
+             width & 7 ||
+@@ -82,6 +86,7 @@
+                                        bottom_field, second_field, width, height );
+         /* could fall back to 3dnow/mmx here too */
+     }
++#endif
+ }
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xine-lib.git/commitdiff/1bafb47a9f5b95038d73b862266b160a1d19ee5e