From nobody Sun Jun 25 17:19:59 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 4QpyQl5V0Kz4hGCn; Sun, 25 Jun 2023 17:19:59 +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 4QpyQl4dKNz4Krk; Sun, 25 Jun 2023 17:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687713599; 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=xqImRq2BDE1ctUxWvnpQnInNI6OH89mQLlrKI6BXD1M=; b=I969mXzAxEHdVH6iJGTUHxN7g2DxNepJzLGJ0GZvOPz0f+NNmSvcVb1C6L3rOJJ8pnH4sn r3dyfvRmF3YTuj2AqL95GlXAKdABj/iSvm64wnY7g9HGILYtKWWFOuH8V6kuL3k6SbnOao 6CNIlJL5HiTOnWBRJ7ZKYB4mzb6eEAZUkriDXOqK18DMrwqUqZxz7/PupsgbuhxXRObacv 81woyIpMFO7bsVG+9uuNz2GYTEbTWDvk6vcg7sMsVdfdPqnZgYpxrBNi7KNRkpMxtcyHkb h+V6CoSEX9gMVWKH0tbwUdVjFOXB9tjXPkLtXP/s7J7qzvMsz64G+VmsV85bTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687713599; 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=xqImRq2BDE1ctUxWvnpQnInNI6OH89mQLlrKI6BXD1M=; b=l+f0bqGZV5QL3KnlIAfjc4277jdcxrVCv8n2stip94eVQZy8OYvHXtXbjSxDJIpfhS4piN snJTJiLH+5uksK4SYy7G0Q9wLBLUbNCUrhb0wInVsgEbsrZnoBrVO1vdl9kiHid6j5eQOW EkhWZAD/fdBMV1jFcnidrMKne3zGpu5FPQwbrhwaK3185Nz5gyEvLKy+unOalaNbBkM1xi hzh2G0+x4hHa/qGNwngyp+r+hViEnMNr9QjidQ36HJjAV+IiT31PwDFMqaGf4kSY8CP/TF DXiOTM3DlDhNd70pRhYRImKnHn6pfqweDclhBlWmyehjBzvw51sUE+DF8b5xkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687713599; a=rsa-sha256; cv=none; b=ISUqbYbf+GrvUhkYfSUI6mlgLMgDtwadxLKD1nGVchhz9OWFS8kCorq4q++yuMROEjQ2Sc Lf/T5RFxF3CnPSWS/CHRjbkQfwSi2XxVWsbVx51RUqn9HOdamf1YJ2XDIWAVw3wFSo5q84 +RYhXXhzGtwCg5JXno7UUsIKFbMGI3vB0SPIo76Dttj1T3eRjsxELpbn+k5W/uOtMn6g8w ki6am8+H623ddlxJG64XOchIZL9p//TSu/f+L45+TWSpfg/F0kUvwNS/psCMOUIIdkbwAy SiLtyulP6NTKnRDdcCPbNpEfIQ7XwyGUxPz1N70BtaSKrrxiqdrxtoE6z2mHuQ== 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 4QpyQl3bCLzbth; Sun, 25 Jun 2023 17:19:59 +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 35PHJxh9009523; Sun, 25 Jun 2023 17:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35PHJxeM009522; Sun, 25 Jun 2023 17:19:59 GMT (envelope-from git) Date: Sun, 25 Jun 2023 17:19:59 GMT Message-Id: <202306251719.35PHJxeM009522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: 903973f2f5dd - main - =?utf-8?Q?audio/flac:=20revert=20update=201.4.2=20=E2=86=92=201.4.3?= 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: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 903973f2f5ddd19fd5c6279de92dee571d1d4351 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=903973f2f5ddd19fd5c6279de92dee571d1d4351 commit 903973f2f5ddd19fd5c6279de92dee571d1d4351 Author: Christian Weisgerber AuthorDate: 2023-06-25 17:15:27 +0000 Commit: Christian Weisgerber CommitDate: 2023-06-25 17:15:27 +0000 audio/flac: revert update 1.4.2 → 1.4.3 As MAINTAINER, I was not given a chance to review this and it likely introduces gratuitous changes I object to. This reverts commit f7f2d731c8d9a0cdfce89950e2d387dc07909e30. --- audio/flac/Makefile | 47 +++++++++++++++++++++------------------- audio/flac/distinfo | 6 ++--- audio/flac/files/patch-configure | 13 +++++++++++ audio/flac/pkg-plist | 11 ++++------ 4 files changed, 45 insertions(+), 32 deletions(-) diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 765ecaa4ab43..7a2684acdde5 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,8 +1,7 @@ PORTNAME= flac -DISTVERSION= 1.4.3 +PORTVERSION= 1.4.2 CATEGORIES= audio -MASTER_SITES= https://github.com/xiph/${PORTNAME}/releases/download/${DISTVERSION}/ \ - https://downloads.xiph.org/releases/${PORTNAME}/ +MASTER_SITES= https://downloads.xiph.org/releases/flac/ MAINTAINER= naddy@FreeBSD.org COMMENT= Free lossless audio codec @@ -15,33 +14,37 @@ LICENSE_FILE_GFDL= ${WRKSRC}/COPYING.FDL LIB_DEPENDS= libogg.so:audio/libogg -USES= cmake:testing compiler:c11 cpe gettext-runtime iconv \ - pathfix pkgconfig tar:xz +USES= compiler:c11 cpe iconv libtool pathfix pkgconfig tar:xz + CPE_VENDOR= flac_project -USE_LDCONFIG= yes # Preserve UTF-8 filenames in test/flac-to-flac-metadata-test-files/. # They are referenced by the test suite. EXTRACT_CMD= ${SETENV} LC_ALL=C.UTF-8 ${TAR} -CMAKE_TESTING_ARGS= -DCMAKE_CTEST_ARGUMENTS="-E;libFLAC" - -CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man -CMAKE_OFF= BUILD_DOCS BUILD_TESTING WITH_STACK_PROTECTOR -CMAKE_ON= BUILD_SHARED_LIBS +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-static \ + --with-ogg="${LOCALBASE}" \ + --disable-doxygen-docs \ + --disable-thorough-tests \ + --disable-xmms-plugin +INSTALL_TARGET= install-strip +TEST_TARGET= check OPTIONS_DEFINE= DOCS -post-install: - ${INSTALL_DATA} ${WRKSRC}/src/*/*.m4 ${STAGEDIR}${PREFIX}/share/aclocal +.include + +.if ${ARCH} != powerpc64le +CONFIGURE_ARGS+=--disable-vsx +.endif -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/api - ${INSTALL_MAN} ${WRKSRC}/doc/api/* ${STAGEDIR}${DOCSDIR}/api - ${MKDIR} ${STAGEDIR}${DOCSDIR}/images - ${INSTALL_MAN} ${WRKSRC}/doc/images/*.gif ${STAGEDIR}${DOCSDIR}/images - ${INSTALL_MAN} ${WRKSRC}/doc/images/*.svg ${STAGEDIR}${DOCSDIR}/images - ${INSTALL_MAN} ${WRKSRC}/doc/*.tag ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/isoflac.txt ${STAGEDIR}${DOCSDIR} +# test_libFLAC: +# "iterator claims file is writable when tester thinks it should not be" +.if ${UID} == 0 +do-test: + @${ECHO_MSG} "The tests cannot be run as root, skipping." +.endif -.include +.include diff --git a/audio/flac/distinfo b/audio/flac/distinfo index 8c9c588b9a07..fc1c468e3fdd 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687505819 -SHA256 (flac-1.4.3.tar.xz) = 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70 -SIZE (flac-1.4.3.tar.xz) = 1006728 +TIMESTAMP = 1666882895 +SHA256 (flac-1.4.2.tar.xz) = e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4 +SIZE (flac-1.4.2.tar.xz) = 1013700 diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure new file mode 100644 index 000000000000..1f47882210cc --- /dev/null +++ b/audio/flac/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2022-10-27 15:10:23 UTC ++++ configure +@@ -21455,8 +21455,8 @@ fi + if test "x${ax_enable_debug}" = "xno" + then : + +- CFLAGS="-O3 -funroll-loops $CFLAGS" +- CXXFLAGS="-O3 $CXXFLAGS" ++ #CFLAGS="-O3 -funroll-loops $CFLAGS" ++ #CXXFLAGS="-O3 $CXXFLAGS" + + fi + diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist index 5837a1560a61..e879d8ededcb 100644 --- a/audio/flac/pkg-plist +++ b/audio/flac/pkg-plist @@ -14,16 +14,14 @@ include/FLAC/metadata.h include/FLAC/ordinals.h include/FLAC/stream_decoder.h include/FLAC/stream_encoder.h -lib/cmake/FLAC/flac-config-version.cmake -lib/cmake/FLAC/flac-config.cmake -lib/cmake/FLAC/targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/FLAC/targets.cmake +lib/libFLAC++.a lib/libFLAC++.so lib/libFLAC++.so.10 -lib/libFLAC++.so.10.0.1 +lib/libFLAC++.so.10.0.0 +lib/libFLAC.a lib/libFLAC.so lib/libFLAC.so.12 -lib/libFLAC.so.12.1.0 +lib/libFLAC.so.12.0.0 libdata/pkgconfig/flac++.pc libdata/pkgconfig/flac.pc man/man1/flac.1.gz @@ -31,7 +29,6 @@ man/man1/metaflac.1.gz share/aclocal/libFLAC++.m4 share/aclocal/libFLAC.m4 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag -%%PORTDOCS%%%%DOCSDIR%%/isoflac.txt %%PORTDOCS%%%%DOCSDIR%%/api/FLAC_09_09_2all_8h_source.html %%PORTDOCS%%%%DOCSDIR%%/api/FLAC_09_09_2export_8h.html %%PORTDOCS%%%%DOCSDIR%%/api/FLAC_09_09_2export_8h_source.html