diff options
author | markd <markd> | 2016-04-26 09:04:23 +0000 |
---|---|---|
committer | markd <markd> | 2016-04-26 09:04:23 +0000 |
commit | 82c841e5e815a701fedc496033777cf43d46c88b (patch) | |
tree | 43a581b13ed1f2e8de4ffa7b3843438b8aa8bf3d | |
parent | f2b6144373c6822fd766e833ca8546be0efdfbda (diff) | |
download | pkgsrc-82c841e5e815a701fedc496033777cf43d46c88b.tar.gz |
Update phonon-{,qt5-}backend-gstreamer{,-shared} 4.9.0
Changes
* CMake requirement aligned with libphonon (2.6.2 => 2.8.9)
Bug Fixes
* Fixed finding GStreamer 1.0
* Only build X11 renderer if X11 is found (enables building on OSX
and Windows)
6 files changed, 18 insertions, 69 deletions
diff --git a/multimedia/phonon-backend-gstreamer-shared/Makefile b/multimedia/phonon-backend-gstreamer-shared/Makefile index 06cc1b9b8e9..8fb7d8859a8 100644 --- a/multimedia/phonon-backend-gstreamer-shared/Makefile +++ b/multimedia/phonon-backend-gstreamer-shared/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2016/03/01 09:21:01 markd Exp $ +# $NetBSD: Makefile,v 1.2 2016/04/26 09:04:23 markd Exp $ -DISTNAME= phonon-backend-gstreamer-4.8.2 +DISTNAME= phonon-backend-gstreamer-4.9.0 PKGNAME= ${DISTNAME:S/-4/-shared-4/} COMMENT= Multimedia API for KF5 - GStreamer backend shared files diff --git a/multimedia/phonon-backend-gstreamer/Makefile b/multimedia/phonon-backend-gstreamer/Makefile index 42fe4e87c10..4c9c02865be 100644 --- a/multimedia/phonon-backend-gstreamer/Makefile +++ b/multimedia/phonon-backend-gstreamer/Makefile @@ -1,14 +1,12 @@ -# $NetBSD: Makefile,v 1.24 2016/03/05 11:29:01 jperkin Exp $ +# $NetBSD: Makefile,v 1.25 2016/04/26 09:04:23 markd Exp $ -DISTNAME= phonon-backend-gstreamer-4.8.2 -PKGREVISION= 2 +DISTNAME= phonon-backend-gstreamer-4.9.0 COMMENT= Multimedia API for KDE and QT - GStreamer backend .include "Makefile.common" -BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 -DEPENDS+= phonon-backend-gstreamer-shared-4.8.2:../../multimedia/phonon-backend-gstreamer-shared +DEPENDS+= phonon-backend-gstreamer-shared-4.9.0:../../multimedia/phonon-backend-gstreamer-shared .include "../../multimedia/phonon/buildlink3.mk" diff --git a/multimedia/phonon-backend-gstreamer/Makefile.common b/multimedia/phonon-backend-gstreamer/Makefile.common index 091f54bc5af..6eb270fb1c8 100644 --- a/multimedia/phonon-backend-gstreamer/Makefile.common +++ b/multimedia/phonon-backend-gstreamer/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.1 2016/03/01 09:21:01 markd Exp $ +# $NetBSD: Makefile.common,v 1.2 2016/04/26 09:04:23 markd Exp $ CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_KDE:=phonon/phonon-backend-gstreamer/4.8.2/src/} +MASTER_SITES= ${MASTER_SITE_KDE:=phonon/phonon-backend-gstreamer/4.9.0/} EXTRACT_SUFX= .tar.xz MAINTAINER= markd@NetBSD.org @@ -17,6 +17,8 @@ USE_CMAKE= yes CMAKE_ARG_PATH= .. CONFIGURE_DIRS= _build +WRKSRC= ${WRKDIR}/phonon-gstreamer-4.9.0 + pre-configure: ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ ${MKDIR} ${WRKSRC}/_build diff --git a/multimedia/phonon-backend-gstreamer/distinfo b/multimedia/phonon-backend-gstreamer/distinfo index 6e072efb33e..553f543caec 100644 --- a/multimedia/phonon-backend-gstreamer/distinfo +++ b/multimedia/phonon-backend-gstreamer/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.10 2016/03/01 09:21:01 markd Exp $ +$NetBSD: distinfo,v 1.11 2016/04/26 09:04:23 markd Exp $ -SHA1 (phonon-backend-gstreamer-4.8.2.tar.xz) = 9998ba3a002af09e1ba4072508d1813af1d1e5be -RMD160 (phonon-backend-gstreamer-4.8.2.tar.xz) = 9c0ec7ef27e925c207e769edc225b1d7202c7e37 -SHA512 (phonon-backend-gstreamer-4.8.2.tar.xz) = a18534b89d424bb2cc9f8a7f63a794d9711d895ad1db6cd5f4bd8748ea38310ffeacd916d16443986f89d3097e108aaf5631eaba6dd37e76a7360d5f1d02ecea -Size (phonon-backend-gstreamer-4.8.2.tar.xz) = 76044 bytes -SHA1 (patch-cmake_FindGStreamer.cmake) = 61ea66ec1a89eec428b94c220e82ff4d0479fda8 +SHA1 (phonon-backend-gstreamer-4.9.0.tar.xz) = 81f16c98e35a6377fefd8ce8e66e1e2ec609c94d +RMD160 (phonon-backend-gstreamer-4.9.0.tar.xz) = 43095bdb9fe8729fd795910188c46cdcb0eae12f +SHA512 (phonon-backend-gstreamer-4.9.0.tar.xz) = 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe +Size (phonon-backend-gstreamer-4.9.0.tar.xz) = 75960 bytes SHA1 (patch-gstreamer_CMakeLists.txt) = b1caffcf6f676540de7b450693e2644f5d35fb8f diff --git a/multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake b/multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake deleted file mode 100644 index 8ec6e8d4968..00000000000 --- a/multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-cmake_FindGStreamer.cmake,v 1.1 2015/11/30 08:36:36 markd Exp $ - -Newer versions of GStreamer put gst-config.h under -lib/gstreamer-1.0/include, so we need to make sure that directory will -be added to the include path as well. - -REVIEW: 125690 - ---- cmake/FindGStreamer.cmake.orig 2015-11-30 08:02:28.000000000 +0000 -+++ cmake/FindGStreamer.cmake -@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst. - PATH_SUFFIXES gstreamer-1.0 - ) - -+IF (NOT GSTREAMER_INCLUDE_DIR) -+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found") -+ENDIF (NOT GSTREAMER_INCLUDE_DIR) -+ -+# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include -+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h -+ PATHS -+ ${PKG_GSTREAMER_INCLUDE_DIRS} -+ PATH_SUFFIXES gstreamer-1.0 -+ ) -+ -+IF (NOT GSTREAMER_CONF_INCLUDE_DIR) -+ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found") -+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR) -+ -+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) -+ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR) -+ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}") -+ ENDIF() -+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR) -+ - FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 - PATHS - ${PKG_GSTREAMER_LIBRARY_DIRS} -@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES - ${PKG_GSTREAMER_LIBRARY_DIRS} - ) - --IF (GSTREAMER_INCLUDE_DIR) --ELSE (GSTREAMER_INCLUDE_DIR) -- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") --ENDIF (GSTREAMER_INCLUDE_DIR) -- - IF (GSTREAMER_LIBRARIES) - ELSE (GSTREAMER_LIBRARIES) - MESSAGE(STATUS "GStreamer: WARNING: library not found") diff --git a/multimedia/phonon-qt5-backend-gstreamer/Makefile b/multimedia/phonon-qt5-backend-gstreamer/Makefile index a4f3a54c359..d0c5d2f5442 100644 --- a/multimedia/phonon-qt5-backend-gstreamer/Makefile +++ b/multimedia/phonon-qt5-backend-gstreamer/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.3 2016/04/11 19:01:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2016/04/26 09:04:23 markd Exp $ -DISTNAME= phonon-backend-gstreamer-4.8.2 +DISTNAME= phonon-backend-gstreamer-4.9.0 PKGNAME= ${DISTNAME:S/-/-qt5-/} -PKGREVISION= 2 COMMENT= Multimedia API for KF5 - GStreamer backend .include "../../multimedia/phonon-backend-gstreamer/Makefile.common" -DEPENDS+= phonon-backend-gstreamer-shared-4.8.2:../../multimedia/phonon-backend-gstreamer-shared +DEPENDS+= phonon-backend-gstreamer-shared-4.9.0:../../multimedia/phonon-backend-gstreamer-shared CMAKE_ARGS+= -DPHONON_BUILD_PHONON4QT5=ON .include "../../multimedia/phonon-qt5/buildlink3.mk" +.include "../../x11/qt5-qtx11extras/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |