From 0f829d02468676326a4a57dc498a7a4129a93fab Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 May 2020 17:28:31 -0700 Subject: [PATCH 1/3] spdlog: switch to static libraries Upstream recommends static libraries for smaller size. There is also one package that uses spdlog. Signed-off-by: Rosen Penev --- libs/spdlog/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libs/spdlog/Makefile b/libs/spdlog/Makefile index fb062f4c8..4d0f4e977 100644 --- a/libs/spdlog/Makefile +++ b/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)) From c88bf0ef2c849b0ce3f265c89f3241b362391596 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 May 2020 17:30:53 -0700 Subject: [PATCH 2/3] pugixml: build as static Upstream recommends static. There is also onle one package that depends on this. Signed-off-by: Rosen Penev --- libs/pugixml/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libs/pugixml/Makefile b/libs/pugixml/Makefile index a1d9618f9..3b041f5ce 100644 --- a/libs/pugixml/Makefile +++ b/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)) From ba2458ae3757c2783ddacfd060c3b01c34c4f735 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 May 2020 18:01:09 -0700 Subject: [PATCH 3/3] gerbera: change dependencies to match previous changes With the previous changes, my local build gets smaller: From 12124957 To 12059421 Not that much but it's something. Signed-off-by: Rosen Penev --- multimedia/gerbera/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile index 29c17c063..91cb0a656 100644 --- a/multimedia/gerbera/Makefile +++ b/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