summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-10-04 01:24:23 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-10-04 01:24:23 +0000
commit3058e5857deae1d84023de3b2a674cd06dac1072 (patch)
treec9797ad2dd2456535568b539a01825e64101adfa /media-libs
parentMake sure at-spi2-atk[gtk2] does not get pulled in for accessibility support. (diff)
downloadhistorical-3058e5857deae1d84023de3b2a674cd06dac1072.tar.gz
historical-3058e5857deae1d84023de3b2a674cd06dac1072.tar.bz2
historical-3058e5857deae1d84023de3b2a674cd06dac1072.zip
Add blocker on gst-plugins-good-1.0 (bug #486830, thanks to Maciej Piechotka).
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/gst-plugins-bad/ChangeLog7
-rw-r--r--media-libs/gst-plugins-bad/Manifest18
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild5
3 files changed, 19 insertions, 11 deletions
diff --git a/media-libs/gst-plugins-bad/ChangeLog b/media-libs/gst-plugins-bad/ChangeLog
index a84c215f22bf..3e2a4a009517 100644
--- a/media-libs/gst-plugins-bad/ChangeLog
+++ b/media-libs/gst-plugins-bad/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/gst-plugins-bad
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.125 2013/10/02 15:01:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.126 2013/10/04 01:24:17 tetromino Exp $
+
+ 04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gst-plugins-bad-1.2.0.ebuild:
+ Add blocker on gst-plugins-good-1.0 (bug #486830, thanks to Maciej
+ Piechotka).
02 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
gst-plugins-bad-1.2.0.ebuild:
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 9309c540a240..619eb277f91d 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -15,17 +15,17 @@ EBUILD gst-plugins-bad-1.0.5.ebuild 1031 SHA256 16be01f66be3ca9f8d0fdb899999fc01
EBUILD gst-plugins-bad-1.0.6.ebuild 1039 SHA256 5b8c28956b50918078446aa4f940d6560866f0503d1875af8f39931ca65fc2f0 SHA512 9a15a5b87a993a6df2ce0a4f059e68297fe53b362b5b3eb229b9315d3f5db88d197e2a44fa9731527fb9bf878fd29ab829adcf226b27b67a6efe92cac1ec1aa0 WHIRLPOOL bb8b4a2d4f44eaa9f01cdc7bb7c9cfa759919f2b97227f49dd90ab43b159db0ba175771a606f86d2be8f2402f3ea11a6b1cac19d66131f296e8d995ba9ab909b
EBUILD gst-plugins-bad-1.0.7.ebuild 1039 SHA256 4709a3cf1695496dde97cd5d4893d38b77b2c7b470f9faef4c068b413d688ce6 SHA512 e0f8f953070277b0c0f908fca85f71215adc90b88378420f936025a34bf19f970193677c864bc50715038946411d84d2b7e7189145cbd19350c8abd9063c9a0e WHIRLPOOL 7790aa96d72ed8b6d2edaea76b33d6de32aceb31f6ef4c9ab1c8182ec0b86196d586010c9669a171d6b349ce2f1ebc81968302c023cbc2105cbc951e7a71d925
EBUILD gst-plugins-bad-1.0.8.ebuild 1039 SHA256 ea733aa1d2e3a43cf0d2056b1e0e3725773590319a8f49f27e771c61020c1c10 SHA512 ec6165152e6e4f8bcbcad2cfd773ce4b1a0b9d5116c296c6fa5dec41fa3e5ea806fcb1d936a3d4093e2bceb2fc1a23fb5f04e5c20c1b8e2d5bb20b068cc24576 WHIRLPOOL 0ff6507c2a9cf62c9ced5fc58b50c00885c08ac453955e9704105b7164490b4a9a2bd10c8e277db165620480f68841693c48000494cfa6f444bea86838dd46b7
-EBUILD gst-plugins-bad-1.2.0.ebuild 1314 SHA256 aa9ea6a37b4820c244f6ee980d439773d88b9cb9de96c479f2703e8223bad2c9 SHA512 fb1563ecf92d8c76bd88a8709e2ffb377171991fefbe57cc5b8c8f9e7258266cd2a6d65693c31f5eff08e371415ff5ddeb04f823be77e6935623759218274209 WHIRLPOOL 7ecd588c0abd98ba442b99936d435d777afd6e1c8fd6e233f247c319e3b942dcc30c4b0d4e56a482fac7824495a4172ff0e04a324d8c2d13113501a8bf2d3d22
-MISC ChangeLog 19470 SHA256 d10804477eb80247071be08173f0e6a4b9be339b5d7fbebdd5e82f426b488329 SHA512 f453a7c14ab32996c8772e0aa9adb521fc345e4c80937ba6c57ffaf809d4afbfcadc92e7d83f5bf99b3aa11564d532284b7403a071fce1a34adad2a363cc2bfd WHIRLPOOL ce6245129dae98cb95bbf8dd9650b1c7f63fa552069d2beb6d015946644e5bf2a4d6e72c77698e4d0eb35531b05973532e3c54f956da6033b037a44eb6b06be5
+EBUILD gst-plugins-bad-1.2.0.ebuild 1402 SHA256 60b73537a24b45771fa850c1df20b1ea6ea87f06d96e956da9c459616e756085 SHA512 7aa94ef64f3ebac3cfafe9e41e325c0c6fbde4c8f35279a4755ea3c20af58fa02252128365cf1576379dd118920c02ea25a97bd1084bc2a10b0eff57b9ee2c24 WHIRLPOOL 7061b547192eb9d6832400ff1c985f287893a709492c2d91b8e8216c91399a3bacb08bb48affdb502c3d8b9b2db7d86b2c67350591748a2fcdf32ac200eeceeb
+MISC ChangeLog 19645 SHA256 a3c351119b5ffc0711c1ae1757e34d7fbaa19e3fecb9087fb71992c290e6692b SHA512 9348a43f1d7666d7f8e418041805a7aa6cc1f000f99aa8e7a471ed0601850b00d8acc46591e36f97b39f9a49ce2b9caedbf7586fcf110891b91f6fecf7735641 WHIRLPOOL 27d42930fc4773e1b0bc4be5c6dbf5dee75c8526e46bea9d590937d342f06e7e7bfbd1fdc67765add1c5e37fa27e7a489a63f89d21ce11c6c426174d6d2f09cf
MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.21 (GNU/Linux)
-iQEcBAEBCAAGBQJSTDVpAAoJEJ0WA1zPCt1hM2UIAKIkbFS02jpK+9yRClmeh+7W
-wK9BWJA+cN51BToUJZPnt0ueZZ90TiF/0kieg58t8rSkGtYNccf6Ud8Au+kSh/eh
-fE0Ec0icPwt/emWQCKAT3eM0a8XXBoAZp2GWtfrRzqzLYqsQuzWB1UT7KvDz66kd
-Fvyt0ZrTdDBEvfsCTFYiyKD3+HfSshHSOEbza/aFej+X5BGcJl+2E66OA4VWDwKR
-PVvhCKEJHgPcy0nRpI8FyxO8StlrygHBnOr3vIPYcOjeoWrVskGvNNn5gEH4fwYg
-uQXbiallHW85+sfNQeyzk001MU0MZhUvDvpKCddXg3mwg+Zh6pxjPLRk7ujkqZo=
-=uG+f
+iQEcBAEBCAAGBQJSThjgAAoJEJ0WA1zPCt1hv2sH/isnmCY5zs4zGniD1h7pqFNk
+QLAVWEs036XDSCVp9Wf6N7AHpAWU7hhi/vSvesOijl77hF+V8w9h/0lGtfqcACCU
+9X1SWSXL48A1p8wmxOldPKl+613KpOeemMhIvRYQmj37ZE2jZhITZnVgRL/8QEhm
+FVcGKDZyy98waBaYVVSQIfV632Nc5aEvFARH9qriv1QI2vLXPURI1I05yGvx5C0Z
+FPOpwDS/kVW1yATlh9QAuEmQyLqRPnafc2P6PNMg5MvM4LhxXtS7MCexY+RJa7Np
+so4xwouK1F/fR+x3hbWKfKxElRZDrFT5bhoOagPzXjf9Y3umF/ufec7PertdxDw=
+=FpoU
-----END PGP SIGNATURE-----
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild
index b6d860d15e0c..c19cb188bcb6 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.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/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild,v 1.2 2013/10/02 15:01:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild,v 1.3 2013/10/04 01:24:17 tetromino Exp $
EAPI="5"
@@ -14,6 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x8
IUSE="+introspection +orc"
# FIXME: we need to depend on mesa to avoid automagic on egl
+# dtmf plugin moved from bad to good in 1.2
RDEPEND="
>=dev-libs/glib-2.32:2
>=media-libs/gst-plugins-base-1.2:${SLOT}
@@ -22,6 +23,8 @@ RDEPEND="
x11-libs/libX11
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
orc? ( >=dev-lang/orc-0.4.17 )
+
+ !<media-libs/gst-plugins-good-1.1:${SLOT}
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.12