vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun May 5 14:46:21 2013 +0200| [3ae38645902bf8850ae042dcc2b150c57f80c193] | committer: Jean-Baptiste Kempf
Contribs: update FLAC to 1.3.0-pre4 Hopefully, we are closer to an upstream release > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3ae38645902bf8850ae042dcc2b150c57f80c193 --- contrib/src/flac/SHA512SUMS | 2 +- contrib/src/flac/libFLAC-pc.patch | 14 +++++++------- contrib/src/flac/rules.mak | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/src/flac/SHA512SUMS b/contrib/src/flac/SHA512SUMS index 6ef218f..8a7b289 100644 --- 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 a686319..8b5105a 100644 --- 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 70fa044..38b146d 100644 --- 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 $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
