From ae601a0d5a6c157dc6a153df05591459ec4a9176 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 20 Sep 2010 07:58:13 +0000 Subject: [PATCH] Garbage collect some patches for Xine-lib which are not necessary. From Brad. --- multimedia/xine-lib/Makefile | 5 ++--- .../patches/patch-src_input_Makefile_in | 12 ----------- .../xine-lib/patches/patch-src_input_mms_c | 20 ------------------- .../patch-src_input_vcd_libcdio_iso9660_fs_c | 11 ---------- .../patch-src_libsputext_demux_sputext_c | 12 ----------- .../patch-src_post_deinterlace_Makefile_in | 12 ----------- .../patches/patch-src_xine-utils_utils_c | 11 ---------- 7 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 multimedia/xine-lib/patches/patch-src_input_Makefile_in delete mode 100644 multimedia/xine-lib/patches/patch-src_input_mms_c delete mode 100644 multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c delete mode 100644 multimedia/xine-lib/patches/patch-src_libsputext_demux_sputext_c delete mode 100644 multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in delete mode 100644 multimedia/xine-lib/patches/patch-src_xine-utils_utils_c diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 10fd3d93682..0561675145f 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.65 2010/09/13 20:12:16 sthen Exp $ +# $OpenBSD: Makefile,v 1.66 2010/09/20 07:58:13 sthen Exp $ SHARED_ONLY= Yes COMMENT= multimedia decoding library DISTNAME= xine-lib-1.1.19 +REVISION= 0 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} EXTRACT_SUFX= .tar.bz2 @@ -51,10 +52,8 @@ LIB_DEPENDS= ::audio/faad \ ::graphics/vcdimager .if ${MACHINE_ARCH} == "i386" -MAKE_FLAGS+= TOMSMOCOMP_LINKS= PKG_ARGS+= -Di386=1 .else -MAKE_FLAGS+= TOMSMOCOMP_LINKS=\# PKG_ARGS+= -Di386=0 .endif diff --git a/multimedia/xine-lib/patches/patch-src_input_Makefile_in b/multimedia/xine-lib/patches/patch-src_input_Makefile_in deleted file mode 100644 index 7c539c89f2e..00000000000 --- a/multimedia/xine-lib/patches/patch-src_input_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_input_Makefile_in,v 1.17 2010/03/21 01:41:15 sthen Exp $ ---- src/input/Makefile.in.orig Sat Mar 6 14:36:10 2010 -+++ src/input/Makefile.in Sat Mar 6 15:12:20 2010 -@@ -662,7 +662,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c - # --------- - # All of xine input plugins should be named like the scheme "xineplug_inp_" - # --@HAVE_CDROM_IOCTLS_TRUE@in_vcd = xineplug_inp_vcdo.la -+@ENABLE_VCD_TRUE@@HAVE_CDROM_IOCTLS_TRUE@in_vcd = xineplug_inp_vcdo.la - @HAVE_V4L_TRUE@in_v4l = xineplug_inp_v4l.la - @HAVE_V4L_TRUE@in_pvr = xineplug_inp_pvr.la - @HAVE_V4L2_TRUE@in_v4l2 = xineplug_inp_v4l2.la diff --git a/multimedia/xine-lib/patches/patch-src_input_mms_c b/multimedia/xine-lib/patches/patch-src_input_mms_c deleted file mode 100644 index 6647bac6883..00000000000 --- a/multimedia/xine-lib/patches/patch-src_input_mms_c +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_input_mms_c,v 1.7 2009/02/02 22:00:42 sthen Exp $ ---- src/input/mms.c.orig Sun Jan 4 10:47:28 2009 -+++ src/input/mms.c Thu Jan 8 01:06:20 2009 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - #endif - - /********** logging **********/ -@@ -290,7 +291,7 @@ static int send_command (mms_t *this, int command, - - #ifdef USE_ICONV - static iconv_t string_utf16_open() { -- return iconv_open("UTF-16LE", "UTF-8"); -+ return iconv_open("UTF-16LE", locale_charset()); - } - - static void string_utf16_close(iconv_t url_conv) { diff --git a/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c b/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c deleted file mode 100644 index 62460baf112..00000000000 --- a/multimedia/xine-lib/patches/patch-src_input_vcd_libcdio_iso9660_fs_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_input_vcd_libcdio_iso9660_fs_c,v 1.3 2007/06/13 10:58:29 jakemsr Exp $ ---- src/input/vcd/libcdio/iso9660_fs.c.orig Sun Apr 15 10:42:16 2007 -+++ src/input/vcd/libcdio/iso9660_fs.c Sun May 20 22:40:02 2007 -@@ -33,6 +33,7 @@ - - #ifdef HAVE_ICONV - # include -+# include - #endif - - #ifdef HAVE_NL_LANGINFO diff --git a/multimedia/xine-lib/patches/patch-src_libsputext_demux_sputext_c b/multimedia/xine-lib/patches/patch-src_libsputext_demux_sputext_c deleted file mode 100644 index 136a978701d..00000000000 --- a/multimedia/xine-lib/patches/patch-src_libsputext_demux_sputext_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_libsputext_demux_sputext_c,v 1.3 2008/01/15 00:36:46 jakemsr Exp $ ---- src/libsputext/demux_sputext.c.orig Tue Jan 1 08:30:08 2008 -+++ src/libsputext/demux_sputext.c Wed Jan 9 01:50:22 2008 -@@ -55,7 +55,7 @@ - #define SUB_MAX_TEXT 5 - #define SUB_BUFSIZE 1024 - #define LINE_LEN 1000 --#define LINE_LEN_QUOT "1000" -+#define LINE_LEN_QUOT "999" - - /* - * Demuxer typedefs diff --git a/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in b/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in deleted file mode 100644 index 3bcdd958793..00000000000 --- a/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.9 2010/03/21 01:41:15 sthen Exp $ ---- src/post/deinterlace/Makefile.in.orig Tue Feb 23 17:50:46 2010 -+++ src/post/deinterlace/Makefile.in Tue Feb 23 19:29:58 2010 -@@ -482,7 +482,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post - vidixdir = $(XINE_PLUGINDIR)/vidix - SUBDIRS = plugins - EXTRA_DIST = --xinepost_LTLIBRARIES = xineplug_post_tvtime.la -+${TOMSMOCOMP_LINKS}xinepost_LTLIBRARIES = xineplug_post_tvtime.la - xineplug_post_tvtime_la_SOURCES = xine_plugin.c \ - deinterlace.c pulldown.c speedy.c tvtime.c - diff --git a/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c b/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c deleted file mode 100644 index 5e532a60f11..00000000000 --- a/multimedia/xine-lib/patches/patch-src_xine-utils_utils_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_xine-utils_utils_c,v 1.4 2008/01/15 00:36:46 jakemsr Exp $ ---- src/xine-utils/utils.c.orig Tue Jan 1 08:30:09 2008 -+++ src/xine-utils/utils.c Wed Jan 9 01:50:22 2008 -@@ -49,6 +49,7 @@ - - #ifdef HAVE_NL_LANGINFO - #include -+#include - #endif - - #if defined(__CYGWIN__) || defined(WIN32)