CVS commit: pkgsrc/audio/libvorbis

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug  4 07:00:58 UTC 2023

Modified Files:
        pkgsrc/audio/libvorbis: Makefile distinfo
Added Files:
        pkgsrc/audio/libvorbis/patches: patch-configure

Log Message:
libvorbis: fix for Darwin with ARM


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/audio/libvorbis/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/audio/libvorbis/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libvorbis/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libvorbis/Makefile
diff -u pkgsrc/audio/libvorbis/Makefile:1.63 pkgsrc/audio/libvorbis/Makefile:1.64
--- pkgsrc/audio/libvorbis/Makefile:1.63        Mon Jul  6 15:32:47 2020
+++ pkgsrc/audio/libvorbis/Makefile     Fri Aug  4 07:00:57 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2020/07/06 15:32:47 adam Exp $
+# $NetBSD: Makefile,v 1.64 2023/08/04 07:00:57 adam Exp $
 
 DISTNAME=      libvorbis-1.3.7
-CATEGORIES=    devel audio
+CATEGORIES=    audio devel
 MASTER_SITES=  http://downloads.xiph.org/releases/vorbis/
 EXTRACT_SUFX=  .tar.xz
 

Index: pkgsrc/audio/libvorbis/distinfo
diff -u pkgsrc/audio/libvorbis/distinfo:1.30 pkgsrc/audio/libvorbis/distinfo:1.31
--- pkgsrc/audio/libvorbis/distinfo:1.30        Tue Oct 26 09:59:10 2021
+++ pkgsrc/audio/libvorbis/distinfo     Fri Aug  4 07:00:57 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 09:59:10 nia Exp $
+$NetBSD: distinfo,v 1.31 2023/08/04 07:00:57 adam Exp $
 
 BLAKE2s (libvorbis-1.3.7.tar.xz) = dd92a6ac2fb16b8f03120cc9c96d102a32a93cca50e867c030ee41411f0149f7
 SHA512 (libvorbis-1.3.7.tar.xz) = bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
 Size (libvorbis-1.3.7.tar.xz) = 1203792 bytes
+SHA1 (patch-configure) = 2b22bad31bbd20b521eff833bba96df3e881cf10

Added files:

Index: pkgsrc/audio/libvorbis/patches/patch-configure
diff -u /dev/null pkgsrc/audio/libvorbis/patches/patch-configure:1.1
--- /dev/null   Fri Aug  4 07:00:58 2023
+++ pkgsrc/audio/libvorbis/patches/patch-configure      Fri Aug  4 07:00:58 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2023/08/04 07:00:58 adam Exp $
+
+-force_cpusubtype_ALL is not supported on Darwin with ARM CPU.
+
+--- configure.orig     2023-08-04 05:28:06.000000000 +0000
++++ configure
+@@ -12840,9 +12840,9 @@ rm -f core conftest.err conftest.$ac_obj
+               CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+               PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
+       *-*-darwin*)
+-              DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-              CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+-              PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
++              DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
++              CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
++              PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
+       *-*-os2*)
+               # Use -W instead of -Wextra because gcc on OS/2 is an old version.
+               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"