Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12109 from neheb/gerb3

Browse source 
gerbera static library changes
This commit is contained in:
Rosen Penev 2020-05-08 10:51:45 -07:00 committed by GitHub
commit a3a87fa8e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/pugixml/Makefile
View file

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

10
libs/spdlog/Makefile
View file

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

5
multimedia/gerbera/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gerbera PKG_NAME:=gerbera
PKG_VERSION:=1.5.0 PKG_VERSION:=1.5.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)? 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:=GPL-2.0-or-later
PKG_LICENSE_FILES:=LICENSE.md PKG_LICENSE_FILES:=LICENSE.md
PKG_BUILD_DEPENDS:=pugixml spdlog
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -28,7 +29,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/gerbera define Package/gerbera
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=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 TITLE:=A free media server
URL:=https://gerbera.io URL:=https://gerbera.io
USERID:=gerbera:gerbera USERID:=gerbera:gerbera