summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authorahoka <ahoka@pkgsrc.org>2008-09-27 22:33:20 +0000
committerahoka <ahoka@pkgsrc.org>2008-09-27 22:33:20 +0000
commit1ba4647814c20c28459de5b2156096611050584a (patch)
tree66721a67747e4178018e9e683aa6545d09f6b549 /multimedia/vlc
parente18d40bbba2f878bfc3c884d55fd904f9c18adb7 (diff)
downloadpkgsrc-1ba4647814c20c28459de5b2156096611050584a.tar.gz
Update to 0.9.2, the first real 0.9.x release of VLC.
Only minor bugfixes, no detailed list in the changelog. Add gnome option for gnome-vfs, not enabled by default. Add support for V4L2. This is only enabled for Linux now. Build needs to be fixed for NetBSD and tested for others.
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile20
-rw-r--r--multimedia/vlc/PLIST4
-rw-r--r--multimedia/vlc/distinfo10
-rw-r--r--multimedia/vlc/options.mk14
-rw-r--r--multimedia/vlc/patches/patch-configure13
-rw-r--r--multimedia/vlc/patches/patch-v4l219
6 files changed, 68 insertions, 12 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 277232bbdcc..ad7c6e37f2c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2008/09/20 22:33:02 ahoka Exp $
+# $NetBSD: Makefile,v 1.60 2008/09/27 22:33:20 ahoka Exp $
#
-DISTNAME= vlc-0.9.1
-PKGREVISION= 1
+DISTNAME= vlc-0.9.2
CATEGORIES= multimedia
-MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/0.9.1/
+MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/0.9.2/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= ahoka@NetBSD.org
@@ -20,7 +19,7 @@ GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
USE_LANGUAGES= c99 c++
USE_DIRS+= xdg-1.4
-PLIST_VARS+= x86simd altivec
+PLIST_VARS+= x86simd altivec v4l2
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
@@ -54,6 +53,14 @@ PLIST.altivec= yes
CONFIGURE_ARGS+= --enable-altivec
.endif
+# Enable when cleanly builds
+.if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h)
+CONFIGURE_ARGS+= --enable-v4l2
+PLIST.v4l2= yes
+.else
+CONFIGURE_ARGS+= --disable-v4l2
+.endif
+
INSTALLATION_DIRS+= ${PREFIX}/share/vlc/http/dialogs \
${PREFIX}/share/vlc/http/images \
${PREFIX}/share/vlc/http/js \
@@ -72,6 +79,9 @@ INSTALLATION_DIRS+= ${PREFIX}/share/vlc/http/dialogs \
${PREFIX}/share/vlc/skins2 \
${PREFIX}/share/vlc/skins2/fonts
+pre-configure:
+ cd ${WRKSRC} && autoconf
+
pre-install:
${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 5ad4c2ce182..7fb62968e84 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2008/09/20 22:33:02 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/09/27 22:33:20 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
@@ -29,6 +29,8 @@ ${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.la
${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_sse2_plugin.la
${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_sse2_plugin.la
${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_sse2_plugin.la
+${PLIST.gnome}lib/vlc/access/libaccess_gnomevfs_plugin.la
+${PLIST.v4l2}lib/vlc/access/libaccess_v4l2_plugin.la
bin/cvlc
bin/rvlc
bin/vlc
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 295b706523e..3980bdae224 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.18 2008/09/08 18:58:24 ahoka Exp $
+$NetBSD: distinfo,v 1.19 2008/09/27 22:33:20 ahoka Exp $
-SHA1 (vlc-0.9.1.tar.bz2) = c9202b0333acfde998d329a4973034212bbe3542
-RMD160 (vlc-0.9.1.tar.bz2) = 0dac8f648140833c6bca41608caba7bd2faf3bb0
-Size (vlc-0.9.1.tar.bz2) = 15795447 bytes
+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 (patch-v4l2) = 54504b7e3bc41522db5c90983319c0c1ce1f3c8f
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index c72425ddd6b..d58a254f316 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.7 2008/09/08 18:58:24 ahoka Exp $
+# $NetBSD: options.mk,v 1.8 2008/09/27 22:33:20 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS= debug faad arts dbus skins sdl esound x11
+PKG_SUPPORTED_OPTIONS= debug faad arts dbus skins sdl esound x11 gnome
PKG_SUGGESTED_OPTIONS= x11 esound
.include "../../mk/bsd.options.mk"
@@ -27,6 +27,16 @@ CONFIGURE_ARGS+= --disable-sdl
CONFIGURE_ARGS+= --disable-sdl-image
.endif
+## gnome-vfs support
+
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+= --enable-gnomevfs
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+PLIST.gnome= yes
+.else
+CONFIGURE_ARGS+= --disable-gnomevfs
+.endif
+
## DBUS message bus support
## also libnotify because it uses dbus
## so taking them apart would make no sense.
diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure
new file mode 100644
index 00000000000..97f1511eb68
--- /dev/null
+++ b/multimedia/vlc/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.1 2008/09/27 22:33:20 ahoka Exp $
+
+--- configure.ac.orig 2008-09-14 09:12:24.000000000 +0200
++++ configure.ac
+@@ -2407,7 +2407,7 @@ then
+ fi
+
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
+- AC_CHECK_HEADERS(linux/videodev2.h, [
++ AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [
+ VLC_ADD_PLUGIN([v4l2])
+ ],[])
+ CPPFLAGS="${CPPFLAGS_save}"
diff --git a/multimedia/vlc/patches/patch-v4l2 b/multimedia/vlc/patches/patch-v4l2
new file mode 100644
index 00000000000..cce3aba1668
--- /dev/null
+++ b/multimedia/vlc/patches/patch-v4l2
@@ -0,0 +1,19 @@
+$NetBSD: patch-v4l2,v 1.1 2008/09/27 22:33:20 ahoka Exp $
+
+--- modules/access/v4l2/v4l2.c.orig 2008-09-25 01:46:12.000000000 +0200
++++ modules/access/v4l2/v4l2.c
+@@ -55,7 +55,13 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+
+-#include <linux/videodev2.h>
++#if defined(HAVE_LINUX_VIDEODEV2_H)
++# include <linux/videodev2.h>
++#elif defined(HAVE_SYS_VIDEOIO_H)
++# include <sys/videoio.h>
++#else
++# error "No Video4Linux2 headers found."
++#endif
+
+ #include <sys/soundcard.h>
+