CVS commit: pkgsrc/audio/flac

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Dec 17 13:59:51 UTC 2019

Modified Files:
        pkgsrc/audio/flac: Makefile distinfo
Added Files:
        pkgsrc/audio/flac/patches: patch-configure.ac patch-src_libFLAC_cpu.c

Log Message:
Fix build on non-linux ppc machines

Fix build on non-linux ppc machines, tested by julian sevard.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/audio/flac/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/flac/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/flac/patches/patch-configure.ac \
    pkgsrc/audio/flac/patches/patch-src_libFLAC_cpu.c

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

Modified files:

Index: pkgsrc/audio/flac/Makefile
diff -u pkgsrc/audio/flac/Makefile:1.54 pkgsrc/audio/flac/Makefile:1.55
--- pkgsrc/audio/flac/Makefile:1.54     Mon Aug  5 15:35:12 2019
+++ pkgsrc/audio/flac/Makefile  Tue Dec 17 13:59:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/08/05 15:35:12 adam Exp $
+# $NetBSD: Makefile,v 1.55 2019/12/17 13:59:50 nros Exp $
 
 DISTNAME=      flac-1.3.3
 CATEGORIES=    audio archivers
@@ -11,7 +11,7 @@ COMMENT=      Free lossless audio codec
 LICENSE=       modified-bsd AND gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
+USE_TOOLS+=            aclocal autoconf autoheader automake gmake
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-doxygen-docs
@@ -48,5 +48,8 @@ CFLAGS+=      -D__inline=inline
 BUILDLINK_TRANSFORM+=  rm:-fgnu89-inline
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf
+
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/flac/distinfo
diff -u pkgsrc/audio/flac/distinfo:1.28 pkgsrc/audio/flac/distinfo:1.29
--- pkgsrc/audio/flac/distinfo:1.28     Mon Aug  5 15:35:12 2019
+++ pkgsrc/audio/flac/distinfo  Tue Dec 17 13:59:50 2019
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.28 2019/08/05 15:35:12 adam Exp $
+$NetBSD: distinfo,v 1.29 2019/12/17 13:59:50 nros Exp $
 
 SHA1 (flac-1.3.3.tar.xz) = 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe
 RMD160 (flac-1.3.3.tar.xz) = 8e5d51781d2cead83f2f0cdd1f28ba4cc641e0e1
 SHA512 (flac-1.3.3.tar.xz) = d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
 Size (flac-1.3.3.tar.xz) = 1044472 bytes
+SHA1 (patch-configure.ac) = 6a6635a37bdbfe7bc2a4e2531f27935f9d545368
 SHA1 (patch-microbench_util.c) = f03bfbef537d10ceb9742451ec3509be886e15ed
+SHA1 (patch-src_libFLAC_cpu.c) = 874fae82ad0596696579d6053f1b19018073c079
 SHA1 (patch-strip_non_asm_libtool_args.sh) = f90f09fbf6a0fa938693a9d52316d3a4105129e5

Added files:

Index: pkgsrc/audio/flac/patches/patch-configure.ac
diff -u /dev/null pkgsrc/audio/flac/patches/patch-configure.ac:1.1
--- /dev/null   Tue Dec 17 13:59:51 2019
+++ pkgsrc/audio/flac/patches/patch-configure.ac        Tue Dec 17 13:59:50 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1 2019/12/17 13:59:50 nros Exp $
+
+* check for getauxval and sys/auxv.h since it is not available on all systems
+
+--- configure.ac.orig  2019-12-16 17:00:33.348861095 +0000
++++ configure.ac
+@@ -103,7 +103,8 @@ AC_CHECK_TYPES(socklen_t, [], [])
+ 
+ dnl check for getopt in standard library
+ dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] )
+-AC_CHECK_FUNCS(getopt_long, [], [])
++AC_CHECK_FUNCS([getopt_long getauxval], [], [])
++AC_CHECK_HEADERS([sys/auxv.h])
+ 
+ AC_CHECK_SIZEOF(void*,1)
+ 
Index: pkgsrc/audio/flac/patches/patch-src_libFLAC_cpu.c
diff -u /dev/null pkgsrc/audio/flac/patches/patch-src_libFLAC_cpu.c:1.1
--- /dev/null   Tue Dec 17 13:59:51 2019
+++ pkgsrc/audio/flac/patches/patch-src_libFLAC_cpu.c   Tue Dec 17 13:59:50 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_libFLAC_cpu.c,v 1.1 2019/12/17 13:59:50 nros Exp $
+
+* check for getauxval and sys/auxv.h since it is not available on all systems
+
+--- src/libFLAC/cpu.c.orig     2018-08-20 08:17:21.000000000 +0000
++++ src/libFLAC/cpu.c
+@@ -53,7 +53,7 @@
+ #define dfprintf(file, format, ...)
+ #endif
+ 
+-#if defined FLAC__CPU_PPC
++#if (defined(FLAC__CPU_PPC) && defined(HAVE_SYS_AUXV_H))
+ #include <sys/auxv.h>
+ #endif
+ 
+@@ -236,7 +236,7 @@ x86_cpu_info (FLAC__CPUInfo *info)
+ static void
+ ppc_cpu_info (FLAC__CPUInfo *info)
+ {
+-#if defined FLAC__CPU_PPC
++#if (defined(FLAC__CPU_PPC) && defined(HAVE_GETAUXVAL))
+ #ifndef PPC_FEATURE2_ARCH_3_00
+ #define PPC_FEATURE2_ARCH_3_00                0x00800000
+ #endif