From b2fe1b008faa75722c69641e0baed924d1d99d15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 24 Dec 2022 14:22:13 +0100 Subject: update kodi, ffmpeg and libvpx --- package/ffmpeg/Makefile | 4 ++-- package/fontconfig/Makefile | 2 +- package/glib/Makefile | 14 ++++++++------ package/kodi/Makefile | 8 ++++---- package/libvpx/Makefile | 13 +++++++------ package/libvpx/patches/patch-configure | 18 ------------------ tasks/003-kodi | 3 ++- 7 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 package/libvpx/patches/patch-configure diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 11ceb7813..e17c4baa5 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 4.4.1 +PKG_VERSION:= 4.4.3 PKG_RELEASE:= 1 -PKG_HASH:= 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42 +PKG_HASH:= 33b8c2dbcd530fe1db5710415345609b4ca227bd0da1e3a9332dbb0f11fd273a PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 16e765148..940c5bca1 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= 9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts PKG_DEPENDS:= libxml2 -PKG_BUILDDEP:= freetype libxml2 gperf-host +PKG_BUILDDEP:= freetype libxml2 gperf-host util-linux HOST_BUILDDEP:= expat-host PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ diff --git a/package/glib/Makefile b/package/glib/Makefile index 429bb7365..438845919 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,15 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.70.0 +PKG_VERSION:= 2.72.3 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.70 -PKG_HASH:= 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 +PKG_EXTRAVER:= 2.72 +PKG_HASH:= 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcre zlib libffi PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python2-host gettext-host util-linux-host +HOST_BUILDDEP+= pcre-host meson-host PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ @@ -24,6 +25,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +HOSTWRKBUILD= $(WRKSRC) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj TARGET_CFLAGS+= -Wno-error=format-nonliteral @@ -37,13 +39,13 @@ INSTALL_STYLE:= meson MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled host-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) + (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) host-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) + (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) glib-hostinstall: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) + (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) do-configure: (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 91a9951e2..a78774c82 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 19.3 +PKG_VERSION:= 19.5 PKG_RELEASE:= 1 -PKG_HASH:= 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b +PKG_HASH:= 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= python3 libsquish libressl libxz libfmt rapidjson @@ -14,14 +14,14 @@ PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid -PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error +PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib PKG_DEPENDS+= glib libdcadec bcm28xx-vc-gl-libs libffmpeg libxvidcore PKG_DEPENDS+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump bcm28xx-vc PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype libpng -PKG_BUILDDEP+= libsamplerate taglib libjasper +PKG_BUILDDEP+= libsamplerate taglib libjasper giflib PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 7aa126402..3108d2e97 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,19 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 1.12.0 PKG_RELEASE:= 1 -PKG_HASH:= d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad +PKG_HASH:= f1acc15d0fd0cb431f4bf6eac32d5e932e40ea1186fe78e074254d6d003957bb PKG_DESCR:= vp8/vp9 codec library PKG_SECTION:= libs/video PKG_BUILDDEP:= yasm-host PKG_URL:= http://www.webmproject.org/about/ -PKG_SITES:= http://storage.googleapis.com/downloads.webmproject.org/releases/webm/ +PKG_SITES:= https://github.com/webmproject/libvpx/archive/refs/tags/ PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= !m68k - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk @@ -43,6 +41,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P),y) CONFIGURE_ARGS+= --target=armv7-linux-gcc endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) +CONFIGURE_ARGS+= --target=armv7-linux-gcc +endif ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) CONFIGURE_ARGS+= --target=armv5te-linux-gcc endif diff --git a/package/libvpx/patches/patch-configure b/package/libvpx/patches/patch-configure deleted file mode 100644 index e3ceac490..000000000 --- a/package/libvpx/patches/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- libvpx-1.5.0.orig/configure 2015-11-09 23:12:38.000000000 +0100 -+++ libvpx-1.5.0/configure 2015-11-22 16:17:41.869446856 +0100 -@@ -111,6 +111,7 @@ all_platforms="${all_platforms} armv7-wi - all_platforms="${all_platforms} armv7s-darwin-gcc" - all_platforms="${all_platforms} mips32-linux-gcc" - all_platforms="${all_platforms} mips64-linux-gcc" -+all_platforms="${all_platforms} loongson2f-linux-gcc" - all_platforms="${all_platforms} sparc-solaris-gcc" - all_platforms="${all_platforms} x86-android-gcc" - all_platforms="${all_platforms} x86-darwin8-gcc" -@@ -242,6 +243,7 @@ ARCH_EXT_LIST=" - dspr2 - msa - mips64 -+ loongson2f - - mmx - sse diff --git a/tasks/003-kodi b/tasks/003-kodi index d1169f3cd..b2a01945e 100644 --- a/tasks/003-kodi +++ b/tasks/003-kodi @@ -4,7 +4,8 @@ config ADK_APPLIANCE_KODI ADK_TARGET_SYSTEM_RASPBERRY_PI || \ ADK_TARGET_SYSTEM_RASPBERRY_PI2 || \ ADK_TARGET_SYSTEM_RASPBERRY_PI3 || \ - ADK_TARGET_SYSTEM_RASPBERRY_PI3P ) + ADK_TARGET_SYSTEM_RASPBERRY_PI3P || \ + ADK_TARGET_SYSTEM_RASPBERRY_PI4 ) select ADK_TARGET_ARCH_ARM_WITH_NEON select ADK_PACKAGE_KODI select ADK_PACKAGE_KODI_WITH_SSH -- cgit v1.2.3