Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-plugins
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-06-17 19:20:42 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-06-17 19:20:42 +0000
commitf1299d0e04ae3a94508d76aabc811f9898434ff4 (patch)
tree175fb1763cdd8bf9fd01d988ce335a05210fb0f2 /media-plugins
parentamd64 stable wrt bug #473558 (diff)
downloadhistorical-f1299d0e04ae3a94508d76aabc811f9898434ff4.tar.gz
historical-f1299d0e04ae3a94508d76aabc811f9898434ff4.tar.bz2
historical-f1299d0e04ae3a94508d76aabc811f9898434ff4.zip
Update the ffmpeg patch to contain libav content, reduce the need for the sed. Fixes bug#443208.
Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-pcd/ChangeLog7
-rw-r--r--media-plugins/vdr-pcd/Manifest36
-rw-r--r--media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch39
-rw-r--r--media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild7
4 files changed, 60 insertions, 29 deletions
diff --git a/media-plugins/vdr-pcd/ChangeLog b/media-plugins/vdr-pcd/ChangeLog
index 8a52471b6cb5..d9b96b1e727e 100644
--- a/media-plugins/vdr-pcd/ChangeLog
+++ b/media-plugins/vdr-pcd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-pcd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.6 2013/03/17 15:33:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.7 2013/06/17 19:20:32 scarabeus Exp $
+
+ 17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+ files/vdr-pcd-0.9-ffmpeg-1.patch, vdr-pcd-0.9.ebuild:
+ Update the ffmpeg patch to contain libav content, reduce the need for the sed.
+ Fixes bug#443208.
17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Add proxy-maintainers to metadata.xml
diff --git a/media-plugins/vdr-pcd/Manifest b/media-plugins/vdr-pcd/Manifest
index f631616f3ccb..9fd9eebf0d90 100644
--- a/media-plugins/vdr-pcd/Manifest
+++ b/media-plugins/vdr-pcd/Manifest
@@ -1,27 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX vdr-pcd-0.9-ffmpeg-1.patch 335 SHA256 8558bdcae36eb4cd774d8feb0266b37245d87d2e0c3d59434666833a32170129 SHA512 30497f524c25ea852fd91a0db46410ab064292024d5da2d4fc5e80187397c237f6ef0abccb15efbe1da54c68f4f2aabe91997c45f9f2239bc5ac6b357b97a2bc WHIRLPOOL 87c43ecd1329d29b4f6e7f6ff48f25d9656edd43bd39a32cb922df93719765adf888c1795280937c7ab2f10b08528dc2b5de0fbd00e52da23ac1465df71b2114
+AUX vdr-pcd-0.9-ffmpeg-1.patch 1094 SHA256 93517a0a044f59aa1dc6328b3641f7f2ce35bc78d5880bbebc74b90100209d20 SHA512 dbee3f8fdb163f03f4a9c5a81c61b3bda69d1bfba4a32a450fea9e593d0a390810e1dc8fd297a63fa625e64d662b4ce7554ff1ef6d86c7e33d5a5edb310407ea WHIRLPOOL ddc56146bee3452a0a3b0c4bc90ff58691c5c319082ffa8f8dfaeb97054be97c0d16a5ab51731f4719678de417eba8d5251c2a69512d995adf31681fc0805c82
DIST vdr-pcd-0.9.tgz 19927 SHA256 92e29d5aceab1a61416a8d83c3e9eeace30cdf9fb82e476cb3db8eac5c169d82 SHA512 8b02eef0ed75467822c876b72c9e2c2c01d060a1fc7b8c6f3a224b175042a5f2215b4e0d8d136be867533406748da3cfb871b1b0716e7e73d10cbf96bccf28cc WHIRLPOOL ab15b873f7c13ecb05b76f7efd61e33d32d691660a913b044a46f48c5f28d5a984a3837a2228bd40bddd581112317b6577efd97be5711404234ca30697c36596
-EBUILD vdr-pcd-0.9.ebuild 825 SHA256 731ac86ee57bd36904af0537a58e237757f8e31fd9f9dbe859ffb3ee0df3beaf SHA512 482d0745188534351ba22b60abb18ea3aed05966bd44077962a0ade82e6623701307ebdd16a1a766286a930e34ff988a30ffffbe7d5d2d58a2a0a945e5c72c62 WHIRLPOOL 59906e68bedb9f809b602e11f0bf1e4fc136dd6852ea7a57deebc1862d796f17ea51480a7819ec22fbe18b6ae500923bab839962127d5867a012b37890318ecd
-MISC ChangeLog 1056 SHA256 fcf9270cc72c96f278f2a4d20b5672fee039f9adbbbb25f5c3ea24a68ea0c193 SHA512 a2e1ca6f046fc3d5ff46f6fee5f6dda3ddf38c7052e54a7c107d0de606b8a326cadae2fe200a1d7d37f77f9dc5610b5ca5d2889f8711d4966633f3d93919af76 WHIRLPOOL ce819d0934bd559110d83765b5bdcbecdc93966f4471412280a873c495767ad9bed00c813cca19d981a9d6d7da71f9a816bb9c9572cdf3a33d722375b8349249
+EBUILD vdr-pcd-0.9.ebuild 766 SHA256 46b0fbf8ead4ed6d48c80ff2f32af6bd265b81c2344cbdb443336cdb121ec6cf SHA512 48f50b7b0c5e5a934964e9072839b51aa212b6d4d45ba455193bc5a9abb756e01955667f1c4723c07db62ef377994d07bd1c0562fcaed453367ae088c0b11704 WHIRLPOOL 7db9808a508318374d80bc236f83e14b79adc48f498e8e8e3c0596c9216caf4cde84b2f2bcf5af23700039c7fbf97db2b3129ece71bce4df3417525e3e1dab65
+MISC ChangeLog 1270 SHA256 4b07af0f7ab882fbfce4c30fb95151413ccfeffae09a20c6a95f48004d515f50 SHA512 9b5d19999e792370e5f0c81243f1804803de58042b5d52958f8ab65528ed2af88b008b286be767d6cea95426764e58f1361e673f9a52ef961e2bd65152f09da0 WHIRLPOOL 785976b0468ae4a64aec4ee2525c7f624d88f5dc48717f1f8672dfe8dd69e45d6c2be430f491c30165eac57e28226f7c8c227c3f6c27c25af8f17075f32843af
MISC metadata.xml 479 SHA256 9c9920111ee61db2602a2f5d7a27432db4d6e566634323e726d50ba5dd4f3435 SHA512 8904bafbf844d03b049731369217b255354803060b75f774da4308c3d77695d4c31279904746cc98ce6d299a767792a5c06bddf75f8a2e6f7b96d8ac364ea1be WHIRLPOOL 951499d2d8658ad0fd23ca53bcfff5ddccd5d2c1028db33603d30ab57ed63ae6720a75527ae4b7384040f613a8ec04996d0b92e2720b3c729453373a6aa1fce8
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQJ8BAEBCABmBQJRReJSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun882+QQAMTBAZofhJFZfOs4OEKEfZ2d
-dt4THnbdOqsQ2yVfOfRqTiiXhOLwQSTi8vZ8/d1nuh7JJ5ep7QV1TOIVzyIEh633
-4v9p2C8MKriBikloMo/Gopa4xhIzgpfl+jOgmkogApD4zjU61/RiNcNE6q7vaiCB
-kG5nbp6rd6yhMqShZaHGHw4RvAo4ImA/TZApeA78oKHrPdaUzJwZjvk1Bcx0pz55
-kZ1/1InSe41fopEMk55OdzoFiGL/suww43pM1AJAzWxccrjtbXWTaodtLfAYr3eu
-kocxyoTLGuO52tHa5dfMTmy8yEGm1embbp9x9ZEi78i6aalBvDOLboxz3dd8naKZ
-s1yoKQsoxnTSR7EqAnPBeuccn7rpjSLNEZD7T8C3Eh0g9PN4dHn4ZcFEh+ZXdMiU
-Q3CQZMwB/QySdj/ZTKHMM+gJ3eGUZpas1aV4p87N2GgSU8cvs6+4sZMdM3mLeoub
-OYfXmjmEFNXwvkMSke/dq4a1Rr6vwA7ESnDPraVURtVabXG5YMp8SLZ3dGyDo1bW
-NgBtUNITz/iqGkE/9FsGV9NfP6atc022x3ha2GA0Bf/OozoNY4P744fvQDXvL7cI
-riuWiq+bb3YprAA6vpf96krE7592gkd9csArHGiF2/Vnlkz9ofTzpljTOizo9MVw
-5J1Zw9j93+GQXV8+qTuE
-=wFrA
+iQIcBAEBCAAGBQJRv2F3AAoJEOSiRoyO7jvorx8P/iJp0Rx0hhA3NoJHzYb4mrfx
+PMB0BQHYDCyjjuN944zFyskSsuwdTMN/QH5HLhtUzYycNuUZkIRn4WGr1LH+HfF2
+QerEXBPG6QmdYZkFbeo4WkRQz+3PuPGLw9p4rGdDBjbZCUBs4bfwJ+QLoFZSy9Cy
+/Hhg/aLGL74z/NPyEeN8B2vDvPunaSJGldTshGtoe5pwX3/PXGOCTXeLN7nJTzoO
+D8DQrQ5ktE3Yrer1zPBzZIl5AckLfBvE1vP+m0VwXTkhGS7RUl5Im9nSogOJV4JZ
+6ObFcvKoBNRJMl3RTZcmsGOEjc7Bd7QldMjtOWhs1CffxPiRsZfx9+VtZJU6ZBvH
+U888q/4A8y2VuxkaSRZfrp+Rd6OyZm65YcNmioqXSYxA4/eb1ZkrsGzCb9wYBQ5k
+czFZ5HbVKuC38zLfgXJdIbnKoQobrgVND24wOMytBe+XYw54NWHbL68PlHS5nVdo
+1cMUCukMcA2xW7CKWZTewpFx8pC4hl05ETCfmnXCq4wMoPQBwIz/hFlOGT0OWpVy
+ZJ+TeieWnQHvF8F7w+EcDtrdLDu0lliNtiPrysX4n7Qb601fFtMlGLH9v/EedAQ3
+/T00hiF01y7O5Ui8zcO8yNtGiywh7Occiz0LWR6eKjo5MUj+WTWso90n0Pi7i7DI
+wBZyljdWM3OOpLRo7BGw
+=hutk
-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
index f1599bc918a9..045605e345f0 100644
--- a/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
+++ b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
@@ -1,8 +1,7 @@
-Index: pcd-0.9/mpeg.c
-===================================================================
---- pcd-0.9.orig/mpeg.c
-+++ pcd-0.9/mpeg.c
-@@ -44,7 +44,6 @@ cMpegFrame::cMpegFrame(bool Pal)
+diff -urN pcd-0.9.old/mpeg.c pcd-0.9/mpeg.c
+--- pcd-0.9.old/mpeg.c 2013-06-17 21:11:54.125454721 +0200
++++ pcd-0.9/mpeg.c 2013-06-17 21:12:15.325453967 +0200
+@@ -44,7 +44,6 @@
bufferSize = 0;
mpegSize = 0;
@@ -10,3 +9,33 @@ Index: pcd-0.9/mpeg.c
avcodec_register_all();
if (!(avCodec = avcodec_find_encoder(CODEC_ID_MPEG2VIDEO))) {
+@@ -52,7 +51,7 @@
+ return;
+ }
+
+- avContext = avcodec_alloc_context();
++ avContext = avcodec_alloc_context3(NULL);
+ avFrame = avcodec_alloc_frame();
+
+ avContext->bit_rate = 400000;
+@@ -63,7 +62,7 @@
+ avContext->flags |= CODEC_FLAG_QSCALE;
+ avContext->pix_fmt = PIX_FMT_YUV420P;
+
+- if (avcodec_open(avContext, avCodec) < 0) {
++ if (avcodec_open2(avContext, avCodec, NULL) < 0) {
+ dsyslog("PCD: Can't open codec");
+ return;
+ }
+diff -urN pcd-0.9.old/mpeg.h pcd-0.9/mpeg.h
+--- pcd-0.9.old/mpeg.h 2013-06-17 21:11:54.125454721 +0200
++++ pcd-0.9/mpeg.h 2013-06-17 21:13:15.595451823 +0200
+@@ -25,7 +25,7 @@
+
+ #include <vdr/tools.h>
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ };
+
+ #define TMP_WIDTH 768
diff --git a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
index 363d7290b804..7793889be421 100644
--- a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
+++ b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.7 2013/01/26 14:44:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.8 2013/06/17 19:20:32 scarabeus Exp $
-EAPI="3"
+EAPI=3
inherit vdr-plugin flag-o-matic eutils
@@ -22,9 +22,8 @@ RDEPEND="${DEPEND}"
src_prepare() {
vdr-plugin_src_prepare
- sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h
epatch "${FILESDIR}/${P}-ffmpeg-1.patch"
# UINT64_C is needed by ffmpeg headers
- append-flags -D__STDC_CONSTANT_MACROS
+ append-cppflags -D__STDC_CONSTANT_MACROS
}