[pkgsrc/trunk]: pkgsrc/audio/xmms-flac fix build on Solaris:

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd7bde50e477
branches:  trunk
changeset: 497495:cd7bde50e477
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Jul 29 06:06:33 2005 +0000

description:
fix build on Solaris:

- sunpro wants 'inline' to inline functions, not '__inline'
- patch away a rogue ;

diffstat:

 audio/xmms-flac/Makefile         |   9 ++++++++-
 audio/xmms-flac/distinfo         |   3 ++-
 audio/xmms-flac/patches/patch-aa |  13 +++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 8b3111ce6e88 -r cd7bde50e477 audio/xmms-flac/Makefile
--- a/audio/xmms-flac/Makefile  Fri Jul 29 05:39:00 2005 +0000
+++ b/audio/xmms-flac/Makefile  Fri Jul 29 06:06:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/29 06:06:33 grant Exp $
 #
 
 DISTNAME=      flac-1.1.2
@@ -21,6 +21,13 @@
 # previous name of the package
 CONFLICTS=     flac-xmms-[0-9]*
 
+.include "../../mk/compiler.mk"
+
+# SunPro does not support __inline
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CFLAGS+=       -D__inline=inline
+.endif
+
 #do-build:
 #      @cd ${XMMS_WRKSRC}/../plugin_common && ${SETENV} ${MAKE_ENV} \
 #              ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${BUILD_TARGET}
diff -r 8b3111ce6e88 -r cd7bde50e477 audio/xmms-flac/distinfo
--- a/audio/xmms-flac/distinfo  Fri Jul 29 05:39:00 2005 +0000
+++ b/audio/xmms-flac/distinfo  Fri Jul 29 06:06:33 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/03/03 15:29:52 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/07/29 06:06:33 grant Exp $
 
 SHA1 (flac-1.1.2.tar.gz) = 65501f3547df99b153951edb2ee7bfc13dd56946
 RMD160 (flac-1.1.2.tar.gz) = 58656837b02e211eaed5010d84c4ed59841c82d3
 Size (flac-1.1.2.tar.gz) = 1516235 bytes
+SHA1 (patch-aa) = 48833d0f6f79e47c5796b96ea497b29636e4ed88
diff -r 8b3111ce6e88 -r cd7bde50e477 audio/xmms-flac/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms-flac/patches/patch-aa  Fri Jul 29 06:06:33 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2005/07/29 06:06:33 grant Exp $
+
+--- src/libFLAC/format.c.orig  2005-02-04 17:54:49.000000000 +1100
++++ src/libFLAC/format.c
+@@ -63,7 +63,7 @@ FLAC_API const char *FLAC__VENDOR_STRING
+ 
+ FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
+ FLAC_API const unsigned FLAC__STREAM_SYNC = 0x664C6143;
+-FLAC_API const unsigned FLAC__STREAM_SYNC_LEN = 32; /* bits */;
++FLAC_API const unsigned FLAC__STREAM_SYNC_LEN = 32; /* bits */
+ 
+ FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN = 16; /* bits */
+ FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN = 16; /* bits */