[rpms/xine-lib] epel9-next: - drop xvmclib_header patch, fixed upstream

[rpms/xine-lib] epel9-next: - drop xvmclib_header patch, fixed upstream

[Kevin Kofler]

A new commit has been pushed.

Repo   : rpms/xine-lib
Branch : epel9-next
Commit : 809c5f3c59b688b83cca49f4831ec373fe84f2cd
Author : Kevin Kofler <Kevin@tigcc.ticalc.org>
Date   : 2011-11-20T03:12:42+01:00
Stats  : +1/-16 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/xine-lib/c/809c5f3c59b688b83cca49f4831ec373fe84f2cd?branch=epel9-next

Log:
- drop xvmclib_header patch, fixed upstream

---
diff --git a/xine-lib-1.1.19-xvmclib_header.patch b/xine-lib-1.1.19-xvmclib_header.patch
deleted file mode 100644
index 880250c..0000000
--- a/xine-lib-1.1.19-xvmclib_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 798ba4e..3bdf3b8 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -43,10 +43,6 @@ Patch1:         xine-lib-1.1.4-optflags.patch
 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}
 %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -152,7 +148,6 @@ touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 %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.
@@ -394,6 +389,7 @@ rm -rf $RPM_BUILD_ROOT
 - drop ESD (esound) support on F17+ (native PulseAudio just works)
 - drop autotools patch, run autogen.sh in %%prep instead
 - drop unused deepbind patch
+- drop xvmclib_header patch, fixed upstream
 
 * Fri Jul 15 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.19-7
 - rebuild for new DirectFB (1.5.0)