[vlc-commits] Contribs: Fix FLAC.pc for Windows

Jean-Baptiste Kempf git at videolan.org
Tue Mar 19 13:03:40 CET 2013


vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar 19 12:59:49 2013 +0100| [51f1f677661d72dabf0527697fbe0063b47266e2] | committer: Jean-Baptiste Kempf

Contribs: Fix FLAC.pc for Windows

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=51f1f677661d72dabf0527697fbe0063b47266e2
---

 contrib/src/flac/libFLAC-pc-win32.patch |   10 ++++++++++
 contrib/src/flac/rules.mak              |    3 +++
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/flac/libFLAC-pc-win32.patch b/contrib/src/flac/libFLAC-pc-win32.patch
new file mode 100644
index 0000000..f538c14
--- /dev/null
+++ b/contrib/src/flac/libFLAC-pc-win32.patch
@@ -0,0 +1,10 @@
+--- flac/src/libFLAC/flac.pc.in	2013-01-04 00:05:04.000000000 +0100
++++ flac.new/src/libFLAC/flac.pc.in	2013-03-19 00:54:54.000000000 +0100
+@@ -6,6 +6,6 @@
+ Name: FLAC
+ Description: Free Lossless Audio Codec Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lFLAC -logg -lm
++Libs: -L${libdir} -lFLAC -logg -lm -lws2_32
+ Cflags: -I${includedir}/FLAC
+ Requires.private: ogg
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index c626c8c..67f9c20 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -17,6 +17,9 @@ flac: flac-$(FLAC_VERSION).tar.gz .sum-flac
 	$(UNPACK)
 	$(APPLY) $(SRC)/flac/flac-win32.patch
 	$(APPLY) $(SRC)/flac/libFLAC-pc.patch
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/flac/libFLAC-pc-win32.patch
+endif
 ifdef HAVE_MACOSX
 	cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' -i.orig configure
 endif



More information about the vlc-commits mailing list