mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-18 08:02:48 +00:00
Upgrade to 1.0.2 and fix a security issue: see
<http://www.videolan.org/security/sa0901.html>. Also include fixes from PR ports/135018 to fix build when WITHOUT_X11 is defined. PR: ports/139114 (1) ports/135018 (2) Submitted by: Christopher Key <cjk32 (at) cam.ac.uk> (1) Nick Triantos <nick-freebsd (at) triantos.com> (2) Approved by: Joseph S. Atkinson <jsa.bsd (at) gmail.com> (maintainer) Security: VideoLAN-SA-0901 (CVE Pending)
This commit is contained in:
Thierry Thomas
parent
e0bcdec57e
commit
83d2efc59d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=243683
@ -9,8 +9,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= vlc
|
||||
DISTVERSION= 1.0.1
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 1.0.2
|
||||
PORTEPOCH= 3
|
||||
CATEGORIES= multimedia audio ipv6 net www
|
||||
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
|
||||
@ -20,8 +19,6 @@ MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSIO
|
||||
MAINTAINER= jsa@wickedmachine.net
|
||||
COMMENT= Multimedia streaming server and player for various audio/video formats
|
||||
|
||||
BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
|
||||
${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
|
||||
LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
|
||||
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
|
||||
|
||||
@ -65,9 +62,13 @@ OPTIONS= A52 "a52 audio support, many DVDs use this" On \
|
||||
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
.if !defined(WITHOUT_X11)
|
||||
WANT_GNOME= yes
|
||||
USE_GNOME= gnomehack gnometarget libxml2
|
||||
.endif
|
||||
.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
|
||||
WANT_SDL= yes
|
||||
.endif
|
||||
USE_ICONV= yes
|
||||
USE_PERL5_BUILD=yes
|
||||
|
||||
@ -87,7 +88,8 @@ CONFIGURE_ARGS+= --enable-vlc \
|
||||
--enable-postproc \
|
||||
--without-dv-raw1394 \
|
||||
--disable-dv \
|
||||
--disable-galaktos
|
||||
--disable-galaktos \
|
||||
--disable-glx
|
||||
|
||||
MAN1= vlc.1 \
|
||||
vlc-config.1 \
|
||||
@ -105,7 +107,7 @@ WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
|
||||
BROKEN= Does not compile with perl ${PERL_VERSION}
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_QT4)
|
||||
.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
|
||||
USE_QT_VER+= 4
|
||||
QT_COMPONENTS+= gui corelib moc_build rcc_build uic_build
|
||||
CONFIGURE_ARGS+=--enable-qt4
|
||||
@ -162,7 +164,7 @@ DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
|
||||
DEFAULT_DVD_DEVICE=/dev/acd0
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_GNOMEVFS)
|
||||
.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_X11)
|
||||
USE_GNOME+= gnomevfs2
|
||||
CONFIGURE_ARGS+= --enable-gnomevfs
|
||||
.else
|
||||
@ -175,14 +177,14 @@ DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
|
||||
DEFAULT_CDROM_DEVICE=/dev/acd0
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_LIBNOTIFY)
|
||||
.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_X11)
|
||||
LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
|
||||
CONFIGURE_ARGS+=--enable-notify
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-notify
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4)
|
||||
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
|
||||
LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar
|
||||
CONFIGURE_ARGS+=--enable-skins2 --enable-libtar
|
||||
.else
|
||||
@ -231,14 +233,14 @@ CONFIGURE_ARGS+=--enable-zvbi
|
||||
CONFIGURE_ARGS+=--disable-zvbi
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_HAL)
|
||||
.if !defined(WITHOUT_HAL) && !defined(WITHOUT_X11)
|
||||
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
|
||||
CONFIGURE_ARGS+=--enable-hal
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-hal
|
||||
.endif
|
||||
|
||||
.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
|
||||
.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS) && !defined(WITHOUT_X11)
|
||||
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
|
||||
CONFIGURE_ARGS+= --enable-arts
|
||||
.else
|
||||
@ -296,7 +298,7 @@ CONFIGURE_ARGS+=--enable-dvdread
|
||||
CONFIGURE_ARGS+=--disable-dvdread
|
||||
.endif
|
||||
|
||||
.if (defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)
|
||||
.if (defined(WITH_ESOUND) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_X11)
|
||||
USE_GNOME+= esound
|
||||
CONFIGURE_ARGS+=--enable-esd
|
||||
.else
|
||||
@ -502,7 +504,7 @@ CONFIGURE_ARGS+=--enable-smb
|
||||
CONFIGURE_ARGS+=--disable-smb
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_SDL)
|
||||
.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
|
||||
USE_SDL= image
|
||||
CONFIGURE_ARGS+=--enable-sdl
|
||||
.else
|
||||
@ -532,7 +534,7 @@ CONFIGURE_ARGS+=--disable-speex
|
||||
CONFIGURE_ARGS+=--disable-sout
|
||||
.endif
|
||||
|
||||
.if (defined(WITH_SVG) || ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG)
|
||||
.if (defined(WITH_SVG) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_X11)
|
||||
USE_GNOME+= librsvg2
|
||||
CONFIGURE_ARGS+=--enable-svg
|
||||
.else
|
||||
@ -587,6 +589,7 @@ CONFIGURE_ARGS+=--enable-optimizations
|
||||
.if defined(WITHOUT_V4L)
|
||||
CONFIGURE_ARGS+=--disable-v4l
|
||||
.else
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
|
||||
CONFIGURE_ARGS+=--enable-v4l
|
||||
.endif
|
||||
|
||||
@ -594,6 +597,7 @@ CONFIGURE_ARGS+=--enable-v4l
|
||||
CONFIGURE_ARGS+=--disable-x11
|
||||
.else
|
||||
USE_XORG= xpm
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
|
||||
CONFIGURE_ARGS+=--enable-x11
|
||||
.endif
|
||||
|
||||
|
||||
@ -257,10 +257,12 @@ pre-install: build
|
||||
${SED} -e 's|^|lib/|' >> ${PLIST} \
|
||||
&& ${FIND} -d * -type d | \
|
||||
${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
|
||||
.if !defined(WITHOUT_X11)
|
||||
cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \
|
||||
${SED} -e 's|^|libdata/|' >> ${PLIST} \
|
||||
&& ${FIND} -d * -type d | \
|
||||
${SED} -e 's|^|@dirrmtry libdata/|' >> ${PLIST}
|
||||
.endif
|
||||
.for dir in vlc
|
||||
cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
|
||||
${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
|
||||
@ -285,7 +287,7 @@ pre-install: build
|
||||
${SED} -e 's|^|%%WEBPLUGINS_DIR%%/|' >> ${PLIST}
|
||||
${ECHO_CMD} "@dirrmtry %%WEBPLUGINS_DIR%%" >> ${PLIST}
|
||||
.endif
|
||||
.for locale in ckb co fur km my oc ps tet tl
|
||||
.for locale in ckb co fur kk km my oc ps tet tl
|
||||
${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
|
||||
${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
|
||||
.endfor
|
||||
@ -297,8 +299,10 @@ do-install:
|
||||
${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
|
||||
cd ${FAKEDIR}/lib && ${FIND} . | \
|
||||
${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
|
||||
.if !defined(WITHOUT_X11)
|
||||
cd ${FAKEDIR}/libdata && ${FIND} . | \
|
||||
${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata
|
||||
.endif
|
||||
cd ${FAKEDIR}/share && ${FIND} . | \
|
||||
${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
|
||||
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (vlc-1.0.1.tar.bz2) = 6e299d373e7751bb36de001cdc6a2989
|
||||
SHA256 (vlc-1.0.1.tar.bz2) = 2b4a1d82699f37a7b696bcdc87e669f17c1ba6ab37bf7a96fd953940e00fd463
|
||||
SIZE (vlc-1.0.1.tar.bz2) = 19794042
|
||||
MD5 (vlc-1.0.2.tar.bz2) = 69d4e30fe4fc2691780fbeacd40359d2
|
||||
SHA256 (vlc-1.0.2.tar.bz2) = 38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0
|
||||
SIZE (vlc-1.0.2.tar.bz2) = 20958212
|
||||
|
||||
20
multimedia/vlc/files/patch-configure-dvbpsi
Normal file
20
multimedia/vlc/files/patch-configure-dvbpsi
Normal file
@ -0,0 +1,20 @@
|
||||
--- configure.orig 2009-09-23 23:31:31.000000000 +0100
|
||||
+++ configure 2009-09-23 23:30:51.000000000 +0100
|
||||
@@ -29130,7 +29130,16 @@
|
||||
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
|
||||
for ac_header in dvbpsi/dr.h
|
||||
do :
|
||||
- ac_fn_c_check_header_mongrel "$LINENO" "dvbpsi/dr.h" "ac_cv_header_dvbpsi_dr_h" "$ac_includes_default"
|
||||
+ ac_fn_c_check_header_compile "$LINENO" "dvbpsi/dr.h" "ac_cv_header_dvbpsi_dr_h" "#if defined( HAVE_STDINT_H )
|
||||
+# include <stdint.h>
|
||||
+#elif defined( HAVE_INTTYPES_H )
|
||||
+# include <inttypes.h>
|
||||
+#endif
|
||||
+#include <dvbpsi/dvbpsi.h>
|
||||
+#include <dvbpsi/descriptor.h>
|
||||
+#include <dvbpsi/pat.h>
|
||||
+#include <dvbpsi/pmt.h>
|
||||
+"
|
||||
if test "x$ac_cv_header_dvbpsi_dr_h" = x""yes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_DVBPSI_DR_H 1
|
||||
@ -1,10 +0,0 @@
|
||||
--- modules/access/file.c.orig 2009-09-13 21:50:02.000000000 +0900
|
||||
+++ modules/access/file.c 2009-09-13 21:50:37.000000000 +0900
|
||||
@@ -52,6 +52,7 @@
|
||||
# include <linux/magic.h>
|
||||
# define HAVE_FSTATFS 1
|
||||
#elif defined (HAVE_SYS_MOUNT_H)
|
||||
+# include <sys/param.h>
|
||||
# include <sys/mount.h>
|
||||
# define HAVE_FSTATFS 1
|
||||
#endif
|
||||
@ -73,14 +73,3 @@
|
||||
p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
|
||||
|
||||
return p_block;
|
||||
--- configure.orig Mon Jun 12 10:44:45 2006
|
||||
+++ configure Mon Jun 12 10:46:11 2006
|
||||
@@ -39400,7 +39400,7 @@
|
||||
enableval="$enable_v4l"
|
||||
fi
|
||||
|
||||
-if test "${enable_v4l}" = "yes"
|
||||
+if true
|
||||
then
|
||||
|
||||
# Check whether --with-v4l or --without-v4l was given.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user