summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-03-10 10:12:23 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-03-10 10:12:23 +0000
commite5b815d5df2f8fa33995e368eacf14818fbba233 (patch)
tree99381f4b8a72c038232483dc2dd8fd07f20664c5 /media-libs
parentsilly off-by-one typo (diff)
downloadgentoo-2-e5b815d5df2f8fa33995e368eacf14818fbba233.tar.gz
gentoo-2-e5b815d5df2f8fa33995e368eacf14818fbba233.tar.bz2
gentoo-2-e5b815d5df2f8fa33995e368eacf14818fbba233.zip
Fix build with gentoo-multilib thanks to Darragh Bailey <felix@compsoc.nuigalway.ie>, wrt bug #455456.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/phonon-gstreamer/ChangeLog7
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild5
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild7
3 files changed, 13 insertions, 6 deletions
diff --git a/media-libs/phonon-gstreamer/ChangeLog b/media-libs/phonon-gstreamer/ChangeLog
index e2ef20af6b53..5d54f2ee7ea1 100644
--- a/media-libs/phonon-gstreamer/ChangeLog
+++ b/media-libs/phonon-gstreamer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/phonon-gstreamer
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.36 2013/03/02 21:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/ChangeLog,v 1.37 2013/03/10 10:12:23 kensington Exp $
+
+ 10 Mar 2013; Michael Palimaka <kensington@gentoo.org>
+ phonon-gstreamer-4.6.3.ebuild, phonon-gstreamer-9999.ebuild:
+ Fix build with gentoo-multilib thanks to Darragh Bailey
+ <felix@compsoc.nuigalway.ie>, wrt bug #455456.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
phonon-gstreamer-4.6.2-r1.ebuild, phonon-gstreamer-4.6.3.ebuild,
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild
index c3c9e56af57d..7e12e783921c 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.6.3.ebuild,v 1.2 2013/03/02 21:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.6.3.ebuild,v 1.3 2013/03/10 10:12:23 kensington Exp $
EAPI=4
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.kde.org/${PN}"
MY_PN="phonon-backend-gstreamer"
MY_P=${MY_PN}-${PV}
-inherit cmake-utils ${git_eclass}
+inherit cmake-utils multilib ${git_eclass}
DESCRIPTION="Phonon GStreamer backend"
HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
@@ -45,6 +45,7 @@ S="${WORKDIR}/${MY_P}"
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with alsa)
+ -DPhonon_DIR=/usr/$(get_libdir)/cmake/phonon/
)
cmake-utils_src_configure
}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 85d74b4c1d69..2fea6f1dac18 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.14 2013/03/02 21:47:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.15 2013/03/10 10:12:23 kensington Exp $
EAPI=4
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.kde.org/${PN}"
MY_PN="phonon-backend-gstreamer"
MY_P=${MY_PN}-${PV}
-inherit cmake-utils ${git_eclass}
+inherit cmake-utils multilib ${git_eclass}
DESCRIPTION="Phonon GStreamer backend"
HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer"
@@ -20,7 +20,7 @@ LICENSE="LGPL-2.1"
if [[ ${PV} == *9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
fi
SLOT="0"
IUSE="alsa debug +network"
@@ -45,6 +45,7 @@ S="${WORKDIR}/${MY_P}"
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with alsa)
+ -DPhonon_DIR=/usr/$(get_libdir)/cmake/phonon/
)
cmake-utils_src_configure
}