From owner-svn-ports-all@freebsd.org Sat Apr 14 14:02:51 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2853CFA2A4A; Sat, 14 Apr 2018 14:02:51 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D0D5B85B28; Sat, 14 Apr 2018 14:02:50 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBCBC2935F; Sat, 14 Apr 2018 14:02:50 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3EE2oTE083636; Sat, 14 Apr 2018 14:02:50 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3EE2ntP083627; Sat, 14 Apr 2018 14:02:49 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201804141402.w3EE2ntP083627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 14 Apr 2018 14:02:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467319 - in head: . deskutils/lumina-mediaplayer graphics/kipi-plugin-videoslideshow misc/artikulate misc/artikulate-kde4 multimedia multimedia/gstreamer1-qt multimedia/gstreamer1-qt4 ... X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . deskutils/lumina-mediaplayer graphics/kipi-plugin-videoslideshow misc/artikulate misc/artikulate-kde4 multimedia multimedia/gstreamer1-qt multimedia/gstreamer1-qt4 multimedia/gstreamer1-qt5... X-SVN-Commit-Revision: 467319 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2018 14:02:51 -0000 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@qt5|2018-04-14|Moved to a flavoured version devel/qjson-qt5|devel/qjson@qt5|2018-04-14|Moved to a flavoured version sysutils/polkit-qt5|sysutils/polkit-qt@qt5|2018-04-14|Moved to flavoured version +multimedia/gstreamer1-qt4|multiemdia/gstreamer1-qt@qt4|2018-04-14|Moved to a flavoured version +multimedia/gstreamer1-qt5|multimedia/gstreamer1-qt@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@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@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@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@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@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@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@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@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@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@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@qt5 \ libboost_thread.so:devel/boost-libs \ libfarstream-0.2.so:net-im/farstream \ libtelepathy-farstream.so:net-im/telepathy-farstream \