Merge pull request #12664 from neheb/dum

dump1900: fix compilation with GCC10

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 5be6f4365824a5b018fdab7549b17cfc589a03e0..c167d3be56b3a38551b5ffef74f83dbadf2d1ccf 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
 PKG_VERSION:=3.27.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
@@ -87,6 +87,9 @@ define Package/syslog-ng/install
 
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) ./files/logread $(1)/sbin
+
+       $(INSTALL_DIR) $(1)/usr/share/syslog-ng/include/
+       $(CP) -r ./files/scl $(1)/usr/share/syslog-ng/include/
 endef
 
 define Package/syslog-ng/postinst

diff --git a/admin/syslog-ng/files/scl/network_localhost/detect.sh b/admin/syslog-ng/files/scl/network_localhost/detect.sh
new file mode 100755 (executable)
index 0000000..ef76272
--- /dev/null
+++ b/admin/syslog-ng/files/scl/network_localhost/detect.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$(sysctl net.ipv6.conf.lo.disable_ipv6 | cut -d' ' -f 3)" = "0" ]; then
+       echo 'network(ip("::1") port(514) transport(udp) ip-protocol(6) )'
+else
+       echo 'network(ip("127.0.0.1") port(514) transport(udp) ip-protocol(4) )'
+fi

diff --git a/admin/syslog-ng/files/scl/network_localhost/plugin.conf b/admin/syslog-ng/files/scl/network_localhost/plugin.conf
new file mode 100644 (file)
index 0000000..b278942
--- /dev/null
+++ b/admin/syslog-ng/files/scl/network_localhost/plugin.conf
@@ -0,0 +1 @@
+@module confgen context(source) name(network_localhost) exec("`scl-root`/network_localhost/detect.sh")

diff --git a/admin/syslog-ng/files/syslog-ng.conf b/admin/syslog-ng/files/syslog-ng.conf
index 2181464b495337e21b86256d350f7e4caa37f755..10cb98d8882aff5870d9fa9cd59177cfc8e94948 100644 (file)
--- a/admin/syslog-ng/files/syslog-ng.conf
+++ b/admin/syslog-ng/files/syslog-ng.conf
@@ -26,7 +26,7 @@ source src {
 };
 
 source net {
-       network(ip("::1") port(514) transport(udp) ip-protocol(6));
+       network_localhost();
 };
 
 source s_network {

diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index 01bff636e96aa87218a7e70ef9926b48c39392a3..e83aef19f0e0d4bce2feb71ee706730b2effbbb5 100644 (file)
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meson
-PKG_VERSION:=0.54.2
+PKG_VERSION:=0.54.3
 PKG_RELEASE:=1
 
 PYPI_NAME:=meson
-PKG_HASH:=a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455
+PKG_HASH:=f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662
 
 PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
 PKG_LICENSE:=Apache-2.0

diff --git a/lang/node-javascript-obfuscator/Makefile b/lang/node-javascript-obfuscator/Makefile
index 76b485139a715908d73c81309e09ed8aa7fcf82a..ef374fd85bed4e0edca2994281318d82b63d2eb2 100644 (file)
--- a/lang/node-javascript-obfuscator/Makefile
+++ b/lang/node-javascript-obfuscator/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NPM_NAME:=javascript-obfuscator
 PKG_NAME:=node-$(PKG_NPM_NAME)
-PKG_VERSION:=0.27.2
+PKG_VERSION:=1.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
-PKG_HASH:=0180bff7f2bbebc353d7c117d87cd66f7b136b7ea3f4c21b0f39bff5e5c99917
+PKG_HASH:=adac10d3afe244833b74e6c965b7631a2a4417879e022fc4b7beea8be60ca86b
 
 PKG_BUILD_DEPENDS:=node/host
 HOST_BUILD_PARALLEL:=1

diff --git a/lang/python/README.md b/lang/python/README.md
index 4bceb978d7334dd83242f633e30e90e29c500b07..ac3bf51c76bd70d2b2aafaab27be46a6dc79532a 100644 (file)
--- a/lang/python/README.md
+++ b/lang/python/README.md
@@ -332,8 +332,11 @@ These can be installed via pip and ideally they should only be installed like th
 
 Which is why [for example] if you need python cffi on the host build, it's easier to just add it via:
 ```
+PKG_BUILD_PARALLEL:=0
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi==$(PKG_VERSION)"
 ```
 [cffi is one of those packages that needs a host-side package installed].
 
 This works reasonably well in the current OpenWrt build system, as binaries get built for this package and get installed in the staging-dir `$(STAGING_DIR)/usr/lib/pythonX.Y/site-packages`.
+
+`PKG_BUILD_PARALLEL:=0` is necessary because installing packages with multiple concurrent pip processes can lead to [errors or unexpected results](https://github.com/pypa/pip/issues/2361).

diff --git a/lang/python/bcrypt/Makefile b/lang/python/bcrypt/Makefile
index 0f56c4d5197e229f7ebfdae3356e1f012de8de01..3a8bdf7d920592d2c4bdef1bf47387a81598ad74 100644 (file)
--- a/lang/python/bcrypt/Makefile
+++ b/lang/python/bcrypt/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcrypt
 PKG_VERSION:=3.1.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42
@@ -16,6 +16,7 @@ PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=libffi/host
+PKG_BUILD_PARALLEL:=0
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.1"
 
 include ../pypi.mk

diff --git a/lang/python/numpy/Makefile b/lang/python/numpy/Makefile
index 9bbf1fb5b11e2590a8cbaa71d09fb2af8d24e0e6..42335ae0747789ba2b54fb2076b71dc764cbcb4c 100644 (file)
--- a/lang/python/numpy/Makefile
+++ b/lang/python/numpy/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=numpy
 PKG_VERSION:=1.18.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b
@@ -20,7 +20,8 @@ PKG_CPE_ID:=cpe:/a:numpy:numpy
 
 # yes, zip... sigh
 PYPI_SOURCE_EXT:=zip
-HOST_PYTHON3_PACKAGE_BUILD_DEPENDS="Cython==0.29.19"
+PKG_BUILD_PARALLEL:=0
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="Cython==0.29.19"
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk

diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile
index a02784303073c9d832ec2c656dde2465bf292fe6..e5a9a1e03e9e1d93b4d3bfa2916b713789cb0b92 100644 (file)
--- a/lang/python/python-cryptography/Makefile
+++ b/lang/python/python-cryptography/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptography
 PKG_VERSION:=2.9.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cryptography
 PKG_HASH:=a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229
@@ -19,6 +19,7 @@ PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleanalex@gmail.com>
 
 PKG_BUILD_DEPENDS:=libffi/host
+PKG_BUILD_PARALLEL:=0
 
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3"
 

diff --git a/lang/python/python-jsonschema/Makefile b/lang/python/python-jsonschema/Makefile
index 0e3c7b6b680379848ae600d7eec692282e355516..efcb76fc6a34586ad0304cadbafcab523cc71ac8 100644 (file)
--- a/lang/python/python-jsonschema/Makefile
+++ b/lang/python/python-jsonschema/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-jsonschema
 PKG_VERSION:=3.2.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PYPI_NAME:=jsonschema
 PKG_HASH:=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
@@ -11,7 +11,8 @@ PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
 
-HOST_PYTHON3_PACKAGE_BUILD_DEPENDS=setuptools_scm
+PKG_BUILD_PARALLEL:=0
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools_scm
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk

diff --git a/lang/python/python-pluggy/Makefile b/lang/python/python-pluggy/Makefile
index 8d79e0e22fc8fe933475e9a8b4c72315002307f9..4ed250eae954757c8659122fccf24fa9b245f54f 100644 (file)
--- a/lang/python/python-pluggy/Makefile
+++ b/lang/python/python-pluggy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pluggy
 PKG_VERSION:=0.13.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=pluggy
 PKG_HASH:=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
@@ -18,12 +18,13 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_PARALLEL:=0
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
-
 define Package/python3-pluggy
   SUBMENU:=Python
   SECTION:=lang

diff --git a/lang/python/python-py/Makefile b/lang/python/python-py/Makefile
index 1ed1a09e0c8440353baa72febd7115efb99422dd..8d7925453a2c1c7bdc8da17a34f8118188adc316 100644 (file)
--- a/lang/python/python-py/Makefile
+++ b/lang/python/python-py/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-py
 PKG_VERSION:=1.8.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=py
 PKG_HASH:=5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa
@@ -18,12 +18,13 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_PARALLEL:=0
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
-
 define Package/python3-py
   SUBMENU:=Python
   SECTION:=lang

diff --git a/lang/python/python-pycparser/Makefile b/lang/python/python-pycparser/Makefile
index b8f63fc37f98c8f4e39e79eb382b1248d40de8e7..ce19a5ba7aa07366fc13818aedf3fd0fbdfbf9f3 100644 (file)
--- a/lang/python/python-pycparser/Makefile
+++ b/lang/python/python-pycparser/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pycparser
 PKG_VERSION:=2.20
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=pycparser
 PKG_HASH:=2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0
@@ -18,6 +18,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 
+PKG_BUILD_PARALLEL:=0
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="ply==3.10"
 
 include ../pypi.mk

diff --git a/lang/python/python-pynacl/Makefile b/lang/python/python-pynacl/Makefile
index fe2c4555dbceaa2f87f4b815a0e885c28d818e9d..69ed754dd4d126ac24eee99a1a2679e8829d6df5 100644 (file)
--- a/lang/python/python-pynacl/Makefile
+++ b/lang/python/python-pynacl/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pynacl
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=PyNaCl
 PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505
@@ -12,6 +12,7 @@ PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=libffi/host
+PKG_BUILD_PARALLEL:=0
 
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.4.1"
 

diff --git a/lang/python/python-pytest/Makefile b/lang/python/python-pytest/Makefile
index df1aa0ade5ead0665c1baaa241d7c14da312e67f..8b1dadcb17fa919bd26aa7661b6a2006dbc2291b 100644 (file)
--- a/lang/python/python-pytest/Makefile
+++ b/lang/python/python-pytest/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pytest
 PKG_VERSION:=5.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pytest
 PKG_HASH:=eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698
@@ -18,6 +18,7 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_PARALLEL:=0
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
 
 include ../pypi.mk

diff --git a/lang/python/python-zipp/Makefile b/lang/python/python-zipp/Makefile
index 19d9e12c1c5efe6e13bf70ef55f57784ef92642c..fede7f14fb7be612fd521bc37024aad7bd53ca4a 100644 (file)
--- a/lang/python/python-zipp/Makefile
+++ b/lang/python/python-zipp/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-zipp
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=zipp
 PKG_HASH:=c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96
@@ -11,6 +11,9 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_PARALLEL:=0
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="setuptools_scm[toml] >= 3.4.1"
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
@@ -24,8 +27,6 @@ define Package/python3-zipp
   DEPENDS:=+python3-light
 endef
 
-HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="setuptools_scm[toml] >= 3.4.1"
-
 define Package/python3-zipp/description
   Backport of pathlib-compatible object wrapper for zip files
 endef

diff --git a/libs/check/Makefile b/libs/check/Makefile
index 52a400d2b3ba2c9cbd475d64b4ea83d2564edfed..d1363b73b4cbdceb4b4e4a52fa81d999d46fd9fe 100644 (file)
--- a/libs/check/Makefile
+++ b/libs/check/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=check
-PKG_VERSION:=0.14.0
+PKG_VERSION:=0.15.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libcheck/check/releases/download/$(PKG_VERSION)
-PKG_HASH:=bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b
+PKG_HASH:=aea2e3c68fa6e1e92378e744b1c0db350ccda4b6bd0d19530d0ae185b3d1ac60
 
 PKG_MAINTAINER:=Eduardo Abinader <eduardoabinader@gmail.com>
 PKG_LICENSE:=LGPL-2.1-or-later

diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile
index 2adcb31da579d12c561e7dd7f6cf9ee2df6ba00f..11f8c049f69a304011206ca61eb80848ed32bc94 100644 (file)
--- a/libs/gdbm/Makefile
+++ b/libs/gdbm/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdbm
 PKG_VERSION:=1.18.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gdbm

diff --git a/libs/gdbm/patches/999-001-fix-multiple-def-gcc-10.patch b/libs/gdbm/patches/999-001-fix-multiple-def-gcc-10.patch
new file mode 100644 (file)
index 0000000..5ccb395
--- /dev/null
+++ b/libs/gdbm/patches/999-001-fix-multiple-def-gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/src/parseopt.c
++++ b/src/parseopt.c
+@@ -255,8 +255,6 @@ print_option_descr (const char *descr, s
+ }
+ \f
+ char *parseopt_program_name;
+-char *parseopt_program_doc;
+-char *parseopt_program_args;
+ const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ void (*parseopt_help_hook) (FILE *stream);
+ \f

diff --git a/libs/libdmapsharing/Makefile b/libs/libdmapsharing/Makefile
index d0ddad5db409c0cf66dc1fc6b0d34abfc4e23e9f..18701a9c5b77948a6ea47b0d25548e5694802e3c 100644 (file)
--- a/libs/libdmapsharing/Makefile
+++ b/libs/libdmapsharing/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdmapsharing
-PKG_VERSION:=3.9.7
-PKG_RELEASE:=2
+PKG_VERSION:=3.9.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.flyn.org/projects/libdmapsharing/
-PKG_HASH:=745f4dc0b00db3e40721d041c883d813489814eaad3ca0f9ffb091e7e1acfa88
+PKG_HASH:=66f154602cf4f444ff3de70be74ae75b932f512c031d21374257d349f11f9710
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=LGPL-2.1-or-later

diff --git a/libs/libdmapsharing/patches/001-disable_pixbuf.patch b/libs/libdmapsharing/patches/001-disable_pixbuf.patch
index fcc845352546b01d72374470a16ec56a138068c9..cefe1be07f10ec00ee0d37596c714ee0ccd9ce9e 100644 (file)
--- a/libs/libdmapsharing/patches/001-disable_pixbuf.patch
+++ b/libs/libdmapsharing/patches/001-disable_pixbuf.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -117,18 +117,7 @@ dnl make GOBJECT_CFLAGS and GOBJECT_LIBS
+@@ -126,18 +126,7 @@ dnl make GOBJECT_CFLAGS and GOBJECT_LIBS
  AC_SUBST(GOBJECT_CFLAGS)
  AC_SUBST(GOBJECT_LIBS)
  

diff --git a/libs/liblo/Makefile b/libs/liblo/Makefile
index 8a5b20f14377d74154b018f40635719b0903db73..20d5536954c93ea5a4d30d186df3e7ee9717b0d5 100644 (file)
--- a/libs/liblo/Makefile
+++ b/libs/liblo/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=liblo
 PKG_VERSION:=0.31
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/liblo
@@ -19,10 +19,13 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_INSTALL:=1
+CMAKE_INSTALL:=1
+CMAKE_SOURCE_SUBDIR:=cmake
 PKG_BUILD_PARALLEL:=1
+PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblo-utils
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/liblo/Default
   TITLE:=Lightweight Open Sound Control (OSC)
@@ -45,21 +48,13 @@ $(call Package/liblo/Default)
   DEPENDS:= +liblo
 endef
 
-CONFIGURE_ARGS += \
-       $(if $(CONFIG_IPV6),--enable,--disable)-ipv6 \
-       --enable-threads \
-       --disable-examples \
-       --disable-network-tests \
-       --disable-tests
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/lo $(1)/usr/include/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblo.* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liblo.pc $(1)/usr/lib/pkgconfig/
-endef
+CMAKE_OPTIONS += \
+       -DWITH_TOOLS=O$(if $(CONFIG_PACKAGE_liblo-utils),N,FF) \
+       -DWITH_TESTS=OFF \
+       -DWITH_EXAMPLES=OFF \
+       -DWITH_CPP_TESTS=OFF \
+       -DWITH_STATIC=OFF \
+       -DTHREADING=ON
 
 define Package/liblo/install
        $(INSTALL_DIR) $(1)/usr/lib

diff --git a/libs/opusfile/Makefile b/libs/opusfile/Makefile
index eb8475c965ccc4647b067cfdea9b20b3cc777764..c3b650b61aaaccde1dfa8e3529ea86dd27b110e4 100644 (file)
--- a/libs/opusfile/Makefile
+++ b/libs/opusfile/Makefile
@@ -6,13 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opusfile
-PKG_VERSION:=0.11
+PKG_VERSION:=0.12
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
-PKG_HASH:=74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf
-
+PKG_HASH:=118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Eduardo Abinader <eduardoabinader@gmail.com>

diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index ff30b9ce2c7d4e524b3fd730abfc309a02c31a84..e6f7f2f735d793a0f2a73f9639670e874611f98e 100644 (file)
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -9,31 +9,27 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tiff
 PKG_VERSION:=4.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.osgeo.org/libtiff
 PKG_HASH:=5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634
 
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-PKG_LICENSE:=BSD
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYRIGHT
 PKG_CPE_ID:=cpe:/a:libtiff:libtiff
 
 PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
 
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/tiff/Default
   TITLE:=TIFF
   URL:=http://simplesystems.org/libtiff/
-  MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 endef
 
 define Package/libtiff
@@ -42,6 +38,7 @@ $(call Package/tiff/Default)
   CATEGORY:=Libraries
   TITLE+= library
   DEPENDS:=+zlib +libjpeg
+  ABI_VERSION:=5
 endef
 
 define Package/libtiffxx
@@ -61,44 +58,42 @@ $(call Package/tiff/Default)
   DEPENDS:=+libtiff
 endef
 
-CONFIGURE_ARGS += \
-       $(if $(CONFIG_PACKAGE_libtiffxx),--enable-cxx,--disable-cxx) \
-       --disable-lzma \
-       --enable-ccitt \
-       --enable-packbits \
-       --enable-lzw \
-       --enable-thunder \
-       --enable-next \
-       --enable-logluv \
-       --enable-mdi \
-       --enable-zlib \
-       --enable-jpeg \
-       --disable-old-jpeg \
-       --disable-jbig \
-       --disable-webp \
-       --disable-zstd \
-       --without-x
-
-define Build/InstallDev/hxx
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.hxx $(1)/usr/include/
-endef
+CMAKE_OPTIONS += \
+       -Dld-version-script=OFF \
+       -Dccitt=ON \
+       -Dpackbits=ON \
+       -Dlzw=ON \
+       -Dthunder=ON \
+       -Dnext=ON \
+       -Dlogluv=ON \
+       -Dmdi=ON \
+       -Dzlib=ON \
+       -Dpixarlog=ON \
+       -Djpeg=ON \
+       -Dold-jpeg=OFF \
+       -Djbig=OFF \
+       -Dlzma=OFF \
+       -Dzstd=OFF \
+       -Dwebp=OFF \
+       -Djpeg12=OFF \
+       -Dcxx=O$(if $(CONFIG_PACKAGE_libtiffxx),N,FF)
+
+TARGET_CFLAGS += $(TARGET_CPPFLAGS)
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/{lib,include} $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-       $(if $(CONFIG_PACKAGE_libtiffxx), $(call Build/InstallDev/hxx,$(1)))
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libtiff-4.pc
+       $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libtiff-4.pc
 endef
 
 define Package/libtiff/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.$(ABI_VERSION)* $(1)/usr/lib
 endef
 
 define Package/libtiffxx/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.$(ABI_VERSION)* $(1)/usr/lib/
 endef
 
 define Package/tiff-utils/install

diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile
index d6336b0c90812890b9fd23e59ef473927c9e51cf..b4ae09a7de52113f714db62dd33a0f019f8777b1 100644 (file)
--- a/multimedia/gst1-libav/Makefile
+++ b/multimedia/gst1-libav/Makefile
@@ -8,24 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gst1-libav
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.17.1
 PKG_RELEASE:=1
 
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
-               Ted Hess <thess@kitschensync.net>
-
 PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav
-PKG_HASH:=c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2
+PKG_HASH:=9d8d73a7944f776199c7648b3b7330f940b10dc4e08a6509185ae43cb456cb1f
+PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
 
-PKG_LICENSE:=GPL-2.0 LGPL-2.0
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
+               Ted Hess <thess@kitschensync.net>
+PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING COPYING.LIB
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
-
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
-
 PKG_USE_MIPS16:=0
 
 GST_VERSION:=1.0
@@ -111,6 +108,7 @@ PKG_CONFIG_DEPENDS:= \
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
+include ../../devel/meson/meson.mk
 
 define Package/gst1-libav
   SECTION:=multimedia
@@ -119,7 +117,7 @@ define Package/gst1-libav
   URL:=https://www.gstreamer.net/modules/gst-libav.html
   DEPENDS:= +libgstreamer1 +gstreamer1-plugins-base \
            +gst1-mod-alsa +libgst1audio +libgst1pbutils +libgst1video \
-           +libbz2 +liblzma
+           +libbz2 +liblzma +libffmpeg-full
 endef
 
 define Package/gst1-libav/description

diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile
index ea29e1ea3e22cb7c1fef4b7ffbb70b90a4f5bc62..227b74bebefa359fe313de1e8856e0b8476d8ff7 100644 (file)
--- a/multimedia/gst1-plugins-bad/Makefile
+++ b/multimedia/gst1-plugins-bad/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gst1-plugins-bad
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.17.1
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
-PKG_HASH:=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74
+PKG_HASH:=598937c818d0955543318203faa28d826eb68d487934be4737e999ad272210d0
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
                Ted Hess <thess@kitschensync.net>
@@ -97,6 +97,7 @@ GST_COND_SELECT = -D$(1)=$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),en,dis)abled
 GST_VERSION:=1.0
 
 MESON_ARGS += \
+       $(call GST_COND_SELECT,accurip) \
        $(call GST_COND_SELECT,adpcmdec) \
        $(call GST_COND_SELECT,adpcmenc) \
        $(call GST_COND_SELECT,aiff) \
@@ -111,6 +112,7 @@ MESON_ARGS += \
        -Dcamerabin2=$(if $(CONFIG_PACKAGE_gst1-mod-camerabin),en,dis)abled \
        $(call GST_COND_SELECT,coloreffects) \
        -Ddebugutils=$(if $(CONFIG_PACKAGE_gst1-mod-debugutilsbad),en,dis)abled \
+       $(call GST_COND_SELECT,dvbsubenc) \
        $(call GST_COND_SELECT,dvbsuboverlay) \
        $(call GST_COND_SELECT,dvdspu) \
        $(call GST_COND_SELECT,faceoverlay) \
@@ -148,6 +150,7 @@ MESON_ARGS += \
        $(call GST_COND_SELECT,smooth) \
        $(call GST_COND_SELECT,speed) \
        $(call GST_COND_SELECT,subenc) \
+       $(call GST_COND_SELECT,switchbin) \
        $(call GST_COND_SELECT,timecode) \
        -Dvideofilters=$(if $(CONFIG_PACKAGE_gst1-mod-videofiltersbad),en,dis)abled \
        $(call GST_COND_SELECT,videoframe_audiolevel) \
@@ -155,13 +158,13 @@ MESON_ARGS += \
        $(call GST_COND_SELECT,videosignal) \
        $(call GST_COND_SELECT,vmnc) \
        -Dy4m=$(if $(CONFIG_PACKAGE_gst1-mod-y4mdec),en,dis)abled \
-       $(call GST_COND_SELECT,yadif) \
        \
        -Dopencv=disabled \
        -Dwayland=disabled \
        -Dx11=disabled \
        \
        -Daom=disabled \
+       -Davtp=disabled \
        -Dandroidmedia=disabled \
        -Dapplemedia=disabled \
        -Dassrender=disabled \
@@ -174,6 +177,7 @@ MESON_ARGS += \
        -Dcurl=disabled \
        -Dcurl-ssh2=disabled \
        -Dd3dvideosink=disabled \
+       -Dd3d11=disabled \
        -Ddash=disabled \
        -Ddc1394=disabled \
        -Ddecklink=disabled \
@@ -194,18 +198,20 @@ MESON_ARGS += \
        -Dipcpipeline=disabled \
        -Diqa=disabled \
        -Dkate=disabled \
+       -Dkms=disabled \
        -Dladspa=disabled \
        -Dlibde265=disabled \
        -Dlibmms=disabled \
        -Dlv2=disabled \
+       -Dmediafoundation=disabled \
+       -Dmicrodns=disabled \
        -Dmodplug=disabled \
        -Dmpeg2enc=disabled \
        -Dmplex=disabled \
        -Dmsdk=disabled \
        -Dmusepack=disabled \
        -Dneon=disabled \
-       -Dnvdec=disabled \
-       -Dnvenc=disabled \
+       -Dnvcodec=disabled \
        -Dofa=disabled \
        -Dopenal=disabled \
        -Dopenexr=disabled \
@@ -220,6 +226,7 @@ MESON_ARGS += \
        -Drtmp=disabled \
        $(call GST_COND_SELECT,sbc) \
        -Dsctp=disabled \
+       $(call GST_COND_SELECT,shm) \
        -Dsmoothstreaming=disabled \
        $(call GST_COND_SELECT,sndfile) \
        -Dsoundtouch=disabled \
@@ -230,11 +237,11 @@ MESON_ARGS += \
        -Dtinyalsa=disabled \
        -Dttml=disabled \
        -Duvch264=disabled \
-       -Dvdpau=disabled \
        -Dvoaacenc=disabled \
        -Dvoamrwbenc=disabled \
        -Dvulkan=disabled \
        -Dwasapi=disabled \
+       -Dwasapi2=disabled \
        $(call GST_COND_SELECT,webp) \
        -Dwebrtc=disabled \
        -Dwebrtcdsp=disabled \
@@ -243,7 +250,10 @@ MESON_ARGS += \
        -Dwinscreencap=disabled \
        -Dx265=disabled \
        -Dzbar=disabled \
+       -Dzxing=disabled \
        -Dwpe=disabled \
+       -Dmagicleap=disabled \
+       -Dv4l2codecs=disabled \
        \
        $(call GST_COND_SELECT,hls) \
        -Dhls-crypto=nettle \
@@ -253,7 +263,9 @@ MESON_ARGS += \
        -Dorc=disabled \
        -Dgobject-cast-checks=disabled \
        -Dglib-asserts=disabled \
-       -Dglib-checks=disabled
+       -Dglib-checks=disabled \
+       -Dextra-checks=disabled \
+       -Ddoc=disabled
 
 define Package/gst1-plugins-bad/install
        /bin/true
@@ -343,18 +355,13 @@ $(eval $(call GstBuildPlugin,audiomixmatrix,audiomixmatrix support,audio,,))
 $(eval $(call GstBuildPlugin,audiovisualizers,audiovisualizers support,audio,,))
 $(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,))
 $(eval $(call GstBuildPlugin,bayer,bayer support,video,,))
-$(eval $(call GstBuildPlugin,bluez,bluez support,,,+bluez-libs))
-$(eval $(call GstBuildPlugin,bz2,bzip2 support,,,+libbz2))
 $(eval $(call GstBuildPlugin,camerabin,camerabin support,basecamerabinsrc photography pbutils app,,))
 $(eval $(call GstBuildPlugin,coloreffects,coloreffects support,video,,))
-#$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,))
 $(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,video,,))
-$(eval $(call GstBuildPlugin,dtls,DTLS support,,,+libopenssl))
+$(eval $(call GstBuildPlugin,dvbsubenc,dvbsubenc support,video,,))
 $(eval $(call GstBuildPlugin,dvbsuboverlay,dvbsuboverlay support,video,,))
 $(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,))
-$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2))
 $(eval $(call GstBuildPlugin,faceoverlay,faceoverlay support,pbutils,,))
-$(eval $(call GstBuildPlugin,fbdevsink,fbdev support,video,,))
 $(eval $(call GstBuildPlugin,festival,festival support,audio,,))
 $(eval $(call GstBuildPlugin,fieldanalysis,fieldanalysis support,audio,,))
 $(eval $(call GstBuildPlugin,freeverb,freeverb support,,,))
@@ -362,7 +369,6 @@ $(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,))
 $(eval $(call GstBuildPlugin,gaudieffects,gaudieffects support,audio,,))
 $(eval $(call GstBuildPlugin,gdp,gdp support,,,))
 $(eval $(call GstBuildPlugin,geometrictransform,geometrictransform support,,,))
-$(eval $(call GstBuildPlugin,hls,HLS support,pbutils adaptivedemux,multifile,+libnettle))
 $(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,))
 $(eval $(call GstBuildPlugin,inter,inter support,,,))
 $(eval $(call GstBuildPlugin,interlace,interlace support,,,))
@@ -378,32 +384,41 @@ $(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,))
 #$(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,video,,))
 $(eval $(call GstBuildPlugin,mxf,mxf support,audio video,,))
 $(eval $(call GstBuildPlugin,netsim,netsim support,,,))
-$(eval $(call GstBuildPlugin,opusparse,OPUS streams library,pbutils,,+libopus))
 $(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,))
 $(eval $(call GstBuildPlugin,pnm,pnm support,video,,))
 $(eval $(call GstBuildPlugin,proxy,proxy support,,,))
 $(eval $(call GstBuildPlugin,removesilence,removesilence support,audio,,))
 $(eval $(call GstBuildPlugin,rfbsrc,librfb support,video,,))
 $(eval $(call GstBuildPlugin,rtponvif,rtponvif support,,,))
-$(eval $(call GstBuildPlugin,sbc,sbc support,audio,,+sbc))
 $(eval $(call GstBuildPlugin,sdpelem,sdp support,rtp sdp,,))
 $(eval $(call GstBuildPlugin,segmentclip,segmentclip support,audio,,))
-$(eval $(call GstBuildPlugin,shm,POSIX shared memory source and sink,,,+librt))
 $(eval $(call GstBuildPlugin,siren,siren support,audio rtp,,))
 $(eval $(call GstBuildPlugin,smooth,smooth support,,,))
-$(eval $(call GstBuildPlugin,sndfile,sndfile support,audio,,+libsndfile))
 $(eval $(call GstBuildPlugin,speed,speed support,audio,,))
 $(eval $(call GstBuildPlugin,subenc,subenc support,controller,,))
-#$(eval $(call GstBuildPlugin,srtp,srtp support,rtp,,+libsrtp))
+$(eval $(call GstBuildPlugin,switchbin,switchbin support,,,))
 $(eval $(call GstBuildPlugin,timecode,timecode support,,,))
 $(eval $(call GstBuildPlugin,videofiltersbad,videofiltersbad support,,,))
 $(eval $(call GstBuildPlugin,videoframe_audiolevel,videoframe_audiolevel support,,,))
 #$(eval $(call GstBuildPlugin,videoparsersbad,videoparsersbad support,,,))
 $(eval $(call GstBuildPlugin,videosignal,videosignal support,,,))
 $(eval $(call GstBuildPlugin,vmnc,vmnc support,,,))
-$(eval $(call GstBuildPlugin,webp,webp support,,,+libwebp))
 $(eval $(call GstBuildPlugin,y4mdec,y4mdec support,,,))
-$(eval $(call GstBuildPlugin,yadif,yadif support,,,))
+
+$(eval $(call GstBuildPlugin,bluez,bluez support,,,+bluez-libs))
+#$(eval $(call GstBuildPlugin,bz2,bzip2 support,,,+libbz2))
+#$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,))
+$(eval $(call GstBuildPlugin,dtls,DTLS support,,,+libopenssl))
+$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2))
+$(eval $(call GstBuildPlugin,fbdevsink,fbdev support,video,,))
+$(eval $(call GstBuildPlugin,hls,HLS support,pbutils adaptivedemux,multifile,+libnettle))
+$(eval $(call GstBuildPlugin,opusparse,OPUS streams library,pbutils,,+libopus))
+$(eval $(call GstBuildPlugin,sbc,sbc support,audio,,+sbc))
+$(eval $(call GstBuildPlugin,shm,POSIX shared memory source and sink,,,+librt))
+$(eval $(call GstBuildPlugin,sndfile,sndfile support,audio,,+libsndfile))
+#$(eval $(call GstBuildPlugin,srtp,srtp support,rtp,,+libsrtp))
+$(eval $(call GstBuildPlugin,webp,webp support,,,+libwebp))
+#$(eval $(call GstBuildPlugin,yadif,yadif support,,,))
 
 $(eval $(call BuildPackage,gstreamer1-plugins-bad))
 $(eval $(call BuildPackage,gst1-plugins-bad))

diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile
index b6d8a30a88d79596b1cbac3155f4a63c61dcc96e..624ba9937f50881ec2828a30af3558c8187af1d4 100644 (file)
--- a/multimedia/gst1-plugins-base/Makefile
+++ b/multimedia/gst1-plugins-base/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gst1-plugins-base
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.17.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base
-PKG_HASH:=b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a
+PKG_HASH:=c0d8a84e3262e706ebc88831ca7349e5ae221274ef362599734573b3d3c028f3
 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
@@ -148,10 +148,13 @@ MESON_ARGS += \
        \
        $(call GST_COND_SELECT,alsa) \
        $(call GST_COND_SELECT,cdparanoia) \
+       $(call GST_COND_SELECT,libvisual) \
        $(call GST_COND_SELECT,ogg) \
        $(call GST_COND_SELECT,opus) \
        $(call GST_COND_SELECT,pango) \
        $(call GST_COND_SELECT,theora) \
+       $(call GST_COND_SELECT,tremor) \
+       -Dtremor=$(if $(CONFIG_PACKAGE_gst1-mod-ivorbisdec),en,dis)abled \
        $(call GST_COND_SELECT,vorbis) \
        -Dx11=disabled \
        -Dxshm=disabled \
@@ -160,13 +163,13 @@ MESON_ARGS += \
        -Dexamples=disabled \
        -Dtests=disabled \
        -Dtools=disabled \
-       -Dgtk_doc=disabled \
        -Dintrospection=disabled \
        -Dnls=enabled \
        -Dorc=disabled \
        -Dgobject-cast-checks=disabled \
        -Dglib-asserts=disabled \
-       -Dglib-checks=disabled
+       -Dglib-checks=disabled \
+       -Ddoc=disabled
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
@@ -281,24 +284,37 @@ define GstBuildPlugin
   $$(eval $$(call BuildPackage,gst1-mod-$(1)))
 endef
 
-$(eval $(call GstBuildPlugin,alsa,ALSA,audio tag,,+alsa-lib))
+$(eval $(call GstBuildPlugin,adder,adder,audio,,))
 $(eval $(call GstBuildPlugin,app,app,app,,))
 $(eval $(call GstBuildPlugin,audioconvert,audio format conversion,audio,,))
+$(eval $(call GstBuildPlugin,audiomixer,audio mixing,audio,,))
 $(eval $(call GstBuildPlugin,audiorate,audio rate adjusting,audio tag,,))
 $(eval $(call GstBuildPlugin,audioresample,audio resampling,audio tag,,))
 $(eval $(call GstBuildPlugin,audiotestsrc,audio test,audio tag controller,,))
-$(eval $(call GstBuildPlugin,playback,media decoder (v2),pbutils,,))
+$(eval $(call GstBuildPlugin,compositor,video compositor,video,,))
+$(eval $(call GstBuildPlugin,encoding,encoding plugin,pbutils video,,))
 $(eval $(call GstBuildPlugin,gio,GIO,,,))
-$(eval $(call GstBuildPlugin,ogg,Ogg,riff tag pbutils video,,+libogg))
-$(eval $(call GstBuildPlugin,opus,OPUS plugin library,pbutils video,,+libopus))
+$(eval $(call GstBuildPlugin,overlaycomposition,overlay composition,video,,))
+$(eval $(call GstBuildPlugin,pbtypes,pbtypes,video,,))
+$(eval $(call GstBuildPlugin,playback,playback,pbutils,,))
+$(eval $(call GstBuildPlugin,subparse,subparse,video,,))
+$(eval $(call GstBuildPlugin,rawparse,parse raw media,audio video,,))
 $(eval $(call GstBuildPlugin,tcp,TCP,net,,))
-$(eval $(call GstBuildPlugin,theora,Theora,tag video,,+libogg +libtheora))
 $(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,audio pbutils tag video,,))
 $(eval $(call GstBuildPlugin,videoconvert,video format conversion,video,,))
 $(eval $(call GstBuildPlugin,videorate,Adjusts video frames,video,,))
 $(eval $(call GstBuildPlugin,videoscale,Resizes video,video,,))
 $(eval $(call GstBuildPlugin,videotestsrc,video test,video,,+liboil))
 $(eval $(call GstBuildPlugin,volume,volume,audio controller,,+liboil))
+
+$(eval $(call GstBuildPlugin,alsa,ALSA audio source/sink,audio tag,,+alsa-lib))
+$(eval $(call GstBuildPlugin,ivorbisdec,Integer Vorbis decoder plugin for devices without floating point,audio tag,,+libvorbisidec))
+#$(eval $(call GstBuildPlugin,cdparanoia,cdparanoia,,+libcdparanoia))
+#$(eval $(call GstBuildPlugin,libvisual,libvisual audio visualization,,+alsa-lib))
+$(eval $(call GstBuildPlugin,ogg,ogg parser muxer demuxer,riff tag pbutils video,,+libogg))
+$(eval $(call GstBuildPlugin,opus,OPUS audio codec,pbutils video,,+libopus))
+#$(eval $(call GstBuildPlugin,pango,Pango text rendering and overlay plugin,,+libopus))
+$(eval $(call GstBuildPlugin,theora,Theora,tag video,,+libogg +libtheora))
 $(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis))
 
 $(eval $(call BuildPackage,gstreamer1-plugins-base))

diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile
index dc229c260776766268c0b69849343eea9e9e7def..07f4d601883a34bbb0e4dc6b0c586766c9a0413b 100644 (file)
--- a/multimedia/gst1-plugins-good/Makefile
+++ b/multimedia/gst1-plugins-good/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gst1-plugins-good
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.17.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/
-PKG_HASH:=40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319
+PKG_HASH:=ea8957460ed38261e5c4bf6a8bf98d946298b756a695b27c9b1209aa7b76b0d7
 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
@@ -131,41 +131,42 @@ MESON_ARGS += \
        $(call GST_COND_SELECT,spectrum) \
        $(call GST_COND_SELECT,udp) \
        $(call GST_COND_SELECT,videobox) \
+       $(call GST_COND_SELECT,videocrop) \
        $(call GST_COND_SELECT,videofilter) \
        $(call GST_COND_SELECT,videomixer) \
        $(call GST_COND_SELECT,wavenc) \
        $(call GST_COND_SELECT,wavparse) \
        $(call GST_COND_SELECT,y4m) \
        \
-       -Daalib=disabled \
-       -Dbz2=disabled \
-       -Dcairo=disabled \
+       $(call GST_COND_SELECT,aalib) \
+       $(call GST_COND_SELECT,bz2) \
+       $(call GST_COND_SELECT,cairo) \
        -Ddirectsound=disabled \
-        -Ddv=disabled \
-        -Ddv1394=disabled \
-        $(call GST_COND_SELECT,flac) \
+       $(call GST_COND_SELECT,dv) \
+       -Ddv1394=$(if $(CONFIG_PACKAGE_gst1-mod-1394),en,dis)abled \
+       $(call GST_COND_SELECT,flac) \
        -Dgdk-pixbuf=disabled \
        -Dgtk3=disabled \
        -Djack=disabled \
-        $(call GST_COND_SELECT,jpeg) \
-        $(call GST_COND_SELECT,lame) \
-        -Dlibcaca=disabled \
-        $(call GST_COND_SELECT,mpg123) \
+       $(call GST_COND_SELECT,jpeg) \
+       $(call GST_COND_SELECT,lame) \
+       -Dlibcaca=disabled \
+       $(call GST_COND_SELECT,mpg123) \
        -Doss=$(if $(CONFIG_PACKAGE_gst1-mod-ossaudio),en,dis)abled \
-        $(call GST_COND_SELECT,oss4) \
+       $(call GST_COND_SELECT,oss4) \
        -Dosxaudio=disabled \
        -Dosxvideo=disabled \
-        $(call GST_COND_SELECT,png) \
-        -Dpulse=disabled \
+       $(call GST_COND_SELECT,png) \
+       $(call GST_COND_SELECT,pulse) \
        -Dqt5=disabled \
-        $(call GST_COND_SELECT,shout2) \
-        $(call GST_COND_SELECT,soup) \
-        $(call GST_COND_SELECT,speex) \
-        -Dtaglib=disabled \
-       -Dtwolame=disabled \
-        $(call GST_COND_SELECT,vpx) \
+       $(call GST_COND_SELECT,shout2) \
+       $(call GST_COND_SELECT,soup) \
+       $(call GST_COND_SELECT,speex) \
+       $(call GST_COND_SELECT,taglib) \
+       $(call GST_COND_SELECT,twolame) \
+       $(call GST_COND_SELECT,vpx) \
        -Dwaveform=disabled \
-        -Dwavpack=disabled \
+       $(call GST_COND_SELECT,wavpack) \
        \
        -Dximagesrc=disabled \
        -Dv4l2=$(if $(CONFIG_PACKAGE_gst1-mod-video4linux2),en,dis)abled \
@@ -175,7 +176,8 @@ MESON_ARGS += \
        -Dorc=disabled \
        -Dgobject-cast-checks=disabled \
        -Dglib-asserts=disabled \
-       -Dglib-checks=disabled
+       -Dglib-checks=disabled \
+       -Ddoc=disabled
 
 define Package/gst1-plugins-good/install
        /bin/true
@@ -217,10 +219,8 @@ define GstBuildPlugin
   $$(eval $$(call BuildPackage,gst1-mod-$(1)))
 endef
 
-#$(eval $(call GstBuildPlugin,1394,IEEE 1394 support,,,))
 $(eval $(call GstBuildPlugin,alaw,alaw codec,audio,,))
 $(eval $(call GstBuildPlugin,alpha,alpha support,video,,))
-$(eval $(call GstBuildPlugin,alphacolor,alphacolor support,video,,))
 $(eval $(call GstBuildPlugin,apetag,apetag support,audio pbutils tag video,,))
 $(eval $(call GstBuildPlugin,audiofx,audio effects,audio fft controller,,))
 $(eval $(call GstBuildPlugin,audioparsers,audioparsers,audio tag pbutils,,))
@@ -229,59 +229,64 @@ $(eval $(call GstBuildPlugin,autodetect,format auto-detection,,,))
 $(eval $(call GstBuildPlugin,avi,avi support,audio riff tag video,,))
 $(eval $(call GstBuildPlugin,cutter,audio cutter,audio,,))
 $(eval $(call GstBuildPlugin,debug,debugging,,,))
-$(eval $(call GstBuildPlugin,deinterlace,deinterlace support,video,,))
+#$(eval $(call GstBuildPlugin,deinterlace,deinterlace support,video,,))
 $(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,))
-#$(eval $(call GstBuildPlugin,dv,dv support,audio tag video,,))
 $(eval $(call GstBuildPlugin,effectv,effectvsupport,video,,))
 $(eval $(call GstBuildPlugin,equalizer,audio equalizer,audio controller,,))
-$(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac))
 $(eval $(call GstBuildPlugin,flv,flv codec,audio pbutils tag video,,))
 $(eval $(call GstBuildPlugin,flxdec,flx codec,,,))
-#$(eval $(call GstBuildPlugin,gdkpixbuf,gdkpixbuf support,video,,))
-$(eval $(call GstBuildPlugin,goom2k1,goom support,audio video pbutils,,))
 $(eval $(call GstBuildPlugin,goom,goom support,audio video pbutils,,))
+$(eval $(call GstBuildPlugin,goom2k1,goom support,audio video pbutils,,))
 $(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,))
 $(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,))
 $(eval $(call GstBuildPlugin,imagefreeze,imagefreeze support,,,))
 $(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,))
 $(eval $(call GstBuildPlugin,isomp4,isomp4 support,audio pbutils riff rtp tag video,,))
-#$(eval $(call GstBuildPlugin,jack,jack support,audio,,))
-$(eval $(call GstBuildPlugin,jpeg,jpeg support,video,,+libjpeg))
-$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib))
 $(eval $(call GstBuildPlugin,level,audio level,audio,,))
 $(eval $(call GstBuildPlugin,matroska,matroska support,audio pbutils riff tag video,,))
-$(eval $(call GstBuildPlugin,mpg123,MP3 decoder (using mpg123),audio tag,,+libid3tag +mpg123))
-$(eval $(call GstBuildPlugin,mulaw,mulaw support,audio,,))
+$(eval $(call GstBuildPlugin,monoscope,monoscope,,,))
 $(eval $(call GstBuildPlugin,multifile,multiple files access,video,,))
 $(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,))
-$(eval $(call GstBuildPlugin,navigationtest,navigationtest support,video,,))
-$(eval $(call GstBuildPlugin,oss4,OSS 4 audio support,audio tag,,))
-$(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio,,))
-$(eval $(call GstBuildPlugin,png,png support,video,,+libpng))
-#$(eval $(call GstBuildPlugin,pulse,pulse support,audio pbutils tag video,,))
 $(eval $(call GstBuildPlugin,replaygain,volume normalization,pbutils,,))
-$(eval $(call GstBuildPlugin,rtpmanager,RTP manager,audio net rtp tag pbutils video,,))
 $(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils video,,))
+$(eval $(call GstBuildPlugin,rtpmanager,RTP manager,audio net rtp tag pbutils video,,))
 $(eval $(call GstBuildPlugin,rtsp,RTSP,net rtp rtsp sdp,,))
 $(eval $(call GstBuildPlugin,shapewipe,shapewipe support,video,,))
-$(eval $(call GstBuildPlugin,shout2,shout2 support,audio,,+libshout))
 $(eval $(call GstBuildPlugin,smpte,smpte support,video,,))
-$(eval $(call GstBuildPlugin,soup,soup input,audio tag,,+libsoup))
 $(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,))
-$(eval $(call GstBuildPlugin,speex,speex support,audio tag,,+libspeex))
-#$(eval $(call GstBuildPlugin,taglib,taglib support,tag,,))
 $(eval $(call GstBuildPlugin,udp,UDP,net,,))
-$(eval $(call GstBuildPlugin,video4linux2,video4linux2 support,video allocators,,+libv4l))
 $(eval $(call GstBuildPlugin,videobox,videobox support,video,,))
 $(eval $(call GstBuildPlugin,videocrop,videocrop support,video,,))
 $(eval $(call GstBuildPlugin,videofilter,videofilter support,video,,))
 $(eval $(call GstBuildPlugin,videomixer,videomixer support,video,,))
-$(eval $(call GstBuildPlugin,vpx,vpx support,tag video,,+libvpx))
 $(eval $(call GstBuildPlugin,wavenc,Wav encoder,riff,,))
-#$(eval $(call GstBuildPlugin,wavpack,Wav packer,audio riff tag,,))
 $(eval $(call GstBuildPlugin,wavparse,Wav parser,audio riff tag,,))
-#$(eval $(call GstBuildPlugin,ximagesrc,ximagesrc support,video,,))
 #$(eval $(call GstBuildPlugin,y4m,sty4menc support,video,,))
 
+#$(eval $(call GstBuildPlugin,1394,IEEE 1394 support,,,))
+#$(eval $(call GstBuildPlugin,aalib,aalib text console video sink,,,))
+#$(eval $(call GstBuildPlugin,alphacolor,alphacolor support,video,,))
+#$(eval $(call GstBuildPlugin,dv,dv support,audio tag video,,))
+$(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac))
+#$(eval $(call GstBuildPlugin,gdkpixbuf,gdkpixbuf support,video,,))
+#$(eval $(call GstBuildPlugin,jack,jack support,audio,,))
+$(eval $(call GstBuildPlugin,jpeg,jpeg support,video,,+libjpeg))
+$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib))
+$(eval $(call GstBuildPlugin,mpg123,MP3 decoder (using mpg123),audio tag,,+libid3tag +mpg123))
+$(eval $(call GstBuildPlugin,mulaw,mulaw support,audio,,))
+$(eval $(call GstBuildPlugin,navigationtest,navigationtest support,video,,))
+$(eval $(call GstBuildPlugin,oss4,OSS 4 audio support,audio tag,,))
+$(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio,,))
+$(eval $(call GstBuildPlugin,png,png support,video,,+libpng))
+#$(eval $(call GstBuildPlugin,pulse,pulse support,audio pbutils tag video,,+pulseaudio))
+$(eval $(call GstBuildPlugin,shout2,shout2 support,audio,,+libshout))
+$(eval $(call GstBuildPlugin,soup,soup input,audio tag,,+libsoup))
+$(eval $(call GstBuildPlugin,speex,speex support,audio tag,,+libspeex))
+#$(eval $(call GstBuildPlugin,taglib,taglib support,tag,,))
+$(eval $(call GstBuildPlugin,video4linux2,video4linux2 support,video allocators,,+libv4l))
+$(eval $(call GstBuildPlugin,vpx,vpx support,tag video,,+libvpx))
+#$(eval $(call GstBuildPlugin,wavpack,Wav packer,audio riff tag,,))
+#$(eval $(call GstBuildPlugin,ximagesrc,ximagesrc support,video,,))
+
 $(eval $(call BuildPackage,gstreamer1-plugins-good))
 $(eval $(call BuildPackage,gst1-plugins-good))

diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile
index de6e50a7ac9346a985a950cbb4be1be69772c0b3..0d934738125589937f72a15676b2cfb6f6ad4b11 100644 (file)
--- a/multimedia/gst1-plugins-ugly/Makefile
+++ b/multimedia/gst1-plugins-ugly/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gst1-plugins-ugly
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.17.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly
-PKG_HASH:=5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca
+PKG_HASH:=a5e564107120b5b27c48709c5dfdb266737def5b3eb7aaabaddd304d425d8f21
 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION)
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
@@ -113,7 +113,8 @@ MESON_ARGS += \
        -Dtests=disabled \
        -Dgobject-cast-checks=disabled \
        -Dglib-asserts=disabled \
-       -Dglib-checks=disabled
+       -Dglib-checks=disabled \
+       -Ddoc=disabled
 
 define Package/gst1-plugins-ugly/install
        /bin/true

diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index b0293ac750abc3c26d13043bec61255cdfdb7edc..a33c3609154c71ea2b7582619741a020674ddc90 100644 (file)
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gstreamer1
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.17.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer
-PKG_HASH:=e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
+PKG_HASH:=f63566152755aab98414feb859ea8b00d3b07cad2486f304a8feec1265e5aa0e
 PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
@@ -121,14 +121,16 @@ MESON_ARGS += \
        -Dregistry=false \
        -Dtracer_hooks=false \
        -Dptp-helper-setuid-user=none \
-       -Dextra-checks=false \
+       -Dptp-helper-setuid-group=none \
        -Doption-parsing=false \
        -Dpoisoning=false \
+       -Dmemory-alignment=malloc \
        -Dcheck=enabled \
        -Dlibunwind=disabled \
        -Dlibdw=disabled \
        -Ddbghelp=disabled \
        -Dbash-completion=disabled \
+       -Dcoretracers=disabled \
        -Dexamples=disabled \
        -Dbenchmarks=disabled \
        -Dtools=enabled \
@@ -136,7 +138,9 @@ MESON_ARGS += \
        -Dintrospection=disabled \
        -Dnls=enabled \
        -Dgobject-cast-checks=disabled \
-       -Dglib-asserts=disabled
+       -Dglib-asserts=disabled \
+       -Dextra-checks=disabled \
+       -Ddoc=disabled
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)

diff --git a/multimedia/gstreamer1/patches/001-no-translations.patch b/multimedia/gstreamer1/patches/001-no-translations.patch
deleted file mode 100644 (file)
index e6c6864..0000000
--- a/multimedia/gstreamer1/patches/001-no-translations.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,6 @@ aclocal_DATA = gst-element-check-1.0.m4
- SUBDIRS = pkgconfig \
-       gst libs plugins tests \
-       docs \
--      po \
-       m4 \
-       common \
-       data
-@@ -22,7 +21,6 @@ endif
- DIST_SUBDIRS = pkgconfig \
-       gst libs plugins tools tests \
-       docs \
--      po \
-       m4 \
-       common \
-       data
---- a/configure.ac
-+++ b/configure.ac
-@@ -1108,7 +1108,6 @@ libs/gst/net/Makefile
- plugins/Makefile
- plugins/elements/Makefile
- plugins/tracers/Makefile
--po/Makefile.in
- tests/Makefile
- tests/benchmarks/Makefile
- tests/check/Makefile

diff --git a/net/frp/Makefile b/net/frp/Makefile
index 5a26e80b559bbbb1028953934c21ef6afbee65c5..b35baa209572735ad73face4dd1787afaef63dca 100644 (file)
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=frp
-PKG_VERSION:=0.32.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.33.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=3a6ef59163f5a1d41b67908269e924000a8ccb2984e4bdfc18bd1405b5dbaf22
+PKG_HASH:=9c773ab4bbd208705c795599c5e69302a379734921c90489ed8ae331c24836cb
 
 PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com>
 PKG_LICENSE:=Apache-2.0

diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile
index ab1888bf3759b9624fbbe512cd02ef0162f75ea5..28396aaa6014b90a1d0296f7599ab66dc2baef6e 100644 (file)
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=seafile-seahub
 PKG_VERSION:=7.1.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seahub/tar.gz/v$(PKG_VERSION)-server?
@@ -23,7 +23,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/seahub-$(PKG_VERSION)-server
 
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="Django~=1.11"
 
-PKG_BUILD_PARALLEL:=1
+PKG_BUILD_PARALLEL:=0
 PYTHON3_PKG_BUILD:=0
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile
index cfcbe512add792b8c72751ab28532d11630a610a..a6e39e2b7dd9b40fac1827ad2a70ac9c1d22bb04 100644 (file)
--- a/net/shorewall-core/Makefile
+++ b/net/shorewall-core/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall-core
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=5
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
@@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh
        http://www.shorewall.no/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://france.shorewall.net/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=94c0df3ef44504b7f370ddd055c2a9459a78fbc5f6057b550e0a652939cfb5fc
+PKG_HASH:=175a3c7cb816c930ae24d074c8c9cd365cbd8ac47551f6878f72bc67022a0147
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index b1a3a642ef90bc06711b3361cbcbf544d26a0bc8..816512cee52af838fafad6377efeadadf4b9ed33 100644 (file)
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall-lite
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=5
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
@@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh
        http://www.shorewall.no/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://france.shorewall.net/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=c51cf167b951d52726c8b70dc710e0831196f677381fda0744e9893d9669f630
+PKG_HASH:=6076ecc8d7ee5d2e3d5443ccf818b79897dfccbe9cb70f4378457e185995cea4
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index a32eeec04c0d914c0a633086b2c7b1d37f06e90b..454500c8fc0ef1450bfa7862da02bad4a4359497 100644 (file)
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=5
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
@@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh
        http://www.shorewall.no/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://france.shorewall.net/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=786c7016d124c131f80aff72105e1cffca3aad825078692ba878287271193f98
+PKG_HASH:=afb08f593e0bb4cbc7baccacdcaf570605e337fe6fe1578a421aa7d2e7643de8
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/net/shorewall6-lite/Makefile b/net/shorewall6-lite/Makefile
index 673d5f8f2ce66ddcefe1d7fae6f36f520db1a2ec..16e324ce7c817c5625e3c8c8b416d182a268154d 100644 (file)
--- a/net/shorewall6-lite/Makefile
+++ b/net/shorewall6-lite/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall6-lite
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=5
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
@@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh
        http://www.shorewall.no/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://france.shorewall.net/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=aa85b1bf93039b760c2b7b9f28f7693079be6d59026d3f58c03baa59cfed4bd0
+PKG_HASH:=d5b20bd467083eba06df6ef73eb9eaa3454b8194bb5c27695697e9a7c18fe4bc
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile
index 3675faf15fbcd88facfd889dccf80d9baa41456c..2c6d3932ad3997282296144d2e645e79c351adaf 100644 (file)
--- a/net/shorewall6/Makefile
+++ b/net/shorewall6/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall6
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=5
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
@@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/sh
        http://www.shorewall.no/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://france.shorewall.net/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=9db0f815a713aec565073c9b6038ccdb673abddb571d714e3153c74d47381d54
+PKG_HASH:=cbf27b0fe84dc19571922cfac9edc813a3d8fae7c59596887d17bb6b2da13041
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/utils/openocd/Makefile b/utils/openocd/Makefile
index c8a6544b5eb380941649f60d09e8640c1c1197c9..30c2e836855ac6bd4a2bd449681ebacc5cb7c434 100644 (file)
--- a/utils/openocd/Makefile
+++ b/utils/openocd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openocd
 PKG_SOURCE_VERSION:=v0.10.0-1000-gdb23c13d
 PKG_VERSION:=$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

diff --git a/utils/openocd/patches/010-gcc10.patch b/utils/openocd/patches/010-gcc10.patch
new file mode 100644 (file)
index 0000000..9bfb610
--- /dev/null
+++ b/utils/openocd/patches/010-gcc10.patch
@@ -0,0 +1,31 @@
+From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001
+From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
+Date: Fri, 17 Apr 2020 13:49:28 +0200
+Subject: [PATCH] bitbang: Fix FTBFS with GCC 10
+
+GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd
+struct between bitbang drivers due to a missing extern.
+
+Change-Id: I2b4122f7939cec91a72284006748f99a23548324
+Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
+Reviewed-on: http://openocd.zylin.com/5592
+Tested-by: jenkins
+Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
+Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li>
+---
+ src/jtag/drivers/bitbang.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h
+index edb779c..bbbc693 100644
+--- a/src/jtag/drivers/bitbang.h
++++ b/src/jtag/drivers/bitbang.h
+@@ -57,7 +57,7 @@ struct bitbang_interface {
+       void (*swdio_drive)(bool on);
+ };
+ 
+-const struct swd_driver bitbang_swd;
++extern const struct swd_driver bitbang_swd;
+ 
+ extern bool swd_mode;
+ 

diff --git a/utils/readsb/Makefile b/utils/readsb/Makefile
index 535580ccb030c955ab15aa6e16eb36916b913fd1..dc46e98cf2bf536b70840ed823f962d00546671a 100644 (file)
--- a/utils/readsb/Makefile
+++ b/utils/readsb/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=readsb
 PKG_VERSION:=3.8.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Mictronics/readsb/tar.gz/v$(PKG_VERSION)?

diff --git a/utils/readsb/patches/010-gcc10.patch b/utils/readsb/patches/010-gcc10.patch
new file mode 100644 (file)
index 0000000..2ef9722
--- /dev/null
+++ b/utils/readsb/patches/010-gcc10.patch
@@ -0,0 +1,61 @@
+From 5119c21ae56f1c7fd0b10250d1beca9634bf74af Mon Sep 17 00:00:00 2001
+From: Mictronics <github@mictronics.de>
+Date: Sun, 14 Jun 2020 18:06:22 +0200
+Subject: [PATCH] Clean up linkage of struct Modes.
+
+---
+ readsb.c         | 2 ++
+ readsb.h         | 6 ++++--
+ viewadsb.c       | 2 ++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/readsb.c b/readsb.c
+index e784d891..d6dab324 100644
+--- a/readsb.c
++++ b/readsb.c
+@@ -57,6 +57,8 @@
+ 
+ #include <stdarg.h>
+ 
++struct _Modes Modes;
++
+ //
+ // ============================= Program options help ==========================
+ //
+diff --git a/readsb.h b/readsb.h
+index 3a1b22d5..1b80c338 100644
+--- a/readsb.h
++++ b/readsb.h
+@@ -312,7 +312,7 @@ struct mag_buf
+ 
+ // Program global state
+ 
+-struct
++struct _Modes
+ { // Internal state
+   pthread_cond_t data_cond; // Conditional variable associated
+   pthread_t reader_thread;
+@@ -412,7 +412,9 @@ struct
+   struct stats stats_15min;
+   struct timespec reader_cpu_accumulator; // CPU time used by the reader thread, copied out and reset by the main thread under the mutex
+   struct mag_buf mag_buffers[MODES_MAG_BUFFERS]; // Converted magnitude buffers from RTL or file input
+-} Modes;
++};
++
++extern struct _Modes Modes;
+ 
+ // The struct we use to store information about a decoded message.
+ 
+diff --git a/viewadsb.c b/viewadsb.c
+index ad7b1bd0..915305b6 100644
+--- a/viewadsb.c
++++ b/viewadsb.c
+@@ -54,6 +54,8 @@
+ #include "readsb.h"
+ #include "help.h"
+ 
++struct _Modes Modes;
++
+ #define _stringize(x) x
+ #define verstring(x) _stringize(x)
+ 

diff --git a/utils/swig/Makefile b/utils/swig/Makefile
index b931534ef89a421c64ca09fe899980af6afebd0c..6624db10d6444d32c2b85731fe5c10a4574d8377 100644 (file)
--- a/utils/swig/Makefile
+++ b/utils/swig/Makefile
@@ -7,18 +7,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swig
-PKG_VERSION:=4.0.1
+PKG_VERSION:=4.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9
-PKG_INSTALL:=1
+PKG_HASH:=d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Hirokazu MORIKAWA <morikw2@gmail.com>
-PKG_LICENSE:=GPL-3.0
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_HOST_ONLY:=1
+HOST_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,10 +28,11 @@ define Package/swig
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=swig binding generator
+  URL:=http://swig.org/
   BUILDONLY:=1
 endef
 
-HOST_CONFIGURE_ARGS+= \
+HOST_CONFIGURE_ARGS += \
        --without-pcre
 
 define Package/swig/description

diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile
index c57730d2ef4197d5aadbe52fa67d3e967c96c7ba..7fb87931d3b063a85fdeee243e754c96e954b8a3 100644 (file)
--- a/utils/syncthing/Makefile
+++ b/utils/syncthing/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syncthing
-PKG_VERSION:=1.4.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=0
 
 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION)
-PKG_HASH:=0c45955445752dac43d56bc321fae2140b5b05ad6d41a574ed37813607493edd
+PKG_HASH:=f42518d453f7475022b5632420f21a6e0ab8d77f19c29b65ad582bc98e00a0a5
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)