diff -ruN /usr/ports/multimedia/vlc/Makefile vlc/Makefile --- /usr/ports/multimedia/vlc/Makefile 2010-06-07 08:41:56.000000000 -0400 +++ vlc/Makefile 2010-06-22 10:21:50.000000000 -0400 @@ -9,8 +9,7 @@ # PORTNAME= vlc -DISTVERSION= 1.0.6 -PORTREVISION= 3 +DISTVERSION= 1.1.0 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -34,10 +33,11 @@ FAAC "Faac audio encoder (mp4/aac) support" Off \ FAAD "Faad audio decoder (mp4/aac) support" On \ FLAC "Flac audio codec support" On \ + GLX "X11 OpenGL support (requires XCB)" On \ GNOMEVFS "Gnome VFS support" On \ HTTPD "Streaming media control via http" On \ LIVEMEDIA "Support for rstp/rtp/sdp protocols" On \ - LUA "Enable lua scripting" Off \ + LUA "Enable lua scripting" On \ MAD "Mad mp3 audio decoder support" On \ MATROSKA "Matroska Container Format support" On \ MPEG2 "Mpeg-2 audio/video decoder Support" On \ @@ -58,7 +58,9 @@ VORBIS "Vorbis support" On \ WIN32_CODECS "win32 multimedia DLL's" Off \ X264 "Enable H.264/AVC codec support" On \ - X11 "Enable X11 (disable for stream only server)" On + XCB "Enable XCB support allowing X11 video " On \ + XOSD "xosd interface support" Off \ + XVIDEO "X11 video support (required XCB)" On USE_BZIP2= yes USE_GMAKE= yes @@ -75,15 +77,13 @@ LIBS="-lc" CONFIGURE_ARGS+= --enable-vlc \ - --enable-release \ --enable-avcodec \ --enable-avformat \ + --enable-oss \ --enable-postproc \ - --without-dv-raw1394 \ --disable-alsa \ - --disable-dv \ - --disable-galaktos \ - --disable-glx + --disable-neon \ + --disable-v4l2 MAN1= vlc.1 \ vlc-config.1 \ @@ -91,14 +91,19 @@ .include -.if !defined(WITHOUT_X11) +# As of 1.1.0, VLC no longer uses X11 directly, instead using XCB +.if defined(WITHOUT_X11) +WITHOUT_XCB=yes +.endif + +.if !defined(WITHOUT_XCB) WANT_GNOME= yes USE_GNOME= gnomehack gnometarget libxml2 .endif -.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11) +.if !defined(WITHOUT_SDL) && !defined(WITHOUT_XCB) WANT_SDL= yes .endif -.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11) +.if !defined(WITHOUT_QT4) && !defined(WITHOUT_XCB) USE_QT_VER= 4 QT_COMPONENTS= gui corelib moc_build rcc_build uic_build .endif @@ -124,7 +129,7 @@ BROKEN= Does not compile with perl ${PERL_VERSION} .endif -.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11) +.if !defined(WITHOUT_QT4) && !defined(WITHOUT_XCB) CONFIGURE_ARGS+=--enable-qt4 .else CONFIGURE_ARGS+=--disable-qt4 @@ -179,7 +184,7 @@ DEFAULT_DVD_DEVICE=/dev/acd0 .endif -.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_X11) +.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_XCB) USE_GNOME+= gnomevfs2 CONFIGURE_ARGS+= --enable-gnomevfs .else @@ -192,14 +197,14 @@ DEFAULT_CDROM_DEVICE=/dev/acd0 .endif -.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_X11) +.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_XCB) 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) && !defined(WITHOUT_X11) +.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4) && !defined(WITHOUT_XCB) LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar CONFIGURE_ARGS+=--enable-skins2 --enable-libtar .else @@ -248,13 +253,6 @@ CONFIGURE_ARGS+=--disable-zvbi .endif -.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(WITHOUT_AVAHI) LIB_DEPENDS+= avahi-common.3:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --enable-bonjour @@ -266,22 +264,11 @@ LIB_DEPENDS+= vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \ cdio.12:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+=--enable-vcd \ - --enable-libcddb \ - --disable-cddax + --enable-libcddb .else CONFIGURE_ARGS+=--disable-vcd \ --disable-libcddb \ - --disable-libcdio \ - --disable-cddax -.endif - -.if !defined(WITHOUT_CDPARANOIA) && !defined(WITHOUT_CDROM) -LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia -CONFIGURE_ARGS+=--enable-cdda \ - --enable-cddax -.else -CONFIGURE_ARGS+=--disable-cdda \ - --disable-cddax + --disable-libcdio .endif .if !defined(WITHOUT_DVBPSI) @@ -332,6 +319,12 @@ CONFIGURE_ARGS+=--disable-fribidi .endif +.if defined(WITHOUT_GLX) +CONFIGURE_ARGS+=--disable-glx +.else +CONFIGURE_ARGS+=--enable-glx +.endif + .if (defined(WITH_AALIB) || exists(${LOCALBASE}/lib/libaa.so.1)) && !defined(WITHOUT_AALIB) LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+=--enable-aa @@ -365,7 +358,7 @@ USE_LUA=5.1+ WANT_LUA_VER=5.1 CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua" -CONFIGURE_ARGS+=--enable-lua +CONFIGURE_ARGS+=--enable-lua LUAC=luac-${WANT_LUA_VER} .else CONFIGURE_ARGS+=--disable-lua .endif @@ -389,6 +382,8 @@ .if defined(WITHOUT_HTTPD) CONFIGURE_ARGS+=--disable-httpd +.else +CONFIGURE_ARGS+=--enable-httpd .endif .if (defined(WITH_GGI) || exists(${LOCALBASE}/lib/libggi.a)) && !defined(WITHOUT_GGI) @@ -504,17 +499,13 @@ CONFIGURE_ARGS+=--disable-smb .endif -.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11) +.if !defined(WITHOUT_SDL) && !defined(WITHOUT_XCB) USE_SDL= image CONFIGURE_ARGS+=--enable-sdl .else CONFIGURE_ARGS+=--disable-sdl .endif -.if defined(WITH_TRANSCODE) || exists(${LOCALBASE}/bin/transcode) -RUN_DEPENDS+= transcode:${PORTSDIR}/multimedia/transcode -.endif - .if !defined(WITHOUT_HTTPD) LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--enable-gnutls @@ -534,7 +525,7 @@ CONFIGURE_ARGS+=--disable-sout .endif -.if (defined(WITH_SVG) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_X11) +.if (defined(WITH_SVG) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_XCB) USE_GNOME+= librsvg2 CONFIGURE_ARGS+=--enable-svg .else @@ -568,21 +559,21 @@ CONFIGURE_ARGS+=--disable-vorbis .endif -.if (defined(WITH_XOSD) || exists(${LOCALBASE}/lib/libxosd.a)) && !defined(WITHOUT_XOSD) +.if defined(WITH_XOSD) && !defined(WITHOUT_XOSD) LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+=--enable-xosd .else CONFIGURE_ARGS+=--disable-xosd .endif -.if defined(DEBUG) +.if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .else -CONFIGURE_ARGS+=--enable-release +CONFIGURE_ARGS+=--disable-debug .endif .if defined(WITH_OCFLAGS) -CFLAGS+= -O3 -ffast-math -fomit-frame-pointer +CFLAGS+=-O3 -ffast-math -fomit-frame-pointer CONFIGURE_ARGS+=--enable-optimizations .endif @@ -594,12 +585,17 @@ CONFIGURE_ARGS+=--enable-v4l --enable-dvb .endif -.if defined(WITHOUT_X11) -CONFIGURE_ARGS+=--disable-x11 +.if defined(WITHOUT_XCB) +CONFIGURE_ARGS+=--disable-xcb +.else +LIBDEPENDS+= xcb.2:${PORTSDIR}/x11/libxcb +CONFIGURE_ARGS+=--enable-xcb +.endif + +.if defined(WITHOUT_XVIDEO) || defined(WITHOUT_XCB) +CONFIGURE_ARGS+=--disable-xvideo .else -USE_XORG= xpm -BUILD_DEPENDS+= ${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm -CONFIGURE_ARGS+=--enable-x11 +CONFIGURE_ARGS+=--enable-xvideo .endif .include "${.CURDIR}/Makefile.inc" diff -ruN /usr/ports/multimedia/vlc/Makefile.inc vlc/Makefile.inc --- /usr/ports/multimedia/vlc/Makefile.inc 2010-04-26 13:30:06.000000000 -0400 +++ vlc/Makefile.inc 2010-06-22 03:36:34.000000000 -0400 @@ -286,7 +286,8 @@ ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include cd ${FAKEDIR}/lib && ${FIND} . | \ ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib - ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png + ${INSTALL_DATA} ${FAKEDIR}/share/icons/hicolor/48x48/apps/vlc.png \ + ${PREFIX}/share/pixmaps/vlc.png .if !defined(WITHOUT_X11) cd ${FAKEDIR}/libdata && ${FIND} . | \ ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata diff -ruN /usr/ports/multimedia/vlc/distinfo vlc/distinfo --- /usr/ports/multimedia/vlc/distinfo 2010-05-03 02:59:47.000000000 -0400 +++ vlc/distinfo 2010-06-22 00:17:51.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (vlc-1.0.6.tar.bz2) = 246a3865ec037f8f5757ef6b973a80fc -SHA256 (vlc-1.0.6.tar.bz2) = f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842 -SIZE (vlc-1.0.6.tar.bz2) = 22149704 +MD5 (vlc-1.1.0.tar.bz2) = e2142957137b183a5ad0a4827c39f655 +SHA256 (vlc-1.1.0.tar.bz2) = a9fb2c5cc400464bbb53ba6feb94f14884f3c76d52eac1ee4c2953a1ce63f1c8 +SIZE (vlc-1.1.0.tar.bz2) = 23908512 diff -ruN /usr/ports/multimedia/vlc/files/patch-configure-dvbpsi vlc/files/patch-configure-dvbpsi --- /usr/ports/multimedia/vlc/files/patch-configure-dvbpsi 2009-11-02 17:51:27.000000000 -0500 +++ vlc/files/patch-configure-dvbpsi 1969-12-31 19:00:00.000000000 -0500 @@ -1,20 +0,0 @@ ---- 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 -+#elif defined( HAVE_INTTYPES_H ) -+# include -+#endif -+#include -+#include -+#include -+#include -+" - if test "x$ac_cv_header_dvbpsi_dr_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_DVBPSI_DR_H 1 diff -ruN /usr/ports/multimedia/vlc/files/patch-modules__access__file.c vlc/files/patch-modules__access__file.c --- /usr/ports/multimedia/vlc/files/patch-modules__access__file.c 1969-12-31 19:00:00.000000000 -0500 +++ vlc/files/patch-modules__access__file.c 2010-06-22 02:06:46.000000000 -0400 @@ -0,0 +1,11 @@ +--- ./modules/access/file.c.orig 2010-06-22 02:05:28.000000000 -0400 ++++ ./modules/access/file.c 2010-06-22 02:05:57.000000000 -0400 +@@ -96,7 +96,7 @@ + if (fstatvfs (fd, &stf)) + return false; + /* fstatvfs() is in POSIX, but MNT_LOCAL is not */ +- return !(s.f_flag & MNT_LOCAL); ++ return !(stf.f_flag & MNT_LOCAL); + + #elif defined (HAVE_LINUX_MAGIC_H) + struct statfs stf; diff -ruN /usr/ports/multimedia/vlc/files/patch-modules__gui__qt4__util__customwidgets.cpp vlc/files/patch-modules__gui__qt4__util__customwidgets.cpp --- /usr/ports/multimedia/vlc/files/patch-modules__gui__qt4__util__customwidgets.cpp 1969-12-31 19:00:00.000000000 -0500 +++ vlc/files/patch-modules__gui__qt4__util__customwidgets.cpp 2010-06-22 02:57:57.000000000 -0400 @@ -0,0 +1,11 @@ +--- ./modules/gui/qt4/util/customwidgets.cpp.orig 2010-06-22 02:57:13.000000000 -0400 ++++ ./modules/gui/qt4/util/customwidgets.cpp 2010-06-22 02:57:45.000000000 -0400 +@@ -380,7 +380,7 @@ + + if( qtk <= 0xff ) + /* VLC and X11 use lowercase whereas Qt uses uppercase */ +-#if defined( __STDC_ISO_10646__ ) || defined( _WIN32 ) ++#if defined( __STDC_ISO_10646__ ) || defined( _WIN32 ) || defined(__FreeBSD__) + i_vlck = towlower( qtk ); + #else + # error FIXME diff -ruN /usr/ports/multimedia/vlc/files/patch-modules_access_pvr.c vlc/files/patch-modules_access_pvr.c --- /usr/ports/multimedia/vlc/files/patch-modules_access_pvr.c 2010-03-25 16:27:39.000000000 -0400 +++ vlc/files/patch-modules_access_pvr.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ ---- modules/access/pvr.c.orig 2010-03-23 17:37:48.000000000 +0100 -+++ modules/access/pvr.c 2010-03-23 17:38:04.000000000 +0100 -@@ -38,7 +38,9 @@ - #include - #include - #include -+#ifdef __linux__ - #include -+#endif - #include - #include - #ifdef HAVE_NEW_LINUX_VIDEODEV2_H diff -ruN /usr/ports/multimedia/vlc/files/patch-modules_codec_png.c vlc/files/patch-modules_codec_png.c --- /usr/ports/multimedia/vlc/files/patch-modules_codec_png.c 2010-03-28 11:30:42.000000000 -0400 +++ vlc/files/patch-modules_codec_png.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,20 +0,0 @@ ---- modules/codec/png.c.orig 2009-12-20 18:43:39.000000000 +0100 -+++ modules/codec/png.c 2010-03-28 17:09:18.000000000 +0200 -@@ -155,7 +155,7 @@ - p_info = png_create_info_struct( p_png ); - if( p_info == NULL ) - { -- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL ); -+ png_destroy_read_struct( &p_png, NULL, NULL ); - block_Release( p_block ); *pp_block = NULL; - return NULL; - } -@@ -163,7 +163,7 @@ - p_end_info = png_create_info_struct( p_png ); - if( p_end_info == NULL ) - { -- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL ); -+ png_destroy_read_struct( &p_png, &p_info, NULL ); - block_Release( p_block ); *pp_block = NULL; - return NULL; - }