Fix linking failure with new phonon. Fixes bug #396109.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 91 insertions, 19 deletions

diff --git a/media-libs/phonon-gstreamer/ChangeLog b/media-libs/phonon-gstreamer/ChangeLog
index 70dce6ac8441..03dce446219e 100644
--- a/media-libs/phonon-gstreamer/ChangeLog
+++ b/media-libs/phonon-gstreamer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/phonon-gstreamer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.12 2011/12/29 20:25:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.13 2011/12/30 11:25:09 scarabeus Exp $
+
+  30 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.5.1-fix-searching-for-phonon.patch, phonon-gstreamer-4.5.1.ebuild:
+  Fix linking failure with new phonon. Fixes bug #396109.
 
   29 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   phonon-gstreamer-4.5.0.ebuild, phonon-gstreamer-4.5.1.ebuild,
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index aa4fccde565f..ea05a44c9b46 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX 4.5.1-fix-searching-for-phonon.patch 2522 RMD160 725d84b49f6570bb85766f128f86b7afeae483ac SHA1 a4b886b7d27a80e96f0b8c0d7d882e7dce52563f SHA256 ea1df8c6117d6251eacfe624258511afd5d1101b1d6579ee85c07b5e07c49d96
 DIST phonon-backend-gstreamer-4.5.0.tar.bz2 89682 RMD160 47fff712220bd040b695e055954346a03d2c5b00 SHA1 93c1bae7ef324b3f80d1b6ed85b80cf920064af6 SHA256 a90874728b4eba089eb427fa1df2b65df387c08380df880ff5fa8f9beb85f79e
 DIST phonon-backend-gstreamer-4.5.1.tar.bz2 90211 RMD160 5c57f14e134edefd8e3a39756bece5262a437a30 SHA1 3f8c059bb60e78fc1eb61bde5ab2c3bba395ca98 SHA256 62326ce7c64810eec8f42245a1f1880ce10d0a3b8976318ad516091f419ba38e
 EBUILD phonon-gstreamer-4.5.0.ebuild 1250 RMD160 331d448eccb7d5919406cd8e35d96749fe6065f1 SHA1 7ad302ca8b5615cc1e1a67aadb697932edebeea0 SHA256 66426d5125ba31a6487759c40bc6da52cb871f40e88135599e74c92c0aea7ced
-EBUILD phonon-gstreamer-4.5.1.ebuild 1239 RMD160 d1f2f6d734c228eaedcd13740bb21e127d677ca6 SHA1 131e6b7937c636b063990d87f3b4ad16fee960e1 SHA256 75d762701bf3a9d491e9bde1c2a739bef9c621f5f395b8619f5cc597dde88ce8
+EBUILD phonon-gstreamer-4.5.1.ebuild 1304 RMD160 c86fd89d3ade7176e890b67c0498e8b4d7a527c7 SHA1 6e1cdd7e1812e3108019012db38e944ee4d961f0 SHA256 b6e6f0a667460935242a005eae831c7da7e53272d1e4ff56e322e0a5e4d01798
 EBUILD phonon-gstreamer-9999.ebuild 1238 RMD160 b7b99fe11bb34dffda0e29b0da0b6d99714f3ca3 SHA1 1620c37e7ff3a5e93862cb16da152cb0c905dcf1 SHA256 9aa4537c9d13bf1d423bd5c13bb217c65138bc83e9496ffa23a30d54bc345188
-MISC ChangeLog 2781 RMD160 a0a2afb6d4268d237d11e2181929bef8e27a4e27 SHA1 02f3961cf8338082552798a16295764a0c25ff8c SHA256 cf016b57e203e71b150490fa11e02ab44deb76ec66cde3c0f429a580e93a7640
+MISC ChangeLog 2973 RMD160 098d062bfad9a48b9fedd86a245a1e6f732f24f4 SHA1 d583c9ad7f246e158a5387d5e06be71601567db5 SHA256 73b16717909606e3810841209887ee3bfbbc4024b05c81d75562e9d4ae4234b0
 MISC metadata.xml 244 RMD160 8b1beeb9273dd415d7a48441fbc5444977194e5a SHA1 466c9d32b10ed56233b65cdfcd9126723c71a6a6 SHA256 4e62785c5651e1802026dce1b7fe721cbd9bc2f24bd59ec5f839e47af0ac8c58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO/M0hAAoJEEb+UGWnxTyHpf4QAIv3KtP199wnyVfxGcGjxupi
-LL5FprO268ps9k6ohjorrwh1MOCb7vlwXsbs0DMewKEUZU40+/Bu3x/cFB5rJhyX
-Muze4YepnqvMbAmg2dRzH2NOqnj0vM4RYrVGL2yGGdB5kWtbrr/DKUI2Z8ASXBm+
-C+WZVRVfLVWWa/D+iRWk5RZVYD9i/Jv3ox9lqpYNkFbRt4xMBdcGimpXMaCqkVRl
-+39zjIWPZn+4GYbMXwuQrjPNEFT22W/oW/LaFRVjNZzfBVCsFGaiGMjPM65sqZmH
-tuwIvL3PwQRDYDUI0x9nSbjyvC7sMelhLReG/CtUSawslz/dyjG/24Is1l668V1T
-6ItW24XZGBqV2HFwo5hRtdQijjG4Q1jhWFyQcVn5ZPCzB/HxrFWyuUYIuVlBLpdA
-n2QGYjiUw3/xrA7tO3k4XNWYy3Fcf7XQRCU0DycKFC+1X6lpsNJoQExkFCLsGMjO
-vFMS/Y33X3vY/WBUTCCY6QDVkWsrNUsbS/RjOdl/iiEGo3rZHuiYPhoUht2qMF1G
-LwOoGISxnvibtkGgcPsU1zxk6DFFwdNCpTszwdcmYLrVuR6BONQEv0Nc7JgXC8At
-kafVRYp4etAxH1UFCSi3EJvpjDBPL0uGtwLIwqSpZbZXozW0esb4RMiidM/DpY6C
-DbR6pFh5vKgJvBFS61zN
-=OScg
+iQIcBAEBAgAGBQJO/Z+iAAoJEOSiRoyO7jvol6QQAIW/3LeDy6pEKUfktxN+O+Vt
+pl61+/Tt43OcVCravUBgeTNF4LWmjypFLjV1risa160FSDfytDvW7d/cb7BCnev0
+4SSEQ3DXpL4hCjsMO38h/MbgKhHNdPsQ9bk1SFjzK1Ltf2A4dnaEuVJtJMysgDrc
+mnvPdaf8MyUvxko8GrdFuC+EMRQHy1xfF7SPWiIWpd1fig8rh7nGgC8JUxXdsJek
+LlMqp5WpNAC3+e1Cbwwj2zq3GWPQhd/FU4KFx3T+RHEqwmudMRX9xXMS6Wt7qKXp
+cYYWA29qvUUim/oJNbLIilCoZc5lEFfvcaHOhEomtQtqBkvpIA5Ia1b9XUioemIz
+Q/qUyL4nnQDSyGtFMxXcwupmldYXGarkTWFV0uLvL9NcyuL4bHvYJzlVjdmJiJEj
+SlQ/RqJ8awyezgd6LgVmCCRkkmaYbgWS7phas43fV5FgpGHA68vVjw+Otkz2Hano
+VhjNv40yjp4d/FrG/vwLJf0q22Jy2xIDeHR7gbsY5Nw8hgBWzRX9ZaUipSo0WjKW
+3wv7z2ff5uyUd6/x60adBDsctNuqNpisiEEau3EzHQ1cYgl0XDBU0Lq5RIGQWWPp
+ajdiYWIKXCZ2zXZOxKU8bf/rhSPSK5rLsQwxCF6z0ZvuAg+DIiHx+M/Pw1ZUAIKO
+YQr6wxBvb4Fx3Ka9xXaV
+=GgMe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch b/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
new file mode 100644
index 000000000000..af9e9c88c8ff
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
@@ -0,0 +1,63 @@
+diff -urN phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake
+--- phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake	2011-05-04 06:34:52.000000000 +0200
++++ phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake	2011-12-30 12:22:03.623333200 +0100
+@@ -1,53 +1,16 @@
+ # Find Phonon
+ 
+ # Copyright (c) 2010, Harald Sitter <sitter@kde.org>
++# Copyright (c) 2011, Alexander Neundorf <neundorf@kde.org>
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-if (NOT PHONON_BUILDSYSTEM_DIR)
+-    find_program(PC_EXECUTABLE NAMES pkg-config
+-    PATH_SUFFIXES bin               
+-    HINTS
+-    ${CMAKE_INSTALL_PREFIX}
+-    ONLY_CMAKE_FIND_ROOT_PATH
+-    )
+-
+-    if (NOT PC_EXECUTABLE)
+-        if (Phonon_FIND_REQUIRED)
+-            message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].")
+-        endif (Phonon_FIND_REQUIRED)
+-    endif (NOT PC_EXECUTABLE)
+-
+-    if (PC_EXECUTABLE)
+-        execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon
+-                        OUTPUT_VARIABLE _data_DIR
+-                        ERROR_QUIET
+-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+-        file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
+-        find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR})
+-    endif (PC_EXECUTABLE)
+-endif (NOT PHONON_BUILDSYSTEM_DIR)
+-
+-if (PHONON_BUILDSYSTEM_DIR)
++find_package(Phonon NO_MODULE)
++if(PHONON_FOUND)
+     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
++endif()
+ 
+-    if (Phonon_FIND_REQUIRED)
+-        set(_req REQUIRED)
+-    endif (Phonon_FIND_REQUIRED)
+-    if (PHONON_FIND_QUIETLY)
+-        set(_quiet QUIET)
+-    endif (PHONON_FIND_QUIETLY)
++include(FindPackageHandleStandardArgs)
+ 
+-    find_package(PhononInternal ${_req} ${_quiet})
+-else (PHONON_BUILDSYSTEM_DIR)
+-    if (_data_DIR)
+-        if (Phonon_FIND_REQUIRED)
+-            message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}")
+-        endif (Phonon_FIND_REQUIRED)
+-    else (_data_DIR)
+-        if (Phonon_FIND_REQUIRED)
+-            message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.")
+-        endif (Phonon_FIND_REQUIRED)
+-    endif (_data_DIR)
+-endif (PHONON_BUILDSYSTEM_DIR)
++find_package_handle_standard_args(Phonon  DEFAULT_MSG  Phonon_DIR )
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
index a0bbbd288869..c4687a512f52 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild,v 1.3 2011/12/29 20:25:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild,v 1.4 2011/12/30 11:25:09 scarabeus Exp $
 
 EAPI=4
 
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}-fix-searching-for-phonon.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {