diff options
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 21 | ||||
| -rw-r--r-- | multimedia/vlc/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c | 10 |
3 files changed, 25 insertions, 10 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 2412ce289d22..3fdc87413dcb 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vlc -DISTVERSION= 1.1.11 -PORTREVISION= 4 +DISTVERSION= 1.1.12 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -69,7 +68,7 @@ OPTIONS= A52 "A52 DVD audio decoder" On \ REALAUDIO "Real Audio(R) support" On \ REMOTEOSD "Remote OSD support" On \ RUNROOT "Enable running as root" Off \ - SAMBA "SAMBA Access module" On \ + SAMBA "SAMBA Access module" Off \ SCHROED "Enable Schroedinger decoder" Off \ SDL "SDL video output" On \ SHOUT "Shout2 support" Off \ @@ -215,8 +214,14 @@ CONFIGURE_ARGS+=--enable-altivec # VLC's config script doesn't know to do this # User tunables # Define these to override +# FreeBSD 9.x uses CAM devices +.if (${OSVERSION} > 900037) +WITH_CDROM_DEVICE?=/dev/cd0 +WITH_DVD_DEVICE?=/dev/cd0 +.else WITH_CDROM_DEVICE?=/dev/acd0 WITH_DVD_DEVICE?=/dev/acd0 +.endif # If you change this value, the dependancy will not be recorded .if !defined(WITH_VLC_DEFAULT_FONT) @@ -466,12 +471,12 @@ CFLAGS+=-O3 -ffast-math -fomit-frame-pointer CONFIGURE_ARGS+=--enable-optimizations .endif -.if !defined(WITHOUT_OGG) -LIB_DEPENDS+= ogg.7:${PORTSDIR}/audio/libogg -CONFIGURE_ARGS+=--enable-ogg -.else +.if defined(WITHOUT_OGG) CONFIGURE_ARGS+=--disable-ogg WITHOUT_VORBIS= yes +.else +LIB_DEPENDS+= ogg.7:${PORTSDIR}/audio/libogg +CONFIGURE_ARGS+=--enable-ogg .endif .if defined(WITH_OPENGL) @@ -539,7 +544,7 @@ CONFIGURE_ARGS+=--enable-remoteosd CONFIGURE_ARGS+=--enable-run-as-root .endif -.if !defined(WITHOUT_SAMBA) +.if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient CONFIGURE_ARGS+=--enable-smb .else diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index 542aea1512b1..a770d95a9149 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,2 +1,2 @@ -SHA256 (vlc-1.1.11.tar.bz2) = 682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb -SIZE (vlc-1.1.11.tar.bz2) = 26319862 +SHA256 (vlc-1.1.12.tar.bz2) = 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68 +SIZE (vlc-1.1.12.tar.bz2) = 26220996 diff --git a/multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c b/multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c new file mode 100644 index 000000000000..229c7637742e --- /dev/null +++ b/multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c @@ -0,0 +1,10 @@ +--- ./modules/misc/inhibit/xdg.c.orig 2011-11-13 19:05:10.000000000 -0500 ++++ ./modules/misc/inhibit/xdg.c 2011-11-13 19:06:20.000000000 -0500 +@@ -28,6 +28,7 @@ + #include <assert.h> + #include <spawn.h> + #include <sys/wait.h> ++#include <signal.h> + + static int Open (vlc_object_t *); + static void Close (vlc_object_t *); |