commit: 8092bac2a7300bb3a8f0918b0e8e6d08a707a556 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Jul 26 11:35:09 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Jul 26 11:35:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8092bac2
media-libs/libsdl2: Removed old. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-libs/libsdl2/Manifest | 1 - .../files/libsdl2-2.0.8-rework-variables.patch | 68 -------- .../files/libsdl2-2.0.8-wayland-headers.patch | 21 --- media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild | 181 --------------------- 4 files changed, 271 deletions(-) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index e75ffdfd92e..fafaf0238e8 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,3 +1,2 @@ DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 -DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 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 9fc43f2b38c..00000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch +++ /dev/null @@ -1,68 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga <[email protected]> -# 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 95dd1730481..00000000000 --- 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.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild deleted file mode 100644 index 27ba581990a..00000000000 --- 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 -}
