diff options
| -rw-r--r-- | multimedia/xine-lib/distinfo | 5 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-al | 18 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-aq | 12 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-gb | 15 |
4 files changed, 1 insertions, 49 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 9bfcfb471e5..5a918c76037 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2010/04/13 15:09:40 drochner Exp $ +$NetBSD: distinfo,v 1.67 2010/07/21 16:47:57 drochner Exp $ SHA1 (xine-lib-1.1.18.1.tar.bz2) = 783232b6d6e23850a7ac97bf53b2a8bc2e743270 RMD160 (xine-lib-1.1.18.1.tar.bz2) = caa05f16a58bb5ba438b6bd4605cdc2ed91c7201 @@ -12,10 +12,8 @@ SHA1 (patch-ah) = 56a0cbb1b5b3c9d1a0e55694ebb82307f82d3198 SHA1 (patch-ai) = 4644746f1a5105cdc1e0d20612fc7be467852140 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 -SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa SHA1 (patch-ap) = f22810c78ac0d1bb7e958ed92fd2ad8a7f889d92 -SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 SHA1 (patch-aw) = 52520d47bd9b5af313fab9a38e79f24f5c58d37c SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633 @@ -29,4 +27,3 @@ SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c SHA1 (patch-fb) = fe4913041758b6e42f32cd810534199129d61351 SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68 -SHA1 (patch-gb) = 1ebf174f34305ad890eb88133587339134d986a2 diff --git a/multimedia/xine-lib/patches/patch-al b/multimedia/xine-lib/patches/patch-al deleted file mode 100644 index de26a4163f0..00000000000 --- a/multimedia/xine-lib/patches/patch-al +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-al,v 1.7 2008/07/17 17:00:35 drochner Exp $ - ---- src/xine-utils/xineutils.h.orig 2008-06-25 15:04:09.000000000 +0200 -+++ src/xine-utils/xineutils.h -@@ -673,7 +673,13 @@ void xine_strdupa(char *dest, char *src) - - /* compatibility macros */ - #define xine_strpbrk(S, ACCEPT) strpbrk((S), (ACCEPT)) -+ -+#ifndef HAVE_STRSEP -+#define strsep(STRINGP, DELIM) _xine_private_strsep((STRINGP), (DELIM)) -+char *_xine_private_strsep(char **stringp, const char *delim); -+#endif - #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM)) -+ - #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX)) - - /** diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq deleted file mode 100644 index 0ad498597cb..00000000000 --- a/multimedia/xine-lib/patches/patch-aq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aq,v 1.8 2007/06/18 21:16:11 joerg Exp $ - ---- src/libffmpeg/libavcodec/utils.c.orig 2007-06-17 20:11:32.000000000 +0000 -+++ src/libffmpeg/libavcodec/utils.c -@@ -34,6 +34,7 @@ - #include <stdarg.h> - #include <limits.h> - #include <float.h> -+#include <unistd.h> - #ifdef __MINGW32__ - #include <fcntl.h> - #endif diff --git a/multimedia/xine-lib/patches/patch-gb b/multimedia/xine-lib/patches/patch-gb deleted file mode 100644 index 31ffc9820cb..00000000000 --- a/multimedia/xine-lib/patches/patch-gb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-gb,v 1.7 2009/12/09 10:13:03 drochner Exp $ - ---- src/combined/ffmpeg/ff_video_decoder.c.orig 2009-12-02 17:53:56.000000000 +0100 -+++ src/combined/ffmpeg/ff_video_decoder.c -@@ -1235,8 +1235,10 @@ static void ff_handle_buffer (ff_video_d - if (this->decoder_init_mode) { - int codec_type = buf->type & 0xFFFF0000; - -+#ifdef AVCODEC_HAS_REORDERED_OPAQUE - if (!ff_check_extradata(this, codec_type, buf)) - return; -+#endif - - /* init ffmpeg decoder */ - init_video_codec(this, codec_type); |