summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mplayer2/ChangeLog6
-rw-r--r--media-video/mplayer2/Manifest25
-rw-r--r--media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch18
-rw-r--r--media-video/mplayer2/mplayer2-2.0_p20120828.ebuild3
4 files changed, 38 insertions, 14 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 39661628d1a5..b07b70aafc2f 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.70 2012/09/30 15:26:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.71 2012/11/08 11:49:17 aballier Exp $
+
+ 08 Nov 2012; Alexis Ballier <aballier@gentoo.org>
+ mplayer2-2.0_p20120828.ebuild, +files/mplayer2-2.0_p20120828-ffmpeg.patch:
+ add upstream fix to build with recent ffmpeg versions, bug #439604
30 Sep 2012; Sebastian Pipping <sping@gentoo.org>
mplayer2-2.0_p20120828.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index c2bfcc9ca51f..6986599da86a 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,22 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-AUX generate-tarball.sh 964 RMD160 2ffdba57c37a1befdc16351001fff5dfc983fae6 SHA1 a8c1bcf8c7304215c830c3e465f5288ff3dcb4be SHA256 49ca2e1174e26f73f2dfadb42426f304e30fc2d7f049e577699ecfdf775b9599
-AUX mplayer2-py2compat.patch 2179 RMD160 b4212b6841b6ced9fa608bff533a6a5ce88f144a SHA1 a13cbc34b8d20a188113e54a7538357879335863 SHA256 36e26a89ec03de0e349443ca3ce07c58e408e032200f49c3ce849691589a1cc7
+AUX generate-tarball.sh 964 SHA256 49ca2e1174e26f73f2dfadb42426f304e30fc2d7f049e577699ecfdf775b9599 SHA512 7141872caebf0e76e92f400f97f0bb540aed071decfb7668cf652d9a6f304cab968355b6d12343001b797d9cbfb113c3a5a272418427391ec7c85404dd618f90 WHIRLPOOL 1adef66fb0889c55f7a095eb1c543935c0a3b4e92ec4d3f086cbfbf9348dac58acec61aa57f0d222376da80cabb0925f3a59215dabf3c93a0baac1e89967d850
+AUX mplayer2-2.0_p20120828-ffmpeg.patch 765 SHA256 2387daac56d711d4a7d32fc15f1b20d787342e4eb21b7cdab44aa04f2b01bc43 SHA512 e5ffa7ba9cba0c381ae37903659aaa050ecde489d7fc011e9375c41800afda08ee6073126a1e1099c4a83deb890b4ebb7ca0af43c3a9664aad8f7546757be140 WHIRLPOOL 1eb7aea177a423dd999e6c4797405bbb61c6f474ec086e9a7b91310fdc51292177fecfbb9191ba6af8326f49791607eb2d09b4201c900d3df3cbeee30a9f29d8
+AUX mplayer2-py2compat.patch 2179 SHA256 36e26a89ec03de0e349443ca3ce07c58e408e032200f49c3ce849691589a1cc7 SHA512 a90417c923c36c78d4c8053de89b26f69cd29a01ee37028360c8c564b903ee00ac0d7e98bcaf25220998951f25987cd89ede47b54518736c14abd1e7153e6568 WHIRLPOOL 987c63235be05fd3dbe89e4e291649c6f2176771e07c8515c08725a4e3d54118136b968531565a65c1e83bd754cc51e9bef5493ec2e653dfa4b3278c8bed6cce
DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
DIST mplayer2-2.0_p20120309.tar.xz 3328620 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31 SHA512 c9b1eda3cfc6279a96864aad9a6096b36742460233f03d715b94437e8ffbb1086d006f379f8fb4d7e2b7598ce810e62b5f88151832b19d8459344079fa55fe67 WHIRLPOOL 15522e5bf9c2fdabc86c23122159b7f9ee855211eb4ae088f1ebff07bb8dcb4b763d61c49ba31ea18d3e3c237a60e685a23e4fac71bf94b1af80f84c638d9fd3
-DIST mplayer2-2.0_p20120828.tar.xz 1739048 RMD160 1b4389e162443ec1205d8331a4a14ea3327fe4a8 SHA1 5ac195f8461dc9734790bf53dd578cba835e0223 SHA256 7a53079c52c73ce00df5c29e1e2c19f944365213c70107b4bf992cf32ca85093
-EBUILD mplayer2-2.0_p20120309.ebuild 16416 RMD160 d2a19cad35e8225f6a87af87eeac2970031633e1 SHA1 22257eaf20e0771869a7f8ada8e2b31b16eb11aa SHA256 aaafe58532a1c4e263b1433d962b11fc8b67af3e24e603413c5c9300981f1276
-EBUILD mplayer2-2.0_p20120828.ebuild 14613 RMD160 dcf1222eed1c0cdef23909094a4ce385383e83a3 SHA1 028da1627c133cc1fca4a9f6c259def7fd933a76 SHA256 a6354ac77dac518c2d3de84b71079ea86b9490a977cf77f6d4e57325f1a6e682
-EBUILD mplayer2-9999.ebuild 14333 RMD160 faab097cd80f8768159bbc456a89bb30e5632f00 SHA1 67eef0a60e7526126d4591e296f0572cbf68946f SHA256 0fe0e735cf4428222db48196def990c5a34f536b523963d039bdfa02f61930f3
-MISC ChangeLog 14590 RMD160 b3cca6ce058b09605620206cb925e77333a7c8e1 SHA1 decea9615ee3d53048235fb8b4c7bdefb4160c97 SHA256 5bd725e2a0204fb12afcf256e3d08cb25d646d3ead125070d2a5ebc6a73c234e
-MISC metadata.xml 3398 RMD160 a024e009a7753099fdf4c1830a90d717fc136eef SHA1 901c635d815ed1005ee6bbc30af5bff5b6aba877 SHA256 5625ac4ca580fbc61081e938371163b4de194d3d539ec0c63330eea9769bf895
+DIST mplayer2-2.0_p20120828.tar.xz 1739048 SHA256 7a53079c52c73ce00df5c29e1e2c19f944365213c70107b4bf992cf32ca85093 SHA512 d8eebf9deb1f07f7178037c9e980bbd942f0c68937fb6f37aad9b4e25f6a4d2cc5b6f055537c7dca12adf198e6f2531197f2869fbd0ba301d5fc7f5294f82b97 WHIRLPOOL ca9055a631fc7d19329db3c45b297f497c44c5e82f621af5cc76e32b4fac8585690f8252156dd2fcd44bd150ad18778aaf2c2b5796ca53f32e4de81d85385135
+EBUILD mplayer2-2.0_p20120309.ebuild 16416 SHA256 aaafe58532a1c4e263b1433d962b11fc8b67af3e24e603413c5c9300981f1276 SHA512 dc9b495fa441ecfa517f06e66952565c35aa84d9597a9e936d901a12b61233e5e483f86f04c07bd552f25dc75654c434284f617e8c5c28174e45c71b63713c2a WHIRLPOOL 7a9418dc7a920f00c318a5135788b32397faef62a8b37cea7654e1bb33928e0182eeccce28b90a9fbabde829a174309a76b4c63916d72ef8a47e45262e4b3793
+EBUILD mplayer2-2.0_p20120828.ebuild 14664 SHA256 e6d2132de6aa3107872930dbaa2c4a5ab12366216c69a17ec0a4b289e08b0826 SHA512 6984f0aff8e8208835ee88bdd605bff08aab4c8a7839c9a5cad3d03cf6d5a7454e85f8ebeca86e4ca76ab27882685d99ddc7bde9333b0b14dfa42d3a869e0571 WHIRLPOOL 8eb2c97a8b37fae4a5f70c94bbf388e30cdf1d28fca87340631fd4a733b4f07f8fef47e5f5c76ca19c2617e1d41a0d7c0748c085cafc2dac831b86423d1760bc
+EBUILD mplayer2-9999.ebuild 14333 SHA256 0fe0e735cf4428222db48196def990c5a34f536b523963d039bdfa02f61930f3 SHA512 1acd663049dc30d1f80d50733d5aaccc3839b2daff0c2f7f312faabc385a483c4356f6737e7bd9d594b68fc1c8ece433a0c696a83c46897ec96bd95ba644a325 WHIRLPOOL 342efc6ebca06791d29e6fafce550019bfacaecf0448909b4ba2cfd55fcd5b4f7635233c3e99402c549ecf274074bfa9f12a2a1e5f709cea8ad388c197503206
+MISC ChangeLog 14792 SHA256 6e08addcbc6c17622c295ed9df290acbb45818c1afcd9c6dfe653b98fbcd932e SHA512 91a4352fd389f14826c27f637a7726c0e199ffc65bc42bfbf38e43236dd2eeec8a2cfe124312872372a0f16f6ff414fecd00fb390a3c23596f40b41f1332c7da WHIRLPOOL df2d6afd7db8906ca43bf8b710bfe2b1c32a6ee1ee30311e9a816bf4fb110fa05e0009850ea643b99adcfbfefedb2d721fb96c82ac2eba0f47d10305f604183d
+MISC metadata.xml 3398 SHA256 5625ac4ca580fbc61081e938371163b4de194d3d539ec0c63330eea9769bf895 SHA512 401fb1e9f9e967cf2d7606a9774b848564f768f96becba691a29f602cad3383c63e6b458d3515d76ddccddd648bda81fc095d807015e4ae4d48dbbe5a56763e9 WHIRLPOOL 6d72078d65e8f9e94567574071233f96c0289c499ba5dafb37c066ab89c2bf9b021aa8b33692367c0e61a0eda9852f05f178f9347a30c13a9cd24a2a7bc4b816
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAlBoZKQACgkQsAvGakAaFgCTHQCggAzGlNJH/nMRA3O3hZvozOIx
-qT0AoJZybc9VBNW+IRhFhx984TVfhE2A
-=xAAy
+iEYEAREIAAYFAlCbnD8ACgkQvFcC4BYPU0r+/QCgo4Y/NR/gdbrGkjIrKEgM1wpO
+b2MAn0vd9DfNog3H+OYRSeISWtXqujst
+=EGvc
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch b/media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch
new file mode 100644
index 000000000000..29ec168ef8fc
--- /dev/null
+++ b/media-video/mplayer2/files/mplayer2-2.0_p20120828-ffmpeg.patch
@@ -0,0 +1,18 @@
+http://devel.mplayer2.org/changeset/f5e0365c8e76e2ef797027134f1819e613764d7e/
+http://devel.mplayer2.org/ticket/202
+https://bugs.gentoo.org/show_bug.cgi?id=439604
+
+Index: libmpcodecs/vf_lavc.c
+===================================================================
+--- libmpcodecs/vf_lavc.c (revision db8cdc73e38c3490389212d94ae9b92dfddd5975)
++++ libmpcodecs/vf_lavc.c (revision f5e0365c8e76e2ef797027134f1819e613764d7e)
+@@ -74,9 +74,4 @@
+ if (avcodec_open2(&lavc_venc_context, vf->priv->codec, NULL) != 0) {
+ mp_tmsg(MSGT_VFILTER,MSGL_ERR,"Could not open codec.\n");
+- return 0;
+- }
+-
+- if (lavc_venc_context.codec->encode == NULL) {
+- mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n");
+ return 0;
+ }
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
index bcac147ca3ae..471a6f609c78 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.4 2012/09/30 15:26:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.5 2012/11/08 11:49:17 aballier Exp $
EAPI=4
@@ -173,6 +173,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-py2compat.patch"
+ "${FILESDIR}/${PN}-2.0_p20120828-ffmpeg.patch"
)
pkg_setup() {