From nobody Wed Apr 17 01:03:26 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK2ht40dwz5HTBd; Wed, 17 Apr 2024 01:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK2ht1RZhz47mS; Wed, 17 Apr 2024 01:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713315806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CN//NkNgfMdd6FovS4LoU0T8SenOxl18Np/bcx22Ks=; b=gIS7mvjxneD8KCNTZuQ4C6pF5AmhwiJ8zZK+dvOSN/W9mPau80FvTULykTNJmwFcPPfkR9 zwkpkcMgBwVn5O71kJDRmsu92GHMYIdxGpssMJaxuTQOOOsWKret35QxNcUlPxHsDZ9u3n BtHdzKg5I+7VLYKUXaT3C4IDAUb67D3mmV0hbQtrE2cdjVIcyo5NBmmjBga8KkSgFiNJjh jEOz1m8BqgmOxSKuNdl5AoIp/LZHpkkCSjE7tSfprNAI4RS5mAMUjdnoloSiG2eAAwZVaM WfG6ncj0vrPiha1iZ4RBM0kDRKWzJVvtN2VC9wUxTVFyS+0XBvQwVe+W5H+AqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713315806; a=rsa-sha256; cv=none; b=dX4uvXHi6/X6w6TMLUZGZ8LE3XsJsoKikW7S9hQOqvzHtVcGX793gVJ0enjYuo28FgsD7H uN5vQ6El2cOCuxEWU9+DK20LnkwR8W0BKKCeA+xWOoWx4GPTcJigNyXXHQ1lrZr/b7mNFW 3h4cn6xl/3VbnwVNjttBTdqAnoh1sujpXvxCLuSjPlXTtKf6YGNm1r+/T7gveaasB2s+qG CcRPL4vlTeo3RPbDNHIwcNW1HE6esL9+457+hujoU/QwE7ZQDlnHPIP3ujXMq4Tm8TYiWs Ox50Zd67KVCnQ/LL8ubdWsylgxnhTy6BP5n/ta82CagKmXHqqZxchIyYQM/N4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713315806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CN//NkNgfMdd6FovS4LoU0T8SenOxl18Np/bcx22Ks=; b=Q99wtTlVIrGTZzynx5CdtRbyMBO/Xwf+4hVxD03y71gNyqNnsiWq27i1ZysYCcMHEXRid5 Z0SLcx2dvzQpGWtjL4bq0V7Ym6VB5LUDb7dYMIiBqGPhQxTndNdQ4Q/UZS64F5FygeOnXO EDC63r47IOqXR0BcSkgTHqUngZMppY1n3t4u6DzQmy/E8JpfSleEmTECEW7cmQ1+pNLxEF DOG23OTnms0IUDtU6FHKHEzZX9orJA3W7M8rrIkv/fXWahcM1le/t9lkWo8VGt0zBxgfYg zRNMcg7ZtDffV9MDJk+z+zuthe5AAwD3829f6+qIc9uOjc0E4fRQ2wE3QvNtzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK2ht133nz15mh; Wed, 17 Apr 2024 01:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H13Q8i032580; Wed, 17 Apr 2024 01:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H13QKg032577; Wed, 17 Apr 2024 01:03:26 GMT (envelope-from git) Date: Wed, 17 Apr 2024 01:03:26 GMT Message-Id: <202404170103.43H13QKg032577@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: ee96b8ea17a1 - main - audio/sdl2_mixer: update 2.6.3 =?utf-8?Q?=E2=86=92?= 2.8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee96b8ea17a1878d7758003bebb3cbca787cf070 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee96b8ea17a1878d7758003bebb3cbca787cf070 commit ee96b8ea17a1878d7758003bebb3cbca787cf070 Author: Dmitry Marakasov AuthorDate: 2024-04-10 18:03:44 +0000 Commit: Dmitry Marakasov 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 .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 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