From nobody Thu Oct 27 16:47:51 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 4Mys6w0Sqnz4gTtZ; Thu, 27 Oct 2022 16:47:52 +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 4Mys6w01Bgz3s5X; Thu, 27 Oct 2022 16:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666889272; 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=KjrlO5WtYg2mdR1TPnhno4lpb/Lcg36JuGoN/NUhAXE=; b=qwq3F+NBjaUocjfZxpoCwkzwHWeW+XMFzdOw6QWR5OWmcqgsYMSupIbTqqevJ5TCkvjFrp 5XVeDA5lJUeLR/GqMGyMISTjNCEiGHOyE0MCU4K/HyektiGCK2eNOXHDZCAn2fTV3e/k4y uAX0KnVyMdDR3L3Eo/mhcVXPegG3jZYaZvzbe61dRWdwf/ylSj54HWjVdzChrtvr7nsfM4 4pU6gkt7AI8xwqZD/E+OIcJiAMgXdFD1M16O/Sshuqij3zHKW+fad3+cxEpVZZiYwa5HkV Xq/wrlnh9lSORZ3uWOyjF8Yc6gXIIf4PvhLsm/rX54HVwsr8S4MsK0ohgbI3fQ== 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 4Mys6v69jVz14tw; Thu, 27 Oct 2022 16:47:51 +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 29RGlpRD020397; Thu, 27 Oct 2022 16:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RGlpZG020396; Thu, 27 Oct 2022 16:47:51 GMT (envelope-from git) Date: Thu, 27 Oct 2022 16:47:51 GMT Message-Id: <202210271647.29RGlpZG020396@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: 8346e17880fc - main - audio/flac: update to 1.4.2 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: 8346e17880fc94fb2959a67ff519f77e47d70fd0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666889272; 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=KjrlO5WtYg2mdR1TPnhno4lpb/Lcg36JuGoN/NUhAXE=; b=B3PHCwMU2A453DVxyBZGqxVRHOWkbPerazCR1ZEk/XYMtm56MkFlSJBVhbqiLkrqRANgp2 hD1DCHU+QagrvmFEW+eK5Ll8W8/ZUnDaX1Zc3iYWLSSLAjjfEakf3KK3F0Vq91MYarLizp yzj41qUZG7Pk/Gli0jx+ErtBM+EnbXD1hZEjI+GISsAzY2XqvA4RF1qTJAvymyamj5Yf8X qL4jPf9z2Oa2D9VlN+aUbNAw5FJL8idvkGKT/rAaS6ewTjCpFdC8MqSHrgnTWAGrE4SCZx uwg02B8UYFrR2LSKuWLTmMY/qMvCyhuT/5O6c11KP93tWzOvSm6aHCI4ApuVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666889272; a=rsa-sha256; cv=none; b=ehz3qyzECj52op8Xbs1IMkdD+GVtD71i6ZMCGvMTiWeFt63tdeQBi5xQAXHyV4xiaxFBPu Hv+dPJ/29gsUXPWFYYsFsfOkaJDkoi5IBJsxbcf6ghBLJ4Lc1N/1JKMJ7lzLe7ZuPFSvZ3 +jb0A3raoP4cIVRxb7oqxV7EQ4Nykg1d6529UIF4vzqz4YiElNa+rfoc2jWCjmSGKbv/VQ hXzL6uWlndzLNfVyCGDlsx+dFqjM690d8UxFNtAefGT3OZBAKl0N1w25uOlPXTYl3bDsI1 l1ea5M7BwTCMNhZ9yU3aQ9vTlr9Qba3XwqBHhavPYUu2dR8MWmUTvOdkbvFiJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8346e17880fc94fb2959a67ff519f77e47d70fd0 commit 8346e17880fc94fb2959a67ff519f77e47d70fd0 Author: Christian Weisgerber AuthorDate: 2022-10-27 16:36:53 +0000 Commit: Christian Weisgerber CommitDate: 2022-10-27 16:47:47 +0000 audio/flac: update to 1.4.2 --- audio/flac/Makefile | 8 +---- audio/flac/distinfo | 6 ++-- audio/flac/files/patch-configure | 18 +++++----- .../files/patch-src_libFLAC_include_private_cpu.h | 41 ---------------------- 4 files changed, 14 insertions(+), 59 deletions(-) diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 7dddce282528..9deb34b57ebf 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,6 +1,5 @@ PORTNAME= flac -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= audio MASTER_SITES= https://downloads.xiph.org/releases/flac/ \ https://ftp.osuosl.org/pub/xiph/releases/flac/ @@ -27,7 +26,6 @@ EXTRACT_CMD= ${SETENV} LC_ALL=C.UTF-8 ${TAR} USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ - --disable-sse \ --with-ogg="${LOCALBASE}" \ --disable-doxygen-docs \ --disable-thorough-tests \ @@ -39,10 +37,6 @@ OPTIONS_DEFINE= DOCS .include -.if ${ARCH} == "i386" -BUILD_DEPENDS+= nasm:devel/nasm -.endif - .if ${ARCH} != powerpc64le CONFIGURE_ARGS+=--disable-vsx .endif diff --git a/audio/flac/distinfo b/audio/flac/distinfo index d5bd1c770e97..fc1c468e3fdd 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664106990 -SHA256 (flac-1.4.1.tar.xz) = 91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6 -SIZE (flac-1.4.1.tar.xz) = 1024160 +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 index 4ccb0d555f73..1f47882210cc 100644 --- a/audio/flac/files/patch-configure +++ b/audio/flac/files/patch-configure @@ -1,11 +1,13 @@ ---- configure.orig 2022-09-25 11:57:11 UTC +--- configure.orig 2022-10-27 15:10:23 UTC +++ configure -@@ -20004,7 +20004,7 @@ then : - fi +@@ -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 -- if test "x$HAVE_PREBUILD_FLAG_TAG$HAVEPREBUILD_API_DIR" = "xyesyes"; then -+ if test "x$HAVE_PREBUILT_FLAC_TAG$HAVE_PREBUILT_API_DIR" = "xyesyes"; then - FLaC__HAS_PREBUILT_DOXYGEN_TRUE= - FLaC__HAS_PREBUILT_DOXYGEN_FALSE='#' - else + diff --git a/audio/flac/files/patch-src_libFLAC_include_private_cpu.h b/audio/flac/files/patch-src_libFLAC_include_private_cpu.h deleted file mode 100644 index 9837d6f10ae2..000000000000 --- a/audio/flac/files/patch-src_libFLAC_include_private_cpu.h +++ /dev/null @@ -1,41 +0,0 @@ -Assume Clang supports x86 intrinsics up to FMA -https://github.com/xiph/flac/commit/90c0562d4eb302b01d9b82c75a7f6a66261c5546 - ---- src/libFLAC/include/private/cpu.h.orig 2022-09-21 18:57:31 UTC -+++ src/libFLAC/include/private/cpu.h -@@ -82,28 +82,14 @@ - #elif defined __clang__ && __has_attribute(__target__) /* clang */ - #define FLAC__SSE_TARGET(x) __attribute__ ((__target__ (x))) - #define FLAC__FAST_MATH_TARGET(x) __attribute__ ((__target__ (x))) -- #if __has_builtin(__builtin_ia32_maxps) -- #define FLAC__SSE_SUPPORTED 1 -- #endif -- #if __has_builtin(__builtin_ia32_pmuludq128) -- #define FLAC__SSE2_SUPPORTED 1 -- #endif -- #if __has_builtin(__builtin_ia32_pabsd128) -- #define FLAC__SSSE3_SUPPORTED 1 -- #endif -- #if __has_builtin(__builtin_ia32_pmuldq128) -- #define FLAC__SSE4_1_SUPPORTED 1 -- #endif -+ #define FLAC__SSE_SUPPORTED 1 -+ #define FLAC__SSE2_SUPPORTED 1 -+ #define FLAC__SSSE3_SUPPORTED 1 -+ #define FLAC__SSE4_1_SUPPORTED 1 - #ifdef FLAC__USE_AVX -- #if __has_builtin(__builtin_ia32_maxps256) -- #define FLAC__AVX_SUPPORTED 1 -- #endif -- #if __has_builtin(__builtin_ia32_pabsd256) -- #define FLAC__AVX2_SUPPORTED 1 -- #endif -- #if __has_builtin(__builtin_ia32_vfmaddps) -- #define FLAC__FMA_SUPPORTED 1 -- #endif -+ #define FLAC__AVX_SUPPORTED 1 -+ #define FLAC__AVX2_SUPPORTED 1 -+ #define FLAC__FMA_SUPPORTED 1 - #endif - #elif defined __GNUC__ && !defined __clang__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) /* GCC 4.9+ */ - #define FLAC__SSE_TARGET(x) __attribute__ ((__target__ (x)))