diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/flac/Makefile | 7 | ||||
| -rw-r--r-- | audio/flac/PLIST | 66 | ||||
| -rw-r--r-- | audio/flac/distinfo | 15 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ab | 8 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ag | 12 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ah | 12 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ai | 13 |
7 files changed, 105 insertions, 28 deletions
diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 7a0bc67f742..cbfa069ce2e 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2007/01/07 15:01:52 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2007/11/21 12:47:04 drochner Exp $ -DISTNAME= flac-1.1.3 -PKGREVISION= 1 +DISTNAME= flac-1.2.1 CATEGORIES= audio archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} @@ -21,6 +20,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no" CONFIGURE_ENV+= ac_cv_prog_DOXYGEN="" +PKGCONFIG_OVERRIDE+= src/libFLAC++/flac++.pc.in src/libFLAC/flac.pc.in + .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) diff --git a/audio/flac/PLIST b/audio/flac/PLIST index 37f76343179..e0178e85228 100644 --- a/audio/flac/PLIST +++ b/audio/flac/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2007/01/07 12:25:05 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/11/21 12:47:04 drochner Exp $ bin/flac bin/metaflac include/FLAC++/all.h @@ -17,6 +17,8 @@ include/FLAC/stream_decoder.h include/FLAC/stream_encoder.h lib/libFLAC++.la lib/libFLAC.la +lib/pkgconfig/flac++.pc +lib/pkgconfig/flac.pc man/man1/flac.1 man/man1/metaflac.1 share/aclocal/libFLAC++.m4 @@ -24,6 +26,7 @@ share/aclocal/libFLAC.m4 share/doc/html/flac/FLAC.tag share/doc/html/flac/api/+_2all_8h-source.html share/doc/html/flac/api/+_2export_8h-source.html +share/doc/html/flac/api/+_2export_8h.html share/doc/html/flac/api/+_2metadata_8h-source.html share/doc/html/flac/api/+_2metadata_8h.html share/doc/html/flac/api/all_8h-source.html @@ -132,6 +135,7 @@ share/doc/html/flac/api/group__flac__stream__encoder.html share/doc/html/flac/api/group__flacpp.html share/doc/html/flac/api/group__flacpp__decoder.html share/doc/html/flac/api/group__flacpp__encoder.html +share/doc/html/flac/api/group__flacpp__export.html share/doc/html/flac/api/group__flacpp__metadata.html share/doc/html/flac/api/group__flacpp__metadata__level0.html share/doc/html/flac/api/group__flacpp__metadata__level1.html @@ -139,6 +143,8 @@ share/doc/html/flac/api/group__flacpp__metadata__level2.html share/doc/html/flac/api/group__flacpp__metadata__object.html share/doc/html/flac/api/group__porting.html share/doc/html/flac/api/group__porting__1__1__2__to__1__1__3.html +share/doc/html/flac/api/group__porting__1__1__3__to__1__1__4.html +share/doc/html/flac/api/group__porting__1__1__4__to__1__2__0.html share/doc/html/flac/api/hierarchy.html share/doc/html/flac/api/index.html share/doc/html/flac/api/metadata_8h-source.html @@ -205,21 +211,76 @@ share/doc/html/flac/api/structFLAC____Subframe__Verbatim-members.html share/doc/html/flac/api/structFLAC____Subframe__Verbatim.html share/doc/html/flac/changelog.html share/doc/html/flac/comparison.html +share/doc/html/flac/comparison__chopin_prelude_24.html +share/doc/html/flac/comparison__dream_theater_600.html +share/doc/html/flac/comparison__eddie_warner_titus.html +share/doc/html/flac/comparison__fanfare_de_l_eventail_de_jeanne.html +share/doc/html/flac/comparison__gloria_estefan_conga.html +share/doc/html/flac/comparison__hand_in_my_pocket.html +share/doc/html/flac/comparison__l_sub_raga_sivapriya.html +share/doc/html/flac/comparison__laetatus_sum.html +share/doc/html/flac/comparison__mummified_in_barbed_wire.html +share/doc/html/flac/comparison__prokofiev_pcon3_3.html +share/doc/html/flac/comparison__ravel_sq4_4.html +share/doc/html/flac/comparison__scarlatti_k42.html +share/doc/html/flac/comparison__tool_forty_six_and_2.html +share/doc/html/flac/comparison__white_room.html +share/doc/html/flac/comparison_all_cpudectime.html +share/doc/html/flac/comparison_all_cpuenctime.html +share/doc/html/flac/comparison_all_procdectime.html +share/doc/html/flac/comparison_all_procenctime.html +share/doc/html/flac/comparison_all_ratio.html share/doc/html/flac/developers.html share/doc/html/flac/documentation.html +share/doc/html/flac/documentation_bugs.html +share/doc/html/flac/documentation_example_code.html +share/doc/html/flac/documentation_format_overview.html +share/doc/html/flac/documentation_tasks.html +share/doc/html/flac/documentation_tools.html +share/doc/html/flac/documentation_tools_flac.html +share/doc/html/flac/documentation_tools_metaflac.html +share/doc/html/flac/documentation_tools_plugins.html share/doc/html/flac/download.html share/doc/html/flac/faq.html share/doc/html/flac/favicon.ico share/doc/html/flac/features.html share/doc/html/flac/flac.css share/doc/html/flac/format.html -share/doc/html/flac/goals.html share/doc/html/flac/id.html share/doc/html/flac/images/1x1.gif share/doc/html/flac/images/cafebug.gif +share/doc/html/flac/images/hw/Blackbird_Front_low3_325x87.jpg +share/doc/html/flac/images/hw/MS300frontsmall_270x108.jpg +share/doc/html/flac/images/hw/MediaBox_Frt_170x325.jpg +share/doc/html/flac/images/hw/SB_Hero_Black_325x182.jpg +share/doc/html/flac/images/hw/Sooloos-ControlOne_325x328.jpg +share/doc/html/flac/images/hw/Z500_front_325x94.jpg +share/doc/html/flac/images/hw/a2_01_325x252.jpg +share/doc/html/flac/images/hw/arcus_325x135.jpg +share/doc/html/flac/images/hw/bmp-1430_325x241.jpg +share/doc/html/flac/images/hw/cs505_front_lrg_325x113.jpg +share/doc/html/flac/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg +share/doc/html/flac/images/hw/escient_ProductLine_325x163.jpg +share/doc/html/flac/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg +share/doc/html/flac/images/hw/i-station-mini-dx_325x237.jpg +share/doc/html/flac/images/hw/iwod-g10_325x257.jpg +share/doc/html/flac/images/hw/knc_hr-2800_325x209.jpg +share/doc/html/flac/images/hw/mediaready_prodmain_MRMCa_325x232.jpg +share/doc/html/flac/images/hw/meizu_m6_325x206.jpg +share/doc/html/flac/images/hw/musica_artwork_325x90.jpg +share/doc/html/flac/images/hw/neodigits_x5000_325x124.jpg +share/doc/html/flac/images/hw/onda-vx737_325x240.jpg +share/doc/html/flac/images/hw/request_n_front_325x103.jpg +share/doc/html/flac/images/hw/rio_karma_279x254.jpg +share/doc/html/flac/images/hw/sonos_family_RGB_325x200.jpg +share/doc/html/flac/images/hw/teclast-tl29_325x244.jpg +share/doc/html/flac/images/hw/transporter_hero_grey_325x208.jpg +share/doc/html/flac/images/hw/tvix-4000_325x204.jpg +share/doc/html/flac/images/hw/vibez_nofm_combi_black_b_325x220.jpg share/doc/html/flac/images/logo100.gif share/doc/html/flac/images/logo130.gif share/doc/html/flac/index.html +share/doc/html/flac/itunes.html share/doc/html/flac/license.html share/doc/html/flac/links.html share/doc/html/flac/news.html @@ -237,6 +298,7 @@ share/doc/html/flac/ru/index.html share/doc/html/flac/ru/links.html share/doc/html/flac/ru/news.html @dirrm share/doc/html/flac/ru +@dirrm share/doc/html/flac/images/hw @dirrm share/doc/html/flac/images @dirrm share/doc/html/flac/api @dirrm share/doc/html/flac diff --git a/audio/flac/distinfo b/audio/flac/distinfo index 169baa15f2c..a3239fc791c 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.16 2007/02/22 19:11:25 rillig Exp $ +$NetBSD: distinfo,v 1.17 2007/11/21 12:47:04 drochner Exp $ -SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295 -RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132 -Size (flac-1.1.3.tar.gz) = 1592699 bytes +SHA1 (flac-1.2.1.tar.gz) = bd54354900181b59db3089347cc84ad81e410b38 +RMD160 (flac-1.2.1.tar.gz) = bd3223c848054f0a75d11200b30f903bdd375bfc +Size (flac-1.2.1.tar.gz) = 2009217 bytes SHA1 (patch-aa) = 2e81bac9dba5b7f66118bbdb3ed77786701072e4 -SHA1 (patch-ab) = d7b48e37ca81450d0ffc4a97914d06c1464daf7b +SHA1 (patch-ab) = 86260d5881c51fb307e1b00c0c5df3643f9d4fb0 SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874 SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3 SHA1 (patch-af) = a91054ce5d37ac2dc88725fa68c59413b5f52067 -SHA1 (patch-ag) = ec37d2e4ce9c0a8d4d638fe08d1f38914029a205 -SHA1 (patch-ah) = 90452d2983aed07a8a0c14926772610ef3799099 +SHA1 (patch-ag) = 39cd81f6ad7451c572d5e5c3c697c7afaa1c65a4 +SHA1 (patch-ah) = 8a2b3d16731c5a41df5679cae915233ed63fdef0 +SHA1 (patch-ai) = 3cabee2e807e4ab3d6e24266fb7a99e86bf3f4e9 diff --git a/audio/flac/patches/patch-ab b/audio/flac/patches/patch-ab index 37dfa194a47..4c60ba36a98 100644 --- a/audio/flac/patches/patch-ab +++ b/audio/flac/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.5 2007/01/07 12:25:05 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2007/11/21 12:47:05 drochner Exp $ ---- doc/html/images/Makefile.in.orig 2006-11-27 06:40:52.000000000 +0000 +--- doc/html/images/Makefile.in.orig 2007-09-16 22:04:58.000000000 +0200 +++ doc/html/images/Makefile.in -@@ -218,7 +218,7 @@ target_alias = @target_alias@ +@@ -223,7 +223,7 @@ AUTOMAKE_OPTIONS = foreign - AUTOMAKE_OPTIONS = foreign + SUBDIRS = hw -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images +docdir = $(datadir)/doc/html/$(PACKAGE)/images diff --git a/audio/flac/patches/patch-ag b/audio/flac/patches/patch-ag index 2a61bba591c..6043858362f 100644 --- a/audio/flac/patches/patch-ag +++ b/audio/flac/patches/patch-ag @@ -1,16 +1,16 @@ -$NetBSD: patch-ag,v 1.3 2007/01/07 15:01:52 wiz Exp $ +$NetBSD: patch-ag,v 1.4 2007/11/21 12:47:05 drochner Exp $ ---- src/libFLAC/Makefile.am.orig 2006-10-13 04:25:26.000000000 +0000 +--- src/libFLAC/Makefile.am.orig 2007-09-14 23:06:17.000000000 +0200 +++ src/libFLAC/Makefile.am -@@ -86,9 +86,10 @@ extra_ogg_sources = \ +@@ -94,9 +94,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_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) ++libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) $(extra_ogg_libs) libFLAC_la_SOURCES = \ - bitbuffer.c \ bitmath.c \ + bitreader.c \ diff --git a/audio/flac/patches/patch-ah b/audio/flac/patches/patch-ah index 0b19d8c05e5..1e8d40f104f 100644 --- a/audio/flac/patches/patch-ah +++ b/audio/flac/patches/patch-ah @@ -1,15 +1,15 @@ -$NetBSD: patch-ah,v 1.3 2007/01/07 15:01:52 wiz Exp $ +$NetBSD: patch-ah,v 1.4 2007/11/21 12:47:05 drochner Exp $ ---- src/libFLAC/Makefile.in.orig 2006-11-27 06:41:11.000000000 +0000 +--- src/libFLAC/Makefile.in.orig 2007-09-16 22:05:12.000000000 +0200 +++ src/libFLAC/Makefile.in -@@ -267,8 +267,9 @@ EXTRA_DIST = \ +@@ -278,8 +278,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_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) ++libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) $(extra_ogg_libs) libFLAC_la_SOURCES = \ - bitbuffer.c \ bitmath.c \ + bitreader.c \ diff --git a/audio/flac/patches/patch-ai b/audio/flac/patches/patch-ai new file mode 100644 index 00000000000..6100e5eb813 --- /dev/null +++ b/audio/flac/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.3 2007/11/21 12:47:05 drochner Exp $ + +--- doc/html/images/hw/Makefile.in.orig 2007-11-20 14:00:50.000000000 +0100 ++++ doc/html/images/hw/Makefile.in +@@ -221,7 +221,7 @@ target_alias = @target_alias@ + + AUTOMAKE_OPTIONS = foreign + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images/hw ++docdir = $(datadir)/doc/html/$(PACKAGE)/images/hw + + doc_DATA = \ + Blackbird_Front_low3_325x87.jpg \ |