Date: Tue, 1 Jan 2019 13:15:23 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488883 - in head/multimedia: phonon phonon-designerplugin phonon-gstreamer phonon-vlc phonon-xine Message-ID: <201901011315.x01DFNTk012188@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Tue Jan 1 13:15:23 2019 New Revision: 488883 URL: https://svnweb.freebsd.org/changeset/ports/488883 Log: multimedia/phonon*@qt4: fix automoc4 depencency after r488807 Modified: head/multimedia/phonon-designerplugin/Makefile head/multimedia/phonon-gstreamer/Makefile head/multimedia/phonon-vlc/Makefile head/multimedia/phonon-xine/Makefile head/multimedia/phonon/Makefile Modified: head/multimedia/phonon-designerplugin/Makefile ============================================================================== --- head/multimedia/phonon-designerplugin/Makefile Tue Jan 1 13:14:02 2019 (r488882) +++ head/multimedia/phonon-designerplugin/Makefile Tue Jan 1 13:15:23 2019 (r488883) @@ -23,7 +23,7 @@ USES= cmake:insource tar:xz . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -USES+= kde:4 qt:4 +USES+= qt:4 USE_QT= corelib designer gui phonon \ qmake_build moc_build rcc_build uic_build PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/libphononwidgets.so Modified: head/multimedia/phonon-gstreamer/Makefile ============================================================================== --- head/multimedia/phonon-gstreamer/Makefile Tue Jan 1 13:14:02 2019 (r488882) +++ head/multimedia/phonon-gstreamer/Makefile Tue Jan 1 13:15:23 2019 (r488883) @@ -31,8 +31,7 @@ USE_XORG= x11 . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -USES+= kde:4 qt:4 -USE_KDE= automoc4 +USES+= qt:4 USE_QT= corelib gui opengl phonon \ qmake_build moc_build rcc_build uic_build . else Modified: head/multimedia/phonon-vlc/Makefile ============================================================================== --- head/multimedia/phonon-vlc/Makefile Tue Jan 1 13:14:02 2019 (r488882) +++ head/multimedia/phonon-vlc/Makefile Tue Jan 1 13:15:23 2019 (r488883) @@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB FLAVORS= qt5 qt4 FLAVOR?= ${FLAVORS:[1]} +qt4_BUILD_DEPENDS= automoc4:devel/automoc4 qt4_LIB_DEPENDS= libvlc.so:multimedia/vlc-qt4 qt5_LIB_DEPENDS= libvlc.so:multimedia/vlc3 @@ -26,8 +27,7 @@ USES= cmake pkgconfig tar:xz . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -USES+= kde:4 qt:4 -USE_KDE= automoc4 +USES+= qt:4 USE_QT= corelib gui phonon \ qmake_build moc_build rcc_build uic_build PLIST_FILES= lib/kde4/plugins/phonon_backend/phonon_vlc.so \ Modified: head/multimedia/phonon-xine/Makefile ============================================================================== --- head/multimedia/phonon-xine/Makefile Tue Jan 1 13:14:02 2019 (r488882) +++ head/multimedia/phonon-xine/Makefile Tue Jan 1 13:15:23 2019 (r488883) @@ -16,10 +16,10 @@ COMMENT= The xine backend for Phonon DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE= 2019-03-15 +BUILD_DEPENDS= automoc4:devel/automoc4 LIB_DEPENDS= libxine.so:multimedia/libxine -USES= cmake kde:4 pkgconfig qt:4 tar:bzip2 -USE_KDE= automoc4 +USES= cmake pkgconfig qt:4 tar:bzip2 USE_QT= corelib dbus gui phonon \ qmake_build moc_build rcc_build uic_build USE_XORG= xcb Modified: head/multimedia/phonon/Makefile ============================================================================== --- head/multimedia/phonon/Makefile Tue Jan 1 13:14:02 2019 (r488882) +++ head/multimedia/phonon/Makefile Tue Jan 1 13:15:23 2019 (r488883) @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB FLAVORS= qt5 qt4 FLAVOR?= ${FLAVORS:[1]} +qt4_BUILD_DEPENDS= automoc4:devel/automoc4 qt4_LIB_DEPENDS= libqzeitgeist.so:sysutils/qzeitgeist qt4_PKGNAMESUFFIX= -qt4 qt5_PKGNAMESUFFIX= -qt5 @@ -32,7 +33,6 @@ USE_LDCONFIG= yes . if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 -BUILD_DEPENDS+= automoc4:devel/automoc4 USES+= qt:4 USE_QT= corelib dbus declarative gui testlib \ qmake_build moc_build rcc_build uic_build
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901011315.x01DFNTk012188>