Make sure libsdl doesnt link against C++ since we dont need it and cleanup sdl-config output.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 68 insertions, 17 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index b3aeb1e50354..52e052c606b1 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsdl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.84 2005/07/12 05:12:00 geoman Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.85 2005/08/04 03:59:52 vapier Exp $
+
+  04 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.8-no-cxx.patch, +files/libsdl-1.2.8-sdl-config.patch,
+  libsdl-1.2.8-r1.ebuild:
+  Make sure libsdl doesnt link against C++ since we dont need it and cleanup
+  sdl-config output.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> libsdl-1.2.8-r1.ebuild:
   stable on mips
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index d05503d2b2ce..c71c2d4123d1 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 MD5 7f079469132865bdd25780277639f098 libsdl-1.2.7-r3.ebuild 3960
 MD5 cbbab78f5125f834ffb0f83be4957736 libsdl-1.2.6-r3.ebuild 3013
@@ -26,3 +29,10 @@ MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743
 MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598
 MD5 3dc057b41e366788a5537a65a65ded43 files/libsdl-1.2.8-sdl-config.patch 741
 MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC8ZLMgIKl8Uu19MoRAr1kAJ9yjInAUk/SUuEJco94rSTqLtzNmQCfVVCe
+rX7hjXzLpmuNu9+QmgyoZb0=
+=xYp2
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/libsdl-1.2.8-no-cxx.patch b/media-libs/libsdl/files/libsdl-1.2.8-no-cxx.patch
new file mode 100644
index 000000000000..8689a46264a5
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.8-no-cxx.patch
@@ -0,0 +1,23 @@
+A little hack to keep C++ crap out of libsdl.
+
+Problem is that autotools isn't smart enough to realize that libarch.la
+should be linked as C++ only for TARGET_BEOS ... otherwise it should be
+linked as a good old fashioned C library.
+
+Since Gentoo doesn't support BEOS [atm], this hack is acceptable considering
+the gain (no more C++ crap !).
+
+--- src/main/Makefile.am
++++ src/main/Makefile.am
+@@ -33,11 +33,7 @@ libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SR
+ # Build an internal library of any special app setup functions
+ noinst_LTLIBRARIES = libarch.la
+ 
+-if TARGET_BEOS
+-ARCH_SRCS = beos/SDL_BeApp.cc beos/SDL_BeApp.h
+-else
+ ARCH_SRCS = arch.c
+-endif
+ 
+ libarch_la_SOURCES = $(ARCH_SRCS)
+ 
diff --git a/media-libs/libsdl/files/libsdl-1.2.8-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.8-sdl-config.patch
new file mode 100644
index 000000000000..a27f098859ec
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.8-sdl-config.patch
@@ -0,0 +1,19 @@
+Only output -L -rpath cruft if using a non-standard install location.
+
+Makes ABI / cross-compiling easier on the soul.
+
+--- sdl-config.in
++++ sdl-config.in
+@@ -51,7 +51,11 @@
+       #echo $includes -I@includedir@/SDL @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
++@ENABLE_SHARED_TRUE@      if test x"@libdir@" != x"/usr/lib" ; then
++@ENABLE_SHARED_TRUE@          libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
++@ENABLE_SHARED_TRUE@      else
++@ENABLE_SHARED_TRUE@          libdirs=""
++@ENABLE_SHARED_TRUE@      fi
+ @ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index 147d63563b51..45a57d16fec0 100644
--- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.18 2005/07/12 05:12:00 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.19 2005/08/04 03:59:52 vapier Exp $
 
-inherit flag-o-matic toolchain-funcs eutils gnuconfig
+inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Simple Direct Media Layer"
 HOMEPAGE="http://www.libsdl.org/"
@@ -33,7 +33,7 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-S="${WORKDIR}/SDL-${PV}"
+S=${WORKDIR}/SDL-${PV}
 
 pkg_setup() {
 	if use noaudio || use novideo || use nojoystick ; then
@@ -56,8 +56,10 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PV}-nobuggy-X.patch #30089
-	epatch "${FILESDIR}"/${PV}-libcaca.patch #40224
+	epatch "${FILESDIR}"/${P}-libcaca.patch #40224
 	epatch "${FILESDIR}"/${PV}-gcc2.patch #75392
+	epatch "${FILESDIR}"/${P}-sdl-config.patch
+	epatch "${FILESDIR}"/${P}-no-cxx.patch
 
 	# This patch breaks compiling >-O0 on gcc4 ; bug #87809
 	[ "`gcc-major-version`" -lt "4" ] && epatch "${FILESDIR}"/${P}-gcc2.patch.bz2 #86481
@@ -69,24 +71,15 @@ src_unpack() {
 	#build with -O0 to get it done)
 	epatch "${FILESDIR}"/${PV}-gcc4.patch
 
-	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"
 	epunt_cxx
-	gnuconfig_update
 }
 
 src_compile() {
 	local myconf=
-
-	if use amd64 ; then
-		replace-flags -O? -O1 # bug #74608
-	fi
 	if use x86 ; then
+		# silly bundled asm triggers TEXTREL ... maybe someday
+		# i'll fix this properly, but for now hide with USE=pic
 		use pic || myconf="${myconf} $(use_enable x86 nasm)"
 	fi
 	use noflagstrip || strip-flags