summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/vlc2/Makefile5
-rw-r--r--multimedia/vlc2/PLIST3
-rw-r--r--multimedia/vlc2/distinfo9
-rw-r--r--multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am25
4 files changed, 8 insertions, 34 deletions
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index f50f3875c43..feaf7f7ac83 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2012/06/14 07:44:23 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2012/07/02 19:02:04 drochner Exp $
#
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.xz
-VLC_VERSION= 2.0.1
+VLC_VERSION= 2.0.2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.videolan.org/
diff --git a/multimedia/vlc2/PLIST b/multimedia/vlc2/PLIST
index e95d852421a..00d8b812821 100644
--- a/multimedia/vlc2/PLIST
+++ b/multimedia/vlc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/07/02 19:02:04 drochner Exp $
bin/cvlc
${PLIST.x11}bin/qvlc
bin/rvlc
@@ -427,6 +427,7 @@ share/locale/fi/LC_MESSAGES/vlc.mo
share/locale/fr/LC_MESSAGES/vlc.mo
share/locale/fur/LC_MESSAGES/vlc.mo
share/locale/ga/LC_MESSAGES/vlc.mo
+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
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 2696dd845f4..a02f78607a1 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/06/15 08:51:25 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/07/02 19:02:04 drochner Exp $
-SHA1 (vlc-2.0.1.tar.xz) = 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538
-RMD160 (vlc-2.0.1.tar.xz) = 9d932e1be72b65cf47057191d9e84deeedea282c
-Size (vlc-2.0.1.tar.xz) = 17210552 bytes
+SHA1 (vlc-2.0.2.tar.xz) = da597e781f855dff4cd278c137c0faf43b504c26
+RMD160 (vlc-2.0.2.tar.xz) = a8fbc91dfc01c8b90c7d693b6cbe4fa16207e822
+Size (vlc-2.0.2.tar.xz) = 18023928 bytes
SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
@@ -11,6 +11,5 @@ SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
-SHA1 (patch-modules_gui_qt4_Modules.am) = 3394b42f8f58d433f318ebdf5ffdc052903051de
SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
SHA1 (patch-skins-ab) = bf8b3e33db5389dbf04dfedf1d2f1d120afed66a
diff --git a/multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am b/multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am
deleted file mode 100644
index 0cd4f1aa71e..00000000000
--- a/multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-modules_gui_qt4_Modules.am,v 1.1 2012/06/15 08:51:25 wiz Exp $
-
-Workaround for:
-/usr/pkg/share/automake-1.12/am/depend2.am: error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL
-/usr/pkg/share/automake-1.12/am/depend2.am: The usual way to define 'am__fastdepOBJCXX' is to add 'AC_PROG_OBJCXX'
-/usr/pkg/share/automake-1.12/am/depend2.am: to 'configure.ac' and run 'aclocal' and 'autoconf' again
-modules/gui/qt4/Makefile.am: error: Objective C++ source seen but 'OBJCXX' is undefined
-modules/gui/qt4/Makefile.am: The usual way to define 'OBJCXX' is to add 'AC_PROG_OBJCXX'
-modules/gui/qt4/Makefile.am: to 'configure.ac' and run 'autoconf' again.
-
---- modules/gui/qt4/Modules.am.orig 2011-12-08 18:00:26.000000000 +0000
-+++ modules/gui/qt4/Modules.am
-@@ -317,9 +317,9 @@ SOURCES_qt4 = qt4.cpp \
- util/buttons/DeckButtonsLayout.cpp \
- util/buttons/RoundButton.cpp
-
--if HAVE_DARWIN
--SOURCES_qt4 += util/searchlineedit_mac.mm
--endif
-+#if HAVE_DARWIN
-+#SOURCES_qt4 += util/searchlineedit_mac.mm
-+#endif
-
- if HAVE_WIN32
- SOURCES_qt4 += main_interface_win32.cpp