Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>

lang/lua-eco/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua-eco
-PKG_VERSION:=3.6.1
+PKG_VERSION:=3.6.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION)
-PKG_HASH:=8bfd5a85a699c0ff1ba760e121f3955e817a66335be6587ef930ec61638e5ae3
+PKG_HASH:=89dc89a70a30fd1b42a5341b6a5e42aba2509b02492aca635148d6f0e0669152
 
 PKG_MAINTAINER:=Jianhui Zhao <[email protected]>
 PKG_LICENSE:=MIT

lang/python/django/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django
-PKG_VERSION:=5.1
+PKG_VERSION:=5.1.3
 PKG_RELEASE:=1
 
 PYPI_NAME:=Django
-PKG_HASH:=848a5980e8efb76eea70872fb0e4bc5e371619c70fffbe48e3e1b50b2c09455d
+PKG_HASH:=c0fa0e619c39325a169208caef234f90baa925227032ad3f44842ba14d75234a
 
 PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>, Peter Stadler <[email protected]>
 PKG_LICENSE:=BSD-3-Clause

lang/python/numpy/Makefile

@@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=numpy
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.3
 PKG_RELEASE:=1
 
 PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=7dc90da0081f7e1da49ec4e398ede6a8e9cc4f5ebe5f9e06b443ed889ee9aaa2
+PKG_HASH:=aa08e04e08aaf974d4458def539dece0d28146d866a39da5639596f4921fd761
 
 PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>
 

lang/python/python-dateutil/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dateutil
-PKG_VERSION:=2.9.0.post0
+PKG_VERSION:=2.9.0
 PKG_RELEASE:=1
 PKG_LICENSE:=BSD-2-Clause
 
 PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3
+PKG_HASH:=78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709
 PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>
 
 PKG_BUILD_DEPENDS:=python-setuptools-scm/host

lang/python/python-pytz/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pytz
-PKG_VERSION:=2024.1
+PKG_VERSION:=2024.2
 PKG_RELEASE:=1
 
 PYPI_NAME:=pytz
-PKG_HASH:=2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812
+PKG_HASH:=2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a
 
 PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>
 PKG_LICENSE:=MIT

lang/ruby/Makefile

@@ -11,15 +11,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruby
-PKG_VERSION:=3.3.5
+PKG_VERSION:=3.3.6
 PKG_RELEASE:=1
 
 # First two numbes
 PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION))))
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cache.ruby-lang.org/pub/ruby/$(PKG_ABI_VERSION)/
-PKG_HASH:=3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196
+PKG_HASH:=8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <[email protected]>
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING

libs/libdrm/Makefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016 OpenWrt.org
+# Copyright (C) 2007-2024 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdrm
 PKG_VERSION:=2.4.123
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://dri.freedesktop.org/libdrm
@@ -17,43 +17,137 @@ PKG_MAINTAINER:=Lucian Cristian <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
 
 PKG_CONFIG_DEPENDS:= \
-	CONFIG_LIBDRM_INTEL \
-	CONFIG_LIBDRM_NOUVEAU \
-	CONFIG_LIBDRM_RADEON
+	CONFIG_PACKAGE_libdrm-amdgpu \
+	CONFIG_PACKAGE_libdrm-etnaviv \
+	CONFIG_PACKAGE_libdrm-intel \
+	CONFIG_PACKAGE_libdrm-nouveau \
+	CONFIG_PACKAGE_libdrm-omap \
+	CONFIG_PACKAGE_libdrm-radeon \
+	CONFIG_PACKAGE_libdrm-tegra
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/meson.mk
 
-define Package/libdrm
+define Package/libdrm/Default
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+LIBDRM_INTEL:libpciaccess
+  SUBMENU:=Video
   TITLE:=libdrm
   URL:=https://dri.freedesktop.org/
 endef
 
-define Package/libdrm/description
+define Package/libdrm/description/Default
   LIBDRM is the cross-driver middleware which allows user-space applications
   (such as Mesa and 2D drivers) to communicate with the Kernel by the means
   of the DRI protocol.
 endef
 
-define Package/libdrm/config
-	source "$(SOURCE)/Config.in"
+define Package/libdrm
+$(call Package/libdrm/Default)
+  TITLE+= common library
+endef
+
+define Package/libdrm/description
+$(call Package/libdrm/description/Default)
+endef
+
+define Package/libdrm-amdgpu
+$(call Package/libdrm/Default)
+  TITLE+= for AMD GPUs
+  DEPENDS:=+libdrm
+endef
+
+define Package/libdrm-amdgpu/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for AMD GPUs.
+endef
+
+define Package/libdrm-etnaviv
+$(call Package/libdrm/Default)
+  TITLE+= for Vivante GPUs
+  DEPENDS:=+libdrm @(arm||aarch64||mips||mipsel||mips64||mips64el)
+endef
+
+define Package/libdrm-etnaviv/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for Vivante GPUs.
+endef
+
+define Package/libdrm-intel
+$(call Package/libdrm/Default)
+  TITLE+= for Intel integrated GPUs
+  DEPENDS:=+libdrm +libpciaccess @(x86||x86_64)
+
+endef
+
+define Package/libdrm-intel/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for GPUs integrated into Intel's CPUs.
+endef
+
+define Package/libdrm-nouveau
+$(call Package/libdrm/Default)
+  TITLE+= for nVidia GPUs
+  DEPENDS:=+libdrm
+endef
+
+define Package/libdrm-nouveau/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for nVidia GPUs.
+endef
+
+define Package/libdrm-omap
+$(call Package/libdrm/Default)
+  TITLE+= for TI OMAP SoCs
+  DEPENDS:=+libdrm @(arm||aarch64)
+endef
+
+define Package/libdrm-omap/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for TI OMAP SoCs.
+endef
+
+define Package/libdrm-radeon
+$(call Package/libdrm/Default)
+  TITLE+= for AMD/ATI Radeon GPUs
+  DEPENDS:=+libdrm
+endef
+
+define Package/libdrm-radeon/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for AMD/ATI Radeon GPUs.
+endef
+
+define Package/libdrm-tegra
+$(call Package/libdrm/Default)
+  TITLE+= for nVidia Tegra SoCs
+  DEPENDS:=+libdrm @(arm||aarch64)
+endef
+
+define Package/libdrm-tegra/description
+$(call Package/libdrm/description/Default)
+
+This package provides the library with functions for nVidia Tegra SoCs.
 endef
 
 MESON_ARGS += \
-	-Dintel=$(if $(CONFIG_LIBDRM_INTEL),en,dis)abled \
-	-Dradeon=$(if $(CONFIG_LIBDRM_RADEON),en,dis)abled \
-	-Damdgpu=disabled \
-	-Dnouveau=$(if $(CONFIG_LIBDRM_NOUVEAU),en,dis)abled \
+	-Dintel=$(if $(CONFIG_PACKAGE_libdrm-intel),en,dis)abled \
+	-Damdgpu=$(if $(CONFIG_PACKAGE_libdrm-amdgpu),en,dis)abled \
+	-Dnouveau=$(if $(CONFIG_PACKAGE_libdrm-nouveau),en,dis)abled \
 	-Dvmwgfx=disabled \
-	-Domap=disabled \
+	-Domap=$(if $(CONFIG_PACKAGE_libdrm-omap),en,dis)abled  \
 	-Dexynos=disabled \
 	-Dfreedreno=disabled \
-	-Dtegra=disabled \
-	-Dvc4=disabled \
-	-Detnaviv=disabled \
+	-Dradeon=$(if $(CONFIG_PACKAGE_libdrm-radeon),en,dis)abled \
+	-Dtegra=$(if $(CONFIG_PACKAGE_libdrm-tegra),en,dis)abled \
+	-Dvc4=$(if $(CONFIG_arm)$(CONFIG_aarch64),en,dis)abled \
+	-Detnaviv=$(if $(CONFIG_PACKAGE_libdrm-etnaviv),en,dis)abled  \
 	-Dcairo-tests=disabled \
 	-Dman-pages=disabled \
 	-Dvalgrind=disabled \
@@ -72,7 +166,51 @@ endef
 
 define Package/libdrm/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm.so.* $(1)/usr/lib/
+endef
+
+define Package/libdrm-amdgpu/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_amdgpu.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/share/libdrm
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libdrm/amdgpu.ids $(1)/usr/share/libdrm
+endef
+
+define Package/libdrm-etnaviv/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_etnaviv.so.* $(1)/usr/lib/
+endef
+
+define Package/libdrm-intel/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_intel.so.* $(1)/usr/lib/
+endef
+
+define Package/libdrm-nouveau/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_nouveau.so.* $(1)/usr/lib/
+endef
+
+define Package/libdrm-omap/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_omap.so.* $(1)/usr/lib/
+endef
+
+define Package/libdrm-radeon/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_radeon.so.* $(1)/usr/lib/
+endef
+
+define Package/libdrm-tegra/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdrm_tegra.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libdrm))
+$(eval $(call BuildPackage,libdrm-amdgpu))
+$(eval $(call BuildPackage,libdrm-etnaviv))
+$(eval $(call BuildPackage,libdrm-intel))
+$(eval $(call BuildPackage,libdrm-nouveau))
+$(eval $(call BuildPackage,libdrm-omap))
+$(eval $(call BuildPackage,libdrm-radeon))
+$(eval $(call BuildPackage,libdrm-tegra))

multimedia/gst1-plugins-bad/Makefile

@@ -428,7 +428,7 @@ $(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,videoparsersbad,videoparsersbad support,codecparsers,,))
 $(eval $(call GstBuildPlugin,videosignal,videosignal support,,,))
 $(eval $(call GstBuildPlugin,vmnc,vmnc support,,,))
 $(eval $(call GstBuildPlugin,y4mdec,y4mdec support,,,))

net/atftp/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=atftp
 PKG_VERSION:=0.8.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)

net/atftp/files/atftpd.init

@@ -2,12 +2,15 @@
 # Copyright (C) 2020 OpenWrt.org
 
 START=95
-PIDFILE=/tmp/run/atftpd.pid
 
-start() {
+USE_PROCD=1
+BIN=atftpd
+
+start_service() {
 	local enable
 	local srv
 	local port
+	local mdns
 
 	config_load atftpd
 
@@ -16,10 +19,11 @@ start() {
 
 	config_get srv service path "/srv/tftp"
 	config_get port service port 69
+	config_get mdns service mdns 0
 
-	atftpd --pidfile $PIDFILE --user root.root --port $port --daemon $srv
-}
-
-stop() {
-	kill $(cat $PIDFILE)
+	procd_open_instance
+	procd_set_param command $BIN "--no-fork" "--daemon" "--user" "root.root" "--port" "$port" "$srv"
+	[ "${mdns}" -ne 0 ] && procd_add_mdns "tftp" "udp" "$port" "daemon=atftpd"
+	procd_set_param respawn
+	procd_close_instance
 }