[xine-lib] - xvmclib header changes, fixes ftbfs (#635653,#661071)

[Rex Dieter]

commit af04f9092826764b0a5cf430e986d86e11f0cc7c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 24 08:55:18 2011 -0600

    - xvmclib header changes, fixes ftbfs (#635653,#661071)

 xine-lib-1.1.19-xvmclib_header.patch |   11 +++++++++++
 xine-lib.spec                        |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xine-lib-1.1.19-xvmclib_header.patch b/xine-lib-1.1.19-xvmclib_header.patch
new file mode 100644
index 0000000..880250c
--- /dev/null
+++ b/xine-lib-1.1.19-xvmclib_header.patch
@@ -0,0 +1,11 @@
+diff -up xine-lib-1.1.19/src/video_out/xxmc.h.ftbfs xine-lib-1.1.19/src/video_out/xxmc.h
+--- xine-lib-1.1.19/src/video_out/xxmc.h.ftbfs	2010-03-09 16:17:05.000000000 -0600
++++ xine-lib-1.1.19/src/video_out/xxmc.h	2011-01-24 08:48:28.516631749 -0600
+@@ -79,6 +79,7 @@
+ #include <X11/extensions/Xvlib.h>
+ #ifdef HAVE_VLDXVMC
+   #include <X11/extensions/vldXvMC.h>
++  #include <X11/extensions/XvMClib.h>
+ #else
+   #include <X11/extensions/XvMClib.h>
+   #include <X11/extensions/XvMC.h>
diff --git a/xine-lib.spec b/xine-lib.spec
index 09ee7d2..771fe4d 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -44,7 +44,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.19
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/ 
@@ -67,6 +67,8 @@ Patch8:         xine-lib-1.1.17-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstreamable patches
+# fixes ftbfs for xvmc header reshuffling
+Patch50:        xine-lib-1.1.19-xvmclib_header.patch
 ## upstream patches
 
 Provides:         xine-lib(plugin-abi) = %{plugin_abi}
@@ -207,6 +209,7 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 #patch6 -p1 -b .deepbind
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
+%patch50 -p1 -b .xvmclib_header
 
 # autotools patch + touch'ing above seems to miss something, aclocal
 # runs on make anyway, let's use the ./autogen.sh hammer for now.
@@ -453,6 +456,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 24 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.1.19-4
+- xvmclib header changes, fixes ftbfs (#635653,#661071)
+
 * Sun Nov 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.19-3
 - rebuild for new directfb (1.4.11)