version bump

5 files changed, 121 insertions, 9 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index dc664a221fa5..5f6fd66d37ba 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.40 2004/02/10 03:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.41 2004/02/24 15:45:34 mr_bones_ Exp $
+
+*libsdl-1.2.7 (24 Feb 2004)
+
+  24 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> libsdl-1.2.7.ebuild,
+  files/1.2.7-nobuggy-X.patch:
+  version bump
 
   09 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
   Make ppc stable with the no-more-buggy-x patch #30089 by Ernst Persson.
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 6cf015902d91..18afd3f99607 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,12 +1,14 @@
+MD5 024d54cc6f83d78c54ae083662045be8 ChangeLog 6338
+MD5 ccd5a78b507c0444d9cef7fec354b717 libsdl-1.2.5-r1.ebuild 3153
+MD5 3dff73f49f2f4dfc0e82ce4faff11003 libsdl-1.2.5-r2.ebuild 3335
+MD5 f35556f206fff4392ff37553ef2fb2e4 libsdl-1.2.6-r3.ebuild 2896
+MD5 0cbee06ae057a2c8a1e257508f28a421 libsdl-1.2.7.ebuild 2873
+MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
+MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r2 62
 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
+MD5 5f42847d56be2ead4597536c3f5654da files/digest-libsdl-1.2.7 62
+MD5 139a7f80f999ec4caafeac89523308a5 files/libsdl-1.2.5-xfree-4.3.patch 5422
 MD5 2468dd594bc1f3ad3b47bcf69ba5ded2 files/libsdl_gcc33_fix.diff 395
+MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
-MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
-MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r2 62
-MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
-MD5 139a7f80f999ec4caafeac89523308a5 files/libsdl-1.2.5-xfree-4.3.patch 5422
-MD5 f35556f206fff4392ff37553ef2fb2e4 libsdl-1.2.6-r3.ebuild 2896
-MD5 ccd5a78b507c0444d9cef7fec354b717 libsdl-1.2.5-r1.ebuild 3153
-MD5 024d54cc6f83d78c54ae083662045be8 ChangeLog 6338
-MD5 3dff73f49f2f4dfc0e82ce4faff11003 libsdl-1.2.5-r2.ebuild 3335
diff --git a/media-libs/libsdl/files/1.2.7-nobuggy-X.patch b/media-libs/libsdl/files/1.2.7-nobuggy-X.patch
new file mode 100644
index 000000000000..50f1297590a4
--- /dev/null
+++ b/media-libs/libsdl/files/1.2.7-nobuggy-X.patch
@@ -0,0 +1,13 @@
+--- SDL-1.2.6.orig/src/video/x11/SDL_x11modes.c	2003-12-16 05:00:33.000000000 +0100
++++ SDL-1.2.6/src/video/x11/SDL_x11modes.c	2003-12-16 05:01:42.000000000 +0100
+@@ -323,10 +323,6 @@
+             fclose(metro_fp);
+         }
+     }
+-#if defined(__alpha__) || defined(__sparc64__) || defined(__powerpc__)
+-    /* The alpha, sparc64 and PPC XFree86 servers are also buggy */
+-    buggy_X11 = 1;
+-#endif
+     /* Enumerate the available fullscreen modes */
+     if ( ! buggy_X11 ) {
+         if ( SDL_NAME(XF86VidModeQueryExtension)(SDL_Display, &vm_event, &vm_error) &&
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.7 b/media-libs/libsdl/files/digest-libsdl-1.2.7
new file mode 100644
index 000000000000..bbfe30ee16b9
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.7
@@ -0,0 +1 @@
+MD5 efcaccfa0f9a242b715ea0fbdfe15180 SDL-1.2.7.tar.gz 2469096
diff --git a/media-libs/libsdl/libsdl-1.2.7.ebuild b/media-libs/libsdl/libsdl-1.2.7.ebuild
new file mode 100644
index 000000000000..ac0cc6903cdd
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2004 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.7.ebuild,v 1.1 2004/02/24 15:45:34 mr_bones_ Exp $
+
+inherit fixheadtails eutils
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl noaudio novideo nojoystick"
+# if you disable audio/video/joystick and something breaks, you pick up the pieces
+
+RDEPEND=">=media-libs/audiofile-0.1.9
+	alsa? ( media-libs/alsa-lib )
+	esd? ( >=media-sound/esound-0.2.19 )
+	arts? ( kde-base/arts )
+	nas? ( media-libs/nas virtual/x11 )
+	X? ( >=x11-base/xfree-4.3.0 )
+	directfb? ( >=dev-libs/DirectFB-0.9.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	aalib? ( media-libs/aalib )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/SDL-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-nobuggy-X.patch #30089
+
+	ht_fix_file configure
+
+	if [ `use nas` ] && [ ! `use X` ] ; then #32447
+		sed -i \
+			-e 's:-laudio:-laudio -L/usr/X11R6/lib:' \
+				configure || die "nas sed hack failed"
+	fi
+}
+
+src_compile() {
+	local myconf=""
+	[ `use noaudio` ] && myconf="${myconf} --disable-audio"
+	[ `use novideo` ] \
+		&& myconf="${myconf} --disable-video" \
+		|| myconf="${myconf} --enable-video-dummy"
+	[ `use nojoystick` ] && myconf="${myconf} --disable-joystick"
+
+	econf \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		`use_enable oss` \
+		`use_enable alsa` \
+		`use_enable esd` \
+		`use_enable arts` \
+		`use_enable nas` \
+		`use_enable x86 nasm` \
+		`use_enable X video-x11` \
+		`use_enable dga` \
+		`use_enable xv video-x11-xv` \
+		`use_enable xinerama video-x11-xinerama` \
+		`use_enable dga video-dga` \
+		`use_enable fbcon video-fbcon` \
+		`use_enable directfb video-directfb` \
+		`use_enable ggi video-ggi` \
+		`use_enable svga video-svga` \
+		`use_enable aalib video-aalib` \
+		`use_enable opengl video-opengl` \
+		${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	preplib
+	dosed "s:-pthread::g" /usr/lib/libSDL.la # Bug 34804
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+	dohtml -r ./
+}