adding libtheora support.

4 files changed, 428 insertions, 14 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index e4f038d4b31c..54995c2e913e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.110 2004/03/17 22:39:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.111 2004/03/21 19:43:22 mholzer Exp $
+
+*mplayer-1.0_pre3-r2 (21 Mar 2004)
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r2.ebuild:
+  adding libtheora support.
 
   18 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r1.ebuild,
   files/mplayer-1.0_pre3-libmatroska063.diff:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index dbd3c108fe42..25f78a01c965 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,22 +1,25 @@
+MD5 23793eed4decfff39af31a95ef52aef7 ChangeLog 18751
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 6ef8b4233f81e3c47276ad6f220e21fb mplayer-0.92.ebuild 11770
 MD5 2d23c2a645687d95406c6a7227ab67a3 mplayer-1.0_pre1-r1.ebuild 11452
-MD5 fba3cddc229a860ee10243c57a9e7bcb mplayer-1.0_pre3-r1.ebuild 12055
 MD5 7283c56dd4492e77d4cb57fcdbfc5073 mplayer-1.0_pre2.ebuild 11644
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 23793eed4decfff39af31a95ef52aef7 ChangeLog 18751
 MD5 c85675a19ef8ffca4ad0ef4871071998 mplayer-1.0_pre3.ebuild 11750
-MD5 6ef8b4233f81e3c47276ad6f220e21fb mplayer-0.92.ebuild 11770
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 fba3cddc229a860ee10243c57a9e7bcb mplayer-1.0_pre3-r1.ebuild 12055
+MD5 67e6643b805887b723b80c5fa1320930 mplayer-1.0_pre3-r2.ebuild 11045
+MD5 84638a78f4bb5d862ef93fa989a744b7 .mplayer-1.0_pre3-r2.ebuild.swo 16384
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92 355
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
+MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3 358
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
-MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r1 358
 MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r2 358
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre3-r2 b/media-video/mplayer/files/digest-mplayer-1.0_pre3-r2
new file mode 100644
index 000000000000..89f8208a6f50
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre3-r2
@@ -0,0 +1,5 @@
+MD5 998becb79417c6a14d15c07e85188b82 MPlayer-1.0pre3.tar.bz2 4714725
+MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
+MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
+MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
+MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
new file mode 100644
index 000000000000..b34aab1ef0f8
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r2.ebuild,v 1.1 2004/03/21 19:43:22 mholzer Exp $
+
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick theora"
+
+inherit eutils
+
+# NOTE to myself:  Test this thing with and without dvd/gtk+ support,
+#                  as it seems the mplayer guys dont really care to
+#                  make it work without dvd support.
+
+# Handle PREversions as well
+MY_PV="${PV/_/}"
+S="${WORKDIR}/MPlayer-${MY_PV}"
+SRC_URI="mirror://mplayer/releases/MPlayer-${MY_PV}.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-1.9.17-mplayer.tar.bz2 )
+	gtk? ( mirror://mplayer/Skin/Blue-1.0.tar.bz2 )"
+# Only install Skin if GUI should be build (gtk as USE flag)
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+# 'encode' in USE for MEncoder.
+RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
+	amd64? ( >=media-libs/xvid-0.9.0 )
+	x86? ( >=media-libs/xvid-0.9.0
+	       >=media-libs/divx4linux-20030428
+	       >=media-libs/win32codecs-0.60 )
+	gtk? ( media-libs/libpng
+	       >=x11-base/xfree-4.2.1-r2
+		!gtk2? ( =x11-libs/gtk+-1.2*
+			=dev-libs/glib-1.2* )
+		gtk2? ( >=x11-libs/gtk+-2.0.6
+	        >=dev-libs/glib-2.0.6 )
+	)
+	jpeg? ( media-libs/jpeg )
+	gif? ( media-libs/giflib
+	       media-libs/libungif )
+	truetype? ( >=media-libs/freetype-2.1 )
+	esd? ( media-sound/esound )
+	ggi? ( media-libs/libggi )
+	sdl? ( media-libs/libsdl )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	nas? ( media-libs/nas )
+	lirc? ( app-misc/lirc )
+	aalib? ( media-libs/aalib )
+	svga? ( media-libs/svgalib )
+	encode? ( media-sound/lame
+	          >=media-libs/libdv-0.9.5 )
+	xmms? ( media-sound/xmms )
+	matroska? ( >=media-libs/libmatroska-0.6.0 )
+	opengl? ( virtual/opengl )
+	directfb? ( dev-libs/DirectFB )
+	oggvorbis? ( media-libs/libvorbis )
+	nls? ( sys-devel/gettext )
+	media-sound/cdparanoia
+	mpeg? ( media-libs/faad2 )
+	samba? ( >=net-fs/samba-2.2.8a )
+	theora? ( media-libs/libtheora )
+	>=sys-apps/portage-2.0.36"
+#	dvd? ( media-libs/libdvdnav )
+# Hardcode paranoia support for now, as there is no
+# related USE flag.
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	app-arch/unzip"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa ~sparc"
+
+
+pkg_setup() {
+	echo
+	einfo "Please note that we do not use C[XX]FLAGS from /etc/make.conf"
+	einfo "or the environment, as the MPlayer guys then do not give support"
+	einfo "in case of bug reports!."
+	echo
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 3
+}
+
+src_unpack() {
+
+	unpack MPlayer-${MY_PV}.tar.bz2 \
+		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2
+
+	use svga && unpack svgalib_helper-1.9.17-mplayer.tar.bz2
+
+	use gtk && unpack Blue-1.0.tar.bz2
+
+	# Use gtk-2.x
+	cd ${S}; epatch ${FILESDIR}/${PN}-1.0-gtk2.patch
+
+	# Fix head/tail call for new coreutils
+	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
+
+	# Fix mencoder segfaulting with bad arguments
+	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
+
+	#Fix libmatroska 
+	if has_version '>=libmatroska-0.6.3'
+	then
+		cd ${S}; epatch ${FILESDIR}/${P}-libmatroska063.diff
+	fi
+
+
+	# Fix hppa detection
+	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
+
+	if [ "`use svga`" ]
+	then
+		echo
+		einfo "Enabling vidix non-root mode."
+		einfo "(You need a proper svgalib_helper.o module for your kernel"
+		einfo " to actually use this)"
+		echo
+
+		mv ${WORKDIR}/svgalib_helper ${S}/libdha
+		cd ${S}/libdha
+		sed -i -e "s/^#CFLAGS/CFLAGS/" Makefile
+	fi
+}
+
+src_compile() {
+
+	use matrox && check_KV
+
+	local myconf=
+
+	use 3dnow \
+		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
+
+	use sse \
+		|| myconf="${myconf} --disable-sse --disable-sse2"
+
+	# Only disable MMX if 3DNOW or SSE is not in USE
+	use mmx || use 3dnow || use sse \
+		|| myconf="${myconf} --disable-mmx --disable-mmx2"
+
+	# Only disable X if gtk is not in USE
+	use X || use gtk \
+		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
+				--disable-xmga --disable-png"
+	use jpeg \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use gif \
+		|| myconf="${myconf} --disable-gif"
+
+	( use matrox && use X ) \
+		&& myconf="${myconf} --enable-xmga" \
+		|| myconf="${myconf} --disable-xmga"
+
+	use gtk \
+		&& myconf="${myconf} --enable-gui --enable-x11 \
+		                     --enable-xv --enable-vm --enable-png"
+
+	( use gtk && use gtk2 ) \
+		&& myconf="${myconf} --enable-gtk2"
+
+	use encode \
+		&& myconf="${myconf} --enable-mencoder --enable-tv" \
+		|| myconf="${myconf} --disable-mencoder"
+
+	use dvd \
+		&& myconf="${myconf} --enable-mpdvdkit" \
+		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread"
+	# Disable dvdnav support as its not considered to be
+	# functional anyhow, and will be removed.
+
+	use mpeg \
+		&& myconf="${myconf} --enable-external-faad" \
+		|| myconf="${myconf} --disable-external-faad"
+
+	use dvb \
+		&& myconf="${myconf} --enable-dvb" \
+		|| myconf="${myconf} --disable-dvb --disable-dvbhead"
+
+	use debug \
+		&& myconf="${myconf} --enable-debug"
+
+	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/Codecs"
+	else
+		REALLIBDIR="/usr/lib/real"
+	fi
+
+	if has_version media-plugins/live
+	then
+		einfo "Enabling LIVE.COM Streaming Media..."
+		myconf="${myconf} --enable-live"
+	fi
+
+	if [ -e /dev/.devfsd ]
+	then
+		myconf="${myconf} --enable-linux-devfs"
+	fi
+
+	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
+	then
+		CC="${CC} -yet_exec"
+	fi
+
+	# Crashes on start when compiled with most optimizations.
+	# The code have CPU detection code now, with CPU specific
+	# optimizations, so extra should not be needed and is not
+	# recommended by the authors
+	unset CFLAGS CXXFLAGS
+	./configure --prefix=/usr \
+		--datadir=/usr/share/mplayer \
+		--confdir=/usr/share/mplayer \
+		--disable-runtime-cpudetection \
+		--enable-largefiles \
+		--enable-menu \
+		--enable-real \
+		--with-reallibdir=${REALLIBDIR} \
+		--with-x11incdir=/usr/X11R6/include \
+		`use_enable xinerama` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable esd` \
+		`use_enable truetype freetype` \
+		`use_enable opengl gl` \
+		`use_enable sdl` \
+		`use_enable nls i18n` \
+		`use_enable samba smb` \
+		`use_enable aalib aa` \
+		`use_enable oss ossaudio` \
+		`use_enable ggi` \
+		`use_enable svga` \
+		`use_enable directfb` \
+		`use_enable fbcon fbdev` \
+		`use_enable alsa` \
+		`use_enable arts` \
+		`use_enable lirc` \
+		`use_enable joystick` \
+		`use_enable matroska` \
+		`use_enable theora` \
+		`use_enable nas` \
+		`use_enable 3dfx tdfxfb` \
+		`use_enable matrox mga` \
+		`use_enable xmms` \
+		${myconf} || die
+	# Breaks with gcc-2.95.3, bug #14479:
+	#  --enable-shared-pp \
+	# Enable untested and currently unused code:
+	#  --enable-dynamic-plugins \
+
+	# emake borks on fast boxes - Azarah (07 Aug 2002)
+	einfo "Make"
+	make all || die "Failed to build MPlayer!"
+	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!"
+
+	if [ -n "`use matrox`" ]
+	then
+		cd ${S}/drivers
+		make all || die "Failed to build matrox driver!"
+	fi
+}
+
+src_install() {
+
+	einfo "Make install"
+	make prefix=${D}/usr \
+	     BINDIR=${D}/usr/bin \
+		 LIBDIR=${D}/usr/lib \
+	     CONFDIR=${D}/usr/share/mplayer \
+	     DATADIR=${D}/usr/share/mplayer \
+	     MANDIR=${D}/usr/share/man \
+	     install || die "Failed to install MPlayer!"
+	einfo "Make install completed"
+
+	# libpostproc is now installed by >=ffmpeg-0.4.8.20040222
+#	cd ${S}/libavcodec/libpostproc
+#	make prefix=${D}/usr \
+#	     SHARED_PP="yes" \
+#	     install || die "Failed to install libpostproc.so!"
+#	cd ${S}
+
+	dodoc AUTHORS ChangeLog README
+	# Install the documentation; DOCS is all mixed up not just html
+	find ${S}/DOCS -type d | xargs -- chmod 0755
+	cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die
+
+	# Copy misc tools to documentation path, as they're not installed
+	# directly
+	find ${S}/TOOLS -type d | xargs -- chmod 0755
+	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
+
+	# Install the default Skin and Gnome menu entry
+	if [ -n "`use gtk`" ]
+	then
+		dodir /usr/share/mplayer/Skin
+		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
+
+		# Fix the symlink
+		rm -rf ${D}/usr/bin/gmplayer
+		dosym mplayer /usr/bin/gmplayer
+	fi
+
+	if [ -n "`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
+
+	dodir /usr/share/mplayer/fonts
+	local x=
+	# Do this generic, as the mplayer people like to change the structure
+	# of their zips ...
+	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-??-iso-*')
+	do
+		cp -Rd ${x} ${D}/usr/share/mplayer/fonts
+	done
+	# Fix the font symlink ...
+	rm -rf ${D}/usr/share/mplayer/font
+	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+
+	insinto /etc
+	newins ${S}/etc/example.conf mplayer.conf
+	dosed -e 's/include =/#include =/' /etc/mplayer.conf
+	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
+	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
+
+	insinto /usr/share/mplayer
+	doins ${S}/etc/codecs.conf
+	doins ${S}/etc/input.conf
+	doins ${S}/etc/menu.conf
+
+	if [ -n "`use matrox`" ]
+	then
+		check_KV
+		insinto /lib/modules/${KV}/kernel/drivers/char
+		doins ${S}/drivers/mga_vid.o
+	fi
+}
+
+pkg_preinst() {
+
+	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
+	then
+		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
+	fi
+}
+
+pkg_postinst() {
+
+	if [ -n "`use ppc`" ]
+	then
+		echo
+		einfo "When you see only GREEN salad on your G4 while playing"
+		einfo "a DivX, you should recompile _without_ altivec enabled."
+		einfo "Further information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
+		echo
+		einfo "If everything functions fine with watching DivX and"
+		einfo "altivec enabled, please drop a comment on the mentioned bug!"
+		echo
+		einfo "libpostproc is no longer installed by mplayer. If you have an"
+		einfo "application that depends on it, install >=ffmpeg-0.4.8.20040222"
+	fi
+
+	depmod -a &>/dev/null || :
+}
+
+pkg_postrm() {
+
+	# Cleanup stale symlinks
+	if [ -L ${ROOT}/usr/share/mplayer/font -a \
+	     ! -e ${ROOT}/usr/share/mplayer/font ]
+	then
+		rm -f ${ROOT}/usr/share/mplayer/font
+	fi
+
+	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
+	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
+	then
+		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
+	fi
+}
+