summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest10
-rw-r--r--media-video/mplayer/files/prepare_mplayer.sh4
3 files changed, 13 insertions, 7 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index b80d53b7ec95..a05cb4582570 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.809 2011/11/02 14:20:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.810 2011/12/15 12:29:06 aballier Exp $
+
+ 15 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
+ update the prepare_mplayer script to use ffmpeg instead of libav and use
+ dump_ffmpeg.sh for dumping unused files
02 Nov 2011; Alexis Ballier <aballier@gentoo.org> files/dump_ffmpeg.sh:
riff.h isnt needed anymore
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 03fa226a2326..4887948a3297 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
AUX dump_ffmpeg.sh 2469 RMD160 cfff8600318af17877e74f4f77acba50ae9a5001 SHA1 66b7462315e75c8657c42a183874cc3ea7f847c0 SHA256 253841d4e44d7b63d2c4ea28f9cd80e4e71323321e1771c5ef9918c32490dca5
AUX mplayer-1.0_rc4_p20110322-gcc46.patch 657 RMD160 a327aa565f55102be2d6f73f12e08862418023e9 SHA1 560e41e7c5c147e8656ec0216f4272e1421e887c SHA256 4c57d5c4c79db87796b6b1b4a485f4d0a8ed95f3ae71040592a0bd5f3dc070b2
AUX mplayer-1.0_rc4_p20110322-sami_subtitle_parsing.patch 417 RMD160 d72bf30164ed6acfac7113ac4c78ff36ebce884e SHA1 4bb165cf52e176201dad512dd4a50cd04a08b228 SHA256 413876d32509c5e09df58b6f833036cb16d1073fcfecb17e0be9dc355d0e7160
-AUX prepare_mplayer.sh 711 RMD160 6a5271c822795f88b86caf0f716f9336528b17c4 SHA1 e2a75ad0fe9caebef8f0eb63f6160b78669e6b12 SHA256 4141c88e9942d7332fb0ed25d26c0c9d1cbe9e6d9d0f3a2d178f263699b1fd42
+AUX prepare_mplayer.sh 784 RMD160 a57658860f34077985a778999d2a73665baa2d57 SHA1 2e91bef4068266fe3d35b7c8bd39dd9f317e5eca SHA256 8f640487ff513ee19598b1db136033954c6e48d3bbe67d49767a9433bf40053e
DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08a4dfafdc17d09 SHA1 3f60cf0ce8c910e3628e425167cb6a46bb4a29a3 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5
EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94
EBUILD mplayer-9999.ebuild 19549 RMD160 9be7cd566621b5acd1c814eb36bf5864d3a014cf SHA1 bd03e21218567968c0eb494834dc8c6cc99b1c06 SHA256 01667e6a1ffc6b8d508a97a080438226aec5e4881b6e097fe50d5b41bce9dcad
-MISC ChangeLog 141705 RMD160 e818b5f7aaa624295b226d50a6412e25f182252f SHA1 f04ff1d53ff426a4ca7f841ccc23b2e435d364a6 SHA256 ce29ea74d89cbd275017203119c701a1ab84d3b68b4ea93ef3696b50afa109c8
+MISC ChangeLog 141901 RMD160 6eb10cfc57ffedb8682871d6e68be0f4e1df1592 SHA1 bf9f2cb3c39a426e88c71feff876b68b74f86fcf SHA256 a6c60d2c2513a3a23d766846155b1cf6e33494ed13cdd13ec33a5cdf56934c78
MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk6xUaMACgkQvFcC4BYPU0ptUACgiHPNzcYjo1IzlYqSf8py3eHF
-LikAoLz3NQJuYB4UV5u84btdZ1UO+CWR
-=MxUH
+iEYEARECAAYFAk7p6BcACgkQvFcC4BYPU0o1NACghiXvF1B4Ss7d6YFBiZLbZNAU
+MpIAn14jtlU3ZcgQKlGAI+uM7TFiuCa9
+=Y5rS
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
index 645b43fe513b..1d453b3f7821 100644
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -1,13 +1,15 @@
#!/bin/sh
VERSION=$(date +%Y%m%d)
PACKAGE="mplayer-1.0_rc4_p${VERSION}"
+DUMP_FFMPEG="$(dirname $0)/dump_ffmpeg.sh"
svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE}
pushd ${PACKAGE} > /dev/null
# ffmpeg is in git now so no svn external anymore
rm -rf ffmpeg
- git clone git://git.libav.org/libav.git ffmpeg/
+ git clone git://git.videolan.org/ffmpeg.git ffmpeg/
+ sh "$DUMP_FFMPEG"
STORE_VERSION=$(svn log -r HEAD -q |grep ^r |cut -d' ' -f1)
echo "*** Remember to adjust mplayer ebuild with revision: \"SVN-${STORE_VERSION}\" ***"
popd > /dev/null