Index: multimedia/vlc/Makefile =================================================================== --- multimedia/vlc/Makefile (revision 382090) +++ multimedia/vlc/Makefile (working copy) @@ -11,7 +11,7 @@ MASTER_SITES= http://download.videolan.org/pub/vid ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ MAINTAINER= multimedia@FreeBSD.org -COMMENT= Qt4 based multimedia player and streaming server +COMMENT?= Qt based multimedia player and streaming server LICENSE= GPLv2 @@ -19,8 +19,7 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/lib libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ - libidn.so:${PORTSDIR}/dns/libidn \ - libminizip.so:${PORTSDIR}/archivers/minizip + libidn.so:${PORTSDIR}/dns/libidn BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg \ yasm:${PORTSDIR}/devel/yasm RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg @@ -31,6 +30,8 @@ USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip +CONFLICTS?= vlc-qt4-* + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --enable-fontconfig --enable-freetype --enable-libgcrypt \ @@ -58,7 +59,7 @@ OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA 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 QT5 REALRTSP RUNROOT SAMPLERATE \ + OPUS PNG PULSEAUDIO QT4 QT5 REALRTSP RUNROOT SAMPLERATE \ SCHROEDINGER SDL SHOUTCAST SIDPLAY SKINS SMB STREAM SPEEX \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \ X11 X264 X265 ZVBI @@ -232,6 +233,13 @@ PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse +QT4_CONFIGURE_ENABLE= qt +QT4_USE= QT4=gui,corelib,moc_build,rcc_build,uic_build +# QT_CFLAGS: pkg-config --cflags "QtCore QtGui >= 4.6.0" +# QT_LIBS: pkg-config --libs "QtCore QtGui >= 4.6.0" +QT4_CONFIGURE_ENV= QT_CFLAGS="-I${LOCALBASE}/include/qt4/QtGui -DQT_SHARED -I${LOCALBASE}/include/qt4 -I${LOCALBASE}/include/qt4/QtCore" \ + QT_LIBS="-lQtGui -L${LOCALBASE}/lib/qt4 -lQtCore" + QT5_CONFIGURE_ENABLE= qt QT5_USE= QT5=gui,core,widgets,x11extras,buildtools_build @@ -317,14 +325,22 @@ IGNORE= Pulseaudio is unsupported with rtld prior INSTALLS_ICONS= yes .endif +.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} +CONFIGURE_ARGS+= --enable-qt +.endif + +.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MQT4} +IGNORE= please choose one of QT4 or QT5 +.endif + .if ${PORT_OPTIONS:MSKINS} -.if ${PORT_OPTIONS:MQT5} +.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} 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 QT5 option +IGNORE= SKINS option requires QT4 or QT5 option .endif .else CONFIGURE_ARGS+=--disable-skins2 --disable-libtar Index: multimedia/vlc/pkg-plist =================================================================== --- multimedia/vlc/pkg-plist (revision 382090) +++ multimedia/vlc/pkg-plist (working copy) @@ -1,6 +1,7 @@ bin/cvlc %%NCURSES%%bin/nvlc %%QT5%%bin/qvlc +%%QT4%%bin/qvlc bin/rvlc %%SKINS%%bin/svlc bin/vlc Index: multimedia/vlc-qt4/Makefile =================================================================== --- multimedia/vlc-qt4/Makefile (revision 0) +++ multimedia/vlc-qt4/Makefile (working copy) @@ -0,0 +1,15 @@ +# Created by: nox@FreeBSD.org +# $FreeBSD$ + +MAINTAINER= multimedia@FreeBSD.org +COMMENT= Qt4 slave port of vlc multimedia player and streaming server +PKGNAMESUFFIX= -qt4 + +OPTIONS_SLAVE= QT4 +OPTIONS_EXCLUDE= QT5 + +CONFLICTS= vlc-[0-9]* + +MASTERDIR= ${.CURDIR}/../vlc + +.include "${MASTERDIR}/Makefile" Property changes on: multimedia/vlc-qt4/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property