Fri Jun 5 20:47:30 2009 UTC ()
Added a patch for Linux.

Fixed pkglint warnings.


(rillig)
diff -r1.42 -r1.43 pkgsrc/audio/flac/Makefile
diff -r1.18 -r1.19 pkgsrc/audio/flac/distinfo
diff -r0 -r1.1 pkgsrc/audio/flac/patches/patch-az
cvs diff -r1.42 -r1.43 pkgsrc/audio/flac/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/flac/Makefile 2007/11/21 12:47:04 1.42
+++ pkgsrc/audio/flac/Makefile 2009/06/05 20:47:30 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.42 2007/11/21 12:47:04 drochner Exp $ 1# $NetBSD: Makefile,v 1.43 2009/06/05 20:47:30 rillig Exp $
2 2
3DISTNAME= flac-1.2.1 3DISTNAME= flac-1.2.1
4CATEGORIES= audio archivers 4CATEGORIES= audio archivers
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://flac.sourceforge.net/ 8HOMEPAGE= http://flac.sourceforge.net/
9COMMENT= Free lossless audio codec 9COMMENT= Free lossless audio codec
10 10
11PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -19,30 +19,30 @@ GNU_CONFIGURE= yes @@ -19,30 +19,30 @@ GNU_CONFIGURE= yes
19 19
20CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no" 20CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no"
21CONFIGURE_ENV+= ac_cv_prog_DOXYGEN="" 21CONFIGURE_ENV+= ac_cv_prog_DOXYGEN=""
22 22
23PKGCONFIG_OVERRIDE+= src/libFLAC++/flac++.pc.in src/libFLAC/flac.pc.in 23PKGCONFIG_OVERRIDE+= src/libFLAC++/flac++.pc.in src/libFLAC/flac.pc.in
24 24
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26 26
27.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) 27.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
28BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm 28BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
29.endif 29.endif
30 30
31.if !empty(MACHINE_PLATFORM:M*-*-powerpc) 31.if !empty(MACHINE_PLATFORM:M*-*-powerpc)
32.if ${OPSYS} != "Darwin" 32. if ${OPSYS} != "Darwin"
33CONFIGURE_ARGS+= --disable-asm-optimizations 33CONFIGURE_ARGS+= --disable-asm-optimizations
34CONFIGURE_ARGS+= --disable-altivec 34CONFIGURE_ARGS+= --disable-altivec
35.endif 35. endif
36.endif 36.endif
37 37
38.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) 38.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
39CONFIGURE_ARGS+= --disable-asm-optimizations 39CONFIGURE_ARGS+= --disable-asm-optimizations
40.endif 40.endif
41 41
42.include "../../mk/compiler.mk" 42.include "../../mk/compiler.mk"
43 43
44# Version 1.1.2 of flac doesn't seem to build correctly with -O3 using 44# Version 1.1.2 of flac doesn't seem to build correctly with -O3 using
45# the MIPSpro compiler. 45# the MIPSpro compiler.
46# XXX: retry for 1.1.3 46# XXX: retry for 1.1.3
47.if !empty(PKGSRC_COMPILER:Mmipspro) 47.if !empty(PKGSRC_COMPILER:Mmipspro)
48BUILDLINK_TRANSFORM+= rm:-O3 48BUILDLINK_TRANSFORM+= rm:-O3
cvs diff -r1.18 -r1.19 pkgsrc/audio/flac/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/flac/distinfo 2008/12/29 05:36:39 1.18
+++ pkgsrc/audio/flac/distinfo 2009/06/05 20:47:30 1.19
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.18 2008/12/29 05:36:39 obache Exp $ 1$NetBSD: distinfo,v 1.19 2009/06/05 20:47:30 rillig Exp $
2 2
3SHA1 (flac-1.2.1.tar.gz) = bd54354900181b59db3089347cc84ad81e410b38 3SHA1 (flac-1.2.1.tar.gz) = bd54354900181b59db3089347cc84ad81e410b38
4RMD160 (flac-1.2.1.tar.gz) = bd3223c848054f0a75d11200b30f903bdd375bfc 4RMD160 (flac-1.2.1.tar.gz) = bd3223c848054f0a75d11200b30f903bdd375bfc
5Size (flac-1.2.1.tar.gz) = 2009217 bytes 5Size (flac-1.2.1.tar.gz) = 2009217 bytes
6SHA1 (patch-aa) = 2e81bac9dba5b7f66118bbdb3ed77786701072e4 6SHA1 (patch-aa) = 2e81bac9dba5b7f66118bbdb3ed77786701072e4
7SHA1 (patch-ab) = 86260d5881c51fb307e1b00c0c5df3643f9d4fb0 7SHA1 (patch-ab) = 86260d5881c51fb307e1b00c0c5df3643f9d4fb0
8SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e 8SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e
9SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874 9SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874
10SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3 10SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3
11SHA1 (patch-af) = a91054ce5d37ac2dc88725fa68c59413b5f52067 11SHA1 (patch-af) = a91054ce5d37ac2dc88725fa68c59413b5f52067
12SHA1 (patch-ag) = 39cd81f6ad7451c572d5e5c3c697c7afaa1c65a4 12SHA1 (patch-ag) = 39cd81f6ad7451c572d5e5c3c697c7afaa1c65a4
13SHA1 (patch-ah) = 8a2b3d16731c5a41df5679cae915233ed63fdef0 13SHA1 (patch-ah) = 8a2b3d16731c5a41df5679cae915233ed63fdef0
14SHA1 (patch-ai) = 3cabee2e807e4ab3d6e24266fb7a99e86bf3f4e9 14SHA1 (patch-ai) = 3cabee2e807e4ab3d6e24266fb7a99e86bf3f4e9
15SHA1 (patch-ay) = f3af19f5f005538580a607887e23679cc0e7f0f2 15SHA1 (patch-ay) = f3af19f5f005538580a607887e23679cc0e7f0f2
 16SHA1 (patch-az) = 2cb3b188d14f388b20831e189317312709d926a8
File Added: pkgsrc/audio/flac/patches/Attic/patch-az
$NetBSD: patch-az,v 1.1 2009/06/05 20:47:30 rillig Exp $

memcpy() needs this.

--- examples/cpp/encode/file/main.cpp.orig	2007-09-13 17:58:03.000000000 +0200
+++ examples/cpp/encode/file/main.cpp	2009-06-05 22:39:37.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"