flac-32: 1.2.1 -> 1.3.0

5 files changed, 32 insertions, 30 deletions

diff --git a/flac-32/.footprint b/flac-32/.footprint
index faf9417d..b9730763 100644
--- a/flac-32/.footprint
+++ b/flac-32/.footprint
@@ -1,15 +1,13 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
--rw-r--r--	root/root	usr/lib32/libFLAC++.a
 -rwxr-xr-x	root/root	usr/lib32/libFLAC++.la
-lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so -> libFLAC++.so.6.2.0
-lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so.6 -> libFLAC++.so.6.2.0
--rwxr-xr-x	root/root	usr/lib32/libFLAC++.so.6.2.0
--rw-r--r--	root/root	usr/lib32/libFLAC.a
+lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so -> libFLAC++.so.6.3.0
+lrwxrwxrwx	root/root	usr/lib32/libFLAC++.so.6 -> libFLAC++.so.6.3.0
+-rwxr-xr-x	root/root	usr/lib32/libFLAC++.so.6.3.0
 -rwxr-xr-x	root/root	usr/lib32/libFLAC.la
-lrwxrwxrwx	root/root	usr/lib32/libFLAC.so -> libFLAC.so.8.2.0
-lrwxrwxrwx	root/root	usr/lib32/libFLAC.so.8 -> libFLAC.so.8.2.0
--rwxr-xr-x	root/root	usr/lib32/libFLAC.so.8.2.0
+lrwxrwxrwx	root/root	usr/lib32/libFLAC.so -> libFLAC.so.8.3.0
+lrwxrwxrwx	root/root	usr/lib32/libFLAC.so.8 -> libFLAC.so.8.3.0
+-rwxr-xr-x	root/root	usr/lib32/libFLAC.so.8.3.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/flac++.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/flac.pc
diff --git a/flac-32/.md5sum b/flac-32/.md5sum
index e1400445..a0466c5d 100644
--- a/flac-32/.md5sum
+++ b/flac-32/.md5sum
@@ -1,2 +1,2 @@
-153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz
-6632677f2e3b0103256023ba76115845  flac.diff
+13b5c214cee8373464d3d65dee362cdd  flac-1.3.0.tar.xz
+422bd38d16a46b29a88724e7a2c75d4c  flac-realloc.patch
diff --git a/flac-32/Pkgfile b/flac-32/Pkgfile
index 7cbf4e01..feb7eee7 100644
--- a/flac-32/Pkgfile
+++ b/flac-32/Pkgfile
@@ -4,22 +4,22 @@
 # Depends on: libogg-32
 
 name=flac-32
-version=1.2.1
-release=3
-source=(http://downloads.sourceforge.net/project/flac/flac-src/flac-$version-src/flac-$version.tar.gz
-	flac.diff)
+version=1.3.0
+release=1
+source=(http://downloads.xiph.org/releases/flac/flac-$version.tar.xz
+	flac-realloc.patch)
 
 build() {
 	cd flac-$version
 
-	export LDFLAGS="$LDFLAGS -L/usr/lib32"
-
-	# fix compilation with gcc 4.3
-	patch -Np1 -i $SRC/flac.diff
+	patch -p1 -i $SRC/flac-realloc.patch
 
 	./configure \
 		--prefix=/usr \
-		--libdir=/usr/lib32
+		--libdir=/usr/lib32 \
+		--mandir=/usr/man \
+		--host=i686-pc-linux-gnu \
+		--with-ogg-libraries=/usr/lib32
 
 	make
 	make DESTDIR=$PKG install
diff --git a/flac-32/flac-realloc.patch b/flac-32/flac-realloc.patch
new file mode 100644
index 00000000..cf1a212c
--- /dev/null
+++ b/flac-32/flac-realloc.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.xiph.org/?p=flac.git;a=blobdiff_plain;f=src%2Fmetaflac%2Futils.c;h=8a31daaddd47f8ea2d7b1e66445d180b4151e0db;hp=097537b2d39ea302269a16e7da9bc413e02ffb6e;hb=606fdfcaece19d3e05434bde57c289102a369069;hpb=d42c04260bf9e27cbb8c61a5529ecab3b20e25ff
+
+diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
+index 097537b..8a31daa 100644
+--- a/src/metaflac/utils.c
++++ b/src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ 	*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ 	if(0 == *dest)
+ 		die("out of memory growing string");
+-	safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++	safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+ 
+ static inline int local_isprint(int c)
diff --git a/flac-32/flac.diff b/flac-32/flac.diff
deleted file mode 100644
index a8251351..00000000
--- a/flac-32/flac.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur flac-1.2.1.orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1.orig/examples/cpp/encode/file/main.cpp	2007-09-13 17:58:03.000000000 +0200
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-10-23 18:30:02.575321637 +0200
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
-