Fixes BUG #53857. libsdl.so now get's build with >=media-libs/libcaca-0.9-r1.

4 files changed, 143 insertions, 21 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 285c612de193..b1b0f9741f91 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.58 2004/09/20 01:01:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.59 2004/10/01 00:26:46 kugelfang Exp $
+
+*libsdl-1.2.7-r3 30 Sep 2004
+
+  30 Sep 2004;  <> 
+  # INSERT ENTRY HERE
 
   19 Sep 2004; Mike Frysinger <vapier@gentoo.org> libsdl-1.2.7-r2.ebuild:
   Add code to check for broken DirectFB #61592.
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 0ea7770aa559..b76c72c7ae36 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,29 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b3fe2f8543d509b18b450f4f66950da9 ChangeLog 8616
-MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
-MD5 4cdef02cae2d28ec06e6fc752ff24602 libsdl-1.2.7-r1.ebuild 2750
+MD5 d236b6a1b3c3ec16b41267dbd46d8624 ChangeLog 8692
 MD5 725053ce30b454e912aaab60c08caf10 libsdl-1.2.6-r3.ebuild 2854
 MD5 5074715fa2ad4fbd78e35864ff07248a libsdl-1.2.7.ebuild 2486
+MD5 4cdef02cae2d28ec06e6fc752ff24602 libsdl-1.2.7-r1.ebuild 2750
+MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 MD5 43637b135b46643ae7d5748b8bfb4682 libsdl-1.2.7-r2.ebuild 3676
+MD5 e4bdd94bf15dc643ec9c60d2272f12ee libsdl-1.2.7-r3.ebuild 3695
 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
-MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
-MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
-MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
-MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
-MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
+MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7 62
+MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
+MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
+MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
+MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
+MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
 MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196
 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r2 62
-MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWaR3HTu7gpaalycRAmqXAJ9PSPNivZx0Qpm+C3R7TuEXpJ/qHgCg9KJh
-4Im0NzjYHesjoXaijnhuxkI=
-=3Ifk
------END PGP SIGNATURE-----
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.7-r3 b/media-libs/libsdl/files/digest-libsdl-1.2.7-r3
new file mode 100644
index 000000000000..e52820076cbe
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.7-r3
@@ -0,0 +1 @@
+MD5 d29b34b6ba3ed213893fc9d8d35e357a SDL-1.2.7.tar.gz 2470936
diff --git a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
new file mode 100644
index 000000000000..a221e1f894c5
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.1 2004/10/01 00:26:46 kugelfang Exp $
+
+inherit fixheadtails eutils gnuconfig
+
+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 ~ppc64"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca 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? ( 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}
+	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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-nobuggy-X.patch #30089
+	epatch ${FILESDIR}/${PV}-libcaca.patch #40224
+	epatch ${FILESDIR}/${PV}-gcc34.patch #48947
+	epatch ${FILESDIR}/${PV}-joystick2.patch #52833
+	epatch ${FILESDIR}/${PV}-26headers.patch #58192
+
+	ht_fix_file configure.in
+
+	if use nas && ! use X ; then #32447
+		sed -i \
+			-e 's:-laudio:-laudio -L/usr/X11R6/lib:' \
+			configure.in || die "nas sed hack failed"
+	fi
+
+	./autogen.sh || die "autogen failed"
+
+	gnuconfig_update
+}
+
+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"
+
+	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
+		$(gcc-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 \
+		--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 ggi video-ggi) \
+		$(use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	preplib
+	# Bug 34804
+	sed -i \
+		-e "s:-pthread::g" "${D}/usr/lib/libSDL.la" \
+		|| die "sed failed"
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+	dohtml -r ./
+}