Merge pull request #12109 from neheb/gerb3

gerbera static library changes

libs/pugixml/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pugixml
 PKG_VERSION:=1.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/zeux/pugixml/releases/download/v$(PKG_VERSION)
@@ -29,6 +29,7 @@ define Package/pugixml
   TITLE:=pugixml
   URL:=https://github.com/zeux/pugixml
   DEPENDS:=+libstdcpp
+  BUILDONLY:=1
 endef
 
 define Package/pugixml/description
@@ -40,14 +41,6 @@ define Package/pugixml/description
   (which happen automatically during parsing/saving).
 endef
 
-CMAKE_OPTIONS += \
-	-DBUILD_SHARED_LIBS=ON
-
 TARGET_CXXFLAGS += -flto
 
-define Package/pugixml/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpugixml.so* $(1)/usr/lib/
-endef
-
 $(eval $(call BuildPackage,pugixml))

libs/spdlog/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=spdlog
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gabime/spdlog/tar.gz/v$(PKG_VERSION)?
@@ -29,6 +29,7 @@ define Package/spdlog
   TITLE:=spdlog
   URL:=https://github.com/gabime/spdlog
   DEPENDS:=+libfmt
+  BUILDONLY:=1
 endef
 
 define Package/spdlog/description
@@ -36,7 +37,7 @@ define Package/spdlog/description
 endef
 
 CMAKE_OPTIONS += \
-	-DSPDLOG_BUILD_SHARED=ON \
+	-DSPDLOG_BUILD_SHARED=OFF \
 	-DSPDLOG_BUILD_EXAMPLE=OFF \
 	-DSPDLOG_BUILD_EXAMPLE_HO=OFF \
 	-DSPDLOG_BUILD_TESTS=OFF \
@@ -50,9 +51,4 @@ CMAKE_OPTIONS += \
 
 TARGET_CXXFLAGS += -flto
 
-define Package/spdlog/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspdlog.so* $(1)/usr/lib/
-endef
-
 $(eval $(call BuildPackage,spdlog))

multimedia/gerbera/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
@@ -19,6 +19,7 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE.md
 
+PKG_BUILD_DEPENDS:=pugixml spdlog
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,7 +29,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/gerbera
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+file +libupnp +libsqlite3 +libexif +libuuid +pugixml +spdlog $(ICONV_DEPENDS)
+  DEPENDS:=+file +libupnp +libsqlite3 +libexif +libuuid +libfmt $(ICONV_DEPENDS)
   TITLE:=A free media server
   URL:=https://gerbera.io
   USERID:=gerbera:gerbera