From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 24 May 2020 00:26:50 +0000 (-0700)
Subject: taglib: update to 1.12-beta-1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=51efb1723e7e17c37ef772ef0b55e3b516b27fc7;p=feed%2Fpackages.git

taglib: update to 1.12-beta-1

It seems 1.11.1 is old and has CVEs.

Removed boost hack since upstream removed boost support.

Removed outdated InstallDev hacks.

Added PKG_CPE_ID.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from b0dc454c0ec20d3e2a4994d30657de2f4e21fe55)
---

diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile
index 06d8a1e53f..eb4f639fd9 100644
--- a/libs/taglib/Makefile
+++ b/libs/taglib/Makefile
@@ -6,16 +6,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=taglib
-PKG_VERSION:=1.11.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.12-beta-1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/taglib/taglib/releases/download/v$(PKG_VERSION)
-PKG_HASH:=b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
+PKG_SOURCE_URL:=https://codeload.github.com/taglib/taglib/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=d2a44be7ca8b7682b218affc9910dcfb027481f402f7c30bd2996392b2429ae4
 
 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
 
@@ -39,7 +40,6 @@ define Package/taglib/description
 endef
 
 CMAKE_OPTIONS += \
-	-DHAVE_BOOST_BYTESWAP=OFF \
 	-DBUILD_TESTS=OFF \
 	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_BINDINGS=OFF \
@@ -50,8 +50,6 @@ TARGET_CXXFLAGS += -flto
 define Build/InstallDev
 	$(call Build/InstallDev/cmake,$(1))
 	$(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' $(1)/usr/bin/taglib-config
-	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/bin/taglib-config
-	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/bin/taglib-config
 	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/taglib.pc
 	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/taglib.pc
 endef