From 06b5966d8846a0fc20412d41cb399ac47cd979ba Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 6 Jul 2012 12:51:11 +0000 Subject: [PATCH] update to VLC 2.0.2, from Brad. --- x11/vlc/Makefile | 11 +++++------ x11/vlc/distinfo | 10 +++++----- x11/vlc/patches/patch-configure_ac | 14 +++++++------- x11/vlc/patches/patch-share_Makefile_am | 10 +++++----- x11/vlc/pkg/PLIST-main | 5 ++++- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 4c290bdc8f6..5fd76379496 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.152 2012/06/20 06:44:28 ratchov Exp $ +# $OpenBSD: Makefile,v 1.153 2012/07/06 12:51:11 sthen Exp $ SHARED_ONLY= Yes COMMENT-main= VideoLAN client; multimedia player COMMENT-jack= JACK audio output module for VLC -V= 2.0.1 +V= 2.0.2 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} -REVISION-main= 4 PKGNAME-jack= vlc-jack-${V} -REVISION-jack= 0 CATEGORIES= x11 MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/ EXTRACT_SUFX= .tar.xz @@ -46,7 +44,7 @@ WANTLIB-main= GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 \ ${WANTLIB-common} WANTLIB-jack= jack vlccore ${WANTLIB-common} -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 AUTOMAKE_VERSION= 1.11 MODULES= devel/gettext \ @@ -155,7 +153,8 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ -L${LOCALBASE}/live/groupsock -L${LOCALBASE}/live/BasicUsageEnvironment \ -L${LOCALBASE}/live/UsageEnvironment" \ LOCALBASE="${LOCALBASE}" \ - PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" + PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \ + ac_cv_header_execinfo_h=no PSEUDO_FLAVORS= no_jack FLAVOR?= diff --git a/x11/vlc/distinfo b/x11/vlc/distinfo index b747eb6cd14..274f408970b 100644 --- a/x11/vlc/distinfo +++ b/x11/vlc/distinfo @@ -1,5 +1,5 @@ -MD5 (vlc-2.0.1.tar.xz) = WtEUdVZw5IgaKzU1Ti95vA== -RMD160 (vlc-2.0.1.tar.xz) = nZMuG+crZc9HBXGR2ehN7u3qKCw= -SHA1 (vlc-2.0.1.tar.xz) = QNDtNg3T+n3D/0+8nDGVU+uyJTg= -SHA256 (vlc-2.0.1.tar.xz) = f0hXJcF0h6d9cIRMvZrPUoNg1lzW/3nSBmV5IPT8v0s= -SIZE (vlc-2.0.1.tar.xz) = 17210552 +MD5 (vlc-2.0.2.tar.xz) = k+cpzJcKRTWzIT2+8OaVKA== +RMD160 (vlc-2.0.2.tar.xz) = qPvJHfwByLkMfWk7bL5PoWIH6CI= +SHA1 (vlc-2.0.2.tar.xz) = 2ll+eB+FXf9M0njBN8D69DtQTCY= +SHA256 (vlc-2.0.2.tar.xz) = ERqDsZ0JmJwXQ+1wiJdYbiD2zTfyfML8rAnHWnIhxi8= +SIZE (vlc-2.0.2.tar.xz) = 18023928 diff --git a/x11/vlc/patches/patch-configure_ac b/x11/vlc/patches/patch-configure_ac index 9d71bef7fae..5dc60e8d2af 100644 --- a/x11/vlc/patches/patch-configure_ac +++ b/x11/vlc/patches/patch-configure_ac @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_ac,v 1.22 2012/05/28 18:44:26 ajacoutot Exp $ ---- configure.ac.orig Thu Mar 8 07:18:41 2012 -+++ configure.ac Sun May 20 22:42:19 2012 +$OpenBSD: patch-configure_ac,v 1.23 2012/07/06 12:51:11 sthen Exp $ +--- configure.ac.orig Mon Jun 25 10:46:34 2012 ++++ configure.ac Sat Jun 30 22:40:47 2012 @@ -122,10 +122,6 @@ case "${host_os}" in ;; openbsd*) @@ -12,7 +12,7 @@ $OpenBSD: patch-configure_ac,v 1.22 2012/05/28 18:44:26 ajacoutot Exp $ ;; netbsd*) SYS=netbsd -@@ -687,6 +683,20 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +@@ -688,6 +684,20 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for pthreads - borrowed from XMMS THREAD_LIB=error if test "${THREAD_LIB}" = "error"; then @@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.22 2012/05/28 18:44:26 ajacoutot Exp $ AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread") fi if test "${THREAD_LIB}" = "error"; then -@@ -963,33 +973,6 @@ dnl Check for various optimization flags +@@ -964,33 +974,6 @@ dnl Check for various optimization flags AS_IF([test "${enable_optimizations}" != "no"], [ C_O="" @@ -67,7 +67,7 @@ $OpenBSD: patch-configure_ac,v 1.22 2012/05/28 18:44:26 ajacoutot Exp $ VLC_RESTORE_FLAGS CFLAGS="${CFLAGS} ${C_O}" CXXFLAGS="${CXXFLAGS} ${C_O}" -@@ -1735,7 +1718,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}" +@@ -1736,7 +1719,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}" AC_LANG_PUSH(C++) CPPFLAGS_save="${CPPFLAGS}" AS_IF([test -z "${CONTRIB_DIR}"], [ @@ -76,7 +76,7 @@ $OpenBSD: patch-configure_ac,v 1.22 2012/05/28 18:44:26 ajacoutot Exp $ ], [ CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" ]) -@@ -3511,6 +3494,24 @@ AS_IF([test "$enable_oss" != "no"], [ +@@ -3509,6 +3492,24 @@ AS_IF([test "$enable_oss" != "no"], [ ]) AC_SUBST(OSS_LIBS) AM_CONDITIONAL([HAVE_OSS], [test "${have_oss}" = "yes"]) diff --git a/x11/vlc/patches/patch-share_Makefile_am b/x11/vlc/patches/patch-share_Makefile_am index d9129cd75d3..d3cb3ef09c1 100644 --- a/x11/vlc/patches/patch-share_Makefile_am +++ b/x11/vlc/patches/patch-share_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-share_Makefile_am,v 1.1 2012/04/23 13:47:08 ajacoutot Exp $ ---- share/Makefile.am.orig Sun Feb 12 13:52:59 2012 -+++ share/Makefile.am Mon Feb 13 00:54:53 2012 -@@ -55,7 +55,6 @@ CLEANFILES += osdmenu/default.cfg +$OpenBSD: patch-share_Makefile_am,v 1.2 2012/07/06 12:51:11 sthen Exp $ +--- share/Makefile.am.orig Sat May 5 21:03:06 2012 ++++ share/Makefile.am Sat Jun 30 22:40:47 2012 +@@ -56,7 +56,6 @@ CLEANFILES += osdmenu/default.cfg nobase_vlcdata_DATA = if BUILD_SKINS @@ -9,7 +9,7 @@ $OpenBSD: patch-share_Makefile_am,v 1.1 2012/04/23 13:47:08 ajacoutot Exp $ nobase_vlcdata_DATA += $(DIST_skins2) endif if BUILD_OSDMENU -@@ -100,10 +99,6 @@ skins2_default_vlt_FILES = \ +@@ -105,10 +104,6 @@ skins2_default_vlt_FILES = \ skins2/default.vlt: $(skins2_default_vlt_FILES) mkdir -p skins2 diff --git a/x11/vlc/pkg/PLIST-main b/x11/vlc/pkg/PLIST-main index d4637f17ba3..e22c87e7121 100644 --- a/x11/vlc/pkg/PLIST-main +++ b/x11/vlc/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.25 2012/06/15 08:30:24 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.26 2012/07/06 12:51:11 sthen Exp $ @pkgpath x11/vlc %%amd64%% %%i386%% @@ -472,6 +472,9 @@ share/locale/fur/ share/locale/fur/LC_MESSAGES/ share/locale/fur/LC_MESSAGES/vlc.mo share/locale/ga/LC_MESSAGES/vlc.mo +share/locale/gd/ +share/locale/gd/LC_MESSAGES/ +share/locale/gd/LC_MESSAGES/vlc.mo share/locale/gl/LC_MESSAGES/vlc.mo share/locale/he/LC_MESSAGES/vlc.mo share/locale/hi/LC_MESSAGES/vlc.mo