diff options
| author | salo <salo> | 2005-08-20 15:04:41 +0000 |
|---|---|---|
| committer | salo <salo> | 2005-08-20 15:04:41 +0000 |
| commit | 184ca5ed8ebb02daca6b091275f08ab3c4a8a248 (patch) | |
| tree | a6888b48dd175524887378fa807b5ab2e4e2e8fc | |
| parent | 275f0b490c025b49dad786af6ca2ffa21988fdc5 (diff) | |
| download | pkgsrc-184ca5ed8ebb02daca6b091275f08ab3c4a8a248.tar.gz | |
Pullup ticket 694 - requested by Grant Beattie
portability fix for xmms-flac
Revisions pulled up:
- pkgsrc/audio/xmms-flac/Makefile 1.15, 1.16
- pkgsrc/audio/xmms-flac/distinfo 1.8
- pkgsrc/audio/xmms-flac/patches/patch-aa 1.3
Module Name: pkgsrc
Committed By: grant
Date: Fri Jul 29 06:06:33 UTC 2005
Modified Files:
pkgsrc/audio/xmms-flac: Makefile distinfo
Added Files:
pkgsrc/audio/xmms-flac/patches: patch-aa
Log Message:
fix build on Solaris:
- sunpro wants 'inline' to inline functions, not '__inline'
- patch away a rogue ;
---
Module Name: pkgsrc
Committed By: grant
Date: Fri Jul 29 06:06:57 UTC 2005
Modified Files:
pkgsrc/audio/xmms-flac: Makefile
Log Message:
USE_LANGUAGES=c c++
| -rw-r--r-- | audio/xmms-flac/Makefile | 10 | ||||
| -rw-r--r-- | audio/xmms-flac/distinfo | 3 | ||||
| -rw-r--r-- | audio/xmms-flac/patches/patch-aa | 13 |
3 files changed, 24 insertions, 2 deletions
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index 06d02f2623f..d3e7676ed95 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.14.2.1 2005/08/20 15:04:41 salo Exp $ # DISTNAME= flac-1.1.2 @@ -13,6 +13,7 @@ COMMENT= FLAC XMMS plugin USE_TOOLS+= gmake GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool-disable-static @@ -21,6 +22,13 @@ XMMS_WRKSRC= ${WRKSRC}/src/plugin_xmms # 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 --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo index a30b57cf816..6e354285566 100644 --- a/audio/xmms-flac/distinfo +++ b/audio/xmms-flac/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/03/03 15:29:52 wiz Exp $ +$NetBSD: distinfo,v 1.7.4.1 2005/08/20 15:04:41 salo 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 --git a/audio/xmms-flac/patches/patch-aa b/audio/xmms-flac/patches/patch-aa new file mode 100644 index 00000000000..cab4d4edd0d --- /dev/null +++ b/audio/xmms-flac/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.2.6.1 2005/08/20 15:04:41 salo 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 */ |