commit: 2b91cd8b4a15b221c509a402394abd478fe36012 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Jul 24 17:20:35 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Jul 24 17:21:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b91cd8b
media-libs/phonon-gstreamer: remove old Package-Manager: portage-2.3.0 media-libs/phonon-gstreamer/Manifest | 1 - .../phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch | 61 --------------- .../phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild | 89 ---------------------- 3 files changed, 151 deletions(-) diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index 0811d1d..17d7b2d 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,3 +1,2 @@ DIST phonon-backend-gstreamer-4.7.2.tar.xz 75552 SHA256 80b72a9092f540dd0a2abd2898328f3d5f9febfa073b0b1d44592a050a99d2b1 SHA512 d8cf408261f80de7ac29101c3613002a0e838f07e6c8dad2d3922a522a27be167ef8f17a8ab0c99c06c1b75cb4d9d68acee03cb60cf4a44dc2248b7b0dafae08 WHIRLPOOL 368f9784d2ea6fbb3d105fe4645af308bca975bac4cf21908a344d04ab76dd56d5a83ce9a4347a3d664f1830b65de4d40e12b663bcdf91170a4df38bdeb479af -DIST phonon-backend-gstreamer-4.8.2.tar.xz 76044 SHA256 20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0 SHA512 a18534b89d424bb2cc9f8a7f63a794d9711d895ad1db6cd5f4bd8748ea38310ffeacd916d16443986f89d3097e108aaf5631eaba6dd37e76a7360d5f1d02ecea WHIRLPOOL 19e68e818acda9602bdc9f557c866943e8f74d83b5a3d3532a32daf10d6c4f70c3961ceaa2e3b373ed1810c438d595864a01e31514da7c7f569d3a630a625654 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 SHA256 cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1 SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe WHIRLPOOL caaa0e3392e82e120b288d3714ec4987ba70f7b11b920049da9c26fea1b940c15e5e569c855c8b37a26cff8a04959ec5b2c238e6460b324a85c22e444265f136 diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch deleted file mode 100644 index 039aebc..0000000 --- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch +++ /dev/null @@ -1,61 +0,0 @@ -From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001 -From: Alex Merry <[email protected]> -Date: Sun, 18 Oct 2015 15:21:45 +0100 -Subject: [PATCH] Fix finding recent versions of GStreamer. - -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 | 26 +++++++++++++++++++++----- - 1 file changed, 21 insertions(+), 5 deletions(-) - -diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake -index d7243d4..e30c349 100644 ---- a/cmake/FindGStreamer.cmake -+++ b/cmake/FindGStreamer.cmake -@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h - 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 gstapp-1.0 - ${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") --- -2.4.10 - diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild deleted file mode 100644 index d15aa5e..0000000 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -[[ ${PV} == *9999 ]] && git_eclass="git-r3" -EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) - -MY_PN="phonon-backend-gstreamer" -MY_P=${MY_PN}-${PV} - -inherit cmake-utils multibuild ${git_eclass} - -DESCRIPTION="Phonon GStreamer backend" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"; -[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz" - -LICENSE="LGPL-2.1" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" -fi -SLOT="0" -IUSE="alsa debug +network +qt4 qt5" -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] - >=media-libs/phonon-4.7.80[qt4?,qt5?] - qt4? ( - dev-qt/qtcore:4[glib] - dev-qt/qtgui:4[glib] - dev-qt/qtopengl:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - virtual/opengl - network? ( media-plugins/gst-plugins-soup:1.0 ) - !<dev-qt/qtwebkit-4.10.4:4[gstreamer] -" -DEPEND="${RDEPEND} - qt4? ( >=dev-util/automoc-0.9.87 ) - virtual/pkgconfig -" - -[[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P} - -PATCHES=( "${FILESDIR}/${P}-gstreamer-1.6.0.patch" ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=() - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON) - fi - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - multibuild_foreach_variant cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -}
