protobuf: Update to version 3.13.0

Signed-off-by: Bruno Randolf <br1@einfach.org>

diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile
index 0b9bab9e87bdf4e837362b578aada9b754b02694..fe29e1d67b9734ac09fa4ed941f36dc5c3a759cd 100644 (file)
--- a/libs/protobuf/Makefile
+++ b/libs/protobuf/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=protobuf
-PKG_VERSION:=3.8.0
-PKG_RELEASE:=5
+PKG_VERSION:=3.13.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
-PKG_HASH:=ddc96d83f3b7417da53bce2510b94ad2796465ef8763f7a4e82089157efe97aa
+PKG_HASH:=f8a547dfe143a9f61fadafba47fa6573713a33cb80909307c1502e26e1102298
 
 PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/libs/protobuf/patches/010-rpath.patch b/libs/protobuf/patches/010-rpath.patch
index 70d27529affe168601e440a965f9a171f37573ef..c2fba6b34602eec0de039c61acf9089c4b87c615 100644 (file)
--- a/libs/protobuf/patches/010-rpath.patch
+++ b/libs/protobuf/patches/010-rpath.patch
@@ -1,12 +1,14 @@
---- a/cmake/install.cmake
-+++ b/cmake/install.cmake
+Index: protobuf-3.13.0/cmake/install.cmake
+===================================================================
+--- protobuf-3.13.0.orig/cmake/install.cmake
++++ protobuf-3.13.0/cmake/install.cmake
 @@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries})
      $<BUILD_INTERFACE:${protobuf_source_dir}/src>
      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
    if (UNIX AND NOT APPLE)
 -    set_property(TARGET ${_library}
 -      PROPERTY INSTALL_RPATH "$ORIGIN")
-+#    set_property(TARGET ${_library}
++#   set_property(TARGET ${_library}
 +#      PROPERTY INSTALL_RPATH "$ORIGIN")
    elseif (APPLE)
      set_property(TARGET ${_library}
@@ -16,9 +18,9 @@
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
    if (UNIX AND NOT APPLE)
 -    set_property(TARGET protoc
--      PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
+-      PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
 +#    set_property(TARGET protoc
-+#      PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
++#      PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
    elseif (APPLE)
      set_property(TARGET protoc
        PROPERTY INSTALL_RPATH "@loader_path/../lib")