CVS commit: pkgsrc/multimedia/xine-ui

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Wed Mar  8 20:20:19 UTC 2023

Modified Files:
        pkgsrc/multimedia/xine-ui: Makefile distinfo
Added Files:
        pkgsrc/multimedia/xine-ui/patches: patch-configure.ac

Log Message:
fix the build on arm64 (and likely others).

always define ATTR_INLINE_ALL_STRINGOPS to something, since the build
wants it to be at least empty.

no bump to pkg version since packages that built correctly should keep
building the same way with no change, only packages that did not build
at all will now build.

tested on amd64 and arm64.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/multimedia/xine-ui/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/xine-ui/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/xine-ui/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/multimedia/xine-ui/Makefile
diff -u pkgsrc/multimedia/xine-ui/Makefile:1.115 pkgsrc/multimedia/xine-ui/Makefile:1.116
--- pkgsrc/multimedia/xine-ui/Makefile:1.115    Sun Jan 29 21:17:23 2023
+++ pkgsrc/multimedia/xine-ui/Makefile  Wed Mar  8 20:20:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2023/01/29 21:17:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.116 2023/03/08 20:20:18 mrg Exp $
 
 DISTNAME=              xine-ui-0.99.13
 PKGREVISION=           6
@@ -14,11 +14,15 @@ LICENSE=            gnu-gpl-v2
 USE_PKGLOCALEDIR=      YES
 USE_TOOLS+=            pkg-config gmake perl
 USE_TOOLS+=            msgfmt msgmerge xgettext
+USE_TOOLS+=            autoconf automake autoreconf
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --disable-lirc
 CONFIGURE_ARGS+=       --without-aalib
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -vif
+
 BUILDLINK_DEPMETHOD.libXt?=    build
 
 LIBS.SunOS+=   -lsocket -lnsl

Index: pkgsrc/multimedia/xine-ui/distinfo
diff -u pkgsrc/multimedia/xine-ui/distinfo:1.32 pkgsrc/multimedia/xine-ui/distinfo:1.33
--- pkgsrc/multimedia/xine-ui/distinfo:1.32     Sun Apr 10 16:49:14 2022
+++ pkgsrc/multimedia/xine-ui/distinfo  Wed Mar  8 20:20:18 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.32 2022/04/10 16:49:14 nia Exp $
+$NetBSD: distinfo,v 1.33 2023/03/08 20:20:18 mrg Exp $
 
 BLAKE2s (xine-ui-0.99.13.tar.xz) = 416e413865a99c72bc344a55a4a188effe9f1846ee102b6971ffbcf29aec4b50
 SHA512 (xine-ui-0.99.13.tar.xz) = a0802d767a805c462f7ae05fa5c4860af5c281ffa74c70a6c2c8a3ecbf8060e6f3f40fed215e27a823985c7d5c3484715cbbe5e4bf43655353f59fa2230b41e7
 Size (xine-ui-0.99.13.tar.xz) = 2156892 bytes
+SHA1 (patch-configure.ac) = 7e4a3613308486feabc1709c12491693d8868b9a
 SHA1 (patch-src_xitk_network.c) = 1a570e51a731c1ec489566e40e52fbb58896a246

Added files:

Index: pkgsrc/multimedia/xine-ui/patches/patch-configure.ac
diff -u /dev/null pkgsrc/multimedia/xine-ui/patches/patch-configure.ac:1.1
--- /dev/null   Wed Mar  8 20:20:19 2023
+++ pkgsrc/multimedia/xine-ui/patches/patch-configure.ac        Wed Mar  8 20:20:18 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure.ac,v 1.1 2023/03/08 20:20:18 mrg Exp $
+
+Always define ATTR_INLINE_ALL_STRINGOPS to something, since the build wants
+it to be at least empty.
+
+--- configure.ac.orig  2021-12-12 11:49:29.000000000 -0800
++++ configure.ac       2023-03-05 20:22:04.328140029 -0800
+@@ -598,12 +598,14 @@
+ ], [
+ int n = my_strlen ("what");
+ ])], [have_attr_iaso=yes], [have_attr_iaso=no])
++stringopattr=''
+ AC_MSG_RESULT([$have_attr_iaso])
+ if test x"$have_attr_iaso" = x"yes" ; then
+-    AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS],
+-        [__attribute__ ((__target__ ("inline-all-stringops")))],
+-        [Define this to a function attribute that inlines string handling code])
++    stringopattr='__attribute__ ((__target__ ("inline-all-stringops")))'
+ fi
++AC_DEFINE_UNQUOTED([ATTR_INLINE_ALL_STRINGOPS],
++    [$stringopattr],
++    [Define this to a function attribute that inlines string handling code])
+ 
+ AC_ARG_ENABLE([asan],
+    [AS_HELP_STRING([--enable-asan], [Compile with address sanitizer])])