aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2008-08-02 08:29:15 +0000
committerVolker Stolz <vs@FreeBSD.org>2008-08-02 08:29:15 +0000
commitf232ebaa5a3a7c83c787aa06deb26653ce924286 (patch)
treee73b355cb4341b278145d195ac79328f0ae5cab7
parentda42c80ed99242cdf12ed4e7893d399126182a30 (diff)
downloadports-f232ebaa5a3a7c83c787aa06deb26653ce924286.tar.gz
ports-f232ebaa5a3a7c83c787aa06deb26653ce924286.zip
- Update multimedia/vlc to 0.8.6i , which adresses usability fixes and fix CVE-2008-2430
- Remove dead configuration options (LAME and CORBA) PR: ports/125830 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=217935
-rw-r--r--multimedia/vlc/Makefile26
-rw-r--r--multimedia/vlc/Makefile.inc7
-rw-r--r--multimedia/vlc/distinfo6
-rw-r--r--multimedia/vlc/files/patch-modules-visualization-galaktos_PCM.c10
4 files changed, 6 insertions, 43 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 04409ecc9f42..1dfd6cdc27bc 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -9,8 +9,7 @@
#
PORTNAME= vlc
-DISTVERSION= 0.8.6h
-PORTREVISION= 2
+DISTVERSION= 0.8.6i
PORTEPOCH= 2
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
@@ -31,7 +30,6 @@ OPTIONS+= AALIB "Aalib Console Graphics Support" Off
OPTIONS+= AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On
OPTIONS+= CACA "Libcaca Console Graphics Support" Off
OPTIONS+= ARTS "Enable arts sound support" Off
-OPTIONS+= CORBA "Enable a Corba interface via orbit2" Off
OPTIONS+= DAAP "Connect to iTunes(R) music shares" On
OPTIONS+= DEBUG "Enable debuging support" Off
OPTIONS+= DTS "DTS decoder support, many DVDs use this" On
@@ -40,7 +38,6 @@ OPTIONS+= FAAC "Faac audio encoder (mp4/aac) support" Off
OPTIONS+= FAAD "Faad audio decoder (mp4/aac) support" Off
OPTIONS+= FLAC "Flac audio codec support" Off
OPTIONS+= HTTPD "Streaming media control via http" On
-OPTIONS+= LAME "Lame mp3 audio encoder support" On
OPTIONS+= LIVEMEDIA "Support for rstp/rtp/sdp protocols" On
OPTIONS+= MAD "Mad mp3 audio decoder support" On
OPTIONS+= MATROSKA "Matroska Container Format support" On
@@ -53,7 +50,7 @@ OPTIONS+= SDL "SDL video output" On
OPTIONS+= SVG "SVG graphics support" Off
OPTIONS+= SVGALIB "SVGALIB video output" Off
OPTIONS+= SHOUT "Shout2 support" Off
-OPTIONS+= SKINS "Enable GTK+ skinsned interface" Off
+OPTIONS+= SKINS "Enable Winamp 2.x skinned interface" Off
OPTIONS+= SPEEX "Speex voice codec support" On
OPTIONS+= THEORA "OGG/Vorbis video codec support" Off
OPTIONS+= TWOLAME "Twolame mpeg2 audio encoder support" Off
@@ -222,13 +219,6 @@ CONFIGURE_ARGS+=--disable-cdda \
--disable-cddax
.endif
-.if defined(WITH_CORBA) && !defined(WITHOUT_CORBA)
-USE_GNOME+= orbit2
-CONFIGURE_ARGS+=--enable-corba
-.else
-CONFIGURE_ARGS+=--disable-corba
-.endif
-
.if !defined(WITHOUT_DVBPSI)
LIB_DEPENDS+= dvbpsi.5:${PORTSDIR}/multimedia/libdvbpsi
CONFIGURE_ARGS+=--enable-dvbpsi \
@@ -343,15 +333,6 @@ CONFIGURE_ARGS+=--enable-ggi
CONFIGURE_ARGS+=--disable-ggi
.endif
-# Do not use lame if PACKAGE_BUILDING is defined. since
-# lame can NOT be packaged.
-.if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING)
-LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+=--enable-mp3lame
-.else
-CONFIGURE_ARGS+=--disable-mp3lame
-.endif
-
.if !defined(WITHOUT_MATROSKA)
LIB_DEPENDS+= matroska.0:${PORTSDIR}/multimedia/libmatroska
CONFIGURE_ARGS+=--enable-mkv
@@ -367,8 +348,7 @@ CONFIGURE_ARGS+=--disable-a52
.endif
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
-USE_GECKO= firefox mozilla seamonkey nvu
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+USE_GECKO= xulrunner firefox3 firefox mozilla seamonkey nvu
CONFIGURE_ENV+= MOZILLA_CONFIG="${GECKO_CONFIG}" \
XPIDL="${XPIDL}" \
XPIDL_INCL="${XPIDL_INCL}"
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 295441ed64cc..7339837899c2 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -11,9 +11,6 @@
#
# Interface Knobs:
#
-# WITH_CORBA
-# Enable a Corba interface via orbit2
-#
# WITH_NCURSES=yes
# Ncurses (console) interface
#
@@ -50,10 +47,6 @@
# Flac Support
#
-# WITHOUT_LAME=yes
-# Mp3 encoder Support
-# ** NOT DEFINED if PACKAGE_BUILDING is defined **
-#
# WITHOUT_A52=yes
# liba52 audio support
#
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index c5a91c729a16..ae25700d28f2 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-0.8.6h.tar.bz2) = 4a6eece2f56d4ad5dfa786e934d2b4a8
-SHA256 (vlc-0.8.6h.tar.bz2) = 50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
-SIZE (vlc-0.8.6h.tar.bz2) = 11762435
+MD5 (vlc-0.8.6i.tar.bz2) = 3c90520c9f22a68d287458d5a8af989e
+SHA256 (vlc-0.8.6i.tar.bz2) = a866768f7dd8254c62e059327094073800ed968214b5b35e2682eb81f448214f
+SIZE (vlc-0.8.6i.tar.bz2) = 11786172
diff --git a/multimedia/vlc/files/patch-modules-visualization-galaktos_PCM.c b/multimedia/vlc/files/patch-modules-visualization-galaktos_PCM.c
deleted file mode 100644
index c5f775189af1..000000000000
--- a/multimedia/vlc/files/patch-modules-visualization-galaktos_PCM.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/visualization/galaktos/PCM.c.orig 2008-06-24 00:46:12.000000000 +0200
-+++ modules/visualization/galaktos/PCM.c 2008-06-24 00:46:31.000000000 +0200
-@@ -32,6 +32,7 @@
-
- #include <stdlib.h>
- #include <stdio.h>
-+#include <inttypes>
-
- double **PCMd; //data structure to store PCM data PCM[channels][maxsamples]
- int maxsamples; //size of PCM buffer