From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- media-libs/libsdl2/Manifest | 7 +- .../libsdl2/files/libsdl2-2.0.10-static-libs.patch | 44 +++++ .../files/libsdl2-2.0.8-rework-variables.patch | 68 -------- .../files/libsdl2-2.0.8-wayland-headers.patch | 21 --- media-libs/libsdl2/libsdl2-2.0.10.ebuild | 189 +++++++++++++++++++++ media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild | 181 -------------------- 6 files changed, 236 insertions(+), 274 deletions(-) create mode 100644 media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch delete mode 100644 media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch delete mode 100644 media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch create mode 100644 media-libs/libsdl2/libsdl2-2.0.10.ebuild delete mode 100644 media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild (limited to 'media-libs/libsdl2') diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 02d122ac4a2a..54ca5bb449d3 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,8 +1,7 @@ +AUX libsdl2-2.0.10-static-libs.patch 2388 BLAKE2B 84d6a6fe3a2630ca899aa01c6d16bfa5f43fdd82281e8022db62c30bfed671298f9011bbf2bbb59d6613dd9fe6e118ec71cb98b9d976c96c5d046fea46156d15 SHA512 bab5b6788b1f09f60a2686ce385496b31b6dcc4c5d76fb8abaeb5f2eb4d2fc6cdada8295e555c1f1527a70465452b0263ea54a0eea5f626f3faa266049b25119 AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25eb0eb3436478c1dddb4165c14d543793e2c378401f7b371976ffea38d6c3ceba4c4e4bfe415c0cfc4d07e62f2ec18dfc3f SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0 -AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81 -AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd71b58fb53ff6e5efce8486e5009d05babff6fd5ee46e46bcea7386555bec0078d894fe81e211844fd6a366c855e2d72799932 SHA512 fdb54d6a8ee1fa1596dad2cf16cb389038167e4ccea123f68e54bd096600e90d86de254667c7dfc46f80ca62edae9f0f47fb3307c72bce5c142afb146870a9b1 -DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 +DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 -EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040 +EBUILD libsdl2-2.0.10.ebuild 5324 BLAKE2B 68386a905f34fa505d6c15e5798b1f2ec12cfb75582640541c2bd6d9740ef7e0c093c63c3df37c413099026f6f0164cd0d0deee886bd64325f7f93eed8f35860 SHA512 c8be24393a12507764a0d8f9b4b0c39e081a2d42b4270828af90244c8268ce59a0e7a3d23287b3bb66dd90bd7d0c8a4600507305e9a38e2d3ec12576ee09d508 EBUILD libsdl2-2.0.9.ebuild 5397 BLAKE2B 25db64fa1f24e9e6c097a3dead86ac350afa31712ed6c87bae67b4b30584dc96fbe65c4edca029dc0dcbea510259bcdb4896fbef577b5a951e4455da85bdf759 SHA512 76f69076eaa39510c84284cbedf19614c681eb0708bc98f324155211ca806927232bad73613fa06fd2a5569a503349872707fa5f83b1410f54ec10fc799b00ea MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch new file mode 100644 index 000000000000..0b01568af6ad --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch @@ -0,0 +1,44 @@ +--- SDL2-2.0.10/configure.ac ++++ SDL2-2.0.10/configure.ac +@@ -3648,7 +3648,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 -lsetupapi -lversion $LIBUUID -static-libgcc" + # The Windows platform requires special setup +@@ -4069,10 +4069,10 @@ + + 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` +--- SDL2-2.0.10/Makefile.in ++++ SDL2-2.0.10/Makefile.in +@@ -147,13 +147,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): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_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_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) ++ $(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_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) ++ $(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: diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch deleted file mode 100644 index 9fc43f2b38cf..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch +++ /dev/null @@ -1,68 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga -# Date 1524545759 25200 -# Node ID 28be2719184c8177899d96b696bcf5e28451266f -# Parent 2a7839691e3d88c0480c4a855126d5fa03f9ff6a -Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc - - Azamat H. Hackimov - -When you try use SDL2 2.0.8 in CMake project in Linux, it complains about trailing spaces in sdl2.pc: - -CMake Error at CMakeLists.txt:147 (add_executable): - Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has - leading or trailing whitespace. This is now an error according to policy - CMP0004. - -diff -r 2a7839691e3d -r 28be2719184c configure ---- a/configure Mon Apr 23 21:50:03 2018 -0700 -+++ b/configure Mon Apr 23 21:55:59 2018 -0700 -@@ -15752,10 +15752,17 @@ - # fi - #done - SDL_CFLAGS="$BASE_CFLAGS" --SDL_LIBS="-lSDL2 $BASE_LDFLAGS" --CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" --CFLAGS="$CFLAGS $EXTRA_CFLAGS" --LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+SDL_LIBS="-lSDL2" -+if "$BASE_LDFLAGS" != "" ; then -+ SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" -+fi -+if "$EXTRA_CFLAGS" != "" ; then -+ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -+ CFLAGS="$CFLAGS $EXTRA_CFLAGS" -+fi -+if "$EXTRA_LDFLAGS" != "" ; then -+ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+fi - - base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` - -diff -r 2a7839691e3d -r 28be2719184c configure.in ---- a/configure.in Mon Apr 23 21:50:03 2018 -0700 -+++ b/configure.in Mon Apr 23 21:55:59 2018 -0700 -@@ -123,10 +123,17 @@ - # fi - #done - SDL_CFLAGS="$BASE_CFLAGS" --SDL_LIBS="-lSDL2 $BASE_LDFLAGS" --CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" --CFLAGS="$CFLAGS $EXTRA_CFLAGS" --LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+SDL_LIBS="-lSDL2" -+if [ "$BASE_LDFLAGS" != "" ]; then -+ SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS" -+fi -+if [ "$EXTRA_CFLAGS" != "" ]; then -+ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS" -+ CFLAGS="$CFLAGS $EXTRA_CFLAGS" -+fi -+if [ "$EXTRA_LDFLAGS" != "" ]; then -+ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" -+fi - - dnl set this to use on systems that use lib64 instead of lib - base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` - diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch deleted file mode 100644 index 95dd17304810..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/configure.in b/configure.in ---- a/configure.in 2018-03-01 16:34:41.000000000 +0000 -+++ b/configure.in 2018-09-21 21:02:34.823834390 +0100 -@@ -1411,7 +1411,8 @@ - - WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1 xdg-shell-unstable-v6" - -- SOURCES="$SOURCES $srcdir/src/video/wayland/*.c" -+ WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c" -+ SOURCES="$SOURCES $WAYLAND_SOURCES" - EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)" - AC_ARG_ENABLE(wayland-shared, - AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[default=maybe]]]), -@@ -4003,6 +4004,7 @@ - $WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS - $WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS - $WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE -+`echo ; for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in $WAYLAND_PROTOCOLS_UNSTABLE ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; done ; echo ; done ; echo` - " - fi - diff --git a/media-libs/libsdl2/libsdl2-2.0.10.ebuild b/media-libs/libsdl2/libsdl2-2.0.10.ebuild new file mode 100644 index 000000000000..20b9115c6f4f --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.10.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" +REQUIRED_USE=" + alsa? ( sound ) + gles? ( video ) + nas? ( sound ) + opengl? ( video ) + pulseaudio? ( sound ) + vulkan? ( video ) + wayland? ( gles ) + xinerama? ( X ) + xscreensaver? ( X )" + +CDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) + kms? ( + >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] + >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm] + ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) + nas? ( + >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.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/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}] ) + )" +RDEPEND="${CDEPEND} + vulkan? ( media-libs/vulkan-loader )" +DEPEND="${CDEPEND} + vulkan? ( dev-util/vulkan-headers ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + virtual/pkgconfig +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/SDL2/SDL_config.h + /usr/include/SDL2/SDL_platform.h + /usr/include/SDL2/begin_code.h + /usr/include/SDL2/close_code.h +) + +PATCHES=( + # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 + "${FILESDIR}"/${PN}-2.0.10-static-libs.patch +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Unbundle some headers. + rm -rv src/video/khronos || die + ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die + + AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf +} + +multilib_src_configure() { + use custom-cflags || strip-flags + + # sorted by `./configure --help` + local myeconfargs=( + $(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 + --enable-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 libsamplerate) + $(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 + $(use_enable video_cards_vc4 video-rpi) + $(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) + $(use_enable aqua video-cocoa) + --disable-video-directfb + --disable-fusionsound + --disable-fusionsound-shared + $(use_enable kms video-kmsdrm) + --disable-kmsdrm-shared + $(use_enable video video-dummy) + $(use_enable opengl video-opengl) + --disable-video-opengles1 + $(use_enable gles video-opengles2) + $(use_enable vulkan video-vulkan) + $(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) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 +} + +multilib_src_install() { + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + if ! use static-libs ; then + find "${ED}" -type f -name "*.a" -delete || die + fi + dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md +} diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild deleted file mode 100644 index 27ba581990ae..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic ltprune toolchain-funcs 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 ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86" - -IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( 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}] ) - gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - kms? ( - >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.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/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" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - "${FILESDIR}"/${PN}-2.0.6-static-libs.patch - # https://bugzilla.libsdl.org/show_bug.cgi?id=4144 - "${FILESDIR}"/${P}-rework-variables.patch - # https://bugzilla.libsdl.org/show_bug.cgi?id=3977 - "${FILESDIR}"/${P}-wayland-headers.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - 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` - local myeconfargs=( - $(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 - $(use_enable kernel_Winnt 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 libsamplerate) - $(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 video_cards_vc4 video-rpi) - $(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) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - --disable-video-opengles1 - $(use_enable gles video-opengles2) - --disable-video-vulkan - $(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) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -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 -} -- cgit v1.2.3