From 108b304e032366f7d1f780c431d6f37433f62e0b Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 15 Aug 2011 07:35:18 +0000
Subject: Remove patch-src_video_out_xxmc.h -- it's a duplicate of patch-gb.
 Migrate comment there.

---
 multimedia/xine-lib/distinfo                           |  5 ++---
 multimedia/xine-lib/patches/patch-gb                   |  5 ++++-
 multimedia/xine-lib/patches/patch-src_video_out_xxmc.h | 15 ---------------
 3 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 multimedia/xine-lib/patches/patch-src_video_out_xxmc.h

(limited to 'multimedia')

diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index da55170aeca..b790f132507 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2011/08/14 10:14:25 sbd Exp $
+$NetBSD: distinfo,v 1.72 2011/08/15 07:35:18 wiz Exp $
 
 SHA1 (xine-lib-1.1.19.tar.bz2) = 5afcc28c5cf2bdaab99d951960f6587797e1e5a0
 RMD160 (xine-lib-1.1.19.tar.bz2) = 84999c43d3cc115c3bda4b2e06089dc827c646cc
@@ -19,6 +19,5 @@ SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68
-SHA1 (patch-gb) = edbb3b607c84a271c31324881fa521f656203e53
+SHA1 (patch-gb) = 569539c868711a004740f40d1c48d30eb9e0399f
 SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9
-SHA1 (patch-src_video_out_xxmc.h) = b82877f498abb2ef29b88aa4ae6dbcbbf72bd3f7
diff --git a/multimedia/xine-lib/patches/patch-gb b/multimedia/xine-lib/patches/patch-gb
index b977b44c188..586259e4ff9 100644
--- a/multimedia/xine-lib/patches/patch-gb
+++ b/multimedia/xine-lib/patches/patch-gb
@@ -1,4 +1,7 @@
-$NetBSD: patch-gb,v 1.9 2011/07/18 09:58:38 drochner Exp $
+$NetBSD: patch-gb,v 1.10 2011/08/15 07:35:18 wiz Exp $
+
+With videoproto-2.3.1 and newer XvMClib.h is nolonger included by
+vldXvMC.h.
 
 --- src/video_out/xxmc.h.orig	2010-03-09 22:17:05.000000000 +0000
 +++ src/video_out/xxmc.h
diff --git a/multimedia/xine-lib/patches/patch-src_video_out_xxmc.h b/multimedia/xine-lib/patches/patch-src_video_out_xxmc.h
deleted file mode 100644
index 0c9c3f63c0b..00000000000
--- a/multimedia/xine-lib/patches/patch-src_video_out_xxmc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_video_out_xxmc.h,v 1.1 2011/08/14 10:14:25 sbd Exp $
-
-With videoproto-2.3.1 and newer XvMClib.h is nolonger included by
-vldXvMC.h.
-
---- src/video_out/xxmc.h.orig	2011-01-18 00:24:24.000000000 +0000
-+++ src/video_out/xxmc.h
-@@ -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>
-- 
cgit v1.2.3