[vlc-commits] Contrib: fix linking of mpg123 on Windows

Jean-Baptiste Kempf git at videolan.org
Wed Sep 27 10:15:52 CEST 2017


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 27 10:14:30 2017 +0200| [83f5e2e231502249e7576697142513d54df82ce7] | committer: Jean-Baptiste Kempf

Contrib: fix linking of mpg123 on Windows

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83f5e2e231502249e7576697142513d54df82ce7
---

 contrib/src/mpg123/mpg123-win32.patch | 9 +++++++++
 contrib/src/mpg123/rules.mak          | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/mpg123/mpg123-win32.patch b/contrib/src/mpg123/mpg123-win32.patch
new file mode 100644
index 0000000000..dd39b3e0a0
--- /dev/null
+++ b/contrib/src/mpg123/mpg123-win32.patch
@@ -0,0 +1,9 @@
+--- mpg123/libmpg123.pc.in	2017-09-27 09:52:17.532298223 +0200
++++ mpg123/libmpg123.pc.in.new	2017-09-27 09:53:18.236300149 +0200
+@@ -7,5 +7,5 @@
+ Description: An optimised MPEG Audio decoder
+ Requires: 
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lmpg123 @LIBM@
++Libs: -L${libdir} -lmpg123 @LIBM@ -lshlwapi
+ Cflags: -I${includedir} 
diff --git a/contrib/src/mpg123/rules.mak b/contrib/src/mpg123/rules.mak
index cfd9a9cb42..46850d129c 100644
--- a/contrib/src/mpg123/rules.mak
+++ b/contrib/src/mpg123/rules.mak
@@ -38,6 +38,9 @@ mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/mpg123/mpg123_android_off_t.patch
 endif
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/mpg123/mpg123-win32.patch
+endif
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/mpg123/winstore.patch
 endif



More information about the vlc-commits mailing list