fixes for xfree-4.3 and refresh rates

4 files changed, 137 insertions, 2 deletions

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 73a2f2a51599..b15b1c5918b6 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,7 +1,8 @@
 MD5 3ca18eb3885b307b310684bf91b83b21 libsdl-1.2.5-r1.ebuild 3054
 MD5 ff6c12b79f61c5485a5de229a749902e libsdl-1.2.4.20020601.ebuild 2832
-MD5 a013896eb5209447644ad62e19ab2575 ChangeLog 3527
-MD5 30a39fc1f609243278c5424cdf733aab libsdl-1.2.5-r2.ebuild 3129
+MD5 57802b5d2fbbac165158e802cfe16720 ChangeLog 3950
+MD5 0e8e0a3b644bba936f7b0a699b96f812 libsdl-1.2.5-r2.ebuild 3204
 MD5 ec27096ad41cb3dce80e23f866133db6 files/digest-libsdl-1.2.4.20020601 75
+MD5 5edca4bf94580e34fce654d8a91d5dd7 files/libsdl-1.2.5-xfree-4.3.patch.bz2 1759
 MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
 MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r2 62
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.5-r2 b/media-libs/libsdl/files/digest-libsdl-1.2.5-r2
new file mode 100644
index 000000000000..7f81a2ad2402
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.5-r2
@@ -0,0 +1 @@
+MD5 cacacf4e4cca546de168fedc23b9b44b SDL-1.2.5.tar.gz 1854550
diff --git a/media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch.bz2 b/media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch.bz2
new file mode 100644
index 000000000000..d3128536cc18
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.5-xfree-4.3.patch.bz2
diff --git a/media-libs/libsdl/libsdl-1.2.5-r2.ebuild b/media-libs/libsdl/libsdl-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..618ae07c4eaa
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.5-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5-r2.ebuild,v 1.1 2003/04/14 05:42:21 seemant Exp $
+
+IUSE="arts xv opengl fbcon aalib nas esd X svga ggi alsa"
+
+S="${WORKDIR}/SDL-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+HOMEPAGE="http://www.libsdl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+RDEPEND=">=media-libs/audiofile-0.1.9
+	X? ( >=x11-base/xfree-4.3.0 )
+	esd? ( >=media-sound/esound-0.2.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	nas? ( media-libs/nas )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	opengl? ( virtual/opengl )"
+# This creates circular deps for the moment ... 
+#	directfb? ( dev-libs/DirectFB )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.5
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/video/directfb
+
+	sed -i "s:DICAPS_ALL, ::" SDL_DirectFB_video.c
+
+	# Patch to allow SDL apps to choose the BEST refresh rates for a given 
+	# resolution in XFree86-4.3 instead of the worst one.
+	cd ${S}
+	use X && epatch ${FILESDIR}/${P}-xfree-4.3.patch.bz2
+}
+
+src_compile() {
+	local myconf
+
+	use X \
+		&& myconf="${myconf} --enable-video-x11" \
+		|| myconf="${myconf} --disable-video-x11"
+
+	use xv \
+		&& myconf="${myconf} --enable-video-x11-xv" \
+		|| myconf="${myconf} --disable-video-x11-xv"
+
+	use esd \
+		&& myconf="--enable-esd" \
+		|| myconf="--disable-esd"
+
+	use ggi \
+		&& myconf="${myconf} --enable-video-ggi" \
+		|| myconf="${myconf} --disable-video-ggi"
+
+	use nas \
+		&& myconf="${myconf} --enable-nas" \
+		|| myconf="${myconf} --disable-nas"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+	use arts \
+		&& myconf="${myconf} --enable-arts" \
+		|| myconf="${myconf} --disable-arts"
+	
+	use svga \
+		&& myconf="${myconf} --enable-video-svga" \
+		|| myconf="${myconf} --disable-video-svga"
+
+	use aalib \
+		&& myconf="${myconf} --enable-video-aalib" \
+		|| myconf="${myconf} --disable-video-aalib"
+
+	use fbcon \
+		&& myconf="${myconf} --enable-video-fbcon" \
+		|| myconf="${myconf} --disable-video-fbcon"
+
+	use opengl \
+		&& myconf="${myconf} --enable-video-opengl" \
+		|| myconf="${myconf} --disable-video-opengl"
+
+	#use directfb \
+	#	&& myconf="${myconf} --enable-video-directfb" \
+		myconf="${myconf} --disable-video-directfb"
+
+	use x86 \
+		&& myconf="${myconf} --enable-nasm" \
+		|| myconf="${myconf} --disable-nasm"
+
+	if use nas || use alsa || use oss || use arts || use esd
+	then
+		myconf="${myconf} --enable-audio"
+	else
+		myconf="${myconf} --disable-audio"
+	fi
+
+	if use X || use xv || use ggi || use aalib || use svga || use fbcon || use opengl
+	then
+		myconf="${myconf} --enable-video-dummy"
+	else
+		myconf="${myconf} --disable-video"
+	fi
+
+	econf \
+		--enable-joystick \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		install || die
+
+	preplib /usr
+	dodoc BUGS COPYING CREDITS README* TODO WhatsNew
+	dohtml -r ./
+}