<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b4576a7673031660bd0453fd9c2208e23ed2e8f6">https://github.com/macports/macports-ports/commit/b4576a7673031660bd0453fd9c2208e23ed2e8f6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b4576a7673031660bd0453fd9c2208e23ed2e8f6
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 3 21:59:25 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> flac: update to 1.4.2
</span>---
audio/flac/Portfile | 42 +++-----------------------------
audio/flac/files/patch-build_lib.mk.diff | 11 ---------
audio/flac/files/patch-ltmain.sh.diff | 11 ---------
audio/flac/files/patch-nasm.h.diff | 14 -----------
4 files changed, 4 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/flac/Portfile b/audio/flac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db10e128e07..e4edc8bc844 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/flac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/flac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span>
name flac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eaf3b891def66cd80b0126fd691a68dfc5a071e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1038356
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.2
</span> categories audio
license GPL-2+ BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,36 +25,10 @@ depends_lib port:libiconv port:libogg
</span>
master_sites https://ftp.osuosl.org/pub/xiph/releases/flac/
use_xz yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b5ea6c2570c22d54d897cdec3874118c39415879 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-nasm.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build_lib.mk.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# <rdar://problem/15203338>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -std=gnu89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/46038
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 3.1 through 3.3 have cpuid.h but lack __cpuid_count()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist macports-clang-3.3 {clang < 503}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xmms-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-asm-optimizations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 10 powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Otherwise Intel assembler is used on Rosetta:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --build=powerpc-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -fstack-protector-strong introduced in GCC 4.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc-4.* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-stack-smash-protection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules
</span>
post-configure {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,8 +36,6 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args OBJ_FORMAT=macho
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/flac/files/patch-build_lib.mk.diff b/audio/flac/files/patch-build_lib.mk.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20b6967ef38..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/flac/files/patch-build_lib.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/lib.mk.orig 2013-05-27 03:08:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/lib.mk 2013-10-04 18:20:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RELEASE_STATIC_LIB = $(RELEASE_LIBPATH)/$(STATIC_LIB_NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RELEASE_DYNAMIC_LIB = $(RELEASE_LIBPATH)/$(DYNAMIC_LIB_NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LINKD = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LINKD = $(CC) -dynamiclib -undefined dynamic_lookup -install_name $(DYNAMIC_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINKD = $(CC) -shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/flac/files/patch-ltmain.sh.diff b/audio/flac/files/patch-ltmain.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc54c9892be..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/flac/files/patch-ltmain.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ltmain.sh.orig 2005-04-26 13:23:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ltmain.sh 2011-10-25 18:12:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2446,7 +2446,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$installed" = no; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notinst_deplibs="$notinst_deplibs $lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- need_relink=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #need_relink=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is a shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/flac/files/patch-nasm.h.diff b/audio/flac/files/patch-nasm.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a7f98fa2c7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/flac/files/patch-nasm.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libFLAC/ia32/nasm.h~ 2005-01-25 13:14:22.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libFLAC/ia32/nasm.h 2006-03-15 18:07:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %idefine code_section section .text align=16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %idefine data_section section .data align=32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %idefine bss_section section .bss align=32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%elifdef OBJ_FORMAT_macho
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ %define FLAC__PUBLIC_NEEDS_UNDERSCORE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ %idefine code_section section .text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ %idefine data_section section .data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ %idefine bss_section section .bss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %error unsupported object format!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %endif
</span></pre><pre style='margin:0'>
</pre>