Date: Wed, 17 Apr 2024 01:03:26 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ee96b8ea17a1 - main - audio/sdl2_mixer: update 2.6.3 =?utf-8?Q?=E2=86=92?= 2.8.0 Message-ID: <202404170103.43H13QKg032577@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee96b8ea17a1878d7758003bebb3cbca787cf070 commit ee96b8ea17a1878d7758003bebb3cbca787cf070 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2024-04-10 18:03:44 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2024-04-17 01:02:46 +0000 audio/sdl2_mixer: update 2.6.3 → 2.8.0 - Remove tremor support, as port was removed from the tree --- audio/sdl2_mixer/Makefile | 68 +++++++++++++---------------- audio/sdl2_mixer/distinfo | 6 +-- audio/sdl2_mixer/files/patch-CMakeLists.txt | 38 +++++----------- audio/sdl2_mixer/pkg-plist | 2 +- 4 files changed, 45 insertions(+), 69 deletions(-) diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile index 73a7c1f8d7f2..36373676be37 100644 --- a/audio/sdl2_mixer/Makefile +++ b/audio/sdl2_mixer/Makefile @@ -1,7 +1,6 @@ PORTNAME= sdl2_mixer DISTVERSIONPREFIX= release- -DISTVERSION= 2.6.3 -PORTREVISION= 1 +DISTVERSION= 2.8.0 CATEGORIES= audio MAINTAINER= amdmi3@FreeBSD.org @@ -24,62 +23,57 @@ CMAKE_OFF= SDL2MIXER_SAMPLES \ SDL2MIXER_MP3_MPG123_SHARED \ SDL2MIXER_MIDI_FLUIDSYNTH_SHARED \ SDL2MIXER_OPUS_SHARED \ - SDL2MIXER_VORBIS_TREMOR_SHARED \ SDL2MIXER_VORBIS_VORBISFILE_SHARED \ SDL2MIXER_FLAC_DRFLAC \ - SDL2MIXER_MP3_DRMP3 \ - SDL2MIXER_MIDI_TIMIDITY + SDL2MIXER_MP3_MINIMP3 \ + SDL2MIXER_MIDI_TIMIDITY \ + SDL2MIXER_GME_SHARED \ + SDL2MIXER_WAVPACK_SHARED CMAKE_ARGS= -DSDL2MIXER_DEBUG_POSTFIX:STRING= USE_LDCONFIG= yes -OPTIONS_DEFINE= FLAC OPUS MPG123 FLUIDSYNTH +OPTIONS_DEFINE= FLAC OPUS MPG123 FLUIDSYNTH GME WAVPACK VORBIS OPTIONS_RADIO= MOD OGG OPTIONS_RADIO_MOD= MODPLUG XMP -OPTIONS_RADIO_OGG= VORBIS TREMOR -OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC OPUS MPG123 +OPTIONS_DEFAULT= FLUIDSYNTH XMP OPUS MPG123 VORBIS -.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp} -OPTIONS_DEFAULT+= TREMOR -.else -OPTIONS_DEFAULT+= VORBIS -.endif - -MOD_DESC= Tracker music support +MOD_DESC= Tracker music support -MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug -MODPLUG_CMAKE_BOOL= SDL2MIXER_MOD_MODPLUG +MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug +MODPLUG_CMAKE_BOOL= SDL2MIXER_MOD_MODPLUG -XMP_DESC= MOD music via libxmp -XMP_LIB_DEPENDS= libxmp.so:audio/libxmp -XMP_CMAKE_BOOL= SDL2MIXER_MOD_XMP +XMP_DESC= MOD music via libxmp +XMP_LIB_DEPENDS= libxmp.so:audio/libxmp +XMP_CMAKE_BOOL= SDL2MIXER_MOD_XMP -FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -FLUIDSYNTH_CMAKE_BOOL= SDL2MIXER_MIDI SDL2MIXER_MIDI_FLUIDSYNTH +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +FLUIDSYNTH_CMAKE_BOOL= SDL2MIXER_MIDI SDL2MIXER_MIDI_FLUIDSYNTH # TODO: add timidity? -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CMAKE_ON= -DSDL2MIXER_VORBIS="VORBISFILE" +VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis +VORBIS_CMAKE_ON= -DSDL2MIXER_VORBIS="VORBISFILE" +VORBIS_CMAKE_OFF= -DSDL2MIXER_VORBIS="" + +MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 +MPG123_CMAKE_BOOL= SDL2MIXER_MP3 SDL2MIXER_MP3_MPG123 -TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor -TREMOR_CMAKE_ON= -DSDL2MIXER_VORBIS="TREMOR" +FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +FLAC_CMAKE_BOOL= SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC -MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MPG123_CMAKE_BOOL= SDL2MIXER_MP3 SDL2MIXER_MP3_MPG123 +OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile +OPUS_CMAKE_BOOL= SDL2MIXER_OPUS -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CMAKE_BOOL= SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC +GME_LIB_DEPENDS= libgme.so:audio/libgme +GME_CMAKE_BOOL= SDL2MIXER_GME +GME_DESC= WavPack DSD music support -OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile -OPUS_CMAKE_BOOL= SDL2MIXER_OPUS +WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack +WAVPACK_CMAKE_BOOL= SDL2MIXER_WAVPACK .include <bsd.port.options.mk> .if !${PORT_OPTIONS:MXMP} && !${PORT_OPTIONS:MMODPLUG} -CMAKE_OFF+= SDL2MIXER_MOD -.endif - -.if !${PORT_OPTIONS:MVORBIS} && !${PORT_OPTIONS:MTREMOR} -CMAKE_ARGS+= -DSDL2MIXER_VORBIS="" +CMAKE_OFF+= SDL2MIXER_MOD .endif .include <bsd.port.mk> diff --git a/audio/sdl2_mixer/distinfo b/audio/sdl2_mixer/distinfo index 5b9d48909c33..2837fe08c8ed 100644 --- a/audio/sdl2_mixer/distinfo +++ b/audio/sdl2_mixer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675768297 -SHA256 (libsdl-org-SDL_mixer-release-2.6.3_GH0.tar.gz) = 91dd065e9e63f499e5317350b110184b0ba96bc5f63c39b3a9939a136c40c035 -SIZE (libsdl-org-SDL_mixer-release-2.6.3_GH0.tar.gz) = 9926750 +TIMESTAMP = 1711647245 +SHA256 (libsdl-org-SDL_mixer-release-2.8.0_GH0.tar.gz) = 1146f00815c8ad22c3d48fbe31ae23dc5997936ebf30b4b3aeab6eab7ea1db3e +SIZE (libsdl-org-SDL_mixer-release-2.8.0_GH0.tar.gz) = 10855317 diff --git a/audio/sdl2_mixer/files/patch-CMakeLists.txt b/audio/sdl2_mixer/files/patch-CMakeLists.txt index d7a99de70601..4766809d52e9 100644 --- a/audio/sdl2_mixer/files/patch-CMakeLists.txt +++ b/audio/sdl2_mixer/files/patch-CMakeLists.txt @@ -1,29 +1,11 @@ -All these changes were upstreamed after 2.6.1 ---- CMakeLists.txt.orig 2022-07-12 20:19:55 UTC +--- CMakeLists.txt.orig 2024-01-21 17:21:25 UTC +++ CMakeLists.txt -@@ -294,14 +294,14 @@ if(SDL2MIXER_CMD) - target_compile_definitions(SDL2_mixer PRIVATE MUSIC_CMD) - set(fork_found OFF) - if(NOT fork_found) -- check_symbol_exists(fork sys/unistd.h HAVE_FORK) -+ check_symbol_exists(fork unistd.h HAVE_FORK) - if(HAVE_FORK) - set(fork_found ON) - target_compile_definitions(SDL2_mixer PRIVATE HAVE_FORK) - endif() - endif() - if(NOT fork_found) -- check_symbol_exists(fork sys/unistd.h HAVE_VFORK) -+ check_symbol_exists(fork unistd.h HAVE_VFORK) - if(HAVE_VFORK) - set(fork_found ON) - target_compile_definitions(SDL2_mixer PRIVATE HAVE_VFORK) -@@ -528,7 +528,7 @@ if(SDL2MIXER_FLAC_LIBFLAC) - add_dependencies(SDL2_mixer FLAC) - endif() - else() -- target_link_libraries(SDL2_mixer PRIVATE FLAC) -+ target_link_libraries(SDL2_mixer PRIVATE FLAC::FLAC) - endif() - endif() - +@@ -696,7 +696,7 @@ if(SDL2MIXER_MOD_XMP) + else() + message(STATUS "Using system libxmp") + find_package(libxmp REQUIRED) +- if(TARGET libxmp::xmp_shared AND SDL2MIXER_MOD_XMP_SHARED) ++ if(TARGET libxmp::xmp_shared) + set(tgt_xmp libxmp::xmp_shared) + elseif(TARGET libxmp::xmp_static) + set(tgt_xmp libxmp::xmp_static) diff --git a/audio/sdl2_mixer/pkg-plist b/audio/sdl2_mixer/pkg-plist index 03dbe45592aa..a6d19528967d 100644 --- a/audio/sdl2_mixer/pkg-plist +++ b/audio/sdl2_mixer/pkg-plist @@ -5,6 +5,6 @@ lib/cmake/SDL2_mixer/SDL2_mixerConfig.cmake lib/cmake/SDL2_mixer/SDL2_mixerConfigVersion.cmake lib/libSDL2_mixer-2.0.so lib/libSDL2_mixer-2.0.so.0 -lib/libSDL2_mixer-2.0.so.0.600.3 +lib/libSDL2_mixer-2.0.so.0.800.0 lib/libSDL2_mixer.so libdata/pkgconfig/SDL2_mixer.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404170103.43H13QKg032577>