summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc/Makefile10
-rw-r--r--multimedia/vlc/PLIST19
-rw-r--r--multimedia/vlc/distinfo10
-rw-r--r--multimedia/vlc/patches/patch-configure15
4 files changed, 35 insertions, 19 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index faa3a7f44b9..e313366d35b 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.61 2008/10/02 17:49:00 ahoka Exp $
+# $NetBSD: Makefile,v 1.62 2008/10/13 18:42:12 ahoka Exp $
#
-DISTNAME= vlc-0.9.2
-PKGREVISION= 1
+DISTNAME= vlc-${VLC_VERSION}
CATEGORIES= multimedia
-MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/0.9.2/
+MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.bz2
+VLC_VERSION= 0.9.4
+
MAINTAINER= ahoka@NetBSD.org
HOMEPAGE= http://videolan.org/
COMMENT= VLC media player and streaming server
@@ -37,7 +38,6 @@ BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0
BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
-CONFIGURE_ARGS+= --disable-gnomevfs
CONFIGURE_ARGS+= --disable-smb
CONFIGURE_ARGS+= --enable-cddax \
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 45d8b7b37a1..a22c79ba2d7 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/10/02 17:49:00 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/10/13 18:42:12 ahoka Exp $
${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
@@ -6,7 +6,6 @@ ${PLIST.dbus}lib/vlc/misc/libtelepathy_plugin.la
${PLIST.x11}bin/qvlc
${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
${PLIST.x11}lib/vlc/codec/libpng_plugin.la
-${PLIST.x11}lib/vlc/gui/libqt4_plugin.la
${PLIST.x11}lib/vlc/misc/libfreetype_plugin.la
${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la
${PLIST.x11}lib/vlc/video_filter/libosdmenu_plugin.la
@@ -33,6 +32,14 @@ ${PLIST.gnome}lib/vlc/access/libaccess_gnomevfs_plugin.la
${PLIST.v4l2}lib/vlc/access/libaccess_v4l2_plugin.la
${PLIST.cdda}lib/vlc/access/libcdda_plugin.la
${PLIST.vcd}lib/vlc/access/libvcd_plugin.la
+${PLIST.skins}bin/svlc
+${PLIST.skins}lib/vlc/gui/libskins2_plugin.la
+${PLIST.skins}share/vlc/skins2/default.vlt
+${PLIST.skins}share/vlc/skins2/fonts/FreeSans.ttf
+${PLIST.skins}share/vlc/skins2/fonts/FreeSansBold.ttf
+${PLIST.skins}share/vlc/skins2/skin.catalog
+${PLIST.skins}share/vlc/skins2/skin.dtd
+${PLIST.skins}share/vlc/skins2/winamp2.xml
bin/cvlc
bin/rvlc
bin/vlc
@@ -138,9 +145,7 @@ lib/vlc/audio_filter/libspatializer_plugin.la
lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.la
lib/vlc/audio_filter/libtrivial_resampler_plugin.la
lib/vlc/audio_filter/libugly_resampler_plugin.la
-lib/vlc/audio_filter/libdtstofloat32_plugin.a
lib/vlc/audio_filter/libdtstofloat32_plugin.la
-lib/vlc/audio_filter/libdtstofloat32_plugin.so
lib/vlc/audio_mixer/libfloat32_mixer_plugin.la
lib/vlc/audio_mixer/libspdif_mixer_plugin.la
lib/vlc/audio_mixer/libtrivial_mixer_plugin.la
@@ -197,6 +202,7 @@ lib/vlc/demux/libm4v_plugin.la
lib/vlc/demux/libmjpeg_plugin.la
lib/vlc/demux/libmkv_plugin.la
lib/vlc/demux/libmp4_plugin.la
+lib/vlc/demux/libmpc_plugin.la
lib/vlc/demux/libmpga_plugin.la
lib/vlc/demux/libmpgv_plugin.la
lib/vlc/demux/libnsc_plugin.la
@@ -226,7 +232,7 @@ lib/vlc/meta_engine/libtaglib_plugin.la
lib/vlc/misc/libaudioscrobbler_plugin.la
lib/vlc/misc/libdummy_plugin.la
lib/vlc/misc/libexport_plugin.la
-lib/vlc/misc/libfreetype_plugin.la
+lib/vlc/misc/libgnutls_plugin.la
lib/vlc/misc/liblogger_plugin.la
lib/vlc/misc/libmemcpy_plugin.la
lib/vlc/misc/libosd_parser_plugin.la
@@ -318,13 +324,13 @@ lib/vlc/video_filter/libwave_plugin.la
lib/vlc/video_output/libglx_plugin.la
lib/vlc/video_output/libimage_plugin.la
lib/vlc/video_output/libopengl_plugin.la
+lib/vlc/video_output/libsnapshot_plugin.la
lib/vlc/video_output/libvmem_plugin.la
lib/vlc/video_output/libx11_plugin.la
lib/vlc/video_output/libxvideo_plugin.la
lib/vlc/visualization/libvisual_plugin.la
lib/vlc/demux/libmpc_plugin.la
lib/vlc/misc/libgnutls_plugin.la
-lib/vlc/video_output/libsnapshot_plugin.la
man/man1/vlc-config.1
man/man1/vlc.1
share/applications/vlc.desktop
@@ -334,6 +340,7 @@ share/doc/vlc/intf-cdda.txt
share/doc/vlc/intf-vcd.txt
share/locale/af/LC_MESSAGES/vlc.mo
share/locale/ar/LC_MESSAGES/vlc.mo
+share/locale/bg/LC_MESSAGES/vlc.mo
share/locale/bn/LC_MESSAGES/vlc.mo
share/locale/ca/LC_MESSAGES/vlc.mo
share/locale/co/LC_MESSAGES/vlc.mo
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 3980bdae224..a1138c6e7a1 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2008/09/27 22:33:20 ahoka Exp $
+$NetBSD: distinfo,v 1.20 2008/10/13 18:42:12 ahoka Exp $
-SHA1 (vlc-0.9.2.tar.bz2) = 04b1fa46964bee98a4dc5b07f21d2980c1081f59
-RMD160 (vlc-0.9.2.tar.bz2) = 00dd848b794ac5ebd99503fdb6ec653a67e41766
-Size (vlc-0.9.2.tar.bz2) = 16163031 bytes
-SHA1 (patch-configure) = a8594efc40ad3f253c5f066d1d779a06ce58831f
+SHA1 (vlc-0.9.4.tar.bz2) = 1325b29268bdcecfb5272433d1fde935171aefed
+RMD160 (vlc-0.9.4.tar.bz2) = 6f02a3cfbe50eb34f58fd1f4b9e6e9881f344152
+Size (vlc-0.9.4.tar.bz2) = 16471217 bytes
+SHA1 (patch-configure) = 0b69157981409067b42385ee5c81fc422f3842a2
SHA1 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f
diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure
index 97f1511eb68..6f0201ece05 100644
--- a/multimedia/vlc/patches/patch-configure
+++ b/multimedia/vlc/patches/patch-configure
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure,v 1.1 2008/09/27 22:33:20 ahoka Exp $
+$NetBSD: patch-configure,v 1.2 2008/10/13 18:42:12 ahoka Exp $
---- configure.ac.orig 2008-09-14 09:12:24.000000000 +0200
+--- configure.ac.orig 2008-10-06 20:14:27.000000000 +0200
+++ configure.ac
-@@ -2407,7 +2407,7 @@ then
+@@ -1592,7 +1592,7 @@ dnl Allow runing as root (usefull for pe
+ dnl
+ AC_ARG_ENABLE(run-as-root,
+ [ --enable-run-as-root allow runing VLC as root (default disabled)])
+-AS_IF([test "${enable_run_as_root}" == "yes"],[
++AS_IF([test "${enable_run_as_root}" = "yes"],[
+ AC_DEFINE(ALLOW_RUN_AS_ROOT, 1,
+ [Define to 1 to allow runing VLC as root (uid 0).])
+ ])
+@@ -2424,7 +2424,7 @@ then
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"