diff options
author | wiz <wiz@pkgsrc.org> | 2007-01-07 15:01:52 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2007-01-07 15:01:52 +0000 |
commit | 54cae78725e61e7937665b547ff7bec709ceca03 (patch) | |
tree | 23eb6f9579f7d4b4f054f10516bd688633c0dd85 | |
parent | 9ed7f543797a56ac42fe90fb991a8267889f6db1 (diff) | |
download | pkgsrc-54cae78725e61e7937665b547ff7bec709ceca03.tar.gz |
Link libFLAC against libogg, since libFLAC references symbols from
there. Bump PKGREVISION and ABI depends (dependencies probably wouldn't
have built anyway).
-rw-r--r-- | audio/flac/Makefile | 3 | ||||
-rw-r--r-- | audio/flac/buildlink3.mk | 4 | ||||
-rw-r--r-- | audio/flac/distinfo | 4 | ||||
-rw-r--r-- | audio/flac/patches/patch-ag | 16 | ||||
-rw-r--r-- | audio/flac/patches/patch-ah | 15 |
5 files changed, 38 insertions, 4 deletions
diff --git a/audio/flac/Makefile b/audio/flac/Makefile index a98a64ef28d..7a0bc67f742 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2007/01/07 12:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2007/01/07 15:01:52 wiz Exp $ DISTNAME= flac-1.1.3 +PKGREVISION= 1 CATEGORIES= audio archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk index 0b872dd1214..9a54d136e9b 100644 --- a/audio/flac/buildlink3.mk +++ b/audio/flac/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/01/07 12:25:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2007/01/07 15:01:52 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+ @@ -13,7 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flac .if !empty(FLAC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.flac+= flac>=1.1.0nb1 -BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.3 +BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.3nb1 BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac .endif # FLAC_BUILDLINK3_MK diff --git a/audio/flac/distinfo b/audio/flac/distinfo index 49f14fdb8cb..176e29dd40c 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2007/01/07 12:25:05 wiz Exp $ +$NetBSD: distinfo,v 1.15 2007/01/07 15:01:52 wiz Exp $ SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295 RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132 @@ -9,3 +9,5 @@ SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874 SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3 SHA1 (patch-af) = 945fd4fa294f84ebbbeeb561bf7ce0885261539c +SHA1 (patch-ag) = ec37d2e4ce9c0a8d4d638fe08d1f38914029a205 +SHA1 (patch-ah) = 90452d2983aed07a8a0c14926772610ef3799099 diff --git a/audio/flac/patches/patch-ag b/audio/flac/patches/patch-ag new file mode 100644 index 00000000000..2a61bba591c --- /dev/null +++ b/audio/flac/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.3 2007/01/07 15:01:52 wiz Exp $ + +--- src/libFLAC/Makefile.am.orig 2006-10-13 04:25:26.000000000 +0000 ++++ src/libFLAC/Makefile.am +@@ -86,9 +86,10 @@ extra_ogg_sources = \ + ogg_encoder_aspect.c \ + ogg_helper.c \ + ogg_mapping.c ++extra_ogg_libs = -logg + endif + # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention +-libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) ++libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) $(extra_ogg_libs) + libFLAC_la_SOURCES = \ + bitbuffer.c \ + bitmath.c \ diff --git a/audio/flac/patches/patch-ah b/audio/flac/patches/patch-ah new file mode 100644 index 00000000000..0b19d8c05e5 --- /dev/null +++ b/audio/flac/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.3 2007/01/07 15:01:52 wiz Exp $ + +--- src/libFLAC/Makefile.in.orig 2006-11-27 06:41:11.000000000 +0000 ++++ src/libFLAC/Makefile.in +@@ -267,8 +267,9 @@ EXTRA_DIST = \ + @FLaC__HAS_OGG_TRUE@ ogg_helper.c \ + @FLaC__HAS_OGG_TRUE@ ogg_mapping.c + ++@FLaC__HAS_OGG_TRUE@extra_ogg_libs = -logg + # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention +-libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) ++libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) $(extra_ogg_libs) + libFLAC_la_SOURCES = \ + bitbuffer.c \ + bitmath.c \ |