Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/Makefile,v retrieving revision 1.306 diff -u -p -r1.306 Makefile --- Makefile 15 Oct 2012 16:49:06 -0000 1.306 +++ Makefile 4 Nov 2012 22:13:42 -0000 @@ -2,8 +2,7 @@ # $FreeBSD: ports/multimedia/vlc/Makefile,v 1.306 2012/10/15 16:49:06 nox Exp $ PORTNAME= vlc -DISTVERSION= 2.0.3 -PORTREVISION= 4 +DISTVERSION= 2.0.4 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \ @@ -24,14 +23,14 @@ RUN_DEPENDS= ffmpeg${FFMPEG_SUFFIX}>=1.0 OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DIRAC DOCS DTS DVDREAD \ DVDNAV FAAD FLAC FLUID FRIBIDI GLX GNOMEVFS GNUTLS GOOM \ HTTPD JACK LIVEMEDIA LUA MAD MATROSKA MODPLUG MPEG2 MTP \ - MUSEPACK NCURSES NLS NOTIFY OPTIMIZED_CFLAGS OGG \ + MUSEPACK NCURSES NLS NOTIFY OPTIMIZED_CFLAGS OGG OPUS \ PNG PORTAUDIO PROJM PULSEAUDIO QT4 REALAUDIO RUNROOT \ SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SQLITE SVG \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \ X11 X264 XCB XOSD XVIDEO ZVBI SERVER_ONLY DEBUG \ NO_DVD OPTIONS_DEFAULT=A52 AVAHI DBUS DTS DVDREAD DVDNAV FAAD FLAC GLX GNUTLS \ - HTTPD LUA MAD MATROSKA MPEG2 OGG PNG QT4 REALAUDIO \ + HTTPD LUA MAD MATROSKA MPEG2 OGG OPUS PNG QT4 REALAUDIO \ SDL SKINS STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ VCD VORBIS X11 X264 XCB XVIDEO ASS_DESC= ASS/SSA subtitle rendering @@ -42,6 +41,7 @@ FLUID_DESC= Fluidsynth MIDI support GNOMEVFS_DESC= Gnome VFS support GOOM_DESC= the Goom visual effect library NCURSES_DESC= ncurses (console) interface +OPUS_DESC= Opus audio format PROJM_DESC= ProjectM visualizations REALAUDIO_DESC= Real Audio(R) support RUNROOT_DESC= Enable running as root @@ -375,6 +375,7 @@ CONFIGURE_ARGS+=--disable-mpc .endif .if ${PORT_OPTIONS:MNCURSES} +CONFIGURE_ENV+= NCURSES_CFLAGS="-I/usr/include" NCURSES_LIBS="-lncursesw" CONFIGURE_ARGS+=--enable-ncurses .else CONFIGURE_ARGS+=--disable-ncurses @@ -406,6 +407,13 @@ PORT_OPTIONS:= ${PORT_OPTIONS:NVORBIS} CONFIGURE_ARGS+=--disable-ogg .endif +.if ${PORT_OPTIONS:MOPUS} +LIB_DEPENDS+= opus:${PORTSDIR}/audio/opus +CONFIGURE_ARGS+=--enable-opus +.else +CONFIGURE_ARGS+=--disable-opus +.endif + .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+=--enable-png @@ -754,11 +762,11 @@ pre-install: .if ${PORT_OPTIONS:MNLS} cd ${FAKEDIR}/share/locale && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's|^|share/locale/|' >> ${PLIST} -.endif -.for locale in ach cgg ckb co ff fur gd kk km lg my oc ps tet tl zu kmr +.for locale in ach cgg bn_IN ckb co ff fur gd kk km kmr lg my oc ps tet tl zu ${ECHO_CMD} "@dirrmtry share/locale/${locale}/LC_MESSAGES" >> ${PLIST} ${ECHO_CMD} "@dirrmtry share/locale/${locale}" >> ${PLIST} .endfor +.endif do-install: cd ${FAKEDIR}/bin && ${FIND} . | \ Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/distinfo,v retrieving revision 1.51 diff -u -p -r1.51 distinfo --- distinfo 1 Sep 2012 14:10:54 -0000 1.51 +++ distinfo 4 Nov 2012 13:23:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (vlc-2.0.3.tar.xz) = fba9805f7415aebf5b88614de83802dc59d3282ff339128da41addf7e375d2d2 -SIZE (vlc-2.0.3.tar.xz) = 18268208 +SHA256 (vlc-2.0.4.tar.xz) = 4e066ed0d48ddc85aa1f01964945af666b5713cb6230d76347aebbc9a6553db6 +SIZE (vlc-2.0.4.tar.xz) = 18518272 Index: files/patch-modules-access-dtv-access.c =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/files/patch-modules-access-dtv-access.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-modules-access-dtv-access.c --- files/patch-modules-access-dtv-access.c 1 Sep 2012 14:10:54 -0000 1.1 +++ files/patch-modules-access-dtv-access.c 4 Nov 2012 13:24:00 -0000 @@ -1,38 +0,0 @@ ---- modules/access/dtv/access.c.orig -+++ modules/access/dtv/access.c -@@ -198,7 +198,7 @@ static const char *const polarization_us - "low noise block-downconverters (LNB) through a DiSEqC 1.0 switch, " \ - "the correct LNB can be selected (1 to 4). " \ - "If there is no switch, this parameter should be 0.") --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - static const int satno_vlc[] = { 0, 1, 2, 3, 4 }; - static const char *const satno_user[] = { N_("Unspecified"), - "A/1", "B/2", "C/3", "D/4" }; -@@ -242,7 +242,7 @@ vlc_module_begin () - #endif - ) - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - add_integer ("dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT, false) - change_integer_range (0, 255) - change_safe () -@@ -366,7 +366,7 @@ vlc_module_begin () - change_integer_range (0, 18) - change_private () - change_safe () --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - add_bool ("dvb-high-voltage", false, - HIGH_VOLTAGE_TEXT, HIGH_VOLTAGE_LONGTEXT, false) - #endif -@@ -380,7 +380,7 @@ vlc_module_begin () - LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true) - change_integer_range (0, 0x7fffffff) - add_obsolete_integer ("dvb-lnb-slof") /* since 2.0.0 */ --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true) - change_integer_list (satno_vlc, satno_user) - add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true) Index: files/patch-modules-audio_output-vlcpulse.c =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/files/patch-modules-audio_output-vlcpulse.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-modules-audio_output-vlcpulse.c --- files/patch-modules-audio_output-vlcpulse.c 1 Sep 2012 14:10:54 -0000 1.1 +++ files/patch-modules-audio_output-vlcpulse.c 4 Nov 2012 13:24:52 -0000 @@ -1,15 +0,0 @@ ---- modules/audio_output/vlcpulse.c.orig -+++ modules/audio_output/vlcpulse.c -@@ -107,7 +107,12 @@ pa_context *vlc_pa_connect (vlc_object_t - //pa_proplist_sets (props, PA_PROP_APPLICATION_PROCESS_BINARY, - // PACKAGE_NAME); - -+#ifdef __FreeBSD__ -+ /* sysconf (_SC_GETPW_R_SIZE_MAX) returns -1 on FreeBSD */ -+ char buf[LINE_MAX + 1]; -+#else - char buf[sysconf (_SC_GETPW_R_SIZE_MAX)]; -+#endif - struct passwd pwbuf, *pw; - - if (getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw) == 0 Index: files/patch-modules-gui-qt4-components-open_panels.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/files/patch-modules-gui-qt4-components-open_panels.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-modules-gui-qt4-components-open_panels.cpp --- files/patch-modules-gui-qt4-components-open_panels.cpp 1 Sep 2012 14:10:54 -0000 1.1 +++ files/patch-modules-gui-qt4-components-open_panels.cpp 4 Nov 2012 13:25:32 -0000 @@ -1,11 +0,0 @@ ---- modules/gui/qt4/components/open_panels.cpp.orig -+++ modules/gui/qt4/components/open_panels.cpp -@@ -925,7 +925,7 @@ void CaptureOpenPanel::initialize() - - dvbCard = new QSpinBox; - dvbCard->setAlignment( Qt::AlignRight ); --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - dvbCard->setPrefix( "/dev/dvb/adapter" ); - #endif - dvbDevLayout->addWidget( dvbDeviceLabel, 0, 0 ); Index: files/patch-modules-gui-skins2-x11-x11_window.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/vlc/files/patch-modules-gui-skins2-x11-x11_window.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-modules-gui-skins2-x11-x11_window.cpp --- files/patch-modules-gui-skins2-x11-x11_window.cpp 1 Sep 2012 14:10:54 -0000 1.1 +++ files/patch-modules-gui-skins2-x11-x11_window.cpp 4 Nov 2012 13:26:12 -0000 @@ -1,10 +0,0 @@ ---- modules/gui/skins2/x11/x11_window.cpp.orig 2011-12-08 19:00:26.000000000 +0100 -+++ modules/gui/skins2/x11/x11_window.cpp 2012-08-03 15:47:39.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "x11_factory.hpp" - - #include -+#include - - X11Window::X11Window( intf_thread_t *pIntf, GenericWindow &rWindow, - X11Display &rDisplay, bool dragDrop, bool playOnDrop,