old

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 7 insertions, 292 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index c474333c961c..63cd199561f3 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.5 2013/10/25 16:03:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.6 2013/10/26 18:18:43 mr_bones_ Exp $
+
+  26 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/libsdl2-2.0.0-static-libs.patch, -files/libsdl2-2.0.0-threads.patch,
+  -libsdl2-2.0.0.ebuild:
+  old
 
 *libsdl2-2.0.1 (25 Oct 2013)
 
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index a53de739b20f..a2b365ebbf95 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,9 +1,5 @@
-AUX libsdl2-2.0.0-static-libs.patch 4131 SHA256 2fb31d757c5cabc7a8f4f017bfc0ac077e1546ac121bdf27d502c6481a492681 SHA512 9cf64da2f0b5112004c0e0a7fe01e0d87cc3700b5adb09fd7952ae7a40533ba552eb3d6645e517ce3dd28361db6086731c70014ee66ee9fb3a5d1984ee221bfe WHIRLPOOL ed66a0f0791f0c51cfd1fb991d016f2c287c32e0cabf5ecfc633f9fc45b9872939b408b6ea2b748b4b894db875a5fe7652c613df28e4f2e0e05d9cb88258c799
-AUX libsdl2-2.0.0-threads.patch 1609 SHA256 f379861e7d9a734dd35836c1a43517d99004b5f5b1fb710c554f6339d4f79062 SHA512 d572767908be221135ca603358242651521f857eff5c891c54addcb120867a950020898e8bfc2e2668e679bd4d9b6f20619da754c1957570de44583501775376 WHIRLPOOL a168e52b4dd2d26406f74f01bd2f0c9201cd1edf18a7410d408c49c3faa12808e01147e64ff6e7331a8e4e8e90f90a497a78d44f82650da3e8ce9af6674837ef
 AUX libsdl2-2.0.1-static-libs.patch 4131 SHA256 2fb31d757c5cabc7a8f4f017bfc0ac077e1546ac121bdf27d502c6481a492681 SHA512 9cf64da2f0b5112004c0e0a7fe01e0d87cc3700b5adb09fd7952ae7a40533ba552eb3d6645e517ce3dd28361db6086731c70014ee66ee9fb3a5d1984ee221bfe WHIRLPOOL ed66a0f0791f0c51cfd1fb991d016f2c287c32e0cabf5ecfc633f9fc45b9872939b408b6ea2b748b4b894db875a5fe7652c613df28e4f2e0e05d9cb88258c799
-DIST SDL2-2.0.0.tar.gz 3623960 SHA256 6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178 SHA512 6650ca1afcf2ad172f511adb80d265722c7533b1e614925ef5bcdce1b898b42c261d6ed8188e15e56bab2002f16d16c255bdd984932e347de6252c0ee54a7f53 WHIRLPOOL 38111cb4f47dda36a658b94f8ab9b50c6009926b45e3d55f255d03e2c0f66040a5b8786d44da51fe572a03eb7fa5ac5d8fa5a0933bbc0579ed0e86de1b2a4c12
 DIST SDL2-2.0.1.tar.gz 3660224 SHA256 0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0 SHA512 012125d72b6baa677c4c4d4747a058d7c0e406d84b21712fe538bd8ecfc1d74cbc0569ce25046a766266460c9e040d2f2c62ccc52fd6e371683999c95c314c33 WHIRLPOOL 353d2909e3738b13885b26d57f2d690ac55c4992650dba552b0ba17d35d4b04946828d76b621de69201aed1676be8dc7ce11bb4c72af95b96df0481fc3785084
-EBUILD libsdl2-2.0.0.ebuild 3989 SHA256 7e9c5e7cad3fa00bacfbfbee5fc2ddee185b7046e2b41be1457b48d46704bd9c SHA512 6da883149e70d5264d6e2b6706b306b531e67749adc235505d737ccce3dab98cc03e0087bb863c86d6befb64394392322b436e2ee7bf15564845d0039966d134 WHIRLPOOL b2ea3be7f8085d772096992cb82a2e9c2ecd33ea47e090c0aed7fcf72e1035a59f6e13ab0feb65d9a4d3087ed5e192f55bb66ff1ce6dfb7be34fd96db88bb716
 EBUILD libsdl2-2.0.1.ebuild 3953 SHA256 7c238320608a349f25af252f82380bf617bb35c34bcbf2a5eb946c087b367df7 SHA512 e0e57a55d0b28e789f5603a56c3cc371bf0b15011f1490698f409f9a2d2bdf12f8c4a1e29de9cb04df76a71cdd34d8ff25ea60264a9904a94e817beff5079f1b WHIRLPOOL aa8cd4dd0985055319dd4a7800ecec0b9bc9bb20b05469b9f51d0f37cca9707951ebe7ec55f0fe75a1b0cb6c972bfb66a9695ff7374554d7ce1141fab7e46416
-MISC ChangeLog 1055 SHA256 365385fdf92131ff3b4e551f486e555dd483075072a61ee2a920d9d9576673eb SHA512 eb4c28ae956cfd3fa86b148778e00ce1ae2e7e16399fa33342a25491d8b6da88e4d936759b259f05da8c112ae02694de4fc078cc5706379cf6f8cb93afde4647 WHIRLPOOL 62d260212a2ba91178dcb22d2352b3078716dd7a902bebed5550c0f2ff561dca13200aeff248dfb8158eec54b1de3ada98102df60e4854247e88544154448554
+MISC ChangeLog 1220 SHA256 8448511e03156729a66d8e3515ceeb8caea3f393529cab2de3c356826e4e52a6 SHA512 c7533383feb466474c41b611be3a1590f9c370ada979cacc0d603c748bba32d09569294cdb0f2a9d2f852c2d3e1c013ece0a5dfa822d2cea644392801daee2be WHIRLPOOL 5d60a65dd198c54fe4461c5e17db5b7ccf50fbd082b23697b84df6b5c94bc686d82624d41923d60ece7314932aab4ee736731fdb8ea51e3a6e745f2cf69d9711
 MISC metadata.xml 1532 SHA256 b0de84edcfbcf286934f7adf119917dcd138c0570d78b25286f25b3a2d110da9 SHA512 fe8e84981baee1567e80430a2352feffa03915864b871916c13cfec4fd734c12dd6d9195ed20da26e7985dcd39c55498d1f55ac0a5dd61c2d4100e6e964b5e79 WHIRLPOOL dfda175811d3dc27eadc3e7b61920c6257ad9e062626cd786adaf0a1c52ab283f8814feb85d0121bfd01ce52cab56f587c078b3d20aa1fc954a1986d176bb4aa
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
deleted file mode 100644
index 6d083e050287..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -33,10 +33,10 @@
- OBJECTS = @OBJECTS@
- VERSION_OBJECTS = @VERSION_OBJECTS@
- 
--SDLMAIN_TARGET = libSDL2main.a
-+SDLMAIN_TARGET = libSDL2main.la
- SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
- 
--SDLTEST_TARGET = libSDL2_test.a
-+SDLTEST_TARGET = libSDL2_test.la
- SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
- 
- SRC_DIST = acinclude Android.mk autogen.sh BUGS build-scripts configure configure.in COPYING CREDITS debian include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC WhatsNew Xcode Xcode-iOS
-@@ -122,15 +122,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--	$(AR) cru $@ $(SDLMAIN_OBJECTS)
--	$(RANLIB) $@
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--	$(AR) cru $@ $(SDLTEST_OBJECTS)
--	$(RANLIB) $@
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
-@@ -151,10 +149,8 @@
- install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
- 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
--	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
--	$(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
- install-data:
- 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
- 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
---- a/configure.in
-+++ b/configure.in
-@@ -2659,23 +2659,23 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
--\\$(objects)/\\2.o: \\1/\\2.rc\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
- 	\\$(WINDRES) \\$< \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
--SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
-+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
--\\$(objects)/\\2.o: \\1/\\2.c\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
- SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
--SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
-+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
--\\$(objects)/\\2.o: \\1/\\2.c\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- # Set runtime shared library paths as needed
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
deleted file mode 100644
index 434313fdf0f6..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# Date 1378390526 25200
-# Node ID e928464b98ec679471ea80d0d5fefe8b3406eef1
-# Parent  384d5ba7ee44f4c90ecb5b581113918a66b8371e
-Fixed bug 2076 - OpenGL doesn't work with --disable-threads
-
-stepik-777
-
-Thread local storage is used to store current window and current opengl context. OpenGL worked before this changeset: 7596 (45e5c263c096)
-
---- a/src/thread/SDL_systhread.h
-+++ b/src/thread/SDL_systhread.h
-@@ -26,6 +26,7 @@
- #define _SDL_systhread_h
- 
- #include "SDL_thread.h"
-+#include "SDL_thread_c.h"
- 
- /* This function creates a thread, passing args to SDL_RunThread(),
-    saves a system-dependent thread id in thread->id, and returns 0
---- a/src/thread/SDL_thread.c
-+++ b/src/thread/SDL_thread.c
-@@ -125,6 +125,7 @@
-     SDL_TLSEntry *entry;
-     SDL_TLSData *storage = NULL;
- 
-+#if !SDL_THREADS_DISABLED
-     if (!SDL_generic_TLS_mutex) {
-         static SDL_SpinLock tls_lock;
-         SDL_AtomicLock(&tls_lock);
-@@ -139,6 +140,7 @@
-         }
-         SDL_AtomicUnlock(&tls_lock);
-     }
-+#endif /* SDL_THREADS_DISABLED */
- 
-     SDL_MemoryBarrierAcquire();
-     SDL_LockMutex(SDL_generic_TLS_mutex);
-@@ -148,7 +150,9 @@
-             break;
-         }
-     }
-+#if !SDL_THREADS_DISABLED
-     SDL_UnlockMutex(SDL_generic_TLS_mutex);
-+#endif
- 
-     return storage;
- }
---- a/src/thread/SDL_thread_c.h
-+++ b/src/thread/SDL_thread_c.h
-@@ -23,6 +23,8 @@
- #ifndef _SDL_thread_c_h
- #define _SDL_thread_c_h
- 
-+#include "SDL_thread.h"
-+
- /* Need the definitions of SYS_ThreadHandle */
- #if SDL_THREADS_DISABLED
- #include "generic/SDL_systhread_c.h"
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.ebuild b/media-libs/libsdl2/libsdl2-2.0.0.ebuild
deleted file mode 100644
index 496a8a42cb23..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.0.ebuild,v 1.3 2013/09/05 18:46:48 hasufell Exp $
-
-EAPI=5
-inherit autotools flag-o-matic toolchain-funcs eutils
-
-MY_P=SDL2-${PV}
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
-REQUIRED_USE="
-	alsa? ( audio )
-	fusionsound? ( audio )
-	gles? ( video )
-	nas? ( audio )
-	opengl? ( video )
-	pulseaudio? ( audio )
-	xinerama? ( X )
-	xscreensaver? ( X )"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	directfb? ( >=dev-libs/DirectFB-1.0.0 )
-	fusionsound? ( >=media-libs/FusionSound-1.1.1 )
-	gles? ( media-libs/mesa[gles2] )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl virtual/glu )
-	pulseaudio? ( media-sound/pulseaudio )
-	tslib? ( x11-libs/tslib )
-	udev? ( virtual/udev )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXt
-		x11-libs/libXxf86vm
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	epatch "${FILESDIR}"/${P}-static-libs.patch \
-		"${FILESDIR}"/${P}-threads.patch
-	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-
-	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
-
-	# sorted by `./configure --help`
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable audio) \
-		$(use_enable video) \
-		--enable-render \
-		--enable-events \
-		$(use_enable joystick) \
-		$(use_enable haptic) \
-		--enable-power \
-		$(use_enable threads) \
-		--enable-timers \
-		--enable-file \
-		--disable-loadso \
-		--enable-cpuinfo \
-		--enable-atomic \
-		--enable-assembly \
-		$(use_enable sse ssemath) \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
-		$(use_enable altivec) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		--disable-alsa-shared \
-		--disable-esd \
-		$(use_enable pulseaudio) \
-		--disable-pulseaudio-shared \
-		--disable-arts \
-		$(use_enable nas) \
-		--disable-nas-shared \
-		--disable-sndio \
-		--disable-sndio-shared \
-		$(use_enable audio diskaudio) \
-		$(use_enable audio dummyaudio) \
-		$(use_enable X video-x11) \
-		--disable-x11-shared \
-		$(use_enable X video-x11-xcursor) \
-		$(use_enable xinerama video-x11-xinerama) \
-		$(use_enable X video-x11-xinput) \
-		$(use_enable X video-x11-xrandr) \
-		$(use_enable xscreensaver video-x11-scrnsaver) \
-		$(use_enable X video-x11-xshape) \
-		$(use_enable X video-x11-vm) \
-		--disable-video-cocoa \
-		${directfbconf} \
-		--disable-directfb-shared \
-		$(use_enable fusionsound) \
-		--disable-fusionsound-shared \
-		$(use_enable video video-dummy) \
-		$(use_enable opengl video-opengl) \
-		$(use_enable gles video-opengles) \
-		$(use_enable udev libudev) \
-		$(use_enable dbus) \
-		$(use_enable tslib input-tslib) \
-		--disable-directx \
-		--disable-rpath \
-		--disable-render-d3d \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use static-libs || prune_libtool_files
-	dodoc {BUGS,CREDITS,README,README-SDL,README-hg,TODO,WhatsNew}.txt
-}