Migrate Buildroot 2019.02.9 (#539)

2020-01-13 14:47:52 +01:00
parent d6a700565e
commit 13e4578b7a
139 changed files with 898 additions and 1178 deletions
--- a/buildroot/package/qpdf/Config.in
+++ b/buildroot/package/qpdf/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_QPDF
 	bool "qpdf"
 	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_JPEG
 	help
--- a/buildroot/package/qpdf/qpdf.hash
+++ b/buildroot/package/qpdf/qpdf.hash
@@ -1,4 +1,5 @@
 # From https://sourceforge.net/projects/qpdf/files/qpdf/8.2.1/qpdf-8.2.1.sha512/download
 sha512	ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c  qpdf-8.2.1.tar.gz
 # Locally computed:
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
 sha256  fb929ac30decb4dc3a2eea2bec6c43296a797c5d2d602deb3784ee39430583d5  Artistic-2.0
--- a/buildroot/package/qpdf/qpdf.mk
+++ b/buildroot/package/qpdf/qpdf.mk
@@ -7,9 +7,9 @@
 QPDF_VERSION = 8.2.1
 QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION)
 QPDF_INSTALL_STAGING = YES
-QPDF_LICENSE = Artistic-2.0
-QPDF_LICENSE_FILES = Artistic-2.0
-QPDF_DEPENDENCIES = pcre zlib jpeg
+QPDF_LICENSE = Apache-2.0 or Artistic-2.0
+QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0
+QPDF_DEPENDENCIES = zlib jpeg

 QPDF_CONF_OPTS = --without-random