* [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/files/, media-libs/sdl2-mixer/
@ 2021-01-23 21:13 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2021-01-23 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 0b7be0693b63c90b9b249fac968a47f69485cb6f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 18:38:24 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:11:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7be069
media-libs/sdl2-mixer: Drop 2.0.2-r1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/sdl2-mixer/Manifest | 1 -
.../sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch | 21 ----
media-libs/sdl2-mixer/metadata.xml | 2 -
media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild | 113 ---------------------
4 files changed, 137 deletions(-)
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index e6990108ce5..8fc00617b6a 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,2 +1 @@
-DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
deleted file mode 100644
index 1377feddb39..00000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- SDL2_mixer-2.0.2/music_smpeg-orig.c 2017-12-06 20:47:21.691153833 -0500
-+++ SDL2_mixer-2.0.2/music_smpeg.c 2017-12-06 20:47:30.032153222 -0500
-@@ -138,7 +138,7 @@
- SDL_free(music);
- return NULL;
- }
-- smpeg.SMPEG_actualSpec(mp3, &music_spec);
-+ smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
-
- music->freesrc = freesrc;
- return music;
---- SDL2_mixer-2.0.2/music_smpeg-orig.c 2017-12-06 21:03:44.907081811 -0500
-+++ SDL2_mixer-2.0.2/music_smpeg.c 2017-12-06 23:34:36.696418752 -0500
-@@ -174,6 +174,7 @@
- int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
- if (left > 0) {
- stream += (len - left);
-+ }
- return left;
- }
-
diff --git a/media-libs/sdl2-mixer/metadata.xml b/media-libs/sdl2-mixer/metadata.xml
index 2049a3a3396..21a39d76443 100644
--- a/media-libs/sdl2-mixer/metadata.xml
+++ b/media-libs/sdl2-mixer/metadata.xml
@@ -12,8 +12,6 @@
<flag name="mod">basic support for MOD files</flag>
<flag name="playtools">Install playwave and playmus tools (useful
for testing)</flag>
- <flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support
- </flag>
<flag name="tremor">enable OGG Vorbis music via libtremor</flag>
<flag name="wav">support WAVE files</flag>
</use>
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
deleted file mode 100644
index 9c910178b0a..00000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="SDL2_mixer-${PV}"
-inherit multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
-REQUIRED_USE="
- midi? ( || ( timidity fluidsynth ) )
- timidity? ( midi )
- fluidsynth? ( midi )
- mp3? ( || ( smpeg mad ) )
- smpeg? ( mp3 )
- mad? ( mp3 )
- mod? ( || ( mikmod modplug ) )
- mikmod? ( mod )
- modplug? ( mod )
- tremor? ( vorbis )
-"
-
-RDEPEND="
- >=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
- flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
- midi? (
- fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
- timidity? ( media-sound/timidity++ )
- )
- mod? (
- mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
- modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- )
- mp3? (
- mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
- smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
- )
- vorbis? (
- tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
- !tremor? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-smpeg.patch )
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- --disable-sdltest
- --enable-music-cmd
- $(use_enable wav music-wave)
- $(use_enable mod music-mod)
- $(use_enable modplug music-mod-modplug)
- --disable-music-mod-modplug-shared
- $(use_enable mikmod music-mod-mikmod)
- --disable-music-mod-mikmod-shared
- $(use_enable midi music-midi)
- $(use_enable timidity music-midi-timidity)
- $(use_enable fluidsynth music-midi-fluidsynth)
- --disable-music-midi-fluidsynth-shared
- $(use_enable vorbis music-ogg)
- $(use_enable tremor music-ogg-tremor)
- --disable-music-ogg-shared
- $(use_enable flac music-flac)
- --disable-music-flac-shared
- $(use_enable mp3 music-mp3)
- $(use_enable smpeg music-mp3-smpeg)
- --disable-music-mp3-smpeg-shared
- --disable-smpegtest
- $(use_enable mad music-mp3-mad-gpl)
- LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
- )
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- if multilib_is_native_abi && use playtools ; then
- emake DESTDIR="${D}" install-bin
- fi
-}
-
-multilib_src_install_all() {
- dodoc {CHANGES,README}.txt
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- # bug 412035
- # https://bugs.gentoo.org/show_bug.cgi?id=412035
- if use midi && use fluidsynth; then
- ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
- ewarn "environment variable to the location of a SoundFont file"
- ewarn "unless the game or application happens to do this for you."
- if use timidity; then
- ewarn "Failing to do so will result in Timidity being used instead."
- else
- ewarn "Failing to do so will result in silence."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-23 21:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-23 21:13 [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/files/, media-libs/sdl2-mixer/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox