diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2022-10-27 18:36:53 +0200 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2022-10-27 18:47:47 +0200 |
| commit | 8346e17880fc94fb2959a67ff519f77e47d70fd0 (patch) | |
| tree | f320d4baab82d3f3d881e9750a468d3e86869982 | |
| parent | net/freeradius3: Update to 3.2.1 (diff) | |
audio/flac: update to 1.4.2
| -rw-r--r-- | audio/flac/Makefile | 8 | ||||
| -rw-r--r-- | audio/flac/distinfo | 6 | ||||
| -rw-r--r-- | audio/flac/files/patch-configure | 18 | ||||
| -rw-r--r-- | audio/flac/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 <bsd.port.pre.mk> -.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))) |