From nobody Tue Jan 10 17:01:39 2023 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 4NrxtC5VF7z2rBf5; Tue, 10 Jan 2023 17:01:39 +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 4NrxtC2mMqz43dh; Tue, 10 Jan 2023 17:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673370099; 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=ibMPM7wPiYVAUZajUU9/j0Ve8vzGynR5Z/92OUUuxrQ=; b=lXma2P5xT5SEwBgYp1js119HadqZL7FIeduPRjHd+rxJzooxNe40P/K+i9s96qDiM9MXIJ +gQHOmJBRyhUpmM3ckp/OLnzZ6a6Xsuu7O1CWNThQ7iwUL0Mlo71Nq7H7/U+iTPTdgd/WV WJevt9emHxnScmDJ99mvJ1LUQvn49BXdGq6x8dMzk0zEzUNHcHF4u2HxifmAGFurbIMBBQ XKC/jaNmdTk91nEhUp14luju8tlNtB3ut8cVFQ6p9mzKVxvF/01gk0cqmCXs/RJSDdXXVo 9hseHanOCGZgDrHr8D7dHbzwcDXtODD3WYb+CyWybe4vWel9KGZmFuA/tfeREg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673370099; 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=ibMPM7wPiYVAUZajUU9/j0Ve8vzGynR5Z/92OUUuxrQ=; b=hyX86pCTC80rvTQx65CWTcNcxoKskzW6/feQuHgBO1JPHFFmgFZdA4zFSKMAcxzAzjvKrV 77S6ZqL8UDP0mLlxX22NQdWP5ccVIAawxd92jMdqPuS8SiaqW+9DLagZ3Zb7njZV6SbT+W LqnUhB+7+Bk/x9r/2Vwj0Wbv9sbVDgn9s7gJdRpqABVywvFHuK6hHhoafO0VGxKu8H2Mq/ WiA8n/Z9GkBw5j1p9/ZvtWqb3L7C90olBIOba845JxvLYRSRuERfXG6gmD+3BhbNPicn+D Q4T/iM7Y6xYxsaqba1ZBANo3z098IbcivdzaE/BzvcbxSesccfNKpmVTIuXOLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673370099; a=rsa-sha256; cv=none; b=nSr5dMhY4YqU3HGnuItbJUvEjuZaYjd1+ode+gR5hfqAKRtuMQQII8GDDEKMuBSu4qax21 AiyQjOMUX6LvLBYrlsoiMXAbjIaEG5E5dcg20XRsjfP+bhI8OizAdBInhOx8c4CyhzhjPr v4KJy7lkolX4OAN1SBCtJ+6qpBZ7bB8IlAuBfPL1+UrVtvdzA3YM03Z4ALnSpYEDNc6x/m O9rByieETIne1s4XVa2iWSCGTgw/wRwgeaB26MnwcfAHQ6vHQrNl+Rz7sVX0HZSzzGgOHi gPlsi4emljNVDXG73fBUx1a8bQzRPPr6XJePsWrVNSGhDZecqqXNLw6H0RxqPQ== 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 4NrxtC1rW9zGMh; Tue, 10 Jan 2023 17:01:39 +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 30AH1dde063986; Tue, 10 Jan 2023 17:01:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AH1dOL063985; Tue, 10 Jan 2023 17:01:39 GMT (envelope-from git) Date: Tue, 10 Jan 2023 17:01:39 GMT Message-Id: <202301101701.30AH1dOL063985@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 1cb6e7b81748 - main - audio/libopenmpt: Update to 0.6.7 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cb6e7b817485144f81cc5ca985b8b06465f71a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1cb6e7b817485144f81cc5ca985b8b06465f71a1 commit 1cb6e7b817485144f81cc5ca985b8b06465f71a1 Author: Daniel Engberg AuthorDate: 2023-01-10 16:59:50 +0000 Commit: Emanuel Haupt CommitDate: 2023-01-10 16:59:50 +0000 audio/libopenmpt: Update to 0.6.7 - Make openmpt123 optional - Reduce options to simplify port and reduce dependency options - Drop "+release.autotools" from version name and .pc file - Enable "make test" --- audio/libopenmpt/Makefile | 46 ++++++++++++++++++++++++++++------------------ audio/libopenmpt/distinfo | 6 +++--- audio/libopenmpt/pkg-plist | 4 ++-- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile index 71ca769c9b7a..5f4905d38c92 100644 --- a/audio/libopenmpt/Makefile +++ b/audio/libopenmpt/Makefile @@ -1,5 +1,5 @@ PORTNAME= libopenmpt -PORTVERSION= 0.6.6 +DISTVERSION= 0.6.7 DISTVERSIONSUFFIX= +release.autotools CATEGORIES= audio MASTER_SITES= https://lib.openmpt.org/files/libopenmpt/src/ \ @@ -12,32 +12,42 @@ WWW= https://lib.openmpt.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler:c++11-lang cpe gmake libtool pkgconfig +LIB_DEPENDS= libmpg123.so:audio/mpg123 \ + libvorbis.so:audio/libvorbis + +USES= compiler:c++17-lang cpe gmake libtool pathfix pkgconfig CPE_VENDOR= openmpt USE_LDCONFIG= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-doxygen-doc \ + --with-mpg123 \ + --with-vorbis \ + --with-vorbisfile \ + --without-portaudiocpp + +TEST_TARGET= check -CONFIGURE_ARGS+= --without-portaudiocpp +OPTIONS_DEFINE= DOCS EXAMPLES OPENMPT123 PULSEAUDIO +OPTIONS_DEFAULT= OPENMPT123 +OPTIONS_SUB= yes -OPTIONS_DEFINE= DOCS EXAMPLES FLAC MPG123 OGG PORTAUDIO PULSEAUDIO \ - SNDFILE VORBIS -OPTIONS_DEFAULT= FLAC MPG123 OGG PORTAUDIO SNDFILE VORBIS +OPENMPT123_DESC= Enable command line player +PULSEAUDIO_DESC= Enable PulseAudio support for openmpt123 -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_WITH= flac -MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 -MPG123_CONFIGURE_WITH= mpg123 -OGG_LIB_DEPENDS= libogg.so:audio/libogg -OGG_CONFIGURE_WITH= ogg -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PORTAUDIO_CONFIGURE_WITH= portaudio +OPENMPT123_LIB_DEPENDS= libFLAC.so:audio/flac \ + libportaudio.so:audio/portaudio \ + libsndfile.so:audio/libsndfile +OPENMPT123_CONFIGURE_OFF= --disable-openmpt123 +OPENMPT123_CONFIGURE_WITH= flac portaudio sndfile + +PULSEAUDIO_IMPLIES= OPENMPT123 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio -SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile -SNDFILE_CONFIGURE_WITH= sndfile -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CONFIGURE_WITH= vorbis vorbisfile + +pre-configure: + @${REINPLACE_CMD} -e 's/+release.autotools//' \ + ${PATCH_WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenmpt.so.* diff --git a/audio/libopenmpt/distinfo b/audio/libopenmpt/distinfo index bf9398b2b411..080e90487c9c 100644 --- a/audio/libopenmpt/distinfo +++ b/audio/libopenmpt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664212817 -SHA256 (libopenmpt-0.6.6+release.autotools.tar.gz) = 6ddb9e26a430620944891796fefb1bbb38bd9148f6cfc558810c0d3f269876c7 -SIZE (libopenmpt-0.6.6+release.autotools.tar.gz) = 1554516 +TIMESTAMP = 1673247806 +SHA256 (libopenmpt-0.6.7+release.autotools.tar.gz) = 2174ac0f5a148ba684db768a47edf783eff9084fbca5fef6c997501643100163 +SIZE (libopenmpt-0.6.7+release.autotools.tar.gz) = 1556248 diff --git a/audio/libopenmpt/pkg-plist b/audio/libopenmpt/pkg-plist index 474c10f16980..c12dc983e813 100644 --- a/audio/libopenmpt/pkg-plist +++ b/audio/libopenmpt/pkg-plist @@ -1,4 +1,4 @@ -bin/openmpt123 +%%OPENMPT123%%bin/openmpt123 include/libopenmpt/libopenmpt.h include/libopenmpt/libopenmpt.hpp include/libopenmpt/libopenmpt_config.h @@ -13,7 +13,7 @@ lib/libopenmpt.so lib/libopenmpt.so.0 lib/libopenmpt.so.0.3.3 libdata/pkgconfig/libopenmpt.pc -man/man1/openmpt123.1.gz +%%OPENMPT123%%man/man1/openmpt123.1.gz %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c_mem.c