From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- media-libs/sdl2-mixer/Manifest | 3 +- .../sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch | 21 ++++ media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild | 113 +++++++++++++++++++++ media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild | 111 -------------------- 4 files changed, 136 insertions(+), 112 deletions(-) create mode 100644 media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch create mode 100644 media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild delete mode 100644 media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild (limited to 'media-libs/sdl2-mixer') diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest index 169ebae5d012..03661fd9efc9 100644 --- a/media-libs/sdl2-mixer/Manifest +++ b/media-libs/sdl2-mixer/Manifest @@ -1,6 +1,7 @@ AUX sdl2-mixer-2.0.1-mp3.patch 1169 BLAKE2B d6d4a30fe303adb71de29e297ea8ea2f250b3eaf3cb8285566ec061fcc2d2a737a461aac1df21cb870ab57f5cf43eaf65bac2148724bddc55449e0b5ba7229a2 SHA512 1c649be61ece8715b2a426a041fa548a8cf0d34cf75d3a0e0b37cec40b71637de954b12f0dcadf3cf632fa2897a2b91223ddca89dd863fadecc8ed055546933e +AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707d9ce75e3be7846baafcbcc36223784c367da111f481377a319562c622d27a3b67b27a32bffc515a32c4e119e65f79 SHA512 78c02a15384e98f846ff9448205da3a43c1e1e39ae9ae33c14651076d5659a83ccd840d67b1044dc19a0da66a07fb98793a78044ae0afa089a26cfbf8951db82 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 EBUILD sdl2-mixer-2.0.1.ebuild 3516 BLAKE2B c70450723d7ad51c24d386a1dd449ec8d3831a59b9c463c6dc57c284c4ace645b85fffc047270e2c4dc74f668206f10a1ab1f8601abf0317138294f0a03c60a4 SHA512 3a2b2b35717f83e4ee71b3c7c204529e3a76f37d39bc5413b5a852d9497cf619dec2b7be90405ef0200dedcb45f6bf95fe6b465aa42ba583f667e25feeec3cbd -EBUILD sdl2-mixer-2.0.2.ebuild 3220 BLAKE2B da25696764086144c2b5e8d48b7bcaa801692e12edb4e0af328a189c1eacf2844a82dfd6be8156b669153c4d547a78da10dc9696d1a2e78a170f8fbee545657c SHA512 8c5076ccfc6360ccb4c30e3cd19599a2279ed2ced569f09bc26dff17c1a9601aa2a84e90dac36df8ea00f37694e93c3896336ac8ad979ea9e4ba8cc0b9c9206e +EBUILD sdl2-mixer-2.0.2-r1.ebuild 3260 BLAKE2B 107d1e139ec158899e8eee08ed47848acb2693e14536dfc867c0579994903d73c661002c56aa0d129afb3bdc2311bef4403fd896fd6cc11347d934287f9859ee SHA512 3e12e8b3e314c2cd4fffb72b2d5dbdb5f7facf681de20bfdf085ece503b3502d0a83ee5f5fb0aaa9db1c699d076492bf0c10c89f813e333007cb994bf74e5217 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b 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 new file mode 100644 index 000000000000..1377feddb39c --- /dev/null +++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.2-smpeg.patch @@ -0,0 +1,21 @@ +--- 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/sdl2-mixer-2.0.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild new file mode 100644 index 000000000000..388f490aac11 --- /dev/null +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~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.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 +} diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild deleted file mode 100644 index 53e5155abeed..000000000000 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit ltprune 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}" - -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 - 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 -} -- cgit v1.2.3