Date: Tue, 22 Jul 2008 06:34:13 -0400 From: Naram Qashat <cyberbotx@cyberbotx.com> To: =?ISO-8859-1?Q?Rafa=EBl_Carr=E9?= <rcarre@m2x.nl> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/125830: [PATCH] Update multimedia/vlc to 0.8.6i , which adresses usability fixes and fix CVE-2008-2430 Message-ID: <4885B7A5.90904@cyberbotx.com> In-Reply-To: <200807220930.m6M9U4jP083087@freefall.freebsd.org> References: <200807220930.m6M9U4jP083087@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Rafaël Carré wrote: > The following reply was made to PR ports/125830; it has been noted by GNATS. > > From: =?ISO-8859-1?Q?Rafa=EBl_Carr=E9?= <rcarre@m2x.nl> > To: bug-followup@FreeBSD.org > Cc: > Subject: Re: ports/125830: [PATCH] Update multimedia/vlc to 0.8.6i , which > adresses usability fixes and fix CVE-2008-2430 > Date: Tue, 22 Jul 2008 11:27:05 +0200 > > --=-L74WmuJDWUjsqyyE1WE2 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: quoted-printable > > Here comes the update, hope GNATS can show it properly. Actually, you shouldn't include <bsd.gecko.mk>, it breaks the build. Just having the USE_GECKO line in there causes bsd.gecko.mk to be automatically included. Thanks, Naram Qashat > --=20 > Rafa=C3=ABl Carr=C3=A9 <rcarre@m2x.nl> > > --=-L74WmuJDWUjsqyyE1WE2 > Content-Disposition: attachment; filename=vlc-0.8.6i.diff > Content-Type: text/x-patch; name=vlc-0.8.6i.diff; charset=UTF-8 > Content-Transfer-Encoding: 7bit > > diff -ruN vlc.orig/Makefile vlc/Makefile > --- vlc.orig/Makefile 2008-07-22 10:41:55.000000000 +0200 > +++ vlc/Makefile 2008-07-22 10:42:28.000000000 +0200 > @@ -9,8 +9,7 @@ > # > > PORTNAME= vlc > -DISTVERSION= 0.8.6h > -PORTREVISION= 1 > +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+= 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+= 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+= 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 @@ > --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+=--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,8 @@ > .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 > +.include <bsd.gecko.mk> > CONFIGURE_ENV+= MOZILLA_CONFIG="${GECKO_CONFIG}" \ > XPIDL="${XPIDL}" \ > XPIDL_INCL="${XPIDL_INCL}" > diff -ruN vlc.orig/Makefile.inc vlc/Makefile.inc > --- vlc.orig/Makefile.inc 2008-07-22 10:41:55.000000000 +0200 > +++ vlc/Makefile.inc 2008-07-22 10:42:05.000000000 +0200 > @@ -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 -ruN vlc.orig/distinfo vlc/distinfo > --- vlc.orig/distinfo 2008-07-22 10:41:55.000000000 +0200 > +++ vlc/distinfo 2008-07-22 10:42:05.000000000 +0200 > @@ -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 -ruN vlc.orig/files/patch-modules-visualization-galaktos_PCM.c vlc/files/patch-modules-visualization-galaktos_PCM.c > --- vlc.orig/files/patch-modules-visualization-galaktos_PCM.c 2008-07-22 10:41:55.000000000 +0200 > +++ vlc/files/patch-modules-visualization-galaktos_PCM.c 1970-01-01 01:00:00.000000000 +0100 > @@ -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 > diff -ruN vlc.orig/files/patch-modules_stream_out_switcher.c vlc/files/patch-modules_stream_out_switcher.c > --- vlc.orig/files/patch-modules_stream_out_switcher.c 2008-07-22 10:41:55.000000000 +0200 > +++ vlc/files/patch-modules_stream_out_switcher.c 1970-01-01 01:00:00.000000000 +0100 > @@ -1,11 +0,0 @@ > ---- modules/stream_out/switcher.c.orig Wed Mar 23 03:57:15 2005 > -+++ modules/stream_out/switcher.c Wed Mar 23 03:57:50 2005 > -@@ -44,7 +44,7 @@ > - #ifdef HAVE_POSTPROC_POSTPROCESS_H > - # include <postproc/postprocess.h> > - #else > --# include <libpostproc/postprocess.h> > -+# include <ffmpeg/postproc/postprocess.h> > - #endif > - > - #define SOUT_CFG_PREFIX "sout-switcher-" > > --=-L74WmuJDWUjsqyyE1WE2-- > > _______________________________________________ > freebsd-ports-bugs@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs > To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4885B7A5.90904>