gentoo auto-resync : 10:11:2024 - 21:02:06

7 files changed, 1 insertions, 323 deletions

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 8fcf94a03f25..374470440a62 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,11 +1,3 @@
-AUX libsdl-1.2.15-gamma.patch 1339 BLAKE2B 83e0d10fc4396ce992c8f59043e2380921a44dac84d305cd3108dc6989de23aef7f1442b162c8f8392846630c3df6a725bb54cf1ead9d6ce2ffe3bc6df735a38 SHA512 0717e8eea7a9a1bcadb56c4a51023142d57718ccfff4e372faba3e28ce17b3e32caa8a8ffc8054c8b49bab566a44fd46f5eaf97b778ba6ec991d845d4ae464ce
-AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d832d68d611c1cd4fb20fa70b5bee641204a4ff7b51eff47f6a4e94193d1cad2f82bdb64a4d73582c932a3661870e3cb SHA512 95af8c3dac4fdea5bad92c044a311efaae02a46e1c5bfa84dadee7b3fab6b48f4dcf12ca6e581429decb479de21ec6167c59b215fb3a398fb82151aa4c3fb432
-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
-EBUILD libsdl-1.2.15_p20221201.ebuild 4947 BLAKE2B 7311e955a7d7ef98d48ab9ac282e0712d27cff6ac3889561f56a2ba5f5dd132743f247f3e33c9183a71ac09c5aee5221e5359cc568f85a7822421cf457c1f4ad SHA512 07a30cc3d81e8acfab77335923e11221461adac5d95e7167a2b1e45cf8d09b8e2a7653db27c028b03bf20c437bafbe0be80af93d9d1f79f611c8a5ed2cc848b8
-EBUILD libsdl-1.2.64.ebuild 1052 BLAKE2B 6f7270b130b5b1f4563aa968881d08dd8f265eb78339fe98328d0077950b65abfaa70b08a2109607747ccf5e16b664f8bf886dffe84af3c427895b676cd9a7ef SHA512 d31a65c36a2411e37c5a42786b6a0bce5973dc2fd86a9bbb386dc3b27fdbd74ac1e2d0dd1a30cfd172edad60184f5090eaa65b2a07d67e1a1a782c2d9acd0c82
-EBUILD libsdl-1.2.64_p20230726.ebuild 1292 BLAKE2B 328baa5b9f735c76987e761e404a005edd48b4478d8b3ee5c984b7ae80c43fd73b82676d7cb2b34cb6cd35cf75d4155df48f3ae08d5bc92fa5914deb61c700e4 SHA512 438f6f665b9fe19a6fe06693e520904e62d3c6b604c73d3168345e731e91d91a071e2020668f9147dd1a38d782c25e6cf0b7bfbce0295d8ef00b4c153c75f6f0
 EBUILD libsdl-1.2.68.ebuild 1315 BLAKE2B 3d2b0b06964b8604105310ec0679db04177946eb1f043334d4479015571398b236f30eced91f96ae2a408163ede48afdf66b8339674d8bb9e564e92eb58a4084 SHA512 16b6b30329e8fefb15f89cc3c4ea3cfb0a537dd0c2ff243329b3c6e5ee335b77849bed69c7194069abb79afcc8da86a9fecb4234887a30c29669c17f59bbbb8b
-MISC metadata.xml 1562 BLAKE2B 317e152b5b838542417fe66589a2f161f7ebb4c9e0dc166deffb13b62227e8e1b957deb41daf5599e6a5ee77155d140048e97708594f308c44f8eef7df3046db SHA512 1144a2155c5fc3ee3dee968bb86c78c7fb3931e1794ad351b5951b19642d414ee02076177a01cb33c3dad8122825fdf9d1934ee02382f6b4a5bbd22fd6e23094
+MISC metadata.xml 1485 BLAKE2B f924c3ec093017650be79949e2a85860fb1a26fb385150b9b2ee28fe9ee4f93e077e29a8dcbb5014d77a6f425985dde2c0e879e7e00f7b4b562f585eb25bfcc7 SHA512 7e1f0dcff5c52e8bc206b94ad43fca8bcef0fd35a384881455a9776a014a6817ef639f51cb6c0902f7e3c81e210fe5220d7b775717a610811b7615e80b78cd04
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?= <petr.pisar@atlas.cz>
-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>