summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2011-10-30 23:22:41 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2011-10-30 23:22:41 +0000
commitd7a6c5a8b21f9275c2401a7a67c8b1a55959330a (patch)
tree0805509de5c3f8122183e4c2def500e80aaa6ba9 /media-libs/phonon
parentVersion bump #387999 by Kilburn Abrahams. (diff)
downloadhistorical-d7a6c5a8b21f9275c2401a7a67c8b1a55959330a.tar.gz
historical-d7a6c5a8b21f9275c2401a7a67c8b1a55959330a.tar.bz2
historical-d7a6c5a8b21f9275c2401a7a67c8b1a55959330a.zip
Add workaround for qmake misbehaviour, bug 388675
Package-Manager: portage-2.1.10.31/cvs/Linux x86_64
Diffstat (limited to 'media-libs/phonon')
-rw-r--r--media-libs/phonon/ChangeLog10
-rw-r--r--media-libs/phonon/Manifest35
-rw-r--r--media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch16
-rw-r--r--media-libs/phonon/phonon-4.5.0-r2.ebuild60
-rw-r--r--media-libs/phonon/phonon-4.5.1-r1.ebuild64
5 files changed, 168 insertions, 17 deletions
diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 8561d1ef1fd3..eb19b0bc8c5d 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,14 @@
# 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.21 2011/10/28 15:16:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.22 2011/10/30 23:22:41 dilfridge Exp $
+
+*phonon-4.5.1-r1 (30 Oct 2011)
+*phonon-4.5.0-r2 (30 Oct 2011)
+
+ 30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +phonon-4.5.0-r2.ebuild, +phonon-4.5.1-r1.ebuild,
+ +files/phonon-4.5.1-qmakeworkaround.patch:
+ Add workaround for qmake misbehaviour, bug 388675
28 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
phonon-4.5.1.ebuild:
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index c7613ee07b35..eafa7f8cea29 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,8 +1,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX phonon-4.4-qt7.patch 15621 RMD160 dd46e1cac72aaffc714ef849c079eac1c9c03536 SHA1 f5902d8138fb550457d8acddebf24743cd5e5498 SHA256 8b236f3731434ec6fd591f7da6f1267943c819ebc523797b58d27facfafde68e
AUX phonon-4.5.0-pow.patch 891 RMD160 65955a585928f4546f30a87b975305a88ae5b681 SHA1 78f9106b6fd1446aad3bb39ff64d5cad61afe835 SHA256 11fd07fef7a2d0b1dbab991f7e8527b8e145661174a11fdf8873ae645cf314d0
+AUX phonon-4.5.1-qmakeworkaround.patch 1084 RMD160 42abc16899e693b37f521a4d0f93e1baf518d1f7 SHA1 6965f7fd3dd475428fd6beb06699eccb4506dfb8 SHA256 a8b22a299ceae59594ca74661af9c37cbaee14ee3c7000aa7b52e2fe7c2c5988
DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606 SHA1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
DIST phonon-4.4.3.tar.bz2 648733 RMD160 d7f36bf490acc595dabfd1f7fb1f4433cf77ccf8 SHA1 50262d590beb648be9dcad6b913b920db19a84f8 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
DIST phonon-4.5.0.tar.bz2 322043 RMD160 80098d330ce4167eed5b6b6004871614178b37ef SHA1 122f7c53939a2c40c3312c2f5e59f25ca2c9ee53 SHA256 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc
@@ -10,25 +11,27 @@ DIST phonon-4.5.1.tar.xz 291088 RMD160 b5aa9313b62bac7d5233716db52c9275168ee191
EBUILD phonon-4.4.2.ebuild 3203 RMD160 a0f49130f52e10cec11e1cceec4c65401cce4e7d SHA1 87543b810822b8fa7559245fc39656da33da1fdc SHA256 fb3e0e1061632acc710b8ff60829efaf24e4f3d86db32c739042f80fc1aadfd0
EBUILD phonon-4.4.3.ebuild 3096 RMD160 c204f5d0e23ebf2c8308a5805effb756ac6d46fc SHA1 688a6d8714dfaeff908b67f1081d83cb4cf898d5 SHA256 21bc50fb7d05894498b57d7c338e19ec3dc7fb9a5cb5412c6a4e83067a8282a4
EBUILD phonon-4.5.0-r1.ebuild 1502 RMD160 cb62731b8245a6360b5fb49d372f5a3d88e7a485 SHA1 f078e009fc3f348e13aab5f9e8df396f80aecfa4 SHA256 2df4be7ff768bc9e760d58fb11fb8928be11ef472f90caf5b1f6c589fe3f20f6
+EBUILD phonon-4.5.0-r2.ebuild 1552 RMD160 1500dc7a3767098e79c76e4888ddcea04dc57fb4 SHA1 8dab03cc859b7a136760b9736913b2216225d4a1 SHA256 ce4cba062dfe1797d9e490438b10baf4f3758bc117783402e424b0878100d475
EBUILD phonon-4.5.0.ebuild 1455 RMD160 8922026063da6d1af4507a6a25c2bb77d9b7532f SHA1 746916879212a687f7a832dd7bb305d78fa3cbfc SHA256 a7482183176afa8d39daca3a435e641d73a6207d4b9bbe87906d3f735d6b0f3b
+EBUILD phonon-4.5.1-r1.ebuild 1647 RMD160 3e6859622f88565a357b79df948ab0519cf3dd76 SHA1 a5ed049f4be0bf05832a018938a765ba1a63bfc9 SHA256 243f53cb4646c1151328472efe90d66445a1c13ea0a3bdc5eed2b0b8740f651f
EBUILD phonon-4.5.1.ebuild 1592 RMD160 5f9d36120a73653eea7ca0eedd917f50035c0661 SHA1 02614012db78229ff173c1d037547231873244cd SHA256 6a96c25695cc360a13b9852e6a2c9a7705606dc6f554b67bc1a5522ec86eba3d
EBUILD phonon-9999.ebuild 1592 RMD160 142eea2bf45688d3ed28d51ac32a34f7192d49e2 SHA1 96417d56cc458ddbd39249d59ef7d20b414c8f3d SHA256 8f9ebbcc26f8811ceec7257819d47c02553ed99fc443d13f83fc108bf733cc00
-MISC ChangeLog 12692 RMD160 f22695c8768b667afd0e06b5d3fcdb6ebc1f0e02 SHA1 f87c7ff21dc39a87fad582df06afe390dd6c697f SHA256 dbdbde2f47582bb75853ab124a243184c2a6f17aac8c7538049b296ac3aea74f
+MISC ChangeLog 12960 RMD160 dd456ffadbd52ba84c46c83b4d566619b642d42b SHA1 12908897fca947e326f20b8523c3484f315f8d4a SHA256 0b57a30d23f44ee9c976276ff3de022785581d102043d1091aba794137fd335a
MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJOqsc1AAoJEC8ZTXQF1qEPSjMP/3uu5O16/e5gJcK2RaZW8zAD
-D4VlI9w4verCD6RFx5gELJOSm1/HQpQ/fVedB1P1fTH1v19IcgtaRnTijuUzjCiu
-Kf1yHPbKlB3vdy7wVqIWq3gmXYAo4ub61wxLqewhyWzddncTLpJ5DxflyeRagHbf
-oovXYGJToTRi6fxKV8csLNCxPR6VYpue3yLNwkEdDDc1+byngOl+5KSOe4yCoOOe
-1Aam3AeBy2hAXYcWlohIQgpKQzOlCQe4CpUBE4XW422y5rBRKe72ik6glCsgmv/H
-3PfZ0PEPsHfJUYBvfK4ERZ9xgVTJk2rsa4Fe1qZNLSF69FE9jlOSpcuyl6K/IhR4
-MXnOw5yiET9VLJuK95DX6JVjmrKZmnR6UFMfJPuILGl9wf1xviGGynJU1ZJi9pO7
-vsMHgjt542g/WddqJuU6Yu2QHC4bBPTUhlJH684qMYJ815DrbsWp9MFv5aGFpykH
-a2KbBDxC0PK6RkkOA9EKqEuu6bcMWwvj5SqWZCnHEXPtsUAZjfnY2Yxtdu2zCVzH
-vAkXJsAuRkkqyqK38nRvxYUEfTLeMhOT8N6vKLJJLk4qzmGRXIzUVRzb+GAZ+ItS
-95Rq/LBhO4qG5BsSZLCT/920MF9e43W8M+uW2xR4JbEeH2ELTnZfBZCKggSfJ0DO
-QATN6Bzbe1GKXvZe00BU
-=H4wh
+iQIcBAEBCgAGBQJOrdxMAAoJENwGBM22xffeeKkP/0+qmUbLLs7iw6Ohti5/NKdP
+jmUTNKwUCgKfSxsSU8x886wAbRFY7JzdLK6D0A422YAyYHoqdp3/EfkHnAUeQG1O
+Y83QD1l1jsx8oWkOAhPFpaatxXtsFAe1vn0b6ksC/T1C2yGxBmZoW5ksPs75iHQV
+yREhlTLH5PAbOEyynoIO0JIJQBs7YQzKYGpLaCK5W8ITX1ppAOjN599AUItvkBvI
+ZcerPGxVD1FH40BDL+ZBF6I8uOmUCIruFezNNMK7+rOFHYnH4zZ0OuYUNN1Dqc6F
+BVo1nob6g6iLjLpurs+a/5bz9RoYKe8nRDxSHGF9PgXXPgha3H6d5ARrKDXrMpka
+Hd1J2ZgFh4rR/xJ8BV7x+4RCvW68221S3Z4hCZZqFyJJExUNCGElkQpugc1Zw1fi
+7A6ckLP1hmIhykYForipfDPe1o6gaEwJs0gazPzVPFFGKa4j5BcXIcaMakgPfXU8
+182M84jzAfhk4mhYR7wSKbCR6wrLiwo1ROZVVCiTTkjmVWwqIy3RBLjIbY3aQ02y
+u/YjRJteg6bqKmpS+Jmy3Vnbwc1bh4AfnzZMXv7o6iHxq/PVjDcbiSt+Fbnbk45B
+dlyeA92rvgFlkaDE17ujsWoP1/kd2ytCuQDy+fzdyiZ/VjJpTAwxz9dNOI9BO1If
+cuzgv+FcxQshjG7PzsYp
+=dSDw
-----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch b/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch
new file mode 100644
index 000000000000..a656889880ac
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.5.1-qmakeworkaround.patch
@@ -0,0 +1,16 @@
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/cmake und phonon-4.5.1/cmake.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/demos und phonon-4.5.1/demos.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/designer und phonon-4.5.1/designer.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/includes und phonon-4.5.1/includes.
+Gemeinsame Unterverzeichnisse: phonon-4.5.1.orig/phonon und phonon-4.5.1/phonon.
+diff -u phonon-4.5.1.orig/qt_phonon.pri phonon-4.5.1/qt_phonon.pri
+--- phonon-4.5.1.orig/qt_phonon.pri 2011-10-21 21:03:49.000000000 +0200
++++ phonon-4.5.1/qt_phonon.pri 2011-10-31 00:16:58.081648105 +0100
+@@ -3,6 +3,5 @@
+ # the next build of Qt. So pretend we're not there in this case.
+ # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
+ # Consequently, we have to do some stunts to get values out of the cache.
+-if(!exists($$_QMAKE_CACHE_)| \
+- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
++if(!exists($$_QMAKE_CACHE_)|!contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
+ QT_CONFIG += phonon
diff --git a/media-libs/phonon/phonon-4.5.0-r2.ebuild b/media-libs/phonon/phonon-4.5.0-r2.ebuild
new file mode 100644
index 000000000000..f8107bb6b4f6
--- /dev/null
+++ b/media-libs/phonon/phonon-4.5.0-r2.ebuild
@@ -0,0 +1,60 @@
+# 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.5.0-r2.ebuild,v 1.1 2011/10/30 23:22:41 dilfridge Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine"
+
+COMMON_DEPEND="
+ >=x11-libs/qt-core-4.6.0:4
+ >=x11-libs/qt-dbus-4.6.0:4
+ >=x11-libs/qt-gui-4.6.0:4
+ >=x11-libs/qt-test-4.6.0:4
+ pulseaudio? (
+ dev-libs/glib:2
+ >=media-sound/pulseaudio-0.9.21[glib]
+ )
+ !x11-libs/qt-phonon:4
+"
+# directshow? ( media-sound/phonon-directshow )
+# mmf? ( media-sound/phonon-mmf )
+# mplayer? ( media-sound/phonon-mplayer )
+# waveout? ( media-sound/phonon-waveout )
+PDEPEND="
+ aqua? ( media-libs/phonon-qt7 )
+ gstreamer? ( media-libs/phonon-gstreamer )
+ vlc? ( >=media-libs/phonon-vlc-0.3.2 )
+ xine? ( >=media-libs/phonon-xine-0.4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-base/phonon-xine
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/automoc-0.9.87
+ dev-util/pkgconfig
+"
+
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-pow.patch"
+ "${FILESDIR}/${PN}-4.5.1-qmakeworkaround.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with pulseaudio GLIB2)
+ $(cmake-utils_use_with pulseaudio PulseAudio)
+ )
+ cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/phonon-4.5.1-r1.ebuild b/media-libs/phonon/phonon-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..ec02b5cbdccc
--- /dev/null
+++ b/media-libs/phonon/phonon-4.5.1-r1.ebuild
@@ -0,0 +1,64 @@
+# 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.5.1-r1.ebuild,v 1.1 2011/10/30 23:22:41 dilfridge Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+else
+ SCM_ECLASS="git-2"
+ EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+ KEYWORDS=""
+fi
+
+inherit cmake-utils ${SCM_ECLASS}
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine"
+
+COMMON_DEPEND="
+ !x11-libs/qt-phonon:4
+ >=x11-libs/qt-core-4.6.0:4
+ >=x11-libs/qt-dbus-4.6.0:4
+ >=x11-libs/qt-gui-4.6.0:4
+ >=x11-libs/qt-test-4.6.0:4
+ pulseaudio? (
+ dev-libs/glib:2
+ >=media-sound/pulseaudio-0.9.21[glib]
+ )
+"
+# directshow? ( media-sound/phonon-directshow )
+# mmf? ( media-sound/phonon-mmf )
+# mplayer? ( media-sound/phonon-mplayer )
+# waveout? ( media-sound/phonon-waveout )
+PDEPEND="
+ aqua? ( media-libs/phonon-qt7 )
+ gstreamer? ( media-libs/phonon-gstreamer )
+ vlc? ( >=media-libs/phonon-vlc-0.3.2 )
+ xine? ( >=media-libs/phonon-xine-0.4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-base/phonon-xine
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/automoc-0.9.87
+ dev-util/pkgconfig
+"
+
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+PATCHES=( "${FILESDIR}/${P}-qmakeworkaround.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with pulseaudio GLIB2)
+ $(cmake-utils_use_with pulseaudio PulseAudio)
+ )
+ cmake-utils_src_configure
+}