svn commit: r382558 - in head/multimedia: . phonon-vlc vlc vlc-qt4

Sat Mar 28 21:39:52 UTC 2015

Author: nox
Date: Sat Mar 28 21:39:49 2015
New Revision: 382558
URL: https://svnweb.freebsd.org/changeset/ports/382558
QAT: https://qat.redports.org/buildarchive/r382558/

Log:
  - Add Qt 4 knob and slave port to multimedia/vlc with appropriate CONFLICTS.
  - Remove SIDPLAY knob from vlc as it's now broken:
  
  	/usr/bin/ld: /usr/local/lib/sidplay/builders/libresid-builder.a(resid-builder.o): relocation R_X86_64_32S against `_ZTV12ReSIDBuilder' can not be used when making a shared object; recompile with -fPIC
  
  - Unbreak phonon-vlc by switching it to using vlc-qt4 slave port. [1]
  - Bump PORTREVISIONs.
  
  Reported by:	makc [1]

Added:
  head/multimedia/vlc-qt4/
  head/multimedia/vlc-qt4/Makefile   (contents, props changed)
Modified:
  head/multimedia/Makefile
  head/multimedia/phonon-vlc/Makefile
  head/multimedia/vlc/Makefile
  head/multimedia/vlc/pkg-plist

Modified: head/multimedia/Makefile
==============================================================================

--- head/multimedia/Makefile	Sat Mar 28 21:23:09 2015	(r382557)
+++ head/multimedia/Makefile	Sat Mar 28 21:39:49 2015	(r382558)
@@ -401,6 +401,7 @@
     SUBDIR += vic
     SUBDIR += vid.stab
     SUBDIR += vlc
+    SUBDIR += vlc-qt4
     SUBDIR += vstream-client
     SUBDIR += vtkmpeg2encode
     SUBDIR += w_scan

Modified: head/multimedia/phonon-vlc/Makefile
==============================================================================
--- head/multimedia/phonon-vlc/Makefile	Sat Mar 28 21:23:09 2015	(r382557)
+++ head/multimedia/phonon-vlc/Makefile	Sat Mar 28 21:39:49 2015	(r382558)
@@ -2,6 +2,7 @@
 
 PORTNAME=	phonon
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-vlc
@@ -11,7 +12,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	VLC backend for Phonon
 
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
+LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc-qt4
 
 USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib gui phonon \

Added: head/multimedia/vlc-qt4/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vlc-qt4/Makefile	Sat Mar 28 21:39:49 2015	(r382558)
@@ -0,0 +1,15 @@
+# Created by: nox at FreeBSD.org
+# $FreeBSD$
+
+MAINTAINER=	multimedia at FreeBSD.org
+COMMENT=	Qt 4 based multimedia player and streaming server
+PKGNAMESUFFIX=	-qt4
+
+OPTIONS_SLAVE=	QT4
+OPTIONS_EXCLUDE=	QT5
+
+CONFLICTS=	vlc-[0-9]*
+
+MASTERDIR=	${.CURDIR}/../vlc
+
+.include "${MASTERDIR}/Makefile"

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Sat Mar 28 21:23:09 2015	(r382557)
+++ head/multimedia/vlc/Makefile	Sat Mar 28 21:39:49 2015	(r382558)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.videolan.o
 		ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
 
 MAINTAINER=	multimedia at 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}/se
 		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,8 +59,8 @@ OPTIONS_DEFINE=	A52 AALIB ASS AVAHI CACA
 		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 \
-		SCHROEDINGER SDL SHOUTCAST SIDPLAY SKINS SMB STREAM SPEEX \
+		OPUS PNG PULSEAUDIO QT4 QT5 REALRTSP RUNROOT SAMPLERATE \
+		SCHROEDINGER SDL SHOUTCAST SKINS SMB STREAM SPEEX \
 		TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \
 		X11 X264 X265 ZVBI
 OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \
@@ -232,7 +233,12 @@ PNG_CONFIGURE_ENABLE=	png
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
-QT5_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${QT_INCDIR}/QtGui -DQT_SHARED -I${QT_INCDIR} -I${QT_INCDIR}/QtCore" \
+			QT_LIBS="-lQtGui -L${QT_LIBDIR} -lQtCore"
+
 QT5_USE=		QT5=gui,core,widgets,x11extras,buildtools_build
 
 REALRTSP_CONFIGURE_ENABLE=	realrtsp
@@ -248,9 +254,12 @@ SCHROEDINGER_CONFIGURE_ENABLE=	schroedin
 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
-SIDPLAY_CONFIGURE_ENABLE=	sid
+# libsidplay build broken with:
+# /usr/bin/ld: /usr/local/lib/sidplay/builders/libresid-builder.a(resid-builder.o): relocation R_X86_64_32S against `_ZTV12ReSIDBuilder' can not be used when making a shared object; recompile with -fPIC
+#SIDPLAY_LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+#SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
+#SIDPLAY_CONFIGURE_ENABLE=	sid
+CONFIGURE_ARGS+=	--disable-sid
 
 SHOUTCAST_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
 SHOUTCAST_CONFIGURE_ENABLE=	shout
@@ -317,14 +326,24 @@ IGNORE=		Pulseaudio is unsupported with 
 INSTALLS_ICONS=	yes
 .endif
 
+.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4}
+CONFIGURE_ARGS+=	--enable-qt
+.else
+CONFIGURE_ARGS+=	--disable-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
@@ -351,6 +370,11 @@ post-patch:
 	@${RM} -rf ${WRKSRC}/modules/access/v4l2/linux
 # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c
 	@${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix
+.if ${PORT_OPTIONS:MQT4}
+# XXX no sane way to tell configure not to pick up Qt5X11Extras with qt4
+	@${REINPLACE_CMD} s/Qt5X11Extras/Qt5X11Extras-not/ \
+		${WRKSRC}/configure
+.endif
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \

Modified: head/multimedia/vlc/pkg-plist
==============================================================================
--- head/multimedia/vlc/pkg-plist	Sat Mar 28 21:23:09 2015	(r382557)
+++ head/multimedia/vlc/pkg-plist	Sat Mar 28 21:39:49 2015	(r382558)
@@ -1,6 +1,7 @@
 bin/cvlc
 %%NCURSES%%bin/nvlc
 %%QT5%%bin/qvlc
+%%QT4%%bin/qvlc
 bin/rvlc
 %%SKINS%%bin/svlc
 bin/vlc
