summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-06-20 11:02:35 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-06-20 11:02:35 +0000
commit44b35cfb8b639e52985724ec2879df3a72b65a0f (patch)
tree7bde120836986dadbf958ba7d5dc1261b8ef777b /media-plugins
parentNew version (diff)
downloadhistorical-44b35cfb8b639e52985724ec2879df3a72b65a0f.tar.gz
historical-44b35cfb8b639e52985724ec2879df3a72b65a0f.tar.bz2
historical-44b35cfb8b639e52985724ec2879df3a72b65a0f.zip
Revision bump the latest to use system ffmpeg like old version did. Remove the patch for 4.7 which patched only libav code, same goes for hardened useflag. Add some elog informations for ffmpeg users informing about upstream using libav.
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/gst-plugins-ffmpeg/ChangeLog11
-rw-r--r--media-plugins/gst-plugins-ffmpeg/Manifest26
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild22
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild46
4 files changed, 81 insertions, 24 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index c89cb8afb8df..c2afed84d4d5 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-plugins/gst-plugins-ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.135 2012/06/15 14:58:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.136 2012/06/20 11:02:35 scarabeus Exp $
+
+*gst-plugins-ffmpeg-0.10.13-r2 (20 Jun 2012)
+
+ 20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ +gst-plugins-ffmpeg-0.10.13-r2.ebuild, gst-plugins-ffmpeg-0.10.13-r1.ebuild:
+ Revision bump the latest to use system ffmpeg like old version did. Remove the
+ patch for 4.7 which patched only libav code, same goes for hardened useflag.
+ Add some elog informations for ffmpeg users informing about upstream using
+ libav.
15 Jun 2012; Justin Lecher <jlec@gentoo.org>
gst-plugins-ffmpeg-0.10.13-r1.ebuild, +files/0.10.13-gcc-4.7.patch,
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 5cbaf2c28835..3951dfb6cbcb 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX 0.10.13-gcc-4.7.patch 1982 RMD160 de0a7c8213c2fc37808465f8ba0be890c68cecf8 SHA1 cd826b0b1d9f557908dd7c007c64bd4f330837b1 SHA256 25b4072e5269e019d4a10b8ecbe77987f63be29a9424863c7ed3342103ad25fa
AUX 0.10.5/lavc.patch 8765 RMD160 fd4d4d6c0d9cea1202f511a071a8ebf4bb7bb80c SHA1 ba3b67eee7754122ca6adc49d899ad922355bd33 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad
@@ -12,15 +12,25 @@ DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 RMD160 3e5e3d44302665214cfde8a908b633f8d
DIST gst-ffmpeg-0.10.9.tar.bz2 3310276 RMD160 07d0ac35a7896058b827992a07bd4f8501c0abc0 SHA1 88b68958680d345ebb7b261dbabd12b5908869ef SHA256 63ed1b3c7d548bed4ad50e05b14374cdb0d91e3bfac19248d68c7144bf2c8f15
EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1145 RMD160 75dc398a62cfe09db771dd4ddddb319371177e23 SHA1 25f706c32cc259786e6a5567a71ac20796842955 SHA256 571840df64030a80ab1ecc2adb7934a0ee74f1674ac7b2d4c210dc44c2bb46ec
EBUILD gst-plugins-ffmpeg-0.10.12.ebuild 1151 RMD160 2dcc346d717f6a2f1e2ff73634b9bd5a3a5d029e SHA1 38f663476943b1728241a5713644f2542e64f51b SHA256 880ad8ef48ed5b54384eaeb38e574752fc463f02c29fffaa48e16e183c68a642
-EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1253 RMD160 0193c2cac34ca2c596aa3fc40d9d242005cbe50d SHA1 b2c4c256b24930eb10dc26d8807af6419590018b SHA256 115198bcf52f442d9e52340cd15e322ec4211d655c7e36dfa1f7dfd0fdbaa8c8
+EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1031 RMD160 c73fe1731ae89265e60bca5b25502c73229a25c7 SHA1 667465c98495a773367c33716937dfe113896203 SHA256 15a36eeca05aff9a71bde696c3ffa8f7d4259c2b0ce137f3a4f5de3629c62bea
+EBUILD gst-plugins-ffmpeg-0.10.13-r2.ebuild 1268 RMD160 1e95450f280a8842ee011855369d4c313e6e5faa SHA1 7a672e4c8ed1b5362a2e2f3a8ccd3cc7ffdac148 SHA256 05b9baae534cafdc31b361a84b2e32e8065ac66c6b60d96191f1eda4d4a8e611
EBUILD gst-plugins-ffmpeg-0.10.9.ebuild 1099 RMD160 75cab3594a71166915fff6716f367db1ee94a7dc SHA1 bd0565298993312690bb644163017445e7e7d6a6 SHA256 aa95723c666b02d62e52b54b35fd9ee7d8c5b9f177476514dc34eb1957cc6084
-MISC ChangeLog 20487 RMD160 ff380e8d561c60b1db2e72ca3133317e4e5bf44f SHA1 a0b20b0249ade9fe69acfe5ed0774088e53aa5da SHA256 8a9588c24dc46e03f149452c95b96d03bbf370237bdc378992216b66bce4eeb4
+MISC ChangeLog 20919 RMD160 f8099bfeeafde388b68032f3164b2555f832c7fc SHA1 89ed8f891da244c87bd186245498404a767414f5 SHA256 211f9c863a73af1ced016bdae38d1c322840045ab89795e95cda130f5d874664
MISC metadata.xml 261 RMD160 9567f7dcfbb864e6fea6dbf4ccaf210edc1e48c5 SHA1 07b7ce712bd1743f31aae9a9c00b7ca7c4c742dd SHA256 18c54afc2f28657fd40f56015d323fd8346d29491a58b812870831e64fbd03a2
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAk/bTakACgkQgAnW8HDreRY4CQCeOzNZMzPdVyIeoyMiqo5LHTGX
-5awAn3rwilo8b0vD7/VrF7vJiL3U93dO
-=3air
+iQIcBAEBAgAGBQJP4a3UAAoJEOSiRoyO7jvoMSsP/jQN3BWGBhiwdiJCRQ38/1lX
+8YGnDCbEUHqZVpWbPBXSBWGoBY2vPYZGsTYz6R1xqAc04JVNNyw1hMj+kS6C9ZdY
+3tc2lsq0TFt36TQoNlZWhLLPILIYaZFneiw0RD1yIwZRc865lkLMuxrHQMtmeF2n
+TIp549/0IVCC+rs8sNWOAFufN+CCa901aiVS0EyQ5pErveQ8aAirH+Rv3Rjw5Zdr
++CnPyuOUrKAAE2MdL8ePMIfsSE1fwrAPKUD3hwvLStJ0Ggo/Si28W/1a+5qOTPgy
+uHlyZ1AOJvOpKSsdolO6VqjVcsa7IGzIKypOkxN61wK7k4OJWfF7qzOVRlOqTkX8
+LNRjZWlSMX591rQ4NcD9OSXtezjSLTu2/dwZqVZ4IfhWDRRM99dcUzMYFcLR9K6c
+DG8ZX7mvZFIuqF7KdZJOX7F0VLbKHZYc3Ay7Mifle4MU7yAPeeOE9G8DVkIjwRob
+Djg86rBp+fvtEiRz6u7DsCDCB2L1BIFje+UatOUJUVGYeV19U61BbJOd7Ap7tgpB
+LSraW4kLrCFjRoGq7RqwYLZN7Q67LhVN8tV77zCHj45bXLRFJXEMGB2MxjABJrEt
+difGpt6R/057kAvgzV+gwXrDEruzxqkIsdDUo/bH1osOyL5RKQrxE2otvbsd2pcq
+75yamzFlXUNkHkwWexgt
+=q5Jf
-----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
index 29cfb3330c33..cee136aab32c 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
@@ -1,19 +1,17 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.3 2012/06/15 14:58:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.4 2012/06/20 11:02:35 scarabeus Exp $
EAPI=4
inherit base eutils flag-o-matic
-PD=${FILESDIR}/${PV}
MY_PN=${PN/-plugins}
MY_P=${MY_PN}-${PV}
# Create a major/minor combo for SLOT
PVP=(${PV//[-\._]/ })
SLOT=${PVP[0]}.${PVP[1]}
-#SLOT=0.10
DESCRIPTION="FFmpeg based gstreamer plugin"
HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
@@ -21,26 +19,20 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+orc hardened"
+IUSE="+orc"
S=${WORKDIR}/${MY_P}
RDEPEND=">=media-libs/gstreamer-0.10.31
>=media-libs/gst-plugins-base-0.10.31
+ >=virtual/ffmpeg-0.10
orc? ( >=dev-lang/orc-0.4.6 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${PV}-gcc-4.7.patch )
-
src_configure() {
- append-flags -fno-strict-aliasing
-
- if ! use hardened; then
- econf $(use_enable orc)
- else
- # On hardened, we need to disable mmx and mmx2 to avoid TEXTRELs
- econf $(use_enable orc) \
- --with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2'
- fi
+ # always use system ffmpeg if possible
+ econf \
+ --with-system-ffmpeg \
+ $(use_enable orc)
}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
new file mode 100644
index 000000000000..6c2ca258fa02
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild,v 1.1 2012/06/20 11:02:35 scarabeus Exp $
+
+EAPI=4
+
+inherit base eutils flag-o-matic
+
+MY_PN=${PN/-plugins}
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+orc"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=media-libs/gstreamer-0.10.31
+ >=media-libs/gst-plugins-base-0.10.31
+ >=virtual/ffmpeg-0.10
+ orc? ( >=dev-lang/orc-0.4.6 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ # always use system ffmpeg if possible
+ econf \
+ --with-system-ffmpeg \
+ $(use_enable orc)
+}
+
+pkg_postinst() {
+ if has_version "media-video/ffmpeg"; then
+ elog "Please note that upstream uses media-video/libav"
+ elog "rather than media-video/ffmpeg. If you encoutner any"
+ elog "issues try to move from ffmpeg to libav."
+ fi
+}