diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-03-14 16:52:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 16:52:22 -0700 |
| commit | 6fa328d10935c8816d12925a5182565c55bb8628 (patch) | |
| tree | 016ffc04172bf50829a7950f7c3e896f1bef5aa1 | |
| parent | d073ecbcbe3cf61b928511f75ada4462e8a488e4 (diff) | |
| parent | be54cf98eb73f355d0e74ea1f7626bd07544805c (diff) | |
Merge pull request #15126 from neheb/wsl
gerbera: update to 1.7.0 and update friends
| -rw-r--r-- | libs/libebml/Makefile | 13 | ||||
| -rw-r--r-- | libs/libmatroska/Makefile | 13 | ||||
| -rw-r--r-- | libs/libnpupnp/Makefile | 6 | ||||
| -rw-r--r-- | libs/pugixml/Makefile | 10 | ||||
| -rw-r--r-- | libs/taglib/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/gerbera/Makefile | 14 |
6 files changed, 30 insertions, 36 deletions
diff --git a/libs/libebml/Makefile b/libs/libebml/Makefile index 49518d484..a9ac1288a 100644 --- a/libs/libebml/Makefile +++ b/libs/libebml/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libebml -PKG_VERSION:=1.4.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.4.2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Matroska-Org/libebml/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=5ad468d78d21dfcde2901320faad4122ade2a12ecb65ce557b5e15d46671cceb +PKG_HASH:=66486742fd4f443553ad1917505208404c8c4240c0ab26cedaf41d9476efc665 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) PKG_MAINTAINER:= @@ -19,10 +19,9 @@ PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENSE.LGPL CMAKE_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/libebml SECTION:=libs @@ -39,11 +38,11 @@ define Package/libebml/description endef CMAKE_OPTIONS += \ + -DCMAKE_LINK_WHAT_YOU_USE=ON \ -DDISABLE_PKGCONFIG=OFF \ -DDISABLE_CMAKE_CONFIG=OFF \ -DENABLE_WIN32_IO=OFF -TARGET_CFLAGS += -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed +TARGET_LDFLAGS += -Wl,--gc-sections $(eval $(call BuildPackage,libebml)) diff --git a/libs/libmatroska/Makefile b/libs/libmatroska/Makefile index bf830429b..f35bb0389 100644 --- a/libs/libmatroska/Makefile +++ b/libs/libmatroska/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmatroska -PKG_VERSION:=1.6.2 -PKG_RELEASE:=1 +PKG_VERSION:=1.6.3 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Matroska-Org/libmatroska/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=62ff966c30c545450eefef49cf2774a1a281f25fb385c5b2ee4a603700ddf98a +PKG_HASH:=0c8c875ae26ac69a722f7fd0f4a4fecb4fdff681f2a165f09c06a40cbf1d0de6 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) PKG_MAINTAINER:= @@ -19,11 +19,10 @@ PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENSE.LGPL CMAKE_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=libebml include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/libmatroska SECTION:=libs @@ -39,10 +38,10 @@ define Package/libmatroska/description endef CMAKE_OPTIONS += \ + -DCMAKE_LINK_WHAT_YOU_USE=ON \ -DDISABLE_PKGCONFIG=OFF \ -DDISABLE_CMAKE_CONFIG=OFF -TARGET_CFLAGS += -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed +TARGET_LDFLAGS += -Wl,--gc-sections $(eval $(call BuildPackage,libmatroska)) diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index d238ba27b..b7d4f4686 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=4.0.14 -PKG_RELEASE:=1 +PKG_VERSION:=4.1.1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=ea5f5bf388bf8c028a25630c58e9a42762fddd357e7e2581b192856e01aad044 +PKG_HASH:=7e41d3933b956073b33c6ac6e61c81e83b428015ee871fd16d18b198bf3be960 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/pugixml/Makefile b/libs/pugixml/Makefile index 0bd49e128..0a16f389e 100644 --- a/libs/pugixml/Makefile +++ b/libs/pugixml/Makefile @@ -6,21 +6,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pugixml -PKG_VERSION:=1.11.1 -PKG_RELEASE:=1 +PKG_VERSION:=1.11.4 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeux/pugixml/releases/download/v$(PKG_VERSION) -PKG_HASH:=9dce9f0a3756c5ab84ab7466c99972d030021d81d674f5d38b9e30e9a3ec4922 +PKG_HASH:=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 PKG_MAINTAINER:= PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/pugixml SECTION:=libs diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile index a35cf6c5a..7fa78fc1a 100644 --- a/libs/taglib/Makefile +++ b/libs/taglib/Makefile @@ -6,22 +6,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=taglib -PKG_VERSION:=1.12-beta-1 -PKG_RELEASE:=2 +PKG_VERSION:=1.12-beta-2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/taglib/taglib/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=d2a44be7ca8b7682b218affc9910dcfb027481f402f7c30bd2996392b2429ae4 +PKG_HASH:=e273e9d97592cebd4e84e71313e91e9df0fc4a8e00c35daea62325e8bebb87d9 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LGPL PKG_CPE_ID:=cpe:/a:taglib:taglib -PKG_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/taglib SECTION:=libs diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile index c84e620d0..fdae64879 100644 --- a/multimedia/gerbera/Makefile +++ b/multimedia/gerbera/Makefile @@ -8,29 +8,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gerbera -PKG_VERSION:=1.6.4 -PKG_RELEASE:=2 +PKG_VERSION:=1.7.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5 +PKG_HASH:=6d40b840d015ba5c512f41442957c1c0fdbba07c18724cf00a45e0a579ddeb7f PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE.md PKG_BUILD_DEPENDS:=libmatroska pugixml spdlog taglib -PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:=CONFIG_BUILD_PATENTED include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/ninja/ninja-cmake.mk define Package/gerbera SECTION:=multimedia CATEGORY:=Multimedia - DEPENDS:=+file +libnpupnp +libsqlite3 +libexif +libuuid +libfmt +BUILD_PATENTED:libffmpeg $(ICONV_DEPENDS) + DEPENDS:=+file +libnpupnp +libsqlite3 +libexif +libuuid +libfmt +libatomic +BUILD_PATENTED:libffmpeg $(ICONV_DEPENDS) TITLE:=A free media server URL:=https://gerbera.io USERID:=gerbera:gerbera @@ -45,6 +44,7 @@ define Package/gerbera/conffiles endef CMAKE_OPTIONS += \ + -DCMAKE_LINK_WHAT_YOU_USE=ON \ -DIconv_INCLUDE_DIR=$(ICONV_PREFIX)/include \ -DIconv_LIBRARY=$(ICONV_PREFIX)/lib/libiconv.a \ -DWITH_MAGIC=ON \ @@ -69,7 +69,7 @@ TARGET_CFLAGS += \ -fdata-sections \ -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed +TARGET_LDFLAGS += -Wl,--gc-sections define Package/gerbera/install $(INSTALL_DIR) $(1)/usr/bin |