commit: 0e1b9622598387d633bd0a2bc4e37577b0c586b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 14:52:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 18:55:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1b9622
media-libs/sdl2-mixer: Drop old
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/sdl2-mixer/Manifest | 1 -
.../sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch | 39 -------
media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild | 119 ---------------------
3 files changed, 159 deletions(-)
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 0d918d8cc4e..a1ec538edf3 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,2 +1 @@
-DIST SDL2_mixer-2.0.1.tar.gz 10213891 BLAKE2B
3f6889e7cf8e4e159bdf18f1e4e9543ffc9160d325c8011fa3b4e7e1903b2b8aa013ef180847c878fe71a8639a069af440c41ae165aeb67d5259338795347a30
SHA512
bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d
DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B
9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4
SHA512
c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
deleted file mode 100644
index 6d617e046cb..00000000000
--- a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-diff -r f095b3477c8e -r 6afe73e1e74b configure.in
---- a/configure.in Sun Jan 03 09:25:52 2016 -0800
-+++ b/configure.in Mon Jan 04 21:40:14 2016 -0800
-@@ -609,7 +609,6 @@
- smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
- ;;
- esac
-- SOURCES="$SOURCES $srcdir/*_mp3.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
- if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib !=
x; then
- echo "-- dynamic libsmpeg -> $smpeg_lib"
-@@ -637,11 +636,6 @@
- AC_MSG_RESULT($have_libmad)
- if test x$have_libmad = xyes; then
- SOURCES="$SOURCES $srcdir/music_mad.c"
-- if echo "$SOURCES" | grep "load_mp3.c" >/dev/null; then
-- :
-- else
-- SOURCES="$SOURCES $srcdir/load_mp3.c"
-- fi
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
- else
-@@ -649,7 +643,9 @@
- fi
- fi
-
--if test x$have_smpeg != xyes -a x$have_libmad != xyes; then
-+if test x$have_smpeg = xyes -o x$have_libmad = xyes; then
-+ SOURCES="$SOURCES $srcdir/*_mp3.c"
-+else
- AC_MSG_WARN([MP3 support disabled])
- fi
-
-
-
-
-
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
deleted file mode 100644
index 8fbeeb1f303..00000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P=SDL2_mixer-${PV}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/";
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz";
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa 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.1-r1[${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++ )
- )
- mp3? (
- mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
- smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
- )
- mod? (
- modplug? (
>=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- mikmod? ( >=media-libs/libmikmod-3.3.6-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}
-
-src_prepare() {
- # upstream patch to fix building with both smpeg and mad mp3 support
(bug #570804)
- epatch "${FILESDIR}"/${P}-mp3.patch
- sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
- mv configure.{in,ac} || die
- rm acinclude/l*.m4 || die
- AT_M4DIR=acinclude eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- $(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
-}
-
-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
- prune_libtool_files
-}
-
-pkg_postinst() {
- # bug 412035
- # https://bugs.gentoo.org/show_bug.cgi?id=412035
- if use midi ; then
- if 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
- fi
-}
