diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2006-04-08 22:21:01 +0000 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2006-04-08 22:21:01 +0000 |
commit | 3c3c2ac2f0df19ae18df9e1027a494be4deacf8e (patch) | |
tree | a84de269c9d9ccba73c5a77bae8df0ee3d3c8715 /media-video | |
parent | Cleanup and version bump. (diff) | |
download | gentoo-2-3c3c2ac2f0df19ae18df9e1027a494be4deacf8e.tar.gz gentoo-2-3c3c2ac2f0df19ae18df9e1027a494be4deacf8e.tar.bz2 gentoo-2-3c3c2ac2f0df19ae18df9e1027a494be4deacf8e.zip |
Fixes for bug #129264
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/mplayer/Manifest | 12 | ||||
-rw-r--r-- | media-video/mplayer/files/digest-mplayer-1.0.20060408 | 6 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0.20060408.ebuild | 25 |
4 files changed, 25 insertions, 24 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index a74900034880..54412085a305 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.361 2006/04/08 16:33:40 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.362 2006/04/08 22:21:00 lu_zero Exp $ + + 08 Apr 2006; Luca Barbato <lu_zero@gentoo.org> + mplayer-1.0.20060408.ebuild: + Lots of fixed related to the new unicode support and vidix support *mplayer-1.0.20060408 (08 Apr 2006) diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 6748e4f42b62..521e34837ad1 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -10,9 +10,9 @@ SHA256 73e6333b0b3e79ef74ddf3073d33f84a2603079c1c4ffb721b66e69bd32b1f83 files/di MD5 c8ca6e32072be08b2c67ad72cbbcc33a files/digest-mplayer-1.0.20060302 433 RMD160 60b7431b0e4db894d5b9bcca1335dfc4835074ef files/digest-mplayer-1.0.20060302 433 SHA256 c4d9707855c4ad55b93cf21bb59d97c541104cb19321bb4bd83debcafac8e863 files/digest-mplayer-1.0.20060302 433 -MD5 dedc769165c8248128339c2cf2f60f30 files/digest-mplayer-1.0.20060408 1575 -RMD160 24a6338a85e2ef09b475d3c0440d94b485bd2b69 files/digest-mplayer-1.0.20060408 1575 -SHA256 2561cd610ac5b3647eae7239bebde3642ed30e5b635fc3edf466a74b35596ae1 files/digest-mplayer-1.0.20060408 1575 +MD5 1bbfaa2ec18c2e40fdba337c56c4fce8 files/digest-mplayer-1.0.20060408 1575 +RMD160 1be679fe04e2816f92b62daa616491c655900caa files/digest-mplayer-1.0.20060408 1575 +SHA256 3a4994f9e113a281fe94c5304c4ab8e7f18a868c987f9c64fed0776c1a9bd204 files/digest-mplayer-1.0.20060408 1575 MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432 RMD160 e15bccf47441f6210b2f1cb1cdfb0ae1a2fb54a7 files/digest-mplayer-1.0_pre7-r1 432 SHA256 1eb44a0c360f6baa94988cf4a0cad549e1ba0f8d21475d70ca4fbf160d853670 files/digest-mplayer-1.0_pre7-r1 432 @@ -46,9 +46,9 @@ SHA256 55d054f9b2403bb426751da06dde973ec1c2d7376be69990738346bc13777397 mplayer- MD5 950dff3897270ef74b416ed5aad1d974 mplayer-1.0.20060302.ebuild 17017 RMD160 eb22ce965a20d974a70f3ffb4285fb7772a4dd14 mplayer-1.0.20060302.ebuild 17017 SHA256 96c9c8655afb03919b76accf4522b8d274cf0aecfab07276ec9f8e867905dacc mplayer-1.0.20060302.ebuild 17017 -MD5 0487b6707422a03c88a70eb67a4a1f4f mplayer-1.0.20060408.ebuild 17017 -RMD160 8c85dc20a80d6a98942aa5fdcbf7f5e19dd15683 mplayer-1.0.20060408.ebuild 17017 -SHA256 6ee8aee023c859aefaf768fc3d26f9cacc2c57e2ca83e6e14b3cedc7ffddd746 mplayer-1.0.20060408.ebuild 17017 +MD5 99c58d9581e3146a0e5e1cbb6720dd6d mplayer-1.0.20060408.ebuild 16819 +RMD160 fb7929ed244334e2f9071ee719cd3912fbffbdfd mplayer-1.0.20060408.ebuild 16819 +SHA256 c84aff620d57d8a242b5c988ea87e5f3d816eb5f79019609f1a6a61db71c8d16 mplayer-1.0.20060408.ebuild 16819 MD5 c14023b29e9f342df8ed9457db1253f4 mplayer-1.0_pre7-r1.ebuild 16913 RMD160 73903913b9601e66b36716760ae61a9f52c22431 mplayer-1.0_pre7-r1.ebuild 16913 SHA256 e799d7beb1b7a985cf9779b367657d6cbbb75c05332c401971d87462d0a5953f mplayer-1.0_pre7-r1.ebuild 16913 diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20060408 b/media-video/mplayer/files/digest-mplayer-1.0.20060408 index 76d9620905b5..2bc07ddb89e9 100644 --- a/media-video/mplayer/files/digest-mplayer-1.0.20060408 +++ b/media-video/mplayer/files/digest-mplayer-1.0.20060408 @@ -10,9 +10,9 @@ SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-ari MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208 -MD5 2d34e5df8857c9a43b8e94c68e3fc3e7 mplayer-1.0.20060408.tar.bz2 6714696 -RMD160 c765972b8d071d85c27f0d5e82461e9abd9067c4 mplayer-1.0.20060408.tar.bz2 6714696 -SHA256 a2bb63af762d972fc953b5a04e800f9d510aac8ccd01be1a4d4618d1e30cbad5 mplayer-1.0.20060408.tar.bz2 6714696 +MD5 e352817e6423e430edd1d32309c5ad71 mplayer-1.0.20060408.tar.bz2 6717755 +RMD160 84040a639caeb2affb35bf4669cef9029c936339 mplayer-1.0.20060408.tar.bz2 6717755 +SHA256 26cc46758d55617f82aa7f997778264b5371eacbad8d12579aae4c587932106b mplayer-1.0.20060408.tar.bz2 6717755 MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234 diff --git a/media-video/mplayer/mplayer-1.0.20060408.ebuild b/media-video/mplayer/mplayer-1.0.20060408.ebuild index 3d5bb56a96c1..53e7a74b46a0 100644 --- a/media-video/mplayer/mplayer-1.0.20060408.ebuild +++ b/media-video/mplayer/mplayer-1.0.20060408.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060408.ebuild,v 1.1 2006/04/08 16:33:40 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060408.ebuild,v 1.2 2006/04/08 22:21:01 lu_zero Exp $ inherit eutils flag-o-matic @@ -8,9 +8,9 @@ RESTRICT="nostrip" IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl bindist cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca -lirc live livecd lzo mad matroska matrox mmx mmxext musepack nas nls nvidia -vorbis opengl openal oss png real rtc samba sdl sse sse2 svga tga theora -truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid xvmc" +lirc live livecd lzo mad matroska matrox mmx mmxext musepack nas nvidia +unicode vorbis opengl openal oss png real rtc samba sdl sse sse2 svga tga +theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid xvmc" # openal BLUV=1.4 SVGV=1.9.17 @@ -244,6 +244,7 @@ src_compile() { local myconf="--disable-external-faad --disable-tv-bsdbt848" + myconf="--disable-external-vidix" ################ #Optional features# ############### @@ -253,6 +254,9 @@ src_compile() { fi myconf="${myconf} $(use_enable bidi fribidi)" + if use unicode; then + myconf="${myconf} --charset=utf8" + fi myconf="${myconf} $(use_enable cdparanoia)" if use dvd; then myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)" @@ -356,7 +360,7 @@ src_compile() { then myconf="${myconf} --enable-svga" else - myconf="${myconf} --disable-svga --disable-vidix" + myconf="${myconf} --disable-svga --disable-internal-vidix" fi myconf="${myconf} $(use_enable tga)" @@ -412,7 +416,6 @@ src_compile() { use x86 && myconf="${myconf} $(use_enable mmx)" use x86 && myconf="${myconf} $(use_enable mmxext mmx2)" myconf="${myconf} $(use_enable debug)" - myconf="${myconf} $(use_enable nls i18n)" # mplayer now contains SIMD assembler code for amd64 # AMD64 Team decided to hardenable SIMD assembler for all users @@ -484,15 +487,9 @@ src_compile() { MAKEOPTS="${MAKEOPTS} -j1" einfo "Make" - make depend && emake || die "Failed to build MPlayer!" - cd doc && make -C DOCS/xml html-chunked + emake || die "Failed to build MPlayer!" + use doc && make -C DOCS/xml html-chunked einfo "Make completed" - - # We build the shared libpostproc.so here so that our - # mplayer binary is not linked to it, ensuring that we - # do not run into issues ... (bug #14479) - cd ${S}/libavcodec/libpostproc - make SHARED_PP="yes" || die "Failed to build libpostproc.so!" } src_install() { |