[vlc-commits] Contribs: update protobuf to 3.1.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec  4 13:17:05 2016 +0100| [90af03db08f5224a482736bfff2de6454f630abb] | committer: Jean-Baptiste Kempf

Contribs: update protobuf to 3.1.0

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

 contrib/src/protobuf/SHA512SUMS  |  2 +-
 contrib/src/protobuf/rules.mak   | 14 ++++++--------
 contrib/src/protobuf/win32.patch | 28 ----------------------------
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/contrib/src/protobuf/SHA512SUMS b/contrib/src/protobuf/SHA512SUMS
index e1c4f70..0153bd0 100644
--- a/contrib/src/protobuf/SHA512SUMS
+++ b/contrib/src/protobuf/SHA512SUMS
@@ -1 +1 @@
-818ac4ad24aca84d214d14ac860a75c14494528821af144d3cb603f69c94d4500512814be6d62cc82973804ebfa99eb94d9f034b309f53cadb622603a7886a3e  protobuf-2.6.1.tar.gz
+9f85a98e55cbc9f245a3079d5a597f778454bc945f0942cb10fbdfbde5fe12b17d6dda93d6a8d5281459ad30a3840be7e0712feb33a824226884e7e4da54a061  protobuf-3.1.0-cpp.tar.gz
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index 4819f51..da4057a 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -1,24 +1,22 @@
 # protobuf
-PROTOBUF_VERSION := 2.6.1
-PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-$(PROTOBUF_VERSION).tar.gz
+PROTOBUF_VERSION := 3.1.0
+PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
 
 PKGS += protobuf
 ifeq ($(call need_pkg,"protobuf"),)
 PKGS_FOUND += protobuf
 endif
 
-$(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.gz:
+$(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
 	$(call download_pkg,$(PROTOBUF_URL),protobuf)
 
-.sum-protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
+.sum-protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz
 
 DEPS_protobuf = zlib $(DEPS_zlib)
 
-protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz .sum-protobuf
+protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 	$(UNPACK)
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/protobuf/win32.patch
-endif
+	mv protobuf-3.1.0 protobuf-3.1.0-cpp
 	$(MOVE)
 
 .protobuf: protobuf
diff --git a/contrib/src/protobuf/win32.patch b/contrib/src/protobuf/win32.patch
deleted file mode 100644
index c3df1ec..0000000
--- a/contrib/src/protobuf/win32.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ruN protobuf/src/google/protobuf/stubs/common.h  protobuf.new/src/google/protobuf/stubs/common.h
---- protobuf/src/google/protobuf/stubs/common.h	2013-02-26 18:56:38.000000000 +0100
-+++ protobuf.new/src/google/protobuf/stubs/common.h	2014-08-13 21:27:13.620935659 +0200
-@@ -619,6 +619,10 @@
- // ===================================================================
- // emulates google3/base/logging.h
-
-+#if defined(ERROR)
-+# undef ERROR
-+#endif
-+
- enum LogLevel {
-   LOGLEVEL_INFO,     // Informational.  This is never actually used by
-                      // libprotobuf.
-diff -ruN protobuf/src/google/protobuf/extension_set.cc  protobuf.new/src/google/protobuf/extension_set.cc
---- protobuf/src/google/protobuf/extension_set.cc	2013-02-26 18:56:42.000000000 +0100
-+++ protobuf.new/src/google/protobuf/extension_set.cc	2014-08-13 21:23:50.960935943 +0200
-@@ -218,6 +218,10 @@
- // ===================================================================
- // Field accessors
-
-+#if defined(OPTIONAL)
-+# undef OPTIONAL
-+#endif
-+
- namespace {
-
- enum Cardinality {