vlc | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Mon Dec 3 15:06:16 2018 +0100| [2e5a1e8b46f59b90e5b14da24f47103cca165e76] | committer: Hugo Beauzée-Luyssen
contrib: shout: Don't force -lwsock32 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2e5a1e8b46f59b90e5b14da24f47103cca165e76 --- contrib/src/shout/no-force-libwsock.patch | 11 +++++++++++ contrib/src/shout/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/shout/no-force-libwsock.patch b/contrib/src/shout/no-force-libwsock.patch new file mode 100644 index 0000000000..4c619acbd8 --- /dev/null +++ b/contrib/src/shout/no-force-libwsock.patch @@ -0,0 +1,11 @@ +--- libshout/m4/xiph_net.m4.old 2018-12-03 14:41:36.427782211 +0100 ++++ libshout/m4/xiph_net.m4 2018-12-03 14:41:43.235782185 +0100 +@@ -7,7 +7,7 @@ + AC_CHECK_HEADERS([sys/select.h sys/uio.h]) + AC_CHECK_HEADER([winsock2.h], + [AC_DEFINE([HAVE_WINSOCK2_H], [1], [Define if you have winsock2.h on MINGW]) +- LIBS="$LIBS -lwsock32"]) ++ ]) + + # These tests are ordered based on solaris 8 tests + AC_SEARCH_LIBS([sethostent], [nsl], diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak index 417137bd6d..ea6d307d34 100644 --- a/contrib/src/shout/rules.mak +++ b/contrib/src/shout/rules.mak @@ -27,6 +27,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout $(APPLY) $(SRC)/shout/shout-timeval.patch $(APPLY) $(SRC)/shout/shout-win32-socklen.patch $(APPLY) $(SRC)/shout/no-examples.patch + $(APPLY) $(SRC)/shout/no-force-libwsock.patch $(call pkg_static,"shout.pc.in") $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits