From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80AAB13835C for ; Sat, 23 Jan 2021 21:13:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9E0EE09AB; Sat, 23 Jan 2021 21:13:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 890E5E09A8 for ; Sat, 23 Jan 2021 21:13:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 559F5340F06 for ; Sat, 23 Jan 2021 21:13:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9192C4A7 for ; Sat, 23 Jan 2021 21:13:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1611436313.0b7be0693b63c90b9b249fac968a47f69485cb6f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/files/, media-libs/sdl2-mixer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/sdl2-mixer/Manifest media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch media-libs/sdl2-mixer/metadata.xml media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild X-VCS-Directories: media-libs/sdl2-mixer/ media-libs/sdl2-mixer/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0b7be0693b63c90b9b249fac968a47f69485cb6f X-VCS-Branch: master Date: Sat, 23 Jan 2021 21:13:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d5b3176-8313-4af0-9eda-4fda82848462 X-Archives-Hash: c783d7edb99257cf18bba9fc01c12351 commit: 0b7be0693b63c90b9b249fac968a47f69485cb6f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 23 18:38:24 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ basic support for MOD files Install playwave and playmus tools (useful for testing) - Use media-libs/smpeg for MP3 support - enable OGG Vorbis music via libtremor support WAVE files 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 -}