From: Alexis Ballier Date: Sat, 17 Dec 2011 13:01:33 +0000 (+0000) Subject: fix build with USE=doc, by Martin von Gagern in bug #394907 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=849b1c9388d2d51d3484a0d0b5dfb2b0cce5a2aa;p=gentoo.git fix build with USE=doc, by Martin von Gagern in bug #394907 Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index ef7fc9f0a19e..4eda2a97388e 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.818 2011/12/16 13:52:53 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.819 2011/12/17 13:01:33 aballier Exp $ + + 17 Dec 2011; Alexis Ballier + mplayer-1.0_rc4_p20111215.ebuild, mplayer-9999.ebuild: + fix build with USE=doc, by Martin von Gagern in bug #394907 16 Dec 2011; Alexis Ballier mplayer-9999.ebuild: use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849 by diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index ffeb302b2b87..38a282dcc3e8 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -11,14 +11,14 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d14 DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08a4dfafdc17d09 SHA1 3f60cf0ce8c910e3628e425167cb6a46bb4a29a3 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94 -EBUILD mplayer-1.0_rc4_p20111215.ebuild 19479 RMD160 6048ba695449c7b2459f30647ddf00d11a5db393 SHA1 64aeeabfe1718112aafeb132c184fa3377490ae9 SHA256 bd76e50de8cd87faaca63fe48622c9dafe88d7a6af67b693a07487ed091b6a73 -EBUILD mplayer-9999.ebuild 19806 RMD160 97909a74424a677905a90c23e9451434ba46de0b SHA1 1f1d8d1b8380dba91e8a4f03f1d55f4e75cf3347 SHA256 1361391a8a439c4fb2474eb3fe0fc1242f9904fc9c4e5ac49066511b0ac203d5 -MISC ChangeLog 143197 RMD160 88e37b28b29d6d5adeb7f668243849d4baaa53d3 SHA1 dcb0c550c55c1aaddc9093008212f701a632f827 SHA256 0ed668d9606099e2d7a709c0e81ec2f73a855ea4db8b519b528e566d03b7d36a +EBUILD mplayer-1.0_rc4_p20111215.ebuild 19455 RMD160 2eb8087a10021f937cc894ffc840f08471a59f14 SHA1 ac7409811698ad1dac29d45ba8ead0a777891c0d SHA256 28678530fed056e3e826ebbddac5069ccb435adef250bda27fa4f41f85acbc8e +EBUILD mplayer-9999.ebuild 19782 RMD160 0994f7ead833213605b6a9fdd6942aaf1fb03a4f SHA1 5a394837d01682b7c68f5d6cc14ed6353e635920 SHA256 da98e408c0543ca810a79093c96edf5409322fbd53c6beb4f21a0974c09ac00a +MISC ChangeLog 143369 RMD160 cb133ccdf9293acc58d926275bc4878b5909378a SHA1 1999a490f32c78c074a1bab910cac15d445742be SHA256 08c4a3ab224633ed4f9db4a44edff49fee1568151bf9e9073c14249b3e5d1f19 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7rTToACgkQvFcC4BYPU0ozMgCeP+NKHdJsXn7Z3ecuk11CBEYN -LhkAn37fP8Bt8fW0l9ZU+5zfvkoiyAPG -=tSX7 +iEYEARECAAYFAk7skrMACgkQvFcC4BYPU0oz1QCgxDc6tWAqdp9/ha16uG8K8u+o +kCMAmwWbdGn/aZQzjRxFUzgBnWXEfuaw +=F0o3 -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild index be041df4f29b..a687d07843d3 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild,v 1.2 2011/12/16 12:19:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild,v 1.3 2011/12/17 13:01:33 aballier Exp $ EAPI=4 @@ -634,10 +634,10 @@ src_compile() { has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" done if [[ -z $BUILT_DOCS ]]; then - emake -j1 -C DOCS/xml html-chunked + emake -j1 html-chunked else for i in ${BUILT_DOCS}; do - emake -j1 -C DOCS/xml html-chunked-${i} + emake -j1 html-chunked-${i} done fi fi diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index c453114b66a4..c3409df9d25e 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.111 2011/12/16 13:52:53 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.112 2011/12/17 13:01:33 aballier Exp $ EAPI=4 @@ -638,10 +638,10 @@ src_compile() { has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" done if [[ -z $BUILT_DOCS ]]; then - emake -j1 -C DOCS/xml html-chunked + emake -j1 html-chunked else for i in ${BUILT_DOCS}; do - emake -j1 -C DOCS/xml html-chunked-${i} + emake -j1 html-chunked-${i} done fi fi