commit 4c7623ef4356efe8217da7ca597adebb2127309c Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed Jul 2 17:05:47 2014 +1000 flac: 1.2.1 -> 1.3.0 diff --git a/flac/.footprint b/flac/.footprint index 8fbf12b..dc615cb 100644 --- a/flac/.footprint +++ b/flac/.footprint @@ -20,16 +20,14 @@ drwxr-xr-x root/root usr/include/FLAC/ -rw-r--r-- root/root usr/include/FLAC/stream_decoder.h -rw-r--r-- root/root usr/include/FLAC/stream_encoder.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libFLAC++.a -rwxr-xr-x root/root usr/lib/libFLAC++.la -lrwxrwxrwx root/root usr/lib/libFLAC++.so -> libFLAC++.so.6.2.0 -lrwxrwxrwx root/root usr/lib/libFLAC++.so.6 -> libFLAC++.so.6.2.0 --rwxr-xr-x root/root usr/lib/libFLAC++.so.6.2.0 --rw-r--r-- root/root usr/lib/libFLAC.a +lrwxrwxrwx root/root usr/lib/libFLAC++.so -> libFLAC++.so.6.3.0 +lrwxrwxrwx root/root usr/lib/libFLAC++.so.6 -> libFLAC++.so.6.3.0 +-rwxr-xr-x root/root usr/lib/libFLAC++.so.6.3.0 -rwxr-xr-x root/root usr/lib/libFLAC.la -lrwxrwxrwx root/root usr/lib/libFLAC.so -> libFLAC.so.8.2.0 -lrwxrwxrwx root/root usr/lib/libFLAC.so.8 -> libFLAC.so.8.2.0 --rwxr-xr-x root/root usr/lib/libFLAC.so.8.2.0 +lrwxrwxrwx root/root usr/lib/libFLAC.so -> libFLAC.so.8.3.0 +lrwxrwxrwx root/root usr/lib/libFLAC.so.8 -> libFLAC.so.8.3.0 +-rwxr-xr-x root/root usr/lib/libFLAC.so.8.3.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/flac++.pc -rw-r--r-- root/root usr/lib/pkgconfig/flac.pc diff --git a/flac/.md5sum b/flac/.md5sum index e140044..a0466c5 100644 --- a/flac/.md5sum +++ b/flac/.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/Pkgfile b/flac/Pkgfile index 74376d7..f7cb2cc 100644 --- a/flac/Pkgfile +++ b/flac/Pkgfile @@ -5,19 +5,22 @@ # Depends on: libogg name=flac -version=1.2.1 -release=3 -source=(http://downloads.sourceforge.net/project/$name/$name-src/$name-$version-src/... - $name.diff) +version=1.3.0 +release=1 +source=(http://downloads.xiph.org/releases/flac/$name-$version.tar.xz + flac-realloc.patch) build() { cd $name-$version - # fix compilation with gcc 4.3 - patch -Np1 -i $SRC/$name.diff + patch -p1 -i $SRC/flac-realloc.patch + + ./configure \ + --prefix=/usr \ + --mandir=/usr/man - ./configure --prefix=/usr make make DESTDIR=$PKG install + rm -r $PKG/usr/share/doc } diff --git a/flac/flac-realloc.patch b/flac/flac-realloc.patch new file mode 100644 index 0000000..cf1a212 --- /dev/null +++ b/flac/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;... + +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/flac.diff b/flac/flac.diff deleted file mode 100644 index a825135..0000000 --- a/flac/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" -