From c5491b57ef26acbdd9f193c5e9e121ac8183b161894fca37c7f847b12742a2f3 Mon Sep 17 00:00:00 2001
From: Manfred Tremmel <Manfred.Tremmel@iiv.de>
Date: Thu, 18 Nov 2010 22:44:49 +0000
Subject: [PATCH] Accepting request 53316 from
 home:coolo:branches:openSUSE:Factory

reviewed ok, should be reported upstream.

OBS-URL: https://build.opensuse.org/request/show/53316
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=37
---
 xine-lib-1.1.19-xvmc.patch | 17 +++++++++++++++++
 xine-lib.changes           |  5 +++++
 xine-lib.spec              |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 xine-lib-1.1.19-xvmc.patch

diff --git a/xine-lib-1.1.19-xvmc.patch b/xine-lib-1.1.19-xvmc.patch
new file mode 100644
index 0000000..3b3a0ed
--- /dev/null
+++ b/xine-lib-1.1.19-xvmc.patch
@@ -0,0 +1,17 @@
+Quoting ChangeLog of X11's videoproto package:
+vldXvMC.h: stop uselessly including XvMClib.h
+
+--- src/video_out/xxmc.h
++++ src/video_out/xxmc.h
+@@ -77,10 +77,10 @@
+ #include <X11/extensions/XShm.h>
+ #include <X11/extensions/Xv.h>
+ #include <X11/extensions/Xvlib.h>
++#include <X11/extensions/XvMClib.h>
+ #ifdef HAVE_VLDXVMC
+   #include <X11/extensions/vldXvMC.h>
+ #else
+-  #include <X11/extensions/XvMClib.h>
+   #include <X11/extensions/XvMC.h>
+ #endif
+ 
diff --git a/xine-lib.changes b/xine-lib.changes
index 74a6585..90bb3f6 100644
--- a/xine-lib.changes
+++ b/xine-lib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 18 10:04:52 UTC 2010 - coolo@novell.com
+
+- add patch from arch linux to fix build with newer xorg
+
 -------------------------------------------------------------------
 Tue Aug  3 13:14:49 UTC 2010 - lnussel@suse.de
 
diff --git a/xine-lib.spec b/xine-lib.spec
index 08d23fc..4a0b48e 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -124,6 +124,7 @@ Source99:       precheckin_cripple_tarball.sh
 Patch26:        xine-lib-doc-fix-X11R6.diff
 Patch28:        xine-lib-%{version}-ia64-is-not-alpha.diff
 Patch31:        xine-lib-%{version}-glitch-free-pulseaudio.patch
+Patch32:        http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc.patch
 # *** Addons
 Patch50:        vdr-xine-0.9.3.diff.bz2
 Patch51:        vdr-xine-SUSE.diff
@@ -631,6 +632,7 @@ EOF
 %patch26
 %patch28 -p1
 %patch31 -p1
+%patch32 -p0
 %if 0%{suse_version} >= 1110
 # set fuzzy=2 to get patch work with crippled and noncrippled tarball
 %patch50 -p1 -F2