version bump

(Portage version: 2.1.10.41/cvs/Linux i686)

7 files changed, 181 insertions, 11 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 8dbb9bc88031..bdc77125ec17 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libsdl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.178 2011/05/22 23:59:29 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.179 2012/01/22 20:07:37 mr_bones_ Exp $
+
+*libsdl-1.2.15 (22 Jan 2012)
+
+  22 Jan 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  files/libsdl-1.2.13-cld.patch, files/libsdl-1.2.14-click.patch,
+  files/libsdl-1.2.14-glibc213.patch, files/libsdl-1.2.14-joystick.patch,
+  +libsdl-1.2.15.ebuild, +files/libsdl-1.2.15-sdl-config.patch:
+  version bump
 
   22 May 2011; Joseph Jezak <josejx@gentoo.org> libsdl-1.2.14-r6.ebuild:
   Marked ppc/ppc64 stable for bug #362005.
diff --git a/media-libs/libsdl/files/libsdl-1.2.13-cld.patch b/media-libs/libsdl/files/libsdl-1.2.13-cld.patch
index 4e0b9a08446f..f91f63bbf052 100644
--- a/media-libs/libsdl/files/libsdl-1.2.13-cld.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.13-cld.patch
@@ -2,8 +2,8 @@ fix from upstream for the cld issue on x86
 
 http://bugs.gentoo.org/217097
 
---- include/SDL_stdinc.h	(revision 3535)
-+++ include/SDL_stdinc.h	(revision 3536)
+--- include/SDL_stdinc.h
++++ include/SDL_stdinc.h
 @@ -373,6 +373,7 @@ do {							\
  	__asm__ __volatile__ (				\
  		"std\n\t"				\
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
index 1fe0241e9364..f6e048b2cf6b 100644
--- a/media-libs/libsdl/files/libsdl-1.2.14-click.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
@@ -1,5 +1,5 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c	2009-10-12 16:07:15.000000000 -0700
-+++ SDL-1.2/src/video/x11/SDL_x11events.c	2010-07-19 23:57:48.365397095 -0700
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c
++++ SDL-1.2/src/video/x11/SDL_x11events.c
 @@ -441,8 +441,10 @@
  if ( xevent.xcrossing.mode == NotifyUngrab )
  printf("Mode: NotifyUngrab\n");
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch
index ab695f9b4616..364f69d02f5d 100644
--- a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch
@@ -1,6 +1,5 @@
-diff -r 6bb01861c4c0 src/video/SDL_blit.c
---- a/src/video/SDL_blit.c	Wed Feb 16 04:49:07 2011 -0800
-+++ b/src/video/SDL_blit.c	Wed Feb 16 22:51:23 2011 +0100
+--- a/src/video/SDL_blit.c
++++ b/src/video/SDL_blit.c
 @@ -214,7 +214,7 @@
  	dstskip = w+info->d_skip;
  	if ( dst < src ) {
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch
index 7f7e7a2e3940..1d699eac5019 100644
--- a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch
@@ -1,5 +1,5 @@
---- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2009-10-18 13:54:40.000000000 -0400
-+++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c	2010-08-15 22:28:19.000000000 -0400
+--- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c
++++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c
 @@ -700,26 +700,26 @@
  				continue;
  			}
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
new file mode 100644
index 000000000000..f430428e6e90
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
@@ -0,0 +1,20 @@
+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
+@@ -44,7 +44,12 @@
+       echo -I@includedir@/SDL @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@      if test x"${prefix}" != x"/usr" ; then
++@ENABLE_SHARED_TRUE@          libdirs="-L@libdir@"
++@ENABLE_SHARED_TRUE@      else
++@ENABLE_SHARED_TRUE@          libdirs=""
++@ENABLE_SHARED_TRUE@      fi
++@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
diff --git a/media-libs/libsdl/libsdl-1.2.15.ebuild b/media-libs/libsdl/libsdl-1.2.15.ebuild
new file mode 100644
index 000000000000..b9615686e984
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15.ebuild,v 1.1 2012/01/22 20:07:37 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic multilib 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.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# WARNING:
+# If you turn on the custom-cflags use flag in USE and something breaks,
+# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
+IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+
+RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+	alsa? ( media-libs/alsa-lib )
+	nas? (
+		media-libs/nas
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+	)
+	X? (
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+	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 virtual/glu )
+	ppc64? ( ps3? ( sys-libs/libspe2 ) )
+	tslib? ( x11-libs/tslib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	nas? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
+
+S=${WORKDIR}/SDL-${PV}
+
+pkg_setup() {
+	if use custom-cflags ; 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 custom-cflags use flag in USE."
+		epause 10
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sdl-config.patch
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=
+	if [[ $(tc-arch) != "x86" ]] ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use audio || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || 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-rpath \
+		--disable-arts \
+		--disable-esd \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		--disable-alsa-shared \
+		--disable-esd-shared \
+		--disable-pulseaudio-shared \
+		--disable-arts-shared \
+		--disable-nas-shared \
+		--disable-osmesa-shared \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		$(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_enable ps3 video-ps3) \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
+	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
+	dohtml -r ./
+}