diff options
author | 2011-12-24 13:19:11 +0000 | |
---|---|---|
committer | 2011-12-24 13:19:11 +0000 | |
commit | c7b450be6065814a28c277fbc3fef883afedfe74 (patch) | |
tree | a090215724d772b289f0f846c5ba88eea2979d67 /media-libs/phonon | |
parent | Version bump. Drop hacks for open4 version since this is now updated upstream. (diff) | |
download | gentoo-2-c7b450be6065814a28c277fbc3fef883afedfe74.tar.gz gentoo-2-c7b450be6065814a28c277fbc3fef883afedfe74.tar.bz2 gentoo-2-c7b450be6065814a28c277fbc3fef883afedfe74.zip |
Revision bump. Adds patch for rpath, thanks to Alphat-PC <AlphatPC@gmail.com>, bug #395865
(Portage version: 2.2.0_alpha81/cvs/Linux i686)
Diffstat (limited to 'media-libs/phonon')
-rw-r--r-- | media-libs/phonon/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/phonon/files/phonon-4.6.0-rpath.patch | 16 | ||||
-rw-r--r-- | media-libs/phonon/phonon-4.6.0-r1.ebuild (renamed from media-libs/phonon/phonon-4.6.0.ebuild) | 7 |
3 files changed, 29 insertions, 3 deletions
diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog index 2a4a9c3f9dbe..6abf9a708796 100644 --- a/media-libs/phonon/ChangeLog +++ b/media-libs/phonon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/phonon # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.27 2011/12/23 13:17:06 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.28 2011/12/24 13:19:11 johu Exp $ + +*phonon-4.6.0-r1 (24 Dec 2011) + + 24 Dec 2011; Johannes Huber <johu@gentoo.org> +files/phonon-4.6.0-rpath.patch, + +phonon-4.6.0-r1.ebuild, -phonon-4.6.0.ebuild: + Revision bump. Adds patch for rpath, thanks to Alphat-PC <AlphatPC@gmail.com>, + bug #395865 *phonon-4.6.0 (23 Dec 2011) diff --git a/media-libs/phonon/files/phonon-4.6.0-rpath.patch b/media-libs/phonon/files/phonon-4.6.0-rpath.patch new file mode 100644 index 000000000000..ae933400c957 --- /dev/null +++ b/media-libs/phonon/files/phonon-4.6.0-rpath.patch @@ -0,0 +1,16 @@ + cmake/FindPhononInternal.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake +index 2bad949..c2ea576 100644 +--- a/cmake/FindPhononInternal.cmake ++++ b/cmake/FindPhononInternal.cmake +@@ -123,7 +123,7 @@ endif(APPLE) + # RPATH directories outside the current CMAKE_BINARY_DIR and also the library + # install directory. Alex + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") ++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") + + + # Uninstall Target diff --git a/media-libs/phonon/phonon-4.6.0.ebuild b/media-libs/phonon/phonon-4.6.0-r1.ebuild index a380de71cc0a..ed2ecc7c88ad 100644 --- a/media-libs/phonon/phonon-4.6.0.ebuild +++ b/media-libs/phonon/phonon-4.6.0-r1.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/phonon-4.6.0.ebuild,v 1.1 2011/12/23 13:17:06 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild,v 1.1 2011/12/24 13:19:11 johu Exp $ EAPI=4 @@ -54,7 +54,10 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="|| ( aqua gstreamer vlc xine )" -PATCHES=( "${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch" + "${FILESDIR}/${PN}-4.6.0-rpath.patch" +) src_configure() { local mycmakeargs=( |