From owner-freebsd-multimedia@FreeBSD.ORG Sun Jun 1 21:23:58 2014 Return-Path: Delivered-To: multimedia@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BAF0DBEB for ; Sun, 1 Jun 2014 21:23:58 +0000 (UTC) Received: from mailrelay006.isp.belgacom.be (mailrelay006.isp.belgacom.be [195.238.6.172]) by mx1.freebsd.org (Postfix) with ESMTP id 182B6220F for ; Sun, 1 Jun 2014 21:23:56 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUMALmZi1NbsUMn/2dsb2JhbABZgwdSSwqtHwGWPxd0gkYBLg0eQTQqN4hGAQiiD7NPF4xYhkEEkVKILYE/kW+DOjsv Received: from 39.67-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.67.39]) by relay.skynet.be with ESMTP; 01 Jun 2014 23:23:37 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.8/8.14.8) with ESMTP id s51LNa9q010330 for ; Sun, 1 Jun 2014 23:23:36 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 1 Jun 2014 23:23:35 +0200 From: Tijl Coosemans To: multimedia@FreeBSD.org Subject: [review/test] multimedia/vlc: various fixes Message-ID: <20140601232335.3d175beb@kalimero.tijl.coosemans.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/O2RHxmTRhFh3Ei7xQLVtn=t" X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2014 21:23:58 -0000 --MP_/O2RHxmTRhFh3Ei7xQLVtn=t Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, Please check out the attached patch for multimedia/vlc. It contains the following changes: - Remove libproxy dependency. I cannot find any references to it. - Add libidn dependency. It is always picked up when detected by configure. - Add libxml2 dependency (USE_GNOME=libxml2). It's actually an optional dependency but it is used by several other plugins. - Replace OSVERSION+clang tests with USES=compiler:c11. - Replace post-patch command with USES=pathfix. - Add some more --enable-* flags to CONFIGURE_ARGS to make sure configure doesn't silently ignore problems with dependencies. - Add some more --disable-* flags to CONFIGURE_ARGS to make sure configure doesn't auto-enable them. - Specify the correct location of KDE Solid files in CONFIGURE_ARGS. ("Play with VLC" option when you insert a CD/DVD.) - Add ac_cv_search_pthread_rwlock_init=-pthread to CONFIGURE_ARGS to override the test for libpthread. It detects pthread_rwlock_init in our libc and assumes no threading library is needed, but libc doesn't have a real pthread implementation. - Add the gnutls3 include directory to CPPFLAGS before LOCALBASE/include which may contain gnutls2 headers. - Rename some options so more descriptions from bsd.options.desc.mk can be used. - Add OPTIMIZED_CFLAGS to OPTIONS_DEFAULT. Remove custom CFLAGS so this option only controls the "optimizations" configure option which is enabled by default by upstream. - Remove REALAUDIO from OPTIONS_DEFAULT. Old codec. - Remove SDL from OPTIONS_DEFAULT. This is an alternative way to render video. The X11 option is better for this. - Remove SKINS from OPTIONS_DEFAULT. - Remove X264 from OPTIONS_DEFAULT. It's an encoder, not a decoder and vlc is typically used as a player not as a video server. - Remove SERVER_ONLY and NO_DVD options. Their implementation doesn't work with modern options framework. - Add a patch to fix some issues in the configure script, e.g. don't add -L/usr/local/lib to LDFLAGS. This ends up in the wrong place on the linker command line causing installed vlc libraries to be linked in instead of freshly built ones. - With patched configure some options like A52 need include/library search paths now. - Some options have pkgconfig files now so remove include/library search paths where possible. - Separate KATE option from OGG. - Use option helpers for LIBRSVG2, LUA, OGG, QT4, SDL, V4L and X11. - Implement NCURSES option with USES=ncurses. - Add VDPAU option. - Drop perl5 dependency. - Drop old hacks like -fPIC, -I${WRKSRC}/include, LIBS="-lc", PTHREAD_LIBS. - Add missing dependencies to SKINS option (libminizip, xorg) - Patch the right file with WITH_CDROM_DEVICE and WITH_DVD_DEVICE. - Only use auto-plist for the plugins directory. Use regular pkg-plist, PORTDATA and PORTDOCS for everything else. This is a lot simpler and makes it easier to detect library version changes. - Delete some unneeded patches. Redports test with all options enabled: https://redports.org/buildarchive/20140601173701-19671/ https://redports.org/buildarchive/20140601181106-57163/ (FreeBSD 8.4 is still broken for some combinations of options due to a bug in rtld there.) --MP_/O2RHxmTRhFh3Ei7xQLVtn=t Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=vlc.patch Index: archivers/minizip/Makefile =================================================================== --- archivers/minizip/Makefile (revision 356085) +++ archivers/minizip/Makefile (working copy) @@ -3,24 +3,25 @@ PORTNAME= minizip PORTVERSION= 1.2.8 +PORTREVISION= 1 CATEGORIES= archivers -MASTER_SITES= https://github.com/madler/zlib/archive/ \ - LOCAL/mandree/${PORTNAME} -DISTNAME= v${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= SF/libpng/zlib/${PORTVERSION} +DISTNAME= zlib-${PORTVERSION} MAINTAINER= coder@tuxfamily.org -COMMENT= Minizip and miniunz programs from Zlib contributions +COMMENT= Zip library and programs from Zlib distribution LICENSE= ZLIB -USES= zip -PLIST_FILES= bin/minizip bin/miniunz \ - man/man1/miniunzip.1.gz man/man1/minizip.1.gz -MAKE_ARGS= CFLAGS="${CPPFLAGS} ${CFLAGS} -include sys/stat.h -include stdint.h" +USES= libtool pathfix tar:xz +PATHFIX_MAKEFILEIN= Makefile.am +USE_AUTOTOOLS= libtoolize aclocal autoconf automake +AUTOMAKE_ARGS= -a -c -f +CONFIGURE_ARGS= --enable-demos +INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/zlib-${PORTVERSION}/contrib/minizip -.include +.include # work around missing typedef in 8.X's libz configuration .if ${OSVERSION} < 900000 @@ -28,16 +29,20 @@ CPPFLAGS+= -Dz_crc_t=uint32_t .endif post-patch: - ${REINPLACE_CMD} -e 's/#ifdef unix \|\| __APPLE__/#ifdef unix/' ${WRKSRC}/mini???.c + @${REINPLACE_CMD} 's/#ifdef unix || __APPLE__/#ifdef unix/' ${WRKSRC}/mini???.c -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKSRC}/miniunz ${STAGEDIR}${PREFIX}/bin/ +post-install: ${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1 regression-test: - ${RM} -f ${WRKDIR}/test.zip && (cd ${WRKSRC} && ./${PORTNAME} ${WRKDIR}/test.zip *) - ${RM} -rf ${WRKDIR}/regression-test && ${MKDIR} ${WRKDIR}/regression-test - ${WRKSRC}/miniunz ${WRKDIR}/test.zip -d ${WRKDIR}/regression-test - diff -ur >/dev/null ${WRKSRC} ${WRKDIR}/regression-test + ${RM} -rf ${WRKDIR}/regression-test1 + ${MKDIR} ${WRKDIR}/regression-test1 + ${MV} ${WRKSRC}/*.[cho] ${WRKDIR}/regression-test1 + ${RM} -f ${WRKDIR}/test.zip + (cd ${WRKDIR}/regression-test1 && ${WRKSRC}/minizip ${WRKDIR}/test.zip *) + ${RM} -rf ${WRKDIR}/regression-test2 + ${MKDIR} ${WRKDIR}/regression-test2 + ${WRKSRC}/miniunzip ${WRKDIR}/test.zip -d ${WRKDIR}/regression-test2 + ${DIFF} -ur ${WRKDIR}/regression-test1 ${WRKDIR}/regression-test2 > /dev/null -.include +.include Index: archivers/minizip/distinfo =================================================================== --- archivers/minizip/distinfo (revision 356085) +++ archivers/minizip/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (minizip/v1.2.8.zip) = da78eabfef55cbab21776d4cca207cf7e0dde483b4dd3590e525421667bfb6a7 -SIZE (minizip/v1.2.8.zip) = 724598 +SHA256 (zlib-1.2.8.tar.xz) = 831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057 +SIZE (zlib-1.2.8.tar.xz) = 450776 Index: archivers/minizip/files/patch-contrib-minizip-Makefile =================================================================== --- archivers/minizip/files/patch-contrib-minizip-Makefile (revision 356085) +++ archivers/minizip/files/patch-contrib-minizip-Makefile (working copy) @@ -1,28 +0,0 @@ ---- Makefile.orig 2013-04-29 02:23:49.000000000 +0200 -+++ Makefile 2013-12-10 10:06:34.000000000 +0100 -@@ -1,8 +1,9 @@ - CC=cc --CFLAGS=-O -I../.. -+CFLAGS=-O -I/usr/local -+LDFLAGS=-L/usr/lib -lz - --UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a --ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a -+UNZ_OBJS = miniunz.o unzip.o ioapi.o -+ZIP_OBJS = minizip.o zip.o ioapi.o - - .c.o: - $(CC) -c $(CFLAGS) $*.c -@@ -10,10 +11,10 @@ - all: miniunz minizip - - miniunz: $(UNZ_OBJS) -- $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(UNZ_OBJS) - - minizip: $(ZIP_OBJS) -- $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ZIP_OBJS) - - test: miniunz minizip - ./minizip test readme.txt Index: archivers/minizip/pkg-plist =================================================================== --- archivers/minizip/pkg-plist (revision 0) +++ archivers/minizip/pkg-plist (working copy) @@ -0,0 +1,15 @@ +bin/miniunzip +bin/minizip +include/minizip/crypt.h +include/minizip/ioapi.h +include/minizip/mztools.h +include/minizip/unzip.h +include/minizip/zip.h +lib/libminizip.a +lib/libminizip.so +lib/libminizip.so.1 +lib/libminizip.so.1.0.0 +libdata/pkgconfig/minizip.pc +man/man1/miniunzip.1.gz +man/man1/minizip.1.gz +@dirrm include/minizip Property changes on: archivers/minizip/pkg-plist ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: multimedia/vlc/Makefile =================================================================== --- multimedia/vlc/Makefile (revision 356085) +++ multimedia/vlc/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.4 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -16,55 +16,76 @@ COMMENT= Qt4 based multimedia player and LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libproxy.so:${PORTSDIR}/net/libproxy \ libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ - libfreetype.so:${PORTSDIR}/print/freetype2 + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libidn.so:${PORTSDIR}/dns/libidn BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg -OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DIRAC DOCS DTS DVDREAD \ - DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GNOMEVFS GNUTLS GOOM \ - HTTPD JACK LIBSSH2 LIRC LIVEMEDIA LUA MAD MATROSKA MODPLUG \ - MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OPTIMIZED_CFLAGS OGG \ - OPUS PNG PULSEAUDIO QT4 REALAUDIO RUNROOT \ - SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SVG \ - TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \ - X11 X264 ZVBI SERVER_ONLY DEBUG \ - GME NO_DVD LIBBLURAY SAMPLERATE SIDPLAY -OPTIONS_DEFAULT=A52 AVAHI DBUS DTS DVDREAD DVDNAV FAAD FLAC GNUTLS \ - HTTPD LUA MAD MATROSKA MPEG2 OGG OPUS PNG QT4 REALAUDIO \ - SDL SKINS STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ - VCD VORBIS X11 X264 SAMPLERATE +USES= compiler:c11 desktop-file-utils gmake iconv libtool pathfix \ + pkgconfig tar:xz +USE_GNOME= libxml2 +USE_LDCONFIG= yes +INSTALL_TARGET= install-strip + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ + --enable-fontconfig --enable-freetype --enable-libgcrypt \ + --enable-libxml2 --enable-oss --enable-postproc \ + --enable-swscale --enable-vlc \ + --disable-alsa --disable-chromaprint --disable-crystalhd \ + --disable-dc1394 --disable-decklink --disable-directfb \ + --disable-dv1394 --disable-egl --disable-fdkaac \ + --disable-gles1 --disable-gles2 --disable-kai --disable-kva \ + --disable-libvnc --disable-opencv --disable-projectm \ + --disable-quicksync --disable-silent-rules --disable-telx \ + --disable-tiger --disable-tremor --disable-udev \ + --disable-update-check --disable-vcdx --disable-vsxu \ + --disable-wasapi --disable-x26410b \ + --with-kde-solid=${PREFIX}/share/apps/solid/actions \ + ac_cv_search_pthread_rwlock_init=-pthread +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +CONFIGURE_ARGS+=--enable-debug +.endif +CPPFLAGS+= -I${LOCALBASE}/include/gnutls3 -I${LOCALBASE}/include + +OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \ + DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNOMEVFS2 GNUTLS \ + GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \ + LIVEMEDIA LUA MAD MATROSKA MODPLUG \ + MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS \ + OPUS PNG PULSEAUDIO QT4 REALRTSP RUNROOT SAMPLERATE \ + SCHROEDINGER SDL SHOUTCAST SIDPLAY SKINS SMB STREAM SPEEX \ + TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \ + X11 X264 ZVBI +OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \ + HTTPD LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS OPUS PNG \ + QT4 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ + VCD VORBIS X11 +OPTIONS_SUB= yes + ASS_DESC= ASS/SSA subtitle rendering -DTS_DESC= DTS DVD audio decoder DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation FLUID_DESC= Fluidsynth MIDI support FREERDP_DESC= RDP support -GME_DESC= Game_Music_Emu (libgme) support -GNOMEVFS_DESC= Gnome VFS support -GOOM_DESC= the Goom visual effect library +GME_DESC= Game Music Emu (libgme) support +GOOM_DESC= Goom visualisation plugin +KATE_DESC= Kate codec support LIBSSH2_DESC= SCP/SFTP support via libssh2 -NCURSES_DESC= ncurses (console) interface OPUS_DESC= Opus audio format -REALAUDIO_DESC= Real Audio(R) support +REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root -SAMBA_DESC= SAMBA Access module -SCHROED_DESC= Schroedinger decoder SIDPLAY_DESC= C64 sid demux support -SKINS_DESC= winamp skins interface +SKINS_DESC= Skins interface module STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support -V4L_DESC= Video4Linux video capture compatibility -VCD_DESC= Video CD support +VCD_DESC= Audio/Video CD support ZVBI_DESC= VBI decoding support -SERVER_ONLY_DESC= Only build server parts -NO_DVD_DESC= disable DVD specific features - -QT4_CONFIGURE_ENABLE= qt A52_CONFIGURE_ENABLE= a52 +A52_CONFIGURE_ON= --with-a52=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib @@ -82,23 +103,22 @@ CACA_CONFIGURE_ENABLE= caca DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_ENABLE= dbus -DEBUG_CONFIGURE_ENABLE= debug +DCA_LIB_DEPENDS= libdca.so:${PORTSDIR}/multimedia/libdca +DCA_CONFIGURE_ENABLE= dca DIRAC_LIB_DEPENDS= libdirac_decoder.so:${PORTSDIR}/multimedia/dirac DIRAC_CONFIGURE_ENABLE= dirac -DIRAC_CPPFLAGS= -I${LOCALBASE}/include/dirac - -DTS_LIB_DEPENDS= libdca.so:${PORTSDIR}/multimedia/libdca -DTS_CONFIGURE_ARGS= dca DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread DVDREAD_CONFIGURE_ENABLE= dvdread DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav -DVDNAV_CONFIGURE_ENABLE= dvdnav +DVDNAV_CONFIGURE_ENABLE=dvdnav FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad FAAD_CONFIGURE_ENABLE= faad +FAAD_CONFIGURE_ENV= CPPFLAGS_faad="-I/usr/local/include" \ + LIBS_faad="-L/usr/local/lib" FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ENABLE= flac @@ -115,11 +135,11 @@ FRIBIDI_CONFIGURE_ENABLE= fribidi GME_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme GME_CONFIGURE_ENABLE= gme -GNOMEVFS_USE= GNOME=gnomevfs2 -GNOMEVFS_CONFIGURE_ENABLE= gnomevfs +GNOMEVFS2_USE= GNOME=gnomevfs2 +GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs GNUTLS_LIB_DEPENDS= libgnutls.so.28:${PORTSDIR}/security/gnutls3 -GNUTLS_CONFIGURE_ENABLE= gnutls +GNUTLS_CONFIGURE_ENABLE=gnutls GOOM_LIB_DEPENDS= libgoom2.so:${PORTSDIR}/graphics/goom GOOM_CONFIGURE_ENABLE= goom @@ -129,26 +149,38 @@ HTTPD_CONFIGURE_ENABLE= httpd JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_ENABLE= jack +KATE_LIB_DEPENDS= libkate.so:${PORTSDIR}/multimedia/libkate +KATE_CONFIGURE_ENABLE= kate + LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= bluray +LIBRSVG2_USE= GNOME=librsvg2 +LIBRSVG2_CONFIGURE_ENABLE= svg + LIBSSH2_LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 LIBSSH2_CONFIGURE_ENABLE= sftp -LIBSSH2_CONFIGURE_ENV= SFTP_CFLAGS=-I${LOCALBASE} SFTP_LIBS=-lssh2\ -L${LOCALBASE}/lib LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIVEMEDIA_LIB_DEPENDS= libliveMedia.so:${PORTSDIR}/net/liveMedia LIVEMEDIA_CONFIGURE_ENABLE= live555 -LIVEMEDIA_CPPFLAGS= -I${LOCALBASE}/include/liveMedia \ - -I${LOCALBASE}/include/UsageEnvironment \ - -I${LOCALBASE}/include/groupsock \ - -I${LOCALBASE}/include/BasicUsageEnvironment -LIVEMEDIA_LDFLAGS= -L${LOCALBASE}/lib +LIVEMEDIA_CONFIGURE_ENV= \ + LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \ + -I${LOCALBASE}/include/UsageEnvironment \ + -I${LOCALBASE}/include/groupsock \ + -I${LOCALBASE}/include/BasicUsageEnvironment" \ + LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \ + -lgroupsock -lBasicUsageEnvironment \ + -lUsageEnvironment" -MAD_LIB_DEPENDS= libid3tag.so:${PORTSDIR}/audio/libid3tag \ - libmad.so:${PORTSDIR}/audio/libmad +LUA_USES= lua +LUA_CONFIGURE_ENABLE= lua +LUA_CONFIGURE_ON= LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \ + LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" + +MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad MAD_CONFIGURE_ENABLE= mad MAD_CONFIGURE_ON= --with-mad=${LOCALBASE} @@ -167,7 +199,9 @@ MTP_CONFIGURE_ENABLE= mtp MUSEPACK_LIB_DEPENDS= libmpcdec.so:${PORTSDIR}/audio/musepack MUSEPACK_CONFIGURE_ENABLE= mpc -NCURSES_CONFIGURE_ENV= NCURSES_CFLAGS="-I/usr/include" NCURSES_LIBS="-lncursesw" +NCURSES_USES= ncurses +NCURSES_CONFIGURE_ENV= NCURSES_CFLAGS="-I${NCURSESINC}" \ + NCURSES_LIBS="-L${NCURSESLIB} -lncursesw" NCURSES_CONFIGURE_ENABLE= ncurses NLS_USES= gettext @@ -175,9 +209,11 @@ NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify NOTIFY_USE= GNOME=gtk20 -NOTIFY_CONFIGURE_ENABLE= notify +NOTIFY_CONFIGURE_ENABLE=notify + +OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg +OGG_CONFIGURE_ENABLE= ogg -OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math -fomit-frame-pointer OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus @@ -189,21 +225,21 @@ PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse -REALAUDIO_CONFIGURE_ENABLE= realrtsp +QT4_CONFIGURE_ENABLE= qt +QT4_USE= QT4=gui,corelib,moc_build,rcc_build,uic_build + +REALRTSP_CONFIGURE_ENABLE= realrtsp RUNROOT_CONFIGURE_ENABLE= run-as-root SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate -SAMBA_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient -SAMBA_CONFIGURE_ENABLE= smbclient -# There is no libsmbclient.pc -SAMBA_CONFIGURE_ENV= SMBCLIENT_CFLAGS="-I${LOCALBASE}/include" \ - SMBCLIENT_LIBS="-lsmbclient" +SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger +SCHROEDINGER_CONFIGURE_ENABLE= schroedinger -SCHROED_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger -SCHROED_CONFIGURE_ENABLE= schroedinger +SDL_USE= SDL=image +SDL_CONFIGURE_ENABLE= sdl sdl-image SIDPLAY_LIB_DEPENDS= libsidplay2.so:${PORTSDIR}/audio/libsidplay2 SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders @@ -212,11 +248,13 @@ SIDPLAY_CONFIGURE_ENABLE= sid SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout -STREAM_CONFIGURE_ENABLE= sout +SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient +SMB_CONFIGURE_ENABLE= smbclient + +STREAM_CONFIGURE_ENABLE=sout SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= speex -SPEEX_CPPFLAGS= -I${LOCALBASE}/include/speex TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib TAGLIB_CONFIGURE_ENABLE=taglib @@ -230,112 +268,42 @@ TWOLAME_CONFIGURE_ENABLE= twolame UPNP_LIB_DEPENDS= libupnp.so:${PORTSDIR}/devel/upnp UPNP_CONFIGURE_ENABLE= upnp +V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l +V4L_CONFIGURE_ENABLE= v4l2 + VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= libva VCD_LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb VCD_CONFIGURE_ENABLE= vcd libcddb +VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau +VDPAU_CONFIGURE_ENABLE= vdpau + VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis +X11_USE= GL=gl XORG=xcb,xproto +X11_LIB_DEPENDS= libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms +X11_CONFIGURE_ENABLE= glx xcb xvideo +X11_CONFIGURE_WITH= x + X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264 X264_CONFIGURE_ENABLE= x264 ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi -USES= desktop-file-utils iconv libtool perl5 gmake pkgconfig tar:xz -INSTALL_TARGET= install-strip -USE_PERL5= build -USE_CSTD= gnu99 -WANT_GNOME= yes -WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//} - -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CFLAGS+= -fPIC -CPPFLAGS+= -I${WRKSRC}/include -CONFIGURE_ENV= LIBS="-lc" -LDFLAGS+= ${PTHREAD_LIBS} -lc - -CONFIGURE_ARGS+= --enable-vlc \ - --enable-avcodec \ - --enable-avformat \ - --enable-oss \ - --enable-postproc \ - --enable-sftp \ - --enable-libgcrypt \ - --disable-alsa \ - --disable-dc1394 \ - --disable-directfb \ - --disable-projectm \ - --disable-telx \ - --disable-tremor \ - --disable-udev \ - --disable-update-check +PORTDATA= * +PORTDOCS= * .include -# Macro section -# Use these for batch control of certain types of builds - -# Disable DVD specific features -.if ${PORT_OPTIONS:MNO_DVD} -PORT_OPTIONS:= ${PORT_OPTIONS:O:u} -PORT_OPTIONS:= ${PORT_OPTIONS:NA52} -PORT_OPTIONS:= ${PORT_OPTIONS:NDVDREAD} -PORT_OPTIONS:= ${PORT_OPTIONS:NDVDNAV} -.endif - -# Use this to disable all UI and output modules -.if ${PORT_OPTIONS:MSERVER_ONLY} -PORT_OPTIONS:= ${PORT_OPTIONS:O:u} -PORT_OPTIONS:= ${PORT_OPTIONS:NLUA} -PORT_OPTIONS:= ${PORT_OPTIONS:NQT4} -PORT_OPTIONS:= ${PORT_OPTIONS:NSKINS} -.if empty(PORT_OPTIONS:MRUNROOT) -PORT_OPTIONS+= RUNROOT -PORT_OPTIONS:= ${PORT_OPTIONS:O:u} -.endif -.endif - -# End Macro section -# - -.if ${PORT_OPTIONS:MQT4} -USE_QT4= gui corelib moc_build rcc_build uic_build -.endif - -# This may become mandantory in the future -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" -CONFIGURE_ARGS+=--enable-lua LUAC=${LUAC_CMD} -.else -CONFIGURE_ARGS+=--disable-lua -.endif - -.if ${PORT_OPTIONS:MOGG} -LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg \ - libkate.so:${PORTSDIR}/multimedia/libkate -CONFIGURE_ARGS+=--enable-ogg --enable-kate -.else -PORT_OPTIONS:= ${PORT_OPTIONS:NVORBIS} -CONFIGURE_ARGS+=--disable-ogg --disable-kate -.endif - -.if ${PORT_OPTIONS:MSDL} && ${PORT_OPTIONS:MX11} -WANT_SDL= yes -USE_SDL= image -CONFIGURE_ARGS+=--enable-sdl --enable-sdl-image -.else -CONFIGURE_ARGS+=--disable-sdl --disable-sdl-image -.endif - .if ${PORT_OPTIONS:MSKINS} .if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libtar.so:${PORTSDIR}/devel/libtar +LIB_DEPENDS+= libminizip.so:${PORTSDIR}/archivers/minizip \ + libtar.so:${PORTSDIR}/devel/libtar +USE_XORG+= xext xinerama xpm CONFIGURE_ARGS+=--enable-skins2 --enable-libtar .else IGNORE= SKINS option requires QT4 option @@ -344,57 +312,6 @@ IGNORE= SKINS option requires QT4 option CONFIGURE_ARGS+=--disable-skins2 --disable-libtar .endif -.if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11} -USE_GNOME+= librsvg2 -CONFIGURE_ARGS+=--enable-svg -.else -CONFIGURE_ARGS+=--disable-svg -.endif - -.if ${PORT_OPTIONS:MV4L} || ${PORT_OPTIONS:MDVB} -LIB_DEPENDS+= libv4l1.so:${PORTSDIR}/multimedia/libv4l -CONFIGURE_ARGS+=--enable-v4l2 -.else -CONFIGURE_ARGS+=--disable-v4l2 -.endif - -.if ${PORT_OPTIONS:MX11} -USE_GL= yes -USE_XORG= xcb xpm -LIB_DEPENDS+= libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms -CONFIGURE_ARGS+=--with-x --enable-glx --enable-xcb --enable-xvideo -.else -CONFIGURE_ARGS+=--without-x --disable-glx --disable-xcb --disable-xvideo -.endif - -.include - -# base clang in 9.0 builds a corrupted lib/vlc/plugins/gui/libqt4_plugin.so -.if (${CC:T:Mclang} == "clang") && \ - (${OSVERSION} >= 900014) && (${OSVERSION} < 900506) -IGNORE= base clang version too old, set NO_IGNORE to override -.endif - -.if ${ARCH} == "powerpc64" -CONFIGURE_ARGS+=--enable-altivec # VLC's config script doesn't know to do this -.endif - -# prefer clang on 9.1+ -.if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang) -CC= clang -CXX= clang++ -CPP= clang-cpp -CFLAGS+= -fomit-frame-pointer -.else -.if ${ARCH} == "i386" -USE_GCC?= yes # sse/3dnow detection on i386 needs newer GCC -.endif -.endif - -# End OS specific hacks - -# User tunables - # Define these to override # FreeBSD 9.x uses CAM devices .if (${OSVERSION} > 900037) @@ -406,40 +323,19 @@ WITH_DVD_DEVICE?=/dev/acd0 .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|gnutls |gnutls3 |g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = \$$\(prefix\)/libdata/pkgconfig|' \ - ${WRKSRC}/src/Makefile.in \ - ${WRKSRC}/lib/Makefile.in @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ - ${WRKSRC}/include/vlc_config.h + ${WRKSRC}/src/libvlc-module.c @${RM} -rf ${WRKSRC}/modules/access/v4l2/linux - @${REINPLACE_CMD} -e '/^DEFAULT_INCLUDES/s|$$| $$(GNUTLS_CFLAGS)|g' \ - ${WRKSRC}/modules/misc/Makefile.in -add-plist-data: - @if [ -n "${MTREE_FILE}" ]; then \ - { ${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}; } | ${TAR} tf - | \ - awk '{ sub(/^\.$$/, "", $$1); \ - if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' ; \ - fi > ${WRKDIR}/.mtree - @a=${PREFIX}; \ - while :; do \ - a=$${a%/*} ; \ - [ -z "$${a}" ] && break ; \ - ${ECHO_CMD} $${a} >> ${WRKDIR}/.mtree ; \ - done - @${FIND} ${STAGEDIR} -type f -o -type l | ${SORT} | ${SED} -E -e "s,${STAGEDIR},,g" \ - -e "s,${PREFIX}/,,g" -e "s,(.*man/.*\.[0-9])$$,\1.gz,g"| ${GREP} -v "^share/licenses" >> ${TMPPLIST} || ${TRUE} - @${FIND} ${STAGEDIR} -type d | ${SED} -e "s,${STAGEDIR},,g" \ - | while read line; do \ - ${GREP} -qw "^$${line}$$" ${WRKDIR}/.mtree || { \ - [ -n "$${line}" ] && ${ECHO_CMD} "@unexec rmdir "%D/$${line}" >/dev/null 2>&1 || :"; \ - }; \ - done | ${SORT} -r | ${SED} \ - -e "s,${PREFIX}/,,g" | ${GREP} -v "^@unexec rmdir %D/share/licenses" >> ${TMPPLIST} || ${TRUE} +post-install: + @(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \ + -type f -o -type l >> ${TMPPLIST}) + @(cd ${STAGEDIR}${PREFIX} && ${FIND} -s -d lib/vlc -type d | \ + ${SED} 's/^/@dirrm /' >> ${TMPPLIST}) -.include +.include Index: multimedia/vlc/files/patch-configure =================================================================== --- multimedia/vlc/files/patch-configure (revision 356085) +++ multimedia/vlc/files/patch-configure (working copy) @@ -1,6 +1,43 @@ --- configure.orig 2014-02-04 19:02:27.000000000 -0600 +++ configure 2014-02-04 19:02:39.000000000 -0600 -@@ -26703,7 +26703,7 @@ +@@ -8350,9 +8350,6 @@ + ;; + freebsd*) + SYS=freebsd +- CFLAGS="${CFLAGS} -pthread" +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +- LDFLAGS="${LDFLAGS} -L/usr/local/lib" + ;; + openbsd*) + SYS=openbsd +@@ -25431,7 +25428,7 @@ + if test "${enable_optimizations}" != "no"; then : + + +- if test "{enable_debug}" = "no"; then : ++ if test "${enable_debug}" = "no"; then : + + + CPPFLAGS_save="${CPPFLAGS}" +@@ -25461,7 +25458,7 @@ + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : ++if ac_fn_c_try_link "$LINENO"; then : + + ac_cv_c_o4=yes + +@@ -25505,7 +25502,7 @@ + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : ++if ac_fn_c_try_link "$LINENO"; then : + + ac_cv_c_o3=yes + +@@ -26709,7 +26706,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_altivec_inline="yes" else @@ -9,7 +46,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -26716,7 +26716,7 @@ +@@ -26722,7 +26719,7 @@ } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -18,3 +55,12 @@ else ac_cv_altivec_inline=no fi +@@ -29118,7 +29115,7 @@ + as_fn_error $? "Could not find the LUA byte compiler." "$LINENO" 5 + + fi +- if test -d ${CONTRIB_DIR} -a -f ${CONTRIB_DIR}/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404; then : ++ if test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}/lib/liblua.a" -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404; then : + + as_fn_error $? "You need 32-bits luac when using using lua from contrib." "$LINENO" 5 + Index: multimedia/vlc/files/patch-modules-gui-qt4-Makefile.in =================================================================== --- multimedia/vlc/files/patch-modules-gui-qt4-Makefile.in (revision 356085) +++ multimedia/vlc/files/patch-modules-gui-qt4-Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- modules/gui/qt4/Makefile.in.orig -+++ modules/gui/qt4/Makefile.in -@@ -3499,7 +3499,7 @@ uninstall-am: uninstall-libvlcLTLIBRARIE - - - resources.cpp: vlc.qrc $(DEPS_res) -- $(AM_V_GEN)$(RCC) -name vlc -o $@ $< -+ $(AM_V_GEN)$(RCC) -name vlc -o $@ vlc.qrc - - .hpp.moc.cpp: - @HAVE_DARWIN_TRUE@ $(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $< Index: multimedia/vlc/files/patch-modules-gui-qt4-qt4.hpp =================================================================== --- multimedia/vlc/files/patch-modules-gui-qt4-qt4.hpp (revision 356085) +++ multimedia/vlc/files/patch-modules-gui-qt4-qt4.hpp (working copy) @@ -1,11 +0,0 @@ ---- modules/gui/qt4/qt4.hpp.orig -+++ modules/gui/qt4/qt4.hpp -@@ -34,7 +34,7 @@ - #include /* playlist_t */ - - #define QT_NO_CAST_TO_ASCII --#include -+#include - - #if ( QT_VERSION < 0x040600 ) - # error Update your Qt version to at least 4.6.0 Index: multimedia/vlc/files/patch-modules-gui-qt4-util-pictureflow.cpp =================================================================== --- multimedia/vlc/files/patch-modules-gui-qt4-util-pictureflow.cpp (revision 356085) +++ multimedia/vlc/files/patch-modules-gui-qt4-util-pictureflow.cpp (working copy) @@ -1,27 +0,0 @@ ---- modules/gui/qt4/util/pictureflow.cpp.orig -+++ modules/gui/qt4/util/pictureflow.cpp -@@ -28,15 +28,15 @@ - #include "pictureflow.hpp" - #include "components/playlist/ml_model.hpp" - --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #include "../components/playlist/playlist_model.hpp" /* getArtPixmap etc */ - #include "../components/playlist/sorting.h" /* Columns List */ - #include "input_manager.hpp" Index: multimedia/vlc/files/patch-modules-misc-Makefile.in =================================================================== --- multimedia/vlc/files/patch-modules-misc-Makefile.in (revision 356085) +++ multimedia/vlc/files/patch-modules-misc-Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- modules/misc/Makefile.in.orig 2013-10-22 11:39:59.422985616 -0200 -+++ modules/misc/Makefile.in 2013-10-22 11:40:23.945984594 -0200 -@@ -1463,7 +1463,7 @@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfingerprinter_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libfingerprinter_plugin_la_CFLAGS) $(CFLAGS) -c -o libfingerprinter_plugin_la-json.lo `test -f 'webservices/json.c' || echo '$(srcdir)/'`webservices/json.c - - libgnutls_plugin_la-gnutls.lo: gnutls.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnutls_plugin_la_CFLAGS) $(CFLAGS) -MT libgnutls_plugin_la-gnutls.lo -MD -MP -MF $(DEPDIR)/libgnutls_plugin_la-gnutls.Tpo -c -o libgnutls_plugin_la-gnutls.lo `test -f 'gnutls.c' || echo '$(srcdir)/'`gnutls.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(libgnutls_plugin_la_CFLAGS) $(CPPFLAGS) $(CFLAGS) -MT libgnutls_plugin_la-gnutls.lo -MD -MP -MF $(DEPDIR)/libgnutls_plugin_la-gnutls.Tpo -c -o libgnutls_plugin_la-gnutls.lo `test -f 'gnutls.c' || echo '$(srcdir)/'`gnutls.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnutls_plugin_la-gnutls.Tpo $(DEPDIR)/libgnutls_plugin_la-gnutls.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gnutls.c' object='libgnutls_plugin_la-gnutls.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ Index: multimedia/vlc/files/patch-modules-visualization-projectm.cpp =================================================================== --- multimedia/vlc/files/patch-modules-visualization-projectm.cpp (revision 356085) +++ multimedia/vlc/files/patch-modules-visualization-projectm.cpp (working copy) @@ -1,12 +0,0 @@ ---- modules/visualization/projectm.cpp.orig -+++ modules/visualization/projectm.cpp -@@ -25,6 +25,9 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif -+#ifdef HAVE_XLOCALE_H -+# include -+#endif - #ifndef __STDC_CONSTANT_MACROS - # define __STDC_CONSTANT_MACROS - #endif Index: multimedia/vlc/files/patch-share-Makefile.in =================================================================== --- multimedia/vlc/files/patch-share-Makefile.in (revision 356085) +++ multimedia/vlc/files/patch-share-Makefile.in (working copy) @@ -1,15 +1,6 @@ --- share/Makefile.in.orig +++ share/Makefile.in -@@ -1734,15 +1734,15 @@ uninstall-am: uninstall-appdataDATA unin - - - vlc.desktop: vlc.desktop.in $(top_builddir)/config.status -- $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@ -+ $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < vlc.desktop.in > tmp-$@ - $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@ - $(AM_V_at)mv -f tmp-$@ $@ - - skins2/default.vlt: $(skins2_default_vlt_FILES) +@@ -1742,7 +1742,7 @@ uninstall-am: uninstall-appdataDATA unin mkdir -p skins2 (cd "$(srcdir)/skins2"; find default -print0 | \ LC_ALL=C sort -z | \ Index: multimedia/vlc/pkg-plist =================================================================== --- multimedia/vlc/pkg-plist (revision 0) +++ multimedia/vlc/pkg-plist (working copy) @@ -0,0 +1,246 @@ +bin/cvlc +%%NCURSES%%bin/nvlc +%%QT4%%bin/qvlc +bin/rvlc +%%SKINS%%bin/svlc +bin/vlc +bin/vlc-wrapper +include/vlc/deprecated.h +include/vlc/libvlc.h +include/vlc/libvlc_events.h +include/vlc/libvlc_media.h +include/vlc/libvlc_media_discoverer.h +include/vlc/libvlc_media_library.h +include/vlc/libvlc_media_list.h +include/vlc/libvlc_media_list_player.h +include/vlc/libvlc_media_player.h +include/vlc/libvlc_structures.h +include/vlc/libvlc_version.h +include/vlc/libvlc_vlm.h +include/vlc/plugins/vlc_about.h +include/vlc/plugins/vlc_access.h +include/vlc/plugins/vlc_aout.h +include/vlc/plugins/vlc_aout_volume.h +include/vlc/plugins/vlc_arrays.h +include/vlc/plugins/vlc_art_finder.h +include/vlc/plugins/vlc_atomic.h +include/vlc/plugins/vlc_avcodec.h +include/vlc/plugins/vlc_bits.h +include/vlc/plugins/vlc_block.h +include/vlc/plugins/vlc_block_helper.h +include/vlc/plugins/vlc_charset.h +include/vlc/plugins/vlc_codec.h +include/vlc/plugins/vlc_common.h +include/vlc/plugins/vlc_config.h +include/vlc/plugins/vlc_config_cat.h +include/vlc/plugins/vlc_configuration.h +include/vlc/plugins/vlc_cpu.h +include/vlc/plugins/vlc_demux.h +include/vlc/plugins/vlc_dialog.h +include/vlc/plugins/vlc_epg.h +include/vlc/plugins/vlc_es.h +include/vlc/plugins/vlc_es_out.h +include/vlc/plugins/vlc_events.h +include/vlc/plugins/vlc_filter.h +include/vlc/plugins/vlc_fingerprinter.h +include/vlc/plugins/vlc_fourcc.h +include/vlc/plugins/vlc_fs.h +include/vlc/plugins/vlc_gcrypt.h +include/vlc/plugins/vlc_http.h +include/vlc/plugins/vlc_httpd.h +include/vlc/plugins/vlc_image.h +include/vlc/plugins/vlc_inhibit.h +include/vlc/plugins/vlc_input.h +include/vlc/plugins/vlc_input_item.h +include/vlc/plugins/vlc_keys.h +include/vlc/plugins/vlc_main.h +include/vlc/plugins/vlc_md5.h +include/vlc/plugins/vlc_media_library.h +include/vlc/plugins/vlc_messages.h +include/vlc/plugins/vlc_meta.h +include/vlc/plugins/vlc_mime.h +include/vlc/plugins/vlc_modules.h +include/vlc/plugins/vlc_mouse.h +include/vlc/plugins/vlc_mtime.h +include/vlc/plugins/vlc_network.h +include/vlc/plugins/vlc_objects.h +include/vlc/plugins/vlc_opengl.h +include/vlc/plugins/vlc_picture.h +include/vlc/plugins/vlc_picture_fifo.h +include/vlc/plugins/vlc_picture_pool.h +include/vlc/plugins/vlc_playlist.h +include/vlc/plugins/vlc_plugin.h +include/vlc/plugins/vlc_probe.h +include/vlc/plugins/vlc_rand.h +include/vlc/plugins/vlc_services_discovery.h +include/vlc/plugins/vlc_sout.h +include/vlc/plugins/vlc_spu.h +include/vlc/plugins/vlc_stream.h +include/vlc/plugins/vlc_strings.h +include/vlc/plugins/vlc_subpicture.h +include/vlc/plugins/vlc_text_style.h +include/vlc/plugins/vlc_threads.h +include/vlc/plugins/vlc_tls.h +include/vlc/plugins/vlc_url.h +include/vlc/plugins/vlc_variables.h +include/vlc/plugins/vlc_video_splitter.h +include/vlc/plugins/vlc_vlm.h +include/vlc/plugins/vlc_vout.h +include/vlc/plugins/vlc_vout_display.h +include/vlc/plugins/vlc_vout_osd.h +include/vlc/plugins/vlc_vout_window.h +include/vlc/plugins/vlc_xlib.h +include/vlc/plugins/vlc_xml.h +include/vlc/vlc.h +lib/libvlc.so +lib/libvlc.so.5 +lib/libvlc.so.5.4.0 +lib/libvlccore.so +lib/libvlccore.so.7 +lib/libvlccore.so.7.0.0 +libdata/pkgconfig/libvlc.pc +libdata/pkgconfig/vlc-plugin.pc +man/man1/vlc-wrapper.1.gz +man/man1/vlc.1.gz +share/applications/vlc.desktop +share/icons/hicolor/128x128/apps/vlc-xmas.png +share/icons/hicolor/128x128/apps/vlc.png +share/icons/hicolor/16x16/apps/vlc.png +share/icons/hicolor/16x16/apps/vlc.xpm +share/icons/hicolor/256x256/apps/vlc.png +share/icons/hicolor/32x32/apps/vlc-xmas.xpm +share/icons/hicolor/32x32/apps/vlc.png +share/icons/hicolor/32x32/apps/vlc.xpm +share/icons/hicolor/48x48/apps/vlc-xmas.png +share/icons/hicolor/48x48/apps/vlc.png +share/apps/solid/actions/vlc-openbd.desktop +share/apps/solid/actions/vlc-opencda.desktop +share/apps/solid/actions/vlc-opendvd.desktop +share/apps/solid/actions/vlc-openvcd.desktop +share/locale/ach/LC_MESSAGES/vlc.mo +share/locale/af/LC_MESSAGES/vlc.mo +share/locale/am/LC_MESSAGES/vlc.mo +share/locale/an/LC_MESSAGES/vlc.mo +share/locale/ar/LC_MESSAGES/vlc.mo +share/locale/ast/LC_MESSAGES/vlc.mo +share/locale/az/LC_MESSAGES/vlc.mo +share/locale/be/LC_MESSAGES/vlc.mo +share/locale/bg/LC_MESSAGES/vlc.mo +share/locale/bn/LC_MESSAGES/vlc.mo +share/locale/bn_IN/LC_MESSAGES/vlc.mo +share/locale/br/LC_MESSAGES/vlc.mo +share/locale/bs/LC_MESSAGES/vlc.mo +share/locale/ca/LC_MESSAGES/vlc.mo +share/locale/cgg/LC_MESSAGES/vlc.mo +share/locale/ckb/LC_MESSAGES/vlc.mo +share/locale/co/LC_MESSAGES/vlc.mo +share/locale/cs/LC_MESSAGES/vlc.mo +share/locale/cy/LC_MESSAGES/vlc.mo +share/locale/da/LC_MESSAGES/vlc.mo +share/locale/de/LC_MESSAGES/vlc.mo +share/locale/el/LC_MESSAGES/vlc.mo +share/locale/en_GB/LC_MESSAGES/vlc.mo +share/locale/es/LC_MESSAGES/vlc.mo +share/locale/et/LC_MESSAGES/vlc.mo +share/locale/eu/LC_MESSAGES/vlc.mo +share/locale/fa/LC_MESSAGES/vlc.mo +share/locale/ff/LC_MESSAGES/vlc.mo +share/locale/fi/LC_MESSAGES/vlc.mo +share/locale/fr/LC_MESSAGES/vlc.mo +share/locale/fur/LC_MESSAGES/vlc.mo +share/locale/ga/LC_MESSAGES/vlc.mo +share/locale/gd/LC_MESSAGES/vlc.mo +share/locale/gl/LC_MESSAGES/vlc.mo +share/locale/gu/LC_MESSAGES/vlc.mo +share/locale/he/LC_MESSAGES/vlc.mo +share/locale/hi/LC_MESSAGES/vlc.mo +share/locale/hr/LC_MESSAGES/vlc.mo +share/locale/hu/LC_MESSAGES/vlc.mo +share/locale/hy/LC_MESSAGES/vlc.mo +share/locale/ia/LC_MESSAGES/vlc.mo +share/locale/id/LC_MESSAGES/vlc.mo +share/locale/is/LC_MESSAGES/vlc.mo +share/locale/it/LC_MESSAGES/vlc.mo +share/locale/ja/LC_MESSAGES/vlc.mo +share/locale/ka/LC_MESSAGES/vlc.mo +share/locale/kk/LC_MESSAGES/vlc.mo +share/locale/km/LC_MESSAGES/vlc.mo +share/locale/kn/LC_MESSAGES/vlc.mo +share/locale/ko/LC_MESSAGES/vlc.mo +share/locale/ky/LC_MESSAGES/vlc.mo +share/locale/lg/LC_MESSAGES/vlc.mo +share/locale/lt/LC_MESSAGES/vlc.mo +share/locale/lv/LC_MESSAGES/vlc.mo +share/locale/mk/LC_MESSAGES/vlc.mo +share/locale/ml/LC_MESSAGES/vlc.mo +share/locale/mn/LC_MESSAGES/vlc.mo +share/locale/mr/LC_MESSAGES/vlc.mo +share/locale/ms/LC_MESSAGES/vlc.mo +share/locale/my/LC_MESSAGES/vlc.mo +share/locale/nb/LC_MESSAGES/vlc.mo +share/locale/ne/LC_MESSAGES/vlc.mo +share/locale/nl/LC_MESSAGES/vlc.mo +share/locale/nn/LC_MESSAGES/vlc.mo +share/locale/oc/LC_MESSAGES/vlc.mo +share/locale/or/LC_MESSAGES/vlc.mo +share/locale/pa/LC_MESSAGES/vlc.mo +share/locale/pl/LC_MESSAGES/vlc.mo +share/locale/ps/LC_MESSAGES/vlc.mo +share/locale/pt_BR/LC_MESSAGES/vlc.mo +share/locale/pt_PT/LC_MESSAGES/vlc.mo +share/locale/ro/LC_MESSAGES/vlc.mo +share/locale/ru/LC_MESSAGES/vlc.mo +share/locale/si/LC_MESSAGES/vlc.mo +share/locale/sk/LC_MESSAGES/vlc.mo +share/locale/sl/LC_MESSAGES/vlc.mo +share/locale/sq/LC_MESSAGES/vlc.mo +share/locale/sr/LC_MESSAGES/vlc.mo +share/locale/sv/LC_MESSAGES/vlc.mo +share/locale/ta/LC_MESSAGES/vlc.mo +share/locale/te/LC_MESSAGES/vlc.mo +share/locale/tet/LC_MESSAGES/vlc.mo +share/locale/th/LC_MESSAGES/vlc.mo +share/locale/tl/LC_MESSAGES/vlc.mo +share/locale/tr/LC_MESSAGES/vlc.mo +share/locale/uk/LC_MESSAGES/vlc.mo +share/locale/uz/LC_MESSAGES/vlc.mo +share/locale/vi/LC_MESSAGES/vlc.mo +share/locale/wa/LC_MESSAGES/vlc.mo +share/locale/zh_CN/LC_MESSAGES/vlc.mo +share/locale/zh_TW/LC_MESSAGES/vlc.mo +share/locale/zu/LC_MESSAGES/vlc.mo +@dirrm include/vlc/plugins +@dirrm include/vlc +@dirrmtry share/apps/solid/actions +@dirrmtry share/apps/solid +@dirrmtry share/apps +@dirrmtry share/locale/ach/LC_MESSAGES +@dirrmtry share/locale/ach +@dirrmtry share/locale/an/LC_MESSAGES +@dirrmtry share/locale/an +@dirrmtry share/locale/cgg/LC_MESSAGES +@dirrmtry share/locale/cgg +@dirrmtry share/locale/ckb/LC_MESSAGES +@dirrmtry share/locale/ckb +@dirrmtry share/locale/co/LC_MESSAGES +@dirrmtry share/locale/co +@dirrmtry share/locale/ff/LC_MESSAGES +@dirrmtry share/locale/ff +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur +@dirrmtry share/locale/gd/LC_MESSAGES +@dirrmtry share/locale/gd +@dirrmtry share/locale/ia/LC_MESSAGES +@dirrmtry share/locale/ia +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/lg/LC_MESSAGES +@dirrmtry share/locale/lg +@dirrmtry share/locale/my/LC_MESSAGES +@dirrmtry share/locale/my +@dirrmtry share/locale/tet/LC_MESSAGES +@dirrmtry share/locale/tet +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu Property changes on: multimedia/vlc/pkg-plist ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --MP_/O2RHxmTRhFh3Ei7xQLVtn=t--