commit: c60a7d0ea97747eb40d4e53d4ee369ac7f8389c0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 10 10:42:35 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 10 13:31:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60a7d0e
media-libs/libsdl: drop 1.2.15_p20221201, 1.2.64, 1.2.64_p20230726 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/libsdl/Manifest | 3 - media-libs/libsdl/files/libsdl-1.2.15-gamma.patch | 42 ------ .../libsdl/files/libsdl-1.2.15-sdl-config.patch | 20 --- media-libs/libsdl/libsdl-1.2.15_p20221201.ebuild | 166 --------------------- media-libs/libsdl/libsdl-1.2.64.ebuild | 40 ----- media-libs/libsdl/libsdl-1.2.64_p20230726.ebuild | 45 ------ media-libs/libsdl/metadata.xml | 1 - 7 files changed, 317 deletions(-) diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index e60a4ed8bb39..3bc75be0f4a0 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,4 +1 @@ -DIST SDL-1.2.15_p20221201.tar.gz 4002787 BLAKE2B 87b729cb16cfb36efa2b66166ef21d4c5c8bc99f8c8b4683885f04699122945a60512c5875d0c8425ddfe33b2eb901d11f27afbd9e3656cde3f30de5a5f1537c SHA512 5e70977cf5beaffebb28ae84f778e08d3cf56b2badda125ec1f08ac26c6b4e60a148d9ca9b2d7efee8a5fbc0b1a343d1d27a05be1c08e5d9251da67aea209659 -DIST libsdl-1.2.64.tar.gz 459020 BLAKE2B 72e13e14c134116edc73a9127a854700f0c878b3a56ae0ed5c70a3e227fcd46411ebb25bdf0ebfe76c1c648ac6052161e3eae11ebdee8ffbddb5cf70e9b01da3 SHA512 cd551666d2e6a2de273ee29b9a68a5472933a5f5a6340616510051e78f0a96af68a2f13f4473431d6b58ad89a379d672b3a3e82bc86ded01943b6bc3ca7947d2 -DIST libsdl-1.2.64_p20230726.tar.gz 459365 BLAKE2B d669e46cb6f1f2ac4869d438d0a045019f8b5132c9e4a34b0945a83514fadb4e7c52954657ff3d9a149c3e052b88c77b740920171654add31d65806a361debfa SHA512 4cb41fb455ea7bfe7768f88715064fa5e092e6e24cdc7e0786f91693f21425a53fb3ba355100db5984d5ca969916f22738b7abd5cb58b87b43a154098979ee2d DIST libsdl-1.2.68.tar.gz 460180 BLAKE2B c821772d5c43a9406e06f89d7f0248e051b2cfb0aff33e025dc645d6ba17277ca6db44a586e65fda48155dfb6c48a9d0459d59319ea6750562caa96194ff232b SHA512 d0e71e75f312402bf075f6553d9fd6493a3db9dd42719bb753287a35e6c40ee37c6092b157ff2384f3055400a3113645595d1269590cd50ea1e0c8f247240858 diff --git a/media-libs/libsdl/files/libsdl-1.2.15-gamma.patch b/media-libs/libsdl/files/libsdl-1.2.15-gamma.patch deleted file mode 100644 index a0582da9cecd..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-gamma.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4b56fa058a45b7c804d1a5fcaf7a70db0bd0581c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> -Date: Tue, 1 Jan 2013 21:25:15 +0100 -Subject: [PATCH] x11: Bypass SetGammaRamp when changing gamma - -Recent Xorg has broken dynamic colors setting, so calling SDL_SetGamme() -does not have any effect here. Recent means xorg-server >= 1.7, since 2010. -See <https://bugs.freedesktop.org/show_bug.cgi?id=27222>. ---- - src/video/SDL_gamma.c | 15 ++------------- - 1 files changed, 2 insertions(+), 13 deletions(-) - ---- a/src/video/SDL_gamma.c -+++ b/src/video/SDL_gamma.c -@@ -92,22 +92,11 @@ static void CalculateGammaFromRamp(float *gamma, Uint16 *ramp) - - int SDL_SetGamma(float red, float green, float blue) - { -- int succeeded; -+ int succeeded = -1; - SDL_VideoDevice *video = current_video; - SDL_VideoDevice *this = current_video; - -- succeeded = -1; -- /* Prefer using SetGammaRamp(), as it's more flexible */ -- { -- Uint16 ramp[3][256]; -- -- CalculateGammaRamp(red, ramp[0]); -- CalculateGammaRamp(green, ramp[1]); -- CalculateGammaRamp(blue, ramp[2]); -- succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]); -- } -- if ( (succeeded < 0) && video->SetGamma ) { -- SDL_ClearError(); -+ if ( video->SetGamma ) { - succeeded = video->SetGamma(this, red, green, blue); - } - return succeeded; --- -1.7.8.6 - 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 deleted file mode 100644 index 457c934b6c40..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -Only output -L -rpath cruft if using a non-standard install location. - -Makes ABI / cross-compiling easier on the soul. - ---- a/sdl-config.in -+++ b/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_p20221201.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20221201.ebuild deleted file mode 100644 index 1bc6f7deb667..000000000000 --- a/media-libs/libsdl/libsdl-1.2.15_p20221201.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -MY_COMMIT="ca3acd25348edc9b6e984fc1712fd4d365931dc1" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://libsdl.org/"; -SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SDL-${PV}.tar.gz" -S="${WORKDIR}"/SDL-1.2-${MY_COMMIT} - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -# 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="aalib alsa custom-cflags dga fbcon +joystick libcaca nas opengl oss pulseaudio +sound static-libs tslib +video X xinerama xv" - -RDEPEND=" - aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] ) - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - nas? ( x11-base/xorg-proto ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - pulseaudio? ( virtual/pkgconfig ) - x86? ( - || ( - >=dev-lang/yasm-0.6.0 - >=dev-lang/nasm-0.98.39-r3 - ) - )" - -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." - fi -} - -PATCHES=( - "${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch - "${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch -) - -DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew ) - -HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} ) - -src_prepare() { - default - - if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then - # GCC at least has no idea what -fpascal-strings is - sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die - # We have trouble building against Frameworks with GCC for now (no Blocks support, etc) - # error: unknown type name ‘CGImageSourceAnimationBlock’ - sed -i \ - -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \ - -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \ - configure.ac || die - fi - - AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - local myconf= - - if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then - # We can't build against Cocoa because we lack Blocks + Objective C++ support in - # GCC (for now) - use video && myconf="${myconf} --disable-video-cocoa" - # CD support drags in audio - myconf="${myconf} --disable-cdrom" - else - myconf="${myconf} --enable-cdrom" - fi - - if use !x86 && use !x86-linux ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || strip-flags - use sound || myconf="${myconf} --disable-audio" - use video \ - && myconf="${myconf} --enable-video-dummy" \ - || myconf="${myconf} --disable-video" - use joystick || myconf="${myconf} --disable-joystick" - - ECONF_SOURCE="${S}" econf \ - $(use_enable prefix rpath) \ - --disable-arts \ - --disable-esd \ - --enable-events \ - --enable-threads \ - --enable-timers \ - --enable-file \ - --enable-cpuinfo \ - --disable-alsa-shared \ - --disable-esd-shared \ - --disable-sndio \ - --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) \ - --disable-video-ggi \ - --disable-video-svga \ - $(use_enable aalib video-aalib) \ - $(use_enable libcaca video-caca) \ - $(use_enable opengl video-opengl) \ - --disable-video-ps3 \ - $(use_enable tslib input-tslib) \ - $(use_with X x) \ - $(use_enable static-libs static) \ - --disable-video-x11-xme \ - --disable-video-directfb \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - use static-libs || find "${ED}" -type f -name "*.la" -delete || die - einstalldocs -} diff --git a/media-libs/libsdl/libsdl-1.2.64.ebuild b/media-libs/libsdl/libsdl-1.2.64.ebuild deleted file mode 100644 index f5a8862ee0f3..000000000000 --- a/media-libs/libsdl/libsdl-1.2.64.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="Simple Direct Media Layer 1.2 compatibility wrapper around SDL2" -HOMEPAGE="https://github.com/libsdl-org/sdl12-compat"; -SRC_URI="https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv" - -# IUSE dropped from real SDL1: aalib custom-cflags dga fbcon libcaca nas oss pulseaudio static-libs tslib xinerama xv -IUSE="alsa +joystick opengl +sound test +video X" -REQUIRED_USE="test? ( joystick opengl sound video )" - -# The tests are more like example programs. -RESTRICT="test" - -RDEPEND=" - media-libs/libsdl2[${MULTILIB_USEDEP},alsa=,joystick=,opengl=,sound=,video=,X=] -" - -DEPEND=" - ${RDEPEND} - test? ( virtual/opengl[${MULTILIB_USEDEP}] ) -" - -S="${WORKDIR}/sdl12-compat-release-${PV}" - -src_configure() { - local mycmakeargs=( - -DSDL12TESTS=$(usex test) - ) - - cmake-multilib_src_configure -} diff --git a/media-libs/libsdl/libsdl-1.2.64_p20230726.ebuild b/media-libs/libsdl/libsdl-1.2.64_p20230726.ebuild deleted file mode 100644 index 99fab427c636..000000000000 --- a/media-libs/libsdl/libsdl-1.2.64_p20230726.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="Simple Direct Media Layer 1.2 compatibility wrapper around SDL2" -HOMEPAGE="https://github.com/libsdl-org/sdl12-compat"; -if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="f94a1ec0069266e40843138d0c5dd2fc6d43734c" - SRC_URI="https://github.com/libsdl-org/sdl12-compat/archive/${MY_COMMIT}.tar.gz -> libsdl-${PV}.tar.gz" - S="${WORKDIR}"/sdl12-compat-${MY_COMMIT} -else - SRC_URI="https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/sdl12-compat-release-${PV}" -fi - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv" - -# IUSE dropped from real SDL1: aalib custom-cflags dga fbcon libcaca nas oss pulseaudio static-libs tslib xinerama xv -IUSE="alsa +joystick opengl +sound test +video X" -REQUIRED_USE="test? ( joystick opengl sound video )" - -# The tests are more like example programs. -RESTRICT="test" - -RDEPEND=" - media-libs/libsdl2[${MULTILIB_USEDEP},alsa=,joystick=,opengl=,sound=,video=,X=] -" - -DEPEND=" - ${RDEPEND} - test? ( virtual/opengl[${MULTILIB_USEDEP}] ) -" - -src_configure() { - local mycmakeargs=( - -DSDL12TESTS=$(usex test) - ) - - cmake-multilib_src_configure -} diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml index 121e0e8a44e1..8197bc495339 100644 --- a/media-libs/libsdl/metadata.xml +++ b/media-libs/libsdl/metadata.xml @@ -24,7 +24,6 @@ <use> <flag name="joystick">Control joystick support (disable at your own risk)</flag> <flag name="sound">Control audio support (disable at your own risk)</flag> - <flag name="tslib">Build with tslib support for touchscreen devices</flag> <flag name="video">Control video support (disable at your own risk)</flag> </use> <upstream>
