svn commit: r467319 - in head: . deskutils/lumina-mediaplayer graphics/kipi-plugin-videoslideshow misc/artikulate misc/artikulate-kde4 multimedia multimedia/gstreamer1-qt multimedia/gstreamer1-qt4 ...
Tobias C. Berner
tcberner at FreeBSD.org
Sat Apr 14 14:02:51 UTC 2018
Author: tcberner
Date: Sat Apr 14 14:02:49 2018
New Revision: 467319
URL: https://svnweb.freebsd.org/changeset/ports/467319
Log:
multimedia/gstreamer1-qt4, multimedia/gstreamer1-qt5: create flavors
Approved by: portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D14641
Added:
head/multimedia/gstreamer1-qt/
- copied from r467318, head/multimedia/gstreamer1-qt4/
Deleted:
head/multimedia/gstreamer1-qt4/
head/multimedia/gstreamer1-qt5/
Modified:
head/MOVED
head/deskutils/lumina-mediaplayer/Makefile
head/graphics/kipi-plugin-videoslideshow/Makefile
head/misc/artikulate-kde4/Makefile
head/misc/artikulate/Makefile
head/multimedia/Makefile
head/multimedia/gstreamer1-qt/Makefile
head/net-im/ktp-call-ui/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Sat Apr 14 13:30:12 2018 (r467318)
+++ head/MOVED Sat Apr 14 14:02:49 2018 (r467319)
@@ -10148,3 +10148,5 @@ devel/py-libusb115|devel/py-libusb1|2018-04-14|Unused
devel/qca-qt5|devel/qca at qt5|2018-04-14|Moved to a flavoured version
devel/qjson-qt5|devel/qjson at qt5|2018-04-14|Moved to a flavoured version
sysutils/polkit-qt5|sysutils/polkit-qt at qt5|2018-04-14|Moved to flavoured version
+multimedia/gstreamer1-qt4|multiemdia/gstreamer1-qt at qt4|2018-04-14|Moved to a flavoured version
+multimedia/gstreamer1-qt5|multimedia/gstreamer1-qt at qt5|2018-04-14|Moved to a flavoured version
Modified: head/deskutils/lumina-mediaplayer/Makefile
==============================================================================
--- head/deskutils/lumina-mediaplayer/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/deskutils/lumina-mediaplayer/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -3,6 +3,7 @@
PORTNAME= lumina-mediaplayer
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= jt at ixsystems.com
@@ -10,7 +11,7 @@ COMMENT= Streaming media player from the Lumina Deskto
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= gstreamer1-qt5>=0:multimedia/gstreamer1-qt5 \
+RUN_DEPENDS= gstreamer1-qt5>=0:multimedia/gstreamer1-qt at qt5 \
gstreamer1-plugins-gl>=0:graphics/gstreamer1-plugins-gl
OPTIONS_DEFINE= I18N
Modified: head/graphics/kipi-plugin-videoslideshow/Makefile
==============================================================================
--- head/graphics/kipi-plugin-videoslideshow/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/graphics/kipi-plugin-videoslideshow/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -2,14 +2,14 @@
PORTNAME= kipi-plugin-${KIPI_PLUGIN}
PORTVERSION= ${DIGIKAM_VER}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics kde
MAINTAINER= kde at FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick \
- libQtGLib-2.0.so:multimedia/gstreamer1-qt4
+ libQtGLib-2.0.so:multimedia/gstreamer1-qt at qt4
KIPI_PLUGIN= videoslideshow
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
Modified: head/misc/artikulate-kde4/Makefile
==============================================================================
--- head/misc/artikulate-kde4/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/misc/artikulate-kde4/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -2,13 +2,13 @@
PORTNAME= artikulate
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= misc kde kde-kde4
MAINTAINER= kde at FreeBSD.org
COMMENT= Pronunciation trainer for KDE
-LIB_DEPENDS= libQtGStreamer-1.0.so:multimedia/gstreamer1-qt4 \
+LIB_DEPENDS= libQtGStreamer-1.0.so:multimedia/gstreamer1-qt at qt4 \
libboost_thread.so:devel/boost-libs
RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts-kde4
Modified: head/misc/artikulate/Makefile
==============================================================================
--- head/misc/artikulate/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/misc/artikulate/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -2,13 +2,14 @@
PORTNAME= artikulate
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-applications
MAINTAINER= kde at FreeBSD.org
COMMENT= Pronunciation trainer for KDE
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
- libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt5
+ libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt at qt5
USES= cmake:outsource gettext kde:5 tar:xz
USE_KDE= archive attica auth codecs config configwidgets coreaddons \
Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/multimedia/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -147,8 +147,7 @@
SUBDIR += gstreamer1-plugins-vpx
SUBDIR += gstreamer1-plugins-x264
SUBDIR += gstreamer1-plugins-x265
- SUBDIR += gstreamer1-qt4
- SUBDIR += gstreamer1-qt5
+ SUBDIR += gstreamer1-qt
SUBDIR += gstreamer1-rtsp-server
SUBDIR += gstreamer1-vaapi
SUBDIR += gstreamer1-validate
Modified: head/multimedia/gstreamer1-qt/Makefile
==============================================================================
--- head/multimedia/gstreamer1-qt4/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/multimedia/gstreamer1-qt/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -1,27 +1,35 @@
# $FreeBSD$
-PORTNAME= gstreamer1-qt
+PORTNAME= gstreamer1
PORTVERSION= 1.2.0
-PORTREVISION?= 9
+PORTREVISION= 10
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/qt-gstreamer/
-PKGNAMESUFFIX?= 4
+PKGNAMESUFFIX= -${FLAVOR}
DISTNAME= qt-gstreamer-${PORTVERSION}
MAINTAINER= kde at FreeBSD.org
-COMMENT= Qt ${PKGNAMESUFFIX} bindings for GStreamer 1.x multimedia library
+COMMENT= Qt ${FLAVOR:C/qt//} bindings for GStreamer 1.x multimedia library
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libgstreamer-1.0.so:multimedia/gstreamer1
-CONFLICTS_INSTALL= gstreamer-qt${PKGNAMESUFFIX}-*
+FLAVORS= qt4 qt5
+FLAVOR?= ${FLAVORS:[1]}
+CONFLICTS_INSTALL= gstreamer${PKGNAMESUFFIX}-*
+
USES= bison cmake:outsource pathfix pkgconfig tar:xz
USE_GSTREAMER1= yes
USE_GL= gl
USE_GNOME= glib20
-. if ${PKGNAMESUFFIX:M4}
+
+USE_LDCONFIG= yes
+CMAKE_OFF= USE_GST_PLUGIN_DIR USE_QT_PLUGIN_DIR
+CMAKE_ARGS= -DQT_VERSION=${FLAVOR:C/qt//}
+
+. if ${FLAVOR} == qt4
USE_QT4= corelib gui opengl declarative script \
qmake_build moc_build rcc_build uic_build qtestlib_build
PLIST_SUB= QT4_ONLY="" QT5_ONLY="@comment "
@@ -31,11 +39,6 @@ USE_QT5= buildtools_build qmake_build core gui network
QTVER_SUFFIX= 5
PLIST_SUB= QT4_ONLY="@comment " QT5_ONLY=""
. endif
-
-USE_LDCONFIG= yes
-CMAKE_ARGS= -DUSE_GST_PLUGIN_DIR=off \
- -DUSE_QT_PLUGIN_DIR=off \
- -DQT_VERSION=${PKGNAMESUFFIX}
PLIST_SUB+= SHLIB_VER="${PORTVERSION}" \
QTVER_SUFFIX="${QTVER_SUFFIX}"
Modified: head/net-im/ktp-call-ui/Makefile
==============================================================================
--- head/net-im/ktp-call-ui/Makefile Sat Apr 14 13:30:12 2018 (r467318)
+++ head/net-im/ktp-call-ui/Makefile Sat Apr 14 14:02:49 2018 (r467319)
@@ -2,13 +2,14 @@
PORTNAME= ktp-call-ui
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net-im kde kde-applications
MAINTAINER= kde at FreeBSD.org
COMMENT= Voice/Video Call UI for Telepathy
LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \
- libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt5 \
+ libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt at qt5 \
libboost_thread.so:devel/boost-libs \
libfarstream-0.2.so:net-im/farstream \
libtelepathy-farstream.so:net-im/telepathy-farstream \
More information about the svn-ports-head
mailing list