Fixed bug #65914 (desktop file) bug #79207 (real libs logic) bug #78481 (avi USE flag for win32codecs).

Package-Manager: portage-2.0.51-r15

6 files changed, 70 insertions, 45 deletions

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 7aee40d4369d..4b80dcea753e 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,22 +1,22 @@
-MD5 60fe66a06badbc2a5e36f508e76d2680 mjpegtools-1.6.2-r1.ebuild 2697
-MD5 0796915c7fc84c1fee5ce6822e908ab6 ChangeLog 14060
+MD5 d1e4e4a8b24cc6731ed47457b4864875 ChangeLog 14156
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
-MD5 2b1c564990247e3a8205859dd1c2c52f mjpegtools-1.6.1.90-r2.ebuild 1911
-MD5 71c39da178f900d01493552b2d7d9e94 mjpegtools-1.6.2-r3.ebuild 3132
 MD5 2e0933d5fbdeab82a7ac0eaa183efce2 mjpegtools-1.6.0-r7.ebuild 2852
-MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r3 69
+MD5 2b1c564990247e3a8205859dd1c2c52f mjpegtools-1.6.1.90-r2.ebuild 1911
+MD5 60fe66a06badbc2a5e36f508e76d2680 mjpegtools-1.6.2-r1.ebuild 2697
+MD5 00144461fd21066efeb29a4c5e0ca5ff mjpegtools-1.6.2-r3.ebuild 3131
+MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r3 69
 MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
-MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
-MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
-MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
-MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.93-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
 MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
-MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
+MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
+MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
+MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c0885c0ba742..8dcf531c31ee 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.270 2005/02/06 15:28:08 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.271 2005/02/06 17:23:53 chriswhite Exp $
+
+  07 Feb 2005; Chris White <chriswhite@gentoo.org> files/mplayer.desktop,
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed bug #65914 (desktop file) bug #79207 (real libs logic) bug #78481 (avi
+  USE flag for win32codecs).
 
   07 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
   mplayer-1.0_pre6.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 41c90f7ebd4e..4c0f71faf1fd 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 914df48fe270bbc8c858f5b9e7cbc214 ChangeLog 49676
+MD5 8c8a37080e67f427ca6e133b8387d897 ChangeLog 49914
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225
 MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050
 MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870
 MD5 db18f76ee40620f5142febc063834345 mplayer-1.0_pre5-r4.ebuild 16471
-MD5 1bda3f3470642ccbbbaa1d3a154afbce mplayer-1.0_pre5-r5.ebuild 16752
-MD5 17888ae56ef8f2d530e2179f7e6592d5 mplayer-1.0_pre6.ebuild 16104
+MD5 037e6cbb34bad966cbbf785b910ab454 mplayer-1.0_pre5-r5.ebuild 16809
+MD5 152fc3dbe1e33715e8f6281a5ab8d39f mplayer-1.0_pre6.ebuild 16595
 MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
@@ -31,7 +31,7 @@ MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
 MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
 MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
 MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
@@ -48,7 +48,7 @@ MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCBjeaFdQwWVoAgN4RAqLwAJ9Gec4KetdsxvV2N5GiFHsiHud5hgCePM9C
-BvTXE2ayUOegzhrOrlGvR10=
-=UuFN
+iD8DBQFCBlK7FdQwWVoAgN4RAmlTAKCYCQfpeK9uoouI2mosBtNpC7MKjwCdFcVX
+0wvyAJHTh/D1HkfgNKS4Ju4=
+=fFT1
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/mplayer.desktop b/media-video/mplayer/files/mplayer.desktop
index 9552ad1ecd20..b5c2227c3455 100644
--- a/media-video/mplayer/files/mplayer.desktop
+++ b/media-video/mplayer/files/mplayer.desktop
@@ -1,7 +1,13 @@
 [Desktop Entry]
+Type=Application
+Encoding=UTF-8
+StartupNotify=true
 Name=MPlayer
-Comment=Media Player for Linux
+Comment=Media Player For Linux
+GenericName=Video Player
 Exec=gmplayer
-Icon=mplayer.xpm
-Terminal=0
+Terminal=false
 Type=Application
+Icon=mplayer.xpm
+Categories=Application;Multimedia;AudioVideo;Player;
+MimeType=video/quicktime;video/x-quicktime;image/x-quicktime;application/x-quicktimeplayer;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;video/x-ms-wm;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;audio/x-ms-wax;audio/x-ms-wma;application/x-drm-v2;audio/wav;audio/x-wav;video/mpeg;audio/mpeg;video/x-mpeg;video/x-mpeg2;audio/mpeg;audio/x-mpeg;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/x-mp3;audio/mp3;video/mp4;video/fli;video/x-fli;video/vnd.vivo;application/x-ogg;application/ogg
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index df0119ebe775..7ab6d51e779e 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.23 2005/02/06 15:28:08 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.24 2005/02/06 17:23:53 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug dga divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi debug dga divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	x86? (
 		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		>=media-libs/win32codecs-20040916
+		avi? ( >=media-libs/win32codecs-20040916 )
 		)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -320,6 +320,7 @@ src_compile() {
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"
 	myconf="${myconf} $(use_enable real)"
+	myconf="${myconf} $(use_enable avi win32)"
 
 	#############
 	# Video Output #
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
index b6bb6155733b..79bd12ca9183 100644
--- a/media-video/mplayer/mplayer-1.0_pre6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.25 2005/02/06 15:28:08 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.26 2005/02/06 17:23:53 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	x86? (
 		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		>=media-libs/win32codecs-20040916
+		avi? ( >=media-libs/win32codecs-20040916 )
 		)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -294,6 +294,7 @@ src_compile() {
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"
 	myconf="${myconf} $(use_enable real)"
+	myconf="${myconf} $(use_enable avi win32)"
 
 	#############
 	# Video Output #
@@ -399,16 +400,31 @@ src_compile() {
 
 	if use real
 	then
-		if [ -d /usr/$(get_libdir)/real ]
+		if use x86 || use amd64 && [ -d /usr/$(get_libdir)/real ]
 		then
-			REALLIBDIR="/usr/$(get_libdir)/real"
+				REALLIBDIR="/usr/$(get_libdir)/real"
 		else
-			eerror "Real libs not found!  Install win32codecs"
-			eerror "And ensure that real USE flag is enabled!"
-			die "Real libs not found"
+				eerror "Real libs not found!  Install win32codecs"
+				eerror "And ensure that real USE flag is enabled!"
+				die "Real libs not found"
+		fi
+		if use ppc || use sparc || use alpha
+		then
+			if [ -d /opt/RealPlayer9/Real/Codecs ]
+			then
+				einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
+				REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
+			elif [ -d /opt/RealPlayer8/Codecs ]
+			then
+				einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
+				REALLIBDIR="/opt/RealPlayer8/Codces"
+			else
+				eerror "Real libs not found!  Install realplayer"
+				die "Real libs not found"
+			fi
 		fi
 	fi
-
+	
 	if use xanim
 	then
 		myconf="${myconf} --with-xanimlibdir=/usr/lib/xanim/mods"
@@ -433,7 +449,6 @@ src_compile() {
 		--disable-runtime-cpudetection \
 		--enable-largefiles \
 		--enable-menu \
-		--enable-real \
 		--enable-network --enable-ftp \
 		--with-reallibdir=${REALLIBDIR} \
 		--with-x11incdir=/usr/X11R6/include \
@@ -486,12 +501,10 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
+	insinto /usr/share/pixmaps
+	newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
+	insinto /usr/share/applications
+	doins ${FILESDIR}/mplayer.desktop
 
 	dodir /usr/share/mplayer/fonts
 	local x=