From owner-svn-ports-head@freebsd.org Tue Feb 5 17:42:23 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E85C614C2207; Tue, 5 Feb 2019 17:42:22 +0000 (UTC) (envelope-from amdmi3@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 87913855D5; Tue, 5 Feb 2019 17:42:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C8AC21442; Tue, 5 Feb 2019 17:42:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x15HgMAA034073; Tue, 5 Feb 2019 17:42:22 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x15HgLCR034013; Tue, 5 Feb 2019 17:42:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201902051742.x15HgLCR034013@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 5 Feb 2019 17:42:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492259 - head/audio/sdl2_mixer X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/audio/sdl2_mixer X-SVN-Commit-Revision: 492259 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 87913855D5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Feb 2019 17:42:23 -0000 Author: amdmi3 Date: Tue Feb 5 17:42:21 2019 New Revision: 492259 URL: https://svnweb.freebsd.org/changeset/ports/492259 Log: - Update to 2.0.4 - Disable dynamic linking - Regroup options Modified: head/audio/sdl2_mixer/Makefile head/audio/sdl2_mixer/distinfo head/audio/sdl2_mixer/pkg-plist Modified: head/audio/sdl2_mixer/Makefile ============================================================================== --- head/audio/sdl2_mixer/Makefile Tue Feb 5 17:38:06 2019 (r492258) +++ head/audio/sdl2_mixer/Makefile Tue Feb 5 17:42:21 2019 (r492259) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sdl2_mixer -PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTVERSION= 2.0.4 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL2_mixer-${PORTVERSION} @@ -11,18 +10,29 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Sample multi-channel audio mixer library LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/COPYING.txt +LICENSE_FILE_ZLIB=${WRKSRC}/COPYING.txt USES= gmake pathfix pkgconfig libtool localbase USE_SDL= sdl2 GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= FLUIDSYNTH FLAC SMPEG -OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC SMPEG -OPTIONS_RADIO= MOD OGG +# 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_RADIO_OGG= VORBIS TREMOR +OPTIONS_RADIO_MP3= MAD MPG123 +OPTIONS_DEFAULT= FLUIDSYNTH MODPLUG FLAC OPUS MPG123 .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msoftfp} OPTIONS_DEFAULT+= TREMOR @@ -30,8 +40,8 @@ OPTIONS_DEFAULT+= TREMOR OPTIONS_DEFAULT+= VORBIS .endif -MOD_DESC= Tracker music support -SMPEG_DESC= MP3 audio support via SMPEG2 +# MOD +MOD_DESC= Tracker music support MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MIKMOD_CONFIGURE_ENABLE= music-mod-mikmod @@ -39,30 +49,44 @@ MIKMOD_CONFIGURE_ENABLE= music-mod-mikmod MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_ENABLE= music-mod-modplug -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ENABLE= music-flac +# MIDI +MIDI_DESC= MIDI music support FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -FLUIDSYNTH_CONFIGURE_ON= --enable-music-midi --enable-music-midi-fluidsynth -FLUIDSYNTH_CONFIGURE_OFF= --disable-music-midi --disable-music-midi-fluidsynth +FLUIDSYNTH_CONFIGURE_ENABLE= music-midi-fluidsynth -SMPEG_LIB_DEPENDS= libsmpeg2.so:multimedia/smpeg2 -SMPEG_CONFIGURE_ON= --enable-music-mp3 --enable-music-mp3-smpeg -SMPEG_CONFIGURE_OFF= --disable-music-mp3 --disable-music-mp3-smpeg +# TODO: add timidity? +# OGG VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CONFIGURE_ENABLE= music-ogg TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor -TREMOR_CONFIGURE_ON= --enable-music-ogg -# TREMOR_CONFIGURE_OFF is handled by VORBIS=off 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 + +MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 +MPG123_CONFIGURE_ENABLE= music-mp3-mpg123 + +# Others +FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +FLAC_CONFIGURE_ENABLE= music-flac + +OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile +OPUS_CONFIGURE_ENABLE= music-opus + +.include + +.if !${PORT_OPTIONS:MVORBIS} && !${PORT_OPTIONS:MTREMOR} +CONFIGURE_ARGS+= --disable-music-ogg +.endif + post-patch: @${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|"modplug.h"|"libmodplug/modplug.h"|' \ - ${WRKSRC}/dynamic_modplug.h ${WRKSRC}/music_modplug.h post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL2_mixer.so Modified: head/audio/sdl2_mixer/distinfo ============================================================================== --- head/audio/sdl2_mixer/distinfo Tue Feb 5 17:38:06 2019 (r492258) +++ head/audio/sdl2_mixer/distinfo Tue Feb 5 17:42:21 2019 (r492259) @@ -1,2 +1,3 @@ -SHA256 (SDL2_mixer-2.0.1.tar.gz) = 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f -SIZE (SDL2_mixer-2.0.1.tar.gz) = 10213891 +TIMESTAMP = 1549290781 +SHA256 (SDL2_mixer-2.0.4.tar.gz) = b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419 +SIZE (SDL2_mixer-2.0.4.tar.gz) = 11125077 Modified: head/audio/sdl2_mixer/pkg-plist ============================================================================== --- head/audio/sdl2_mixer/pkg-plist Tue Feb 5 17:38:06 2019 (r492258) +++ head/audio/sdl2_mixer/pkg-plist Tue Feb 5 17:42:21 2019 (r492259) @@ -1,6 +1,6 @@ include/SDL2/SDL_mixer.h lib/libSDL2_mixer-2.0.so.0 -lib/libSDL2_mixer-2.0.so.0.0.1 +lib/libSDL2_mixer-2.0.so.0.2.2 lib/libSDL2_mixer.a lib/libSDL2_mixer.so libdata/pkgconfig/SDL2_mixer.pc