From b39c53935bd3d204d8866511d4ca2c36a11624be Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 17 Feb 2012 22:07:16 +0000 Subject: [PATCH] - Remove patches for QT4/MKV modules which are unnecessary. - Remove patch for tdestroy() wrapper now that tdelete() has been fixed. - Remove @comment's from the PLIST which are no longer necessary. From Brad --- x11/vlc/Makefile | 3 ++- x11/vlc/patches/patch-modules_demux_mkv_Makefile_in | 12 ------------ x11/vlc/patches/patch-modules_gui_qt4_Makefile_in | 12 ------------ x11/vlc/patches/patch-src_extras_tdestroy_c | 13 ------------- x11/vlc/pkg/PLIST-main | 8 ++++---- 5 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 x11/vlc/patches/patch-modules_demux_mkv_Makefile_in delete mode 100644 x11/vlc/patches/patch-modules_gui_qt4_Makefile_in delete mode 100644 x11/vlc/patches/patch-src_extras_tdestroy_c diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 96f31bc7be3..1b4710ca4d9 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.139 2011/12/23 15:01:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.140 2012/02/17 22:07:16 sthen Exp $ SHARED_ONLY= Yes @@ -9,6 +9,7 @@ COMMENT-web= Mozilla plugin for embedded media playback V= 1.1.13 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} +REVISION-main= 0 PKGNAME-jack= vlc-jack-${V} PKGNAME-web= vlc-web-${V} CATEGORIES= x11 diff --git a/x11/vlc/patches/patch-modules_demux_mkv_Makefile_in b/x11/vlc/patches/patch-modules_demux_mkv_Makefile_in deleted file mode 100644 index 5cd9ef78091..00000000000 --- a/x11/vlc/patches/patch-modules_demux_mkv_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-modules_demux_mkv_Makefile_in,v 1.2 2011/11/16 13:33:15 phessler Exp $ ---- modules/demux/mkv/Makefile.in.orig Thu Oct 6 20:04:44 2011 -+++ modules/demux/mkv/Makefile.in Sun Nov 13 11:53:42 2011 -@@ -711,7 +711,7 @@ libmkv_plugin_la_CFLAGS = $(AM_CFLAGS) - libmkv_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) - libmkv_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) - # Set LIBADD and DEPENDENCIES manually: --libmkv_plugin_la_LIBADD = $(AM_LIBADD) -+libmkv_plugin_la_LIBADD = $(AM_LIBADD) -lstdc++ - libmkv_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/x11/vlc/patches/patch-modules_gui_qt4_Makefile_in b/x11/vlc/patches/patch-modules_gui_qt4_Makefile_in deleted file mode 100644 index f7437340b2e..00000000000 --- a/x11/vlc/patches/patch-modules_gui_qt4_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-modules_gui_qt4_Makefile_in,v 1.2 2011/11/16 13:33:15 phessler Exp $ ---- modules/gui/qt4/Makefile.in.orig Thu Oct 6 20:04:47 2011 -+++ modules/gui/qt4/Makefile.in Sun Nov 13 11:53:42 2011 -@@ -1125,7 +1125,7 @@ libqt4_plugin_la_CFLAGS = $(AM_CFLAGS) - libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) - libqt4_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) - # Set LIBADD and DEPENDENCIES manually: --libqt4_plugin_la_LIBADD = $(AM_LIBADD) -+libqt4_plugin_la_LIBADD = $(AM_LIBADD) -lstdc++ - libqt4_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/x11/vlc/patches/patch-src_extras_tdestroy_c b/x11/vlc/patches/patch-src_extras_tdestroy_c deleted file mode 100644 index d7ae444e2a4..00000000000 --- a/x11/vlc/patches/patch-src_extras_tdestroy_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_extras_tdestroy_c,v 1.1 2011/11/16 13:33:16 phessler Exp $ ---- src/extras/tdestroy.c.orig Tue Apr 13 02:22:28 2010 -+++ src/extras/tdestroy.c Sat Nov 12 21:06:10 2011 -@@ -102,8 +102,7 @@ void vlc_tdestroy (void *root, void (*freenode) (void - for (size_t i = 0; i < count; i++) - { - smallest.node = tab[i]; -- if (tdelete (smallest.node, &root, cmp_smallest) == NULL) -- abort (); -+ tdelete (smallest.node, &root, cmp_smallest); - } - vlc_mutex_unlock (&smallest.lock); - assert (root == NULL); diff --git a/x11/vlc/pkg/PLIST-main b/x11/vlc/pkg/PLIST-main index 16afc75c5d5..65a84933b45 100644 --- a/x11/vlc/pkg/PLIST-main +++ b/x11/vlc/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.19 2011/12/23 15:01:59 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.20 2012/02/17 22:07:16 sthen Exp $ @pkgpath x11/vlc %%amd64%% %%i386%% @@ -237,16 +237,16 @@ lib/vlc/plugins/misc/libaudioscrobbler_plugin.so lib/vlc/plugins/misc/libdummy_plugin.so lib/vlc/plugins/misc/libexport_plugin.so lib/vlc/plugins/misc/libfreetype_plugin.so -@comment lib/vlc/plugins/misc/libinhibit_plugin.so +lib/vlc/plugins/misc/libinhibit_plugin.so lib/vlc/plugins/misc/liblogger_plugin.so lib/vlc/plugins/misc/libnotify_plugin.so lib/vlc/plugins/misc/libosd_parser_plugin.so lib/vlc/plugins/misc/libstats_plugin.so lib/vlc/plugins/misc/libtelepathy_plugin.so lib/vlc/plugins/misc/libvod_rtsp_plugin.so -@comment lib/vlc/plugins/misc/libxdg_screensaver_plugin.so +lib/vlc/plugins/misc/libxdg_screensaver_plugin.so lib/vlc/plugins/misc/libxml_plugin.so -@comment lib/vlc/plugins/misc/libxscreensaver_plugin.so +lib/vlc/plugins/misc/libxscreensaver_plugin.so lib/vlc/plugins/misc/libxtag_plugin.so lib/vlc/plugins/mux/ lib/vlc/plugins/mux/libmux_asf_plugin.so