protobuf: move existing package to protobuf-compat

Move existing protobuf package to protobuf-compat to support packages that
don't work with modern version of Protobuf.

Install headers and libraries into /usr/protobuf-compat so as not to
confuse other packages with duplicate headers, and to prevent paths
conflicts with non-compat Protobuf.

Install link protoc as protoc-compat.

Signed-off-by: George Sapkin <redacted>

diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile
deleted file mode 100644 (file)
index f9e1edc..0000000
--- a/libs/protobuf/Makefile
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=protobuf
-PKG_VERSION:=3.17.3
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
-PKG_HASH:=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb
-
-PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-PKG_CPE_ID:=cpe:/a:google:protobuf
-
-CMAKE_SOURCE_SUBDIR:=cmake
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/protobuf/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A structured data encoding library
-  URL:=https://github.com/google/protobuf
-  DEPENDS:=+zlib +libpthread +libatomic +libstdcpp
-endef
-
-define Package/protobuf
-  $(call Package/protobuf/Default)
-  DEPENDS+=+protobuf-lite
-endef
-
-define Package/protobuf-lite
-  $(call Package/protobuf/Default)
-endef
-
-define Package/protobuf/description/Default
-Protocol Buffers are a way of encoding structured data in an efficient
-yet extensible format. Google uses Protocol Buffers for almost all
-of its internal RPC protocols and file formats.
-endef
-
-define Package/protobuf/description
-$(call Package/protobuf/description/Default)
-
-This package provides the libprotoc, libprotobuf, and libprotobuf-lite
-libraries.  For a much smaller protobuf package, see "protobuf-lite".
-
-endef
-
-define Package/protobuf-lite/description
-$(call Package/protobuf/description/Default)
-
-This package provides the libprotobuf-lite library.
-
-endef
-
-CMAKE_HOST_OPTIONS += \
-       -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
-       -Dprotobuf_BUILD_TESTS=OFF \
-       -DBUILD_SHARED_LIBS=OFF \
-       -DCMAKE_INSTALL_LIBDIR=lib
-
-CMAKE_OPTIONS += \
-       -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
-       -Dprotobuf_BUILD_TESTS=OFF \
-       -Dprotobuf_WITH_ZLIB=ON \
-       -DBUILD_SHARED_LIBS=ON
-
-TARGET_LDFLAGS += -latomic
-
-define Build/InstallDev
-       $(call Build/InstallDev/cmake,$(1))
-       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/protobuf.pc
-       $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/protobuf.pc
-       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/protobuf-lite.pc
-       $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/protobuf-lite.pc
-endef
-
-define Package/protobuf-lite/install
-       $(INSTALL_DIR) \
-               $(1)/usr/lib
-
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-lite.so* \
-               $(1)/usr/lib/
-endef
-
-define Package/protobuf/install
-       $(INSTALL_DIR) \
-               $(1)/usr/lib
-
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libprotoc.so*  \
-               $(1)/usr/lib/
-
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libprotobuf.so* \
-               $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,protobuf))
-$(eval $(call BuildPackage,protobuf-lite))
-$(eval $(call HostBuild))

diff --git a/libs/protobuf/protobuf-compat/Makefile b/libs/protobuf/protobuf-compat/Makefile
new file mode 100644 (file)
index 0000000..9a86df7
--- /dev/null
+++ b/libs/protobuf/protobuf-compat/Makefile
@@ -0,0 +1,106 @@
+# Copyright (C) 2007-2026 OpenWrt.org
+#
+# SPDX-License-Identifier: GPL-2.0-only
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=protobuf-compat
+PKG_VERSION:=3.17.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=protobuf-cpp-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
+PKG_HASH:=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb
+
+PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:google:protobuf
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/protobuf-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/protobuf-$(PKG_VERSION)
+
+CMAKE_SOURCE_SUBDIR:=cmake
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/protobuf-compat/Default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A structured data encoding library (compat version)
+  URL:=https://github.com/google/protobuf
+  DEPENDS:=+zlib +libatomic +libstdcpp
+endef
+
+define Package/protobuf-compat
+  $(call Package/protobuf-compat/Default)
+  DEPENDS+=+protobuf-compat-lite
+endef
+
+define Package/protobuf-compat-lite
+  $(call Package/protobuf-compat/Default)
+endef
+
+define Package/protobuf-compat/description/Default
+  Protocol Buffers are a way of encoding structured data in an efficient
+  yet extensible format. Google uses Protocol Buffers for almost all of its
+  internal RPC protocols and file formats.
+endef
+
+define Package/protobuf-compat/description
+  $(call Package/protobuf-compat/description/Default)
+
+  This package provides the libprotoc, libprotobuf, and libprotobuf-lite
+  libraries. For a much smaller protobuf package, see
+  "protobuf-compat-lite".
+endef
+
+define Package/protobuf-compat-lite/description
+ $(call Package/protobuf-compat/description/Default)
+
+ This package provides the libprotobuf-lite library.
+endef
+
+# Install headers and libraries into /usr/protobuf-compat so as not to confuse
+# other packages with duplicate headers, and to prevent paths conflicts with
+# non-compat Protobuf.
+CMAKE_HOST_OPTIONS += \
+       -DBUILD_SHARED_LIBS=OFF \
+       -DCMAKE_INSTALL_INCLUDEDIR=usr/protobuf-compat/include \
+       -DCMAKE_INSTALL_LIBDIR=usr/protobuf-compat/lib \
+       -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
+       -Dprotobuf_BUILD_TESTS=OFF
+
+CMAKE_OPTIONS += \
+       -DBUILD_SHARED_LIBS=ON \
+       -DCMAKE_INSTALL_PREFIX=/usr/protobuf-compat \
+       -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
+       -Dprotobuf_BUILD_TESTS=OFF \
+       -Dprotobuf_WITH_ZLIB=ON
+
+TARGET_LDFLAGS += -latomic
+
+define Build/InstallDev
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/usr/protobuf-compat,g' $(1)/usr/protobuf-compat/lib/pkgconfig/protobuf.pc
+       $(SED) 's,/usr/lib,$$$${exec_prefix}/usr/protobuf-compat,g' $(1)/usr/protobuf-compat/lib/pkgconfig/protobuf.pc
+       $(SED) 's,/usr/include,$$$${prefix}/usr/protobuf-compat,g' $(1)/usr/protobuf-compat/lib/pkgconfig/protobuf-lite.pc
+       $(SED) 's,/usr/lib,$$$${exec_prefix}/usr/protobuf-compat,g' $(1)/usr/protobuf-compat/lib/pkgconfig/protobuf-lite.pc
+endef
+
+define Package/protobuf-compat-lite/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/protobuf-compat/lib/libprotobuf-lite.so.* $(1)/usr/lib/
+endef
+
+define Package/protobuf-compat/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/protobuf-compat/lib/libprotobuf.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/protobuf-compat/lib/libprotoc.so.*  $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,protobuf-compat))
+$(eval $(call BuildPackage,protobuf-compat-lite))
+$(eval $(call HostBuild))

diff --git a/libs/protobuf/patches/001-cmake4.patch b/libs/protobuf/protobuf-compat/patches/001-cmake4.patch
similarity index 100%
rename from libs/protobuf/patches/001-cmake4.patch
rename to libs/protobuf/protobuf-compat/patches/001-cmake4.patch

diff --git a/libs/protobuf/patches/010-rpath.patch b/libs/protobuf/protobuf-compat/patches/010-rpath.patch
similarity index 100%
rename from libs/protobuf/patches/010-rpath.patch
rename to libs/protobuf/protobuf-compat/patches/010-rpath.patch

diff --git a/libs/protobuf/protobuf-compat/patches/100-rename-protoc.patch b/libs/protobuf/protobuf-compat/patches/100-rename-protoc.patch
new file mode 100644 (file)
index 0000000..cc3c7ed
--- /dev/null
+++ b/libs/protobuf/protobuf-compat/patches/100-rename-protoc.patch
@@ -0,0 +1,9 @@
+--- a/cmake/protoc.cmake
++++ b/cmake/protoc.cmake
+@@ -12,5 +12,5 @@ add_executable(protoc ${protoc_files} ${
+ target_link_libraries(protoc libprotoc libprotobuf)
+ add_executable(protobuf::protoc ALIAS protoc)
+ 
+-set_target_properties(protoc PROPERTIES
++set_target_properties(protoc PROPERTIES OUTPUT_NAME protoc-compat
+     VERSION ${protobuf_VERSION})