Contribs: update FLAC to 1.3.0-pre4

Hopefully, we are closer to an upstream release

diff --git a/contrib/src/flac/SHA512SUMS b/contrib/src/flac/SHA512SUMS
index 6ef218f70300991874987f18227ad0f0cf89eccf..8a7b289417ceee0db75e6f62caec8a05f2ea038a 100644 (file)
--- a/contrib/src/flac/SHA512SUMS
+++ b/contrib/src/flac/SHA512SUMS
@@ -1 +1 @@
-cc4ec1d5f89a5b674cd66d4fcbd1f34c5ee141cbe4e6978e9d5d55701be95442038d39daba2b8ca31914e9a8d54071f19d1b8c0e08af77a559e94d60d8074f5c  flac-1.3.0pre2.tar.xz
+2b5f1ea20502c93b71c0bd268fd7d2698a659d2bc63ee0fc6f208acc427d19ba1466c2f6de93db19caf46a9ddcc5d36c7905e325453c2a410812a10987f054b5  flac-1.3.0pre4.tar.xz

diff --git a/contrib/src/flac/libFLAC-pc.patch b/contrib/src/flac/libFLAC-pc.patch
index a686319d6f8c976604aa0283086750062850399d..8b5105aac045d7e397e278f14c1445f764b2f175 100644 (file)
--- a/contrib/src/flac/libFLAC-pc.patch
+++ b/contrib/src/flac/libFLAC-pc.patch
@@ -1,10 +1,10 @@
---- flac-1.3.0pre2/src/libFLAC/flac.pc.in.orig 2013-03-10 13:19:01.140663514 +0100
-+++ flac-1.3.0pre2/src/libFLAC/flac.pc.in      2013-03-10 13:20:46.398688639 +0100
-@@ -6,5 +6,6 @@
- Name: FLAC
+--- flac/src/libFLAC/flac.pc.in.orig   2013-05-05 14:05:30.059024229 +0200
++++ flac/src/libFLAC/flac.pc.in        2013-05-05 14:06:25.529822137 +0200
+@@ -7,6 +7,6 @@
  Description: Free Lossless Audio Codec Library
  Version: @VERSION@
--Libs: -L${libdir} -lFLAC -lm
-+Libs: -L${libdir} -lFLAC -logg -lm
+ Requires.private: @OGG_PACKAGE@
+-Libs: -L${libdir} -lFLAC
++Libs: -L${libdir} -lFLAC -logg
+ Libs.private: -lm
  Cflags: -I${includedir}
-+Requires.private: ogg

diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index 70fa044021b6a04eb800fa948ad397d22b149079..38b146d6e8202df6813e639815e28ff02c317b16 100644 (file)
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -1,6 +1,6 @@
 # FLAC
 
-FLAC_VERSION := 1.3.0pre2
+FLAC_VERSION := 1.3.0pre4
 FLAC_URL := http://downloads.xiph.org/releases/flac/beta/flac-$(FLAC_VERSION).tar.xz
 
 PKGS += flac
@@ -46,6 +46,6 @@ DEPS_flac = ogg $(DEPS_ogg)
 
 .flac: flac
        cd $< && $(HOSTVARS) ./configure $(FLACCONF)
-       cd $</src && $(MAKE) -C libFLAC install
-       cd $< && $(MAKE) -C include install
+       cd $</src && $(MAKE) install
+       cd $</include && $(MAKE) install
        touch $@