vlc | branch: master | Rafaël Carré <[email protected]> | Wed Dec 12 13:20:40 2018 +0100| [c1014e9ab0257d9a6333bd34283a7e012a189781] | committer: Rafaël Carré
contrib: shout: drop obsolete bsd.patch It was added to fix this FreeBSD 8 error: sock.c:736: error: 'IPPROTO_IPV6' undeclared The need for __BSD_VISIBLE was removed in: https://github.com/freebsd/freebsd/commit/fcb67434842e8a1a8ba60a2607b55922d35887fb#diff-dab66d274da3dd4ba168b2ba7f3b4374 Which predates the last supported FreeBSD releases > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1014e9ab0257d9a6333bd34283a7e012a189781 --- contrib/src/shout/bsd.patch | 13 ------------- contrib/src/shout/rules.mak | 1 - 2 files changed, 14 deletions(-) diff --git a/contrib/src/shout/bsd.patch b/contrib/src/shout/bsd.patch deleted file mode 100644 index c4c153dcc2..0000000000 --- a/contrib/src/shout/bsd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libshout.orig/src/common/net/sock.c 2012-10-04 13:04:55.000000000 +0200 -+++ libshout/src/common/net/sock.c 2012-10-04 13:05:18.000000000 +0200 -@@ -22,6 +22,10 @@ - #include <config.h> - #endif - -+#ifdef __FreeBSD__ -+# define __BSD_VISIBLE 1 -+#endif -+ - #include <stdio.h> - #include <stdlib.h> - #include <stdarg.h> diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak index ea6d307d34..d364762c97 100644 --- a/contrib/src/shout/rules.mak +++ b/contrib/src/shout/rules.mak @@ -20,7 +20,6 @@ $(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz: # TODO: fix socket stuff on POSIX and Linux libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout $(UNPACK) - $(APPLY) $(SRC)/shout/bsd.patch $(APPLY) $(SRC)/shout/libshout-arpa.patch $(APPLY) $(SRC)/shout/fix-xiph_openssl.patch $(APPLY) $(SRC)/shout/shout-strings.patch _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
