From nobody Mon Apr 22 18:20:36 2024 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 4VNYTK0jYZz5Hc79; Mon, 22 Apr 2024 18:20:37 +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 4VNYTJ4b9bz4X1F; Mon, 22 Apr 2024 18:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713810036; 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=xytV5FjwqZIg0sIEN6o09Y7Qgm+bQuoLVJZVXkb9zZE=; b=YahGvnevHelseGp0o0TWaOtu96ygh8qF/qfZfTaTtzOdgAdKZ91MYFH/WPE4AOVo3Y/ROw eTrKzXHp8XhjoAF0aSNHdxh8k31pt1fp46SxaypEO3eRHEinB/wqfYq4cjtcpQS1xextET EQqvDoDT79H1wXAQKVjvhcrapZptXQZbNJSVzk7FLiWLFiFMt2kGZU27UTqupb2lr2FCNT AF87jmQu6YxUtLTAwHVW3vIBJkx2IQMccOedo5TtTSuU7hfCW9BgNHTRpzy2am0bXa/xra DpbefIMXIeNCnokdI0tDpFBWh1lDCt2PVaFwwimjNTuPjporMX8+NsG0p/1taQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713810036; a=rsa-sha256; cv=none; b=iUBaN82fEkPignDFiiAHtHTdQEaKs+dYDrG5VynWJVBPTRLv9m8aThK8UQniHu60s3XK+u uveShCvT9qpLUWDOq583Im8AagnmIKsvRQX0r8oOnDexzs71vAD3oFtgE4W0sEcsWRQI6y lTuiZ1f67FA5Qlt7PLQhLZRrqCflDmzawIWNOZm1kHRkZcmra+URgCvugJn4PY+4thOWka FnLHnE3hbb0mB2iUU29m40IU3780UMLTpYUzKNA9XdYl/ZMfnb2hnPF/mWn/TagYkbIvh+ DLcYit3L9/uFbgkVVM7tHsZcLeegrnurYQsmEjcHoCS0ePQOC7y9w7u0fc7oQg== 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=1713810036; 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=xytV5FjwqZIg0sIEN6o09Y7Qgm+bQuoLVJZVXkb9zZE=; b=la41g483UHGHeqIHtbmWQcVfSDWeIJ+DCew6iz3/GakZ9th4X22DggieS8VUt26VnD5Db4 DndrlUc+gQ47fi/lpMy8eUP657ClYTdK1gMc5f39X5JAkExDnz9Tb/HDG+62Bmuw+0bOon LRnM9O8vJoND3bEMIxZnjdaxBZz8R18PS2bLbON2NDmXgi6Yvzwv6NrWQ9xwxnRVcRsDf+ nT0cmN6bYEUgpggbA+pwi2XiPgxu10zCS+tyDrcImSBAUbb5Bt7GySi8XkR5Rk60rJerho 4xPkx9NNgg0hViBR25/QvzHq/ke+7TZtjNWHaYdEVyxsDrAOUzs1ylCEZG7PrQ== 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 4VNYTJ48TczyGQ; Mon, 22 Apr 2024 18:20:36 +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 43MIKapN089595; Mon, 22 Apr 2024 18:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MIKaQV089581; Mon, 22 Apr 2024 18:20:36 GMT (envelope-from git) Date: Mon, 22 Apr 2024 18:20:36 GMT Message-Id: <202404221820.43MIKaQV089581@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: 5b634162c6b6 - main - audio/sdl2_mixer: sort options, remove stray OGG option 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 5b634162c6b63002436e316c8f35b442bb58f41c Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b634162c6b63002436e316c8f35b442bb58f41c commit 5b634162c6b63002436e316c8f35b442bb58f41c Author: Dmitry Marakasov AuthorDate: 2024-04-22 18:12:51 +0000 Commit: Dmitry Marakasov CommitDate: 2024-04-22 18:20:02 +0000 audio/sdl2_mixer: sort options, remove stray OGG option PR: 278510 Submitted by: diizzy --- audio/sdl2_mixer/Makefile | 53 ++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile index 36373676be37..a67ef45319b7 100644 --- a/audio/sdl2_mixer/Makefile +++ b/audio/sdl2_mixer/Makefile @@ -15,61 +15,54 @@ USE_GITHUB= yes GH_ACCOUNT= libsdl-org GH_PROJECT= SDL_mixer USE_SDL= sdl2 -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_VORBISFILE_SHARED \ +CMAKE_OFF= SDL2MIXER_DEPS_SHARED \ SDL2MIXER_FLAC_DRFLAC \ - SDL2MIXER_MP3_MINIMP3 \ - SDL2MIXER_MIDI_TIMIDITY \ SDL2MIXER_GME_SHARED \ - SDL2MIXER_WAVPACK_SHARED + SDL2MIXER_MIDI_TIMIDITY \ + SDL2MIXER_MOD_XMP_LITE \ + SDL2MIXER_MP3_MINIMP3 \ + SDL2MIXER_SAMPLES CMAKE_ARGS= -DSDL2MIXER_DEBUG_POSTFIX:STRING= USE_LDCONFIG= yes -OPTIONS_DEFINE= FLAC OPUS MPG123 FLUIDSYNTH GME WAVPACK VORBIS -OPTIONS_RADIO= MOD OGG +OPTIONS_DEFINE= FLAC FLUIDSYNTH GME MPG123 OPUS VORBIS WAVPACK +OPTIONS_RADIO= MOD OPTIONS_RADIO_MOD= MODPLUG XMP -OPTIONS_DEFAULT= FLUIDSYNTH XMP OPUS MPG123 VORBIS +OPTIONS_DEFAULT= FLUIDSYNTH MPG123 OPUS VORBIS XMP +GME_DESC= GME music support via game-music-emu MOD_DESC= Tracker music support +XMP_DESC= MOD music support via libxmp -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 +FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +FLAC_CMAKE_BOOL= SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_CMAKE_BOOL= SDL2MIXER_MIDI SDL2MIXER_MIDI_FLUIDSYNTH # TODO: add timidity? -VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis -VORBIS_CMAKE_ON= -DSDL2MIXER_VORBIS="VORBISFILE" -VORBIS_CMAKE_OFF= -DSDL2MIXER_VORBIS="" +GME_LIB_DEPENDS= libgme.so:audio/libgme +GME_CMAKE_BOOL= SDL2MIXER_GME + +MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug +MODPLUG_CMAKE_BOOL= SDL2MIXER_MOD_MODPLUG MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 MPG123_CMAKE_BOOL= SDL2MIXER_MP3 SDL2MIXER_MP3_MPG123 -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CMAKE_BOOL= SDL2MIXER_FLAC SDL2MIXER_FLAC_LIBFLAC - OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile OPUS_CMAKE_BOOL= SDL2MIXER_OPUS -GME_LIB_DEPENDS= libgme.so:audio/libgme -GME_CMAKE_BOOL= SDL2MIXER_GME -GME_DESC= WavPack DSD music support +VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis +VORBIS_CMAKE_OFF= -DSDL2MIXER_VORBIS="" +VORBIS_CMAKE_ON= -DSDL2MIXER_VORBIS="VORBISFILE" WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CMAKE_BOOL= SDL2MIXER_WAVPACK +XMP_LIB_DEPENDS= libxmp.so:audio/libxmp +XMP_CMAKE_BOOL= SDL2MIXER_MOD_XMP + .include .if !${PORT_OPTIONS:MXMP} && !${PORT_OPTIONS:MMODPLUG}