commit:     7b7033606de2112e760d22c4215481a5b03b18eb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 19:39:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 19:39:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b703360

media-libs/libsdl2: Drop 2.0.4

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 media-libs/libsdl2/Manifest                        |   1 -
 .../libsdl2/files/libsdl2-2.0.4-static-libs.patch  |  89 ------------
 media-libs/libsdl2/libsdl2-2.0.4.ebuild            | 150 ---------------------
 media-libs/libsdl2/metadata.xml                    |   1 -
 4 files changed, 241 deletions(-)

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 6f3ef4735ad..7007e6ba1a7 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 
374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7
 SHA512 
dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B 
f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1
 SHA512 
673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
deleted file mode 100644
index bee2fd580aa..00000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- SDL2-2.0.4.orig/configure.in
-+++ SDL2-2.0.4/configure.in
-@@ -3114,7 +3114,7 @@
-         if test -f /lib/w32api/libuuid.a; then
-             LIBUUID=/lib/w32api/libuuid.a
-         else
--            LIBUUID=-luuid
-+            LIBUUID=-Wl,-luuid
-         fi
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 
-lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
-         # The Windows platform requires special setup
-@@ -3464,23 +3464,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\\\\
--      \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
-+      \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,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\\\\
-       \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --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\\\\
-       \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) 
\\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- # Set runtime shared library paths as needed
---- SDL2-2.0.4.orig/Makefile.in
-+++ SDL2-2.0.4/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 = *.txt acinclude Android.mk autogen.sh android-project 
build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs 
include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in 
SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
-@@ -138,15 +138,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)
--      $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) 
$(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+      $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--      $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS)
--      $(RUN_CMD_RANLIB)$(RANLIB) $@
-+      $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--      $(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS)
--      $(RUN_CMD_RANLIB)$(RANLIB) $@
-+      $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ 
$^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
-@@ -167,10 +165,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

diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
deleted file mode 100644
index e3a0c12691c..00000000000
--- a/media-libs/libsdl2/libsdl2-2.0.4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: convert FusionSound #484250
-
-EAPI=5
-inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal
-
-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="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
-
-IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles 
haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound 
cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video 
wayland X xinerama xscreensaver"
-REQUIRED_USE="
-       alsa? ( sound )
-       fusionsound? ( sound )
-       gles? ( video )
-       nas? ( sound )
-       opengl? ( video )
-       pulseaudio? ( sound )
-       wayland? ( gles )
-       xinerama? ( X )
-       xscreensaver? ( X )"
-
-RDEPEND="
-       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-       fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-       gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-       nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-       opengl? (
-               >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-               >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-       )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
-       udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-       wayland? (
-               >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
-               >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
-               >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-       )
-       X? (
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-               >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-               xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-               xscreensaver? ( 
>=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-       )"
-DEPEND="${RDEPEND}
-       X? ( x11-base/xorg-proto )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-       # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-       epatch "${FILESDIR}"/${P}-static-libs.patch
-       sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-       mv configure.{in,ac} || die
-       AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
-       use custom-cflags || strip-flags
-
-       # sorted by `./configure --help`
-       ECONF_SOURCE="${S}" econf \
-               $(use_enable static-libs static) \
-               --enable-atomic \
-               $(use_enable sound audio) \
-               $(use_enable video) \
-               --enable-render \
-               --enable-events \
-               $(use_enable joystick) \
-               $(use_enable haptic) \
-               --enable-power \
-               --enable-filesystem \
-               $(use_enable threads) \
-               --enable-timers \
-               --enable-file \
-               --disable-loadso \
-               --enable-cpuinfo \
-               --enable-assembly \
-               $(use_enable cpu_flags_x86_sse ssemath) \
-               $(use_enable cpu_flags_x86_mmx mmx) \
-               $(use_enable cpu_flags_x86_3dnow 3dnow) \
-               $(use_enable cpu_flags_x86_sse sse) \
-               $(use_enable cpu_flags_x86_sse2 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 sound diskaudio) \
-               $(use_enable sound dummyaudio) \
-               $(use_enable wayland video-wayland) \
-               --disable-wayland-shared \
-               --disable-video-mir \
-               $(use_enable X video-x11) \
-               --disable-x11-shared \
-               $(use_enable X video-x11-xcursor) \
-               $(use_enable X video-x11-xdbe) \
-               $(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 \
-               --disable-video-directfb \
-               $(multilib_native_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) \
-               --disable-ibus \
-               $(use_enable tslib input-tslib) \
-               --disable-directx \
-               --disable-rpath \
-               --disable-render-d3d \
-               $(use_with X x)
-}
-
-multilib_src_install() {
-       emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-       prune_libtool_files
-       dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}

diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index f10ebbd6297..66484c6e18e 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -24,7 +24,6 @@
                Perl, PHP, Pike, Python, and Ruby.
        </longdescription>
        <use>
-               <flag name="fusionsound">use FusionSound audio driver</flag>
                <flag name="gles">include OpenGL ES support</flag>
                <flag name="haptic">Enable the haptic (force feedback) 
subsystem</flag>
                <flag name="joystick">Control joystick support (disable at your 
own risk)</flag>

Reply via email to