From nobody Thu Jul 21 12:41:08 2022 X-Original-To: dev-commits-ports-main@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 4LpXHS44Lxz4WWr4; Thu, 21 Jul 2022 12:41:08 +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 4LpXHS3fJ6z3sZC; Thu, 21 Jul 2022 12:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658407268; 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=MYY/+SkSGC4D7FWAwmZ2OJXwZeTAJBO9hHPFpoHhwVg=; b=l7qKN+SJootvHRSfGBzuRBHpQLBhmZI7dkr5pGldXUPzAZSkSu3lIuAY3YGZFsu2fEqQ2G arcqez6F+KctyHSxVDm6owgxnX2Sdm5g+JgXuZDqfGimKnb8t8wq1y5NTGw2NOjFRUDMCh b8rjKF4vzyx0jcES7ikfneNWNDgSwC/0gA7c1gM/LlrMpmbGtF0cIdxZuoSw0+fyFgqYA+ mzTVHqxlCRQmg215ZT13xsyggCgHvdVPh0/BXepCCCwChFkCKOByn9tTEPXWj6ze8KWTBp cVn1r1XwoS/Nx9m+cu5cdiJCYSu6aE0I66exHnVnpNiLvp7GDiaitYizXdlVDw== 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 4LpXHS2kBBzM1j; Thu, 21 Jul 2022 12:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26LCf85F017464; Thu, 21 Jul 2022 12:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LCf8AX017463; Thu, 21 Jul 2022 12:41:08 GMT (envelope-from git) Date: Thu, 21 Jul 2022 12:41:08 GMT Message-Id: <202207211241.26LCf8AX017463@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: 6b4c8d1e3b7b - main - =?utf-8?Q?audio/sdl2_mixer:=20update=202.0.4=20=E2=86=92=202.6.1?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6b4c8d1e3b7bc7ed1c07b0e3f74d21405be186c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658407268; 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=MYY/+SkSGC4D7FWAwmZ2OJXwZeTAJBO9hHPFpoHhwVg=; b=CPBa/p6j97tdhvTTmSGmCmaqWIS630vA6G+QmZr4ub1WAOgFxTV2sC7QQJ2Ks95tKcMBPH 3BSQJbAqRVxq79cgNlsYftxYSA+HMfSUPdhAOLKCUzmIpRF24VwN/iZPiSEEyCvmBk9dOd 5zt1j1AINaqndFh/dtTqzGVCbDtF8DkXr4iSeYA1Fc1ksIVY8xDRQf9rh/fg4R3MqNW5zP 8IjJt3Bo0p0qzno8MYy1gye2RDh6ft+ZOsTEBYsdV4LHeXCq4FwfnHydgrJvhIE3i2AvSX 42Ix/XtaoRW7gqUILTYKhBpqzn926kessj3fJVDYWz4T9VVL8rynz0BeR+r9rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658407268; a=rsa-sha256; cv=none; b=bXL8TVOVSTIz59sa8VaQsbfrg1N0Niz2xCoz3o+Cp+9GCMwnmjMEhaiq48pZVOlV4NhZ6A WHK15F58kLJbPr+tM2IkaHJJw7YXR1ndYtoqtdcVKhbKRXGrUy9Hg3R1AO9rlEZya7KLD6 NGSre2TLLJaHfrRIvhl0Z3+YYKsoaA1goHBf2i9cy7Bu6Yf90JpntZS9C3nYmEnTaFW9Ae Dcrha/xqLQOWaQyjSBRtidsIuCNoeY+wHJsHcb7Rj42v0zPKzsxjPtBNg9iQKyFUJMT435 TRpqY7Baqc+si02zNRgjMKpaK1vYbXm4frjG5IMk0XahFTSFGlSUVZzyxGnybg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b4c8d1e3b7bc7ed1c07b0e3f74d21405be186c0 commit 6b4c8d1e3b7bc7ed1c07b0e3f74d21405be186c0 Author: Dmitry Marakasov AuthorDate: 2022-07-20 19:40:07 +0000 Commit: Dmitry Marakasov CommitDate: 2022-07-21 12:40:40 +0000 audio/sdl2_mixer: update 2.0.4 → 2.6.1 --- audio/sdl2_mixer/Makefile | 88 +++++++++++++---------------- audio/sdl2_mixer/distinfo | 6 +- audio/sdl2_mixer/files/patch-CMakeLists.txt | 29 ++++++++++ audio/sdl2_mixer/pkg-plist | 8 ++- 4 files changed, 77 insertions(+), 54 deletions(-) diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile index 86698d792ef9..a31400b653ce 100644 --- a/audio/sdl2_mixer/Makefile +++ b/audio/sdl2_mixer/Makefile @@ -1,36 +1,39 @@ PORTNAME= sdl2_mixer -PORTVERSION= 2.0.4 -PORTREVISION= 5 +DISTVERSIONPREFIX= release- +DISTVERSION= 2.6.1 CATEGORIES= audio -MASTER_SITES= https://www.libsdl.org/projects/SDL_mixer/release/ -DISTNAME= SDL2_mixer-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Sample multi-channel audio mixer library LICENSE= ZLIB -LICENSE_FILE_ZLIB=${WRKSRC}/COPYING.txt +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= gmake libtool localbase pathfix pkgconfig sdl +USES= cmake sdl +USE_GITHUB= yes +GH_ACCOUNT= libsdl-org +GH_PROJECT= SDL_mixer USE_SDL= sdl2 -GNU_CONFIGURE= yes +CMAKE_OFF= SDL2MIXER_SAMPLES \ + SDL2MIXER_DEPS_SHARED \ + SDL2MIXER_FLAC_LIBFLAC_SHARED \ + SDL2MIXER_MOD_MODPLUG_SHARED \ + SDL2MIXER_MOD_XMP_SHARED \ + 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 + USE_LDCONFIG= yes -# disabled dynamic loading of shared libraries, not shared linking -CONFIGURE_ARGS= --disable-music-mod-modplug-shared \ - --disable-music-mod-mikmod-shared \ - --disable-music-midi-fluidsynth-shared \ - --disable-music-ogg-shared \ - --disable-music-flac-shared \ - --disable-music-mp3-mpg123-shared \ - --disable-music-opus-shared - -OPTIONS_DEFINE= FLAC OPUS -OPTIONS_RADIO= MOD MIDI OGG MP3 -OPTIONS_RADIO_MOD= MIKMOD MODPLUG -OPTIONS_RADIO_MIDI= FLUIDSYNTH +OPTIONS_DEFINE= FLAC OPUS MPG123 FLUIDSYNTH +OPTIONS_RADIO= MOD OGG +OPTIONS_RADIO_MOD= MODPLUG XMP OPTIONS_RADIO_OGG= VORBIS TREMOR -OPTIONS_RADIO_MP3= MAD MPG123 OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC OPUS MPG123 .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp} @@ -39,55 +42,42 @@ OPTIONS_DEFAULT+= TREMOR OPTIONS_DEFAULT+= VORBIS .endif -# MOD MOD_DESC= Tracker music support -MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod -MIKMOD_CONFIGURE_ENABLE= music-mod-mikmod - MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug -MODPLUG_CONFIGURE_ENABLE= music-mod-modplug +MODPLUG_CMAKE_BOOL= SDL2MIXER_MOD_MODPLUG -# MIDI -MIDI_DESC= MIDI music support +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_CONFIGURE_ENABLE= music-midi-fluidsynth - +FLUIDSYNTH_CMAKE_BOOL= SDL2MIXER_MIDI SDL2MIXER_MIDI_FLUIDSYNTH # TODO: add timidity? -# OGG VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis +VORBIS_CMAKE_ON= -DSDL2MIXER_VORBIS="VORBISFILE" TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor -TREMOR_CONFIGURE_ENABLE= music-ogg-tremor - -# MP3 -MAD_LIB_DEPENDS= libmad.so:audio/libmad -MAD_CONFIGURE_ENABLE= music-mp3-mad-gpl -MAD_VARS= LICENSE+=GPLv2+ LICENSE_COMB=multi +TREMOR_CMAKE_ON= -DSDL2MIXER_VORBIS="TREMOR" MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MPG123_CONFIGURE_ENABLE= music-mp3-mpg123 +MPG123_CMAKE_BOOL= SDL2MIXER_MP3 SDL2MIXER_MP3_MPG123 -# Others FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ENABLE= music-flac +FLAC_CMAKE_BOOL= SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile -OPUS_CONFIGURE_ENABLE= music-opus +OPUS_CMAKE_BOOL= SDL2MIXER_OPUS .include -.if !${PORT_OPTIONS:MVORBIS} && !${PORT_OPTIONS:MTREMOR} -CONFIGURE_ARGS+= --disable-music-ogg +.if !${PORT_OPTIONS:MXMP} && !${PORT_OPTIONS:MMODPLUG} +CMAKE_OFF+= SDL2MIXER_MOD .endif -post-patch: - @${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \ - ${WRKSRC}/Makefile.in - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL2_mixer.so +.if !${PORT_OPTIONS:MVORBIS} && !${PORT_OPTIONS:MTREMOR} +CMAKE_ARGS+= -DSDL2MIXER_VORBIS="" +.endif .include diff --git a/audio/sdl2_mixer/distinfo b/audio/sdl2_mixer/distinfo index e5fbcf8afbe5..9dc3db862970 100644 --- a/audio/sdl2_mixer/distinfo +++ b/audio/sdl2_mixer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549290781 -SHA256 (SDL2_mixer-2.0.4.tar.gz) = b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419 -SIZE (SDL2_mixer-2.0.4.tar.gz) = 11125077 +TIMESTAMP = 1658263580 +SHA256 (libsdl-org-SDL_mixer-release-2.6.1_GH0.tar.gz) = 8c7193d3b6ae8d44f4436e53b26735b02f6cceb70fb1a3ae3f44ebd0c965e0a6 +SIZE (libsdl-org-SDL_mixer-release-2.6.1_GH0.tar.gz) = 9922871 diff --git a/audio/sdl2_mixer/files/patch-CMakeLists.txt b/audio/sdl2_mixer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d7a99de70601 --- /dev/null +++ b/audio/sdl2_mixer/files/patch-CMakeLists.txt @@ -0,0 +1,29 @@ +All these changes were upstreamed after 2.6.1 +--- CMakeLists.txt.orig 2022-07-12 20:19:55 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() + diff --git a/audio/sdl2_mixer/pkg-plist b/audio/sdl2_mixer/pkg-plist index bf341efbfe8f..23c41cbfac67 100644 --- a/audio/sdl2_mixer/pkg-plist +++ b/audio/sdl2_mixer/pkg-plist @@ -1,6 +1,10 @@ include/SDL2/SDL_mixer.h +lib/cmake/SDL2_mixer/SDL2_mixer-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/SDL2_mixer/SDL2_mixer-shared-targets.cmake +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.2.2 -lib/libSDL2_mixer.a +lib/libSDL2_mixer-2.0.so.0.600.1 lib/libSDL2_mixer.so libdata/pkgconfig/SDL2_mixer.pc