Version bump to fix #135101.

(Portage version: 2.1.1_pre1-r2)

3 files changed, 169 insertions, 1 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index eca3bc223e3f..c3694bb01d93 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.104 2006/06/08 09:42:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.105 2006/06/27 07:05:07 vapier Exp $
+
+*libsdl-1.2.11 (27 Jun 2006)
+
+  27 Jun 2006; Mike Frysinger <vapier@gentoo.org> +libsdl-1.2.11.ebuild:
+  Version bump to fix #135101.
 
   08 Jun 2006; Mike Frysinger <vapier@gentoo.org> libsdl-1.2.10.ebuild:
   Make sure yasm doesnt generate exec stacks #134632 by Martin Wegner.
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.11 b/media-libs/libsdl/files/digest-libsdl-1.2.11
new file mode 100644
index 000000000000..0c18548c73c0
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.11
@@ -0,0 +1,3 @@
+MD5 dbe82ff408bccfd6992b4cf162538595 SDL-1.2.11.tar.gz 2796143
+RMD160 1ea73d45dcecde9df8e4b5c18e7cbcaedb1e4c59 SDL-1.2.11.tar.gz 2796143
+SHA256 c3f0e9b016368601697495dcdaed010ab0ee4b541d0052910f829ce318d90a2b SDL-1.2.11.tar.gz 2796143
diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild
new file mode 100644
index 000000000000..f1fa6bdab04c
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.11.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.1 2006/06/27 07:05:08 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils libtool
+
+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="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# WARNING:
+# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# in USE and something breaks, you pick up the pieces.  Be prepared for
+# bug reports to be marked INVALID.
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
+
+RDEPEND="!noaudio? ( >=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
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	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 )
+	libcaca? ( >=media-libs/libcaca-0.9-r1 )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	nas? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
+	X? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 ) )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/SDL-${PV}
+
+pkg_setup() {
+	if use noaudio || use novideo || use nojoystick ; then
+		ewarn "Since you've chosen to turn off some of libsdl's functionality,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the no* flags in USE.  You need to know what"
+		ewarn "you're doing to selectively turn off parts of libsdl."
+		epause 30
+	fi
+	if use noflagstrip ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the noflagstrip use flag in USE."
+		epause 10
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/libsdl-1.2.10-libcaca.patch #40224
+	epatch "${FILESDIR}"/libsdl-1.2.10-sdl-config.patch
+
+	# add yasm-compatible defines to nasm code (hopefully we
+	# can get this killed soonish)
+	local f
+	for f in "${S}"/src/hermes/*.asm ; do
+		cat <<-EOF >> "${f}"
+		%ifidn __YASM_OBJFMT__,elf
+		section ".note.GNU-stack" noalloc noexec nowrite progbits
+		%endif
+		EOF
+	done
+
+	./autogen.sh || die "autogen failed"
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=
+	if [[ $(tc-arch) != "x86" ]] ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} $(use_enable x86 nasm)"
+	fi
+	use noflagstrip || strip-flags
+	use noaudio && myconf="${myconf} --disable-audio"
+	use novideo \
+		&& myconf="${myconf} --disable-video" \
+		|| myconf="${myconf} --enable-video-dummy"
+	use nojoystick && myconf="${myconf} --disable-joystick"
+
+	local directfbconf="--disable-video-directfb"
+	if use directfb ; then
+		# since DirectFB can link against SDL and trigger a
+		# dependency loop, only link against DirectFB if it
+		# isn't broken #61592
+		echo 'int main(){}' > directfb-test.c
+		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+			&& directfbconf="--enable-video-directfb" \
+			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
+	fi
+
+	myconf="${myconf} ${directfbconf}"
+
+	econf \
+		--disable-dependency-tracking \
+		--disable-rpath \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		--enable-cpuinfo \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable esd) \
+		$(use_enable arts) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		$(use_enable ggi video-ggi) \
+		$(use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		$(use_with X x) \
+		--disable-video-x11-xme \
+		${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+	dohtml -r ./
+}