From 82124ac8bc561e63415122006717bf74634a4f2f Mon Sep 17 00:00:00 2001 From: David Barbion Date: Tue, 7 Feb 2023 22:22:54 +0100 Subject: [PATCH 1/3] fix(xorg): remove old intel xorg driver This is replaced by modesetting driver which is actively developed --- configs/recalbox-x86_64_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/recalbox-x86_64_defconfig b/configs/recalbox-x86_64_defconfig index 5c94883b4d..9a31ecb209 100644 --- a/configs/recalbox-x86_64_defconfig +++ b/configs/recalbox-x86_64_defconfig @@ -139,7 +139,6 @@ BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV=y -BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV=y BR2_PACKAGE_XTERM=y -- GitLab From 4dabd9f3625dc09b5148ca975f8926aca4845487 Mon Sep 17 00:00:00 2001 From: David Barbion Date: Tue, 7 Feb 2023 22:31:07 +0100 Subject: [PATCH 2/3] feat: bump mesa3d to 22.3.4 Using buildroot master package --- Dockerfile | 3 +- ...rk-around-Mesa-eglchromium-h-removal.patch | 113 +++++ custom/list.hash | 15 + .../package/mesa3d-headers/mesa3d-headers.mk | 77 ++++ .../mesa3d-headers/mesa3d-headers.mk.patch | 38 ++ ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 41 ++ ...tion-to-disable-optional-neon-suppor.patch | 84 ++++ ...r-Include-stddef.h-to-fix-build-erro.patch | 40 ++ .../mesa3d/0004-Fix-uClibc-build.patch | 70 +++ custom/package/mesa3d/Config.in | 403 ++++++++++++++++++ custom/package/mesa3d/Config.in.patch | 163 +++++++ custom/package/mesa3d/mesa3d.hash | 5 + custom/package/mesa3d/mesa3d.hash.patch | 15 + custom/package/mesa3d/mesa3d.mk | 267 ++++++++++++ custom/package/mesa3d/mesa3d.mk.patch | 63 +++ 15 files changed, 1396 insertions(+), 1 deletion(-) create mode 100644 board/recalbox/patches/kodi/0001-Work-around-Mesa-eglchromium-h-removal.patch create mode 100644 custom/package/mesa3d-headers/mesa3d-headers.mk create mode 100644 custom/package/mesa3d-headers/mesa3d-headers.mk.patch create mode 100644 custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch create mode 100644 custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch create mode 100644 custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch create mode 100644 custom/package/mesa3d/0004-Fix-uClibc-build.patch create mode 100644 custom/package/mesa3d/Config.in create mode 100644 custom/package/mesa3d/Config.in.patch create mode 100644 custom/package/mesa3d/mesa3d.hash create mode 100644 custom/package/mesa3d/mesa3d.hash.patch create mode 100644 custom/package/mesa3d/mesa3d.mk create mode 100644 custom/package/mesa3d/mesa3d.mk.patch diff --git a/Dockerfile b/Dockerfile index 7ad1a6b2ed..222e0f493c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,8 @@ apt-get -y install build-essential git libncurses5-dev qtbase5-dev qtchooser qt5 mercurial libdbus-glib-1-dev texinfo zip openssh-client libxml2-utils libpng-dev \ software-properties-common wget cpio bc locales rsync imagemagick bison flex bsdmainutils \ nano vim automake autopoint mtools dosfstools subversion openjdk-8-jdk libssl-dev libelf-dev \ -graphviz python3 python3-matplotlib python3-numpy python3-six re2c libc6-dev-i386 libtool cabextract && \ +graphviz python3 python3-matplotlib python3-numpy python3-six re2c libc6-dev-i386 libtool cabextract \ +glslang-tools && \ rm -rf /var/lib/apt/lists/* # Set the locale needed by toolchain diff --git a/board/recalbox/patches/kodi/0001-Work-around-Mesa-eglchromium-h-removal.patch b/board/recalbox/patches/kodi/0001-Work-around-Mesa-eglchromium-h-removal.patch new file mode 100644 index 0000000000..96d38c22a0 --- /dev/null +++ b/board/recalbox/patches/kodi/0001-Work-around-Mesa-eglchromium-h-removal.patch @@ -0,0 +1,113 @@ +From cd719750ce57b0381b8ac56e95571fc5d39c7dc7 Mon Sep 17 00:00:00 2001 +From: Vasyl Gello +Date: Mon, 12 Dec 2022 15:54:11 +0000 +Subject: [PATCH 1/2] Get rid of bashisms in kodi*.sh + +Signed-off-by: Vasyl Gello +--- + tools/Linux/kodi-standalone.sh.in | 8 ++++---- + tools/Linux/kodi.sh.in | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/Linux/kodi-standalone.sh.in b/tools/Linux/kodi-standalone.sh.in +index dc902b4d7ef7d..956e1938649a3 100644 +--- a/tools/Linux/kodi-standalone.sh.in ++++ b/tools/Linux/kodi-standalone.sh.in +@@ -30,21 +30,21 @@ LOOP=1 + CRASHCOUNT=0 + LASTSUCCESSFULSTART=$(date +%s) + +-while [ $(( $LOOP )) = "1" ] ++while [ $LOOP -eq 1 ] + do + $APP + RET=$? + NOW=$(date +%s) +- if [ $(( ($RET >= 64 && $RET <=66) || $RET == 0 )) = "1" ]; then # clean exit ++ if [ $RET -ge 64 ] && [ $RET -le 66 ] || [ $RET -eq 0 ]; then # clean exit + LOOP=0 + else # crash + DIFF=$((NOW-LASTSUCCESSFULSTART)) +- if [ $(($DIFF > 60 )) = "1" ]; then # Not on startup, ignore ++ if [ $DIFF -gt 60 ]; then # Not on startup, ignore + LASTSUCESSFULSTART=$NOW + CRASHCOUNT=0 + else # at startup, look sharp + CRASHCOUNT=$((CRASHCOUNT+1)) +- if [ $(($CRASHCOUNT >= 3)) = "1" ]; then # Too many, bail out ++ if [ $CRASHCOUNT -ge 3 ]; then # Too many, bail out + LOOP=0 + echo "${APP} has exited in an unclean state 3 times in the last ${DIFF} seconds." + echo "Something is probably wrong" +diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in +index 108c0b007b802..11cace29a58b3 100644 +--- a/tools/Linux/kodi.sh.in ++++ b/tools/Linux/kodi.sh.in +@@ -180,10 +180,10 @@ do + CHILD=$! + wait "${CHILD}" + RET=$? +- if [ $(( $RET == 65 )) = "1" ] ++ if [ $RET -eq 65 ] + then # User requested to restart app + LOOP=1 +- elif [ $(( ($RET >= 131 && $RET <= 136) || $RET == 139 )) = "1" ] ++ elif [ $RET -ge 131 ] && [ $RET -le 136 ] || [ $RET -eq 139 ] + then # Crashed with core dump + print_crash_report + fi + +From 5449652abf0bb9dddd0d796de4120e60f19f89a5 Mon Sep 17 00:00:00 2001 +From: Alan Swanson +Date: Mon, 19 Dec 2022 21:28:13 +0200 +Subject: [PATCH 2/2] Work around Mesa eglchromium.h removal + +I have polished Alan's snippet to buildable state and tested +on Kodi from Debian sid. + +Signed-off-by: Vasyl Gello +--- + cmake/modules/FindEGL.cmake | 6 ++++++ + xbmc/windowing/X11/GLContextEGL.h | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake +index b00fe08a25f95..a68a8db901222 100644 +--- a/cmake/modules/FindEGL.cmake ++++ b/cmake/modules/FindEGL.cmake +@@ -9,6 +9,7 @@ + # EGL_INCLUDE_DIRS - the EGL include directory + # EGL_LIBRARIES - the EGL libraries + # EGL_DEFINITIONS - the EGL definitions ++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h + # + # and the following imported targets:: + # +@@ -35,6 +36,11 @@ if(EGL_FOUND) + set(EGL_LIBRARIES ${EGL_LIBRARY}) + set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR}) + set(EGL_DEFINITIONS -DHAS_EGL=1) ++ include(CheckIncludeFiles) ++ check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE) ++ if(HAVE_EGLEXTANGLE) ++ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1") ++ endif() + + if(NOT TARGET EGL::EGL) + add_library(EGL::EGL UNKNOWN IMPORTED) +diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h +index 99a6a9024e8c6..afea0b7c43eac 100644 +--- a/xbmc/windowing/X11/GLContextEGL.h ++++ b/xbmc/windowing/X11/GLContextEGL.h +@@ -13,7 +13,11 @@ + #include "threads/CriticalSection.h" + + #include ++#ifdef HAVE_EGLEXTANGLE ++#include ++#else + #include ++#endif + #include + + class CGLContextEGL : public CGLContext diff --git a/custom/list.hash b/custom/list.hash index f698f4935b..78612a602e 100644 --- a/custom/list.hash +++ b/custom/list.hash @@ -5,6 +5,17 @@ # * a line of plus signs ('+') indicates a file that we add to the Buildroot external tree ++++++++++++++++++++++++++++++++ package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch +++++++++++++++++++++++++++++++++ package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +++++++++++++++++++++++++++++++++ package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++++++++++++++++++++++++++++++++ package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch +++++++++++++++++++++++++++++++++ package/mesa3d/0004-Fix-uClibc-build.patch +-------------------------------- package/mesa3d/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch +-------------------------------- package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +-------------------------------- package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +-------------------------------- package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch +-------------------------------- package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch +-------------------------------- package/mesa3d/0006-fix-valist.patch +-------------------------------- package/mesa3d/0007-fix-cpp-detection.patch 087eaf782e2a27d9830114325ad8681a linux/Config.in 214c5e2762f0292cf0a31cabc895e54d linux/linux.mk c17b2548c35cffbd487ade70e272015c package/bcm2835/Config.in @@ -26,6 +37,10 @@ d01ff39be7590054b52166b00c3d54ae package/lirc-tools/lirc-tools.mk 7e75396e1df40927003bdba95ba389c2 package/llvm/llvm.hash 07e24c7e14b4e4f8ed8b52d8c8b62500 package/llvm/llvm.mk 64b2fa393cafff6958f4bfd2b9e30f24 package/luajit/Config.in +6a3efbae068f6c1c04450fee91f2cb99 package/mesa3d-headers/mesa3d-headers.mk +ed8bb4896bb8de6cc07c550105614d3c package/mesa3d/Config.in +d17f66a13fa02c49686276540d49b51a package/mesa3d/mesa3d.hash +ece045603a80d9b12eb80a08da6c8882 package/mesa3d/mesa3d.mk d7cb896078557db39434504d041a681f package/mosquitto/mosquitto.mk 11ad80c411d2df20c1e09022e7bcfc28 package/mpv/mpv.mk 135abab5349e68ddb60a698bf31db0c5 package/nodejs/0001-add-qemu-wrapper-support.patch diff --git a/custom/package/mesa3d-headers/mesa3d-headers.mk b/custom/package/mesa3d-headers/mesa3d-headers.mk new file mode 100644 index 0000000000..9177adceda --- /dev/null +++ b/custom/package/mesa3d-headers/mesa3d-headers.mk @@ -0,0 +1,77 @@ +################################################################################ +# +# mesa3d-headers +# +################################################################################ + +# mesa3d-headers is inherently incompatible with mesa3d, so error out +# if both are enabled. +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) +$(error mesa3d-headers enabled, but mesa3d enabled too) +endif + +# Not possible to directly refer to mesa3d variables, because of +# first/second expansion trickery... +MESA3D_HEADERS_VERSION = 22.3.4 +MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz +MESA3D_HEADERS_SITE = https://archive.mesa3d.org +MESA3D_HEADERS_DL_SUBDIR = mesa3d +MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos +MESA3D_HEADERS_LICENSE_FILES = docs/license.rst +MESA3D_HEADERS_CPE_ID_VENDOR = mesa3d +MESA3D_HEADERS_CPE_ID_PRODUCT = mesa + +# Only installs header files +MESA3D_HEADERS_INSTALL_STAGING = YES +MESA3D_HEADERS_INSTALL_TARGET = NO + +MESA3D_HEADERS_DIRS = KHR + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) + +MESA3D_HEADERS_DIRS += GL + +ifeq ($(BR2_PACKAGE_XORG7),y) + +# Not using $(SED) because we do not want to work in-place, and $(SED) +# contains -i. +define MESA3D_HEADERS_BUILD_DRI_PC + sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ + $(MESA3D_HEADERS_PKGDIR)/dri.pc \ + >$(@D)/src/gallium/frontends/dri/dri.pc +endef + +define MESA3D_HEADERS_INSTALL_DRI_PC + $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ + $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h + $(INSTALL) -D -m 0644 $(@D)/src/gallium/frontends/dri/dri.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc +endef + +endif # Xorg + +endif # OpenGL + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +MESA3D_HEADERS_DIRS += EGL +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +MESA3D_HEADERS_DIRS += GLES GLES2 +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBOPENCL),y) +MESA3D_HEADERS_DIRS += CL +endif + +define MESA3D_HEADERS_BUILD_CMDS + $(MESA3D_HEADERS_BUILD_DRI_PC) +endef + +define MESA3D_HEADERS_INSTALL_STAGING_CMDS + $(foreach d,$(MESA3D_HEADERS_DIRS),\ + cp -dpfr $(@D)/include/$(d) $(STAGING_DIR)/usr/include/ || exit 1$(sep)) + $(MESA3D_HEADERS_INSTALL_DRI_PC) +endef + +$(eval $(generic-package)) diff --git a/custom/package/mesa3d-headers/mesa3d-headers.mk.patch b/custom/package/mesa3d-headers/mesa3d-headers.mk.patch new file mode 100644 index 0000000000..24798dc15e --- /dev/null +++ b/custom/package/mesa3d-headers/mesa3d-headers.mk.patch @@ -0,0 +1,38 @@ +diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk +index 760c5368e5..9177adceda 100644 +--- a/package/mesa3d-headers/mesa3d-headers.mk ++++ b/package/mesa3d-headers/mesa3d-headers.mk +@@ -6,13 +6,13 @@ + + # mesa3d-headers is inherently incompatible with mesa3d, so error out + # if both are enabled. +-ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) ++ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) + $(error mesa3d-headers enabled, but mesa3d enabled too) + endif + + # Not possible to directly refer to mesa3d variables, because of + # first/second expansion trickery... +-MESA3D_HEADERS_VERSION = 21.3.8 ++MESA3D_HEADERS_VERSION = 22.3.4 + MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz + MESA3D_HEADERS_SITE = https://archive.mesa3d.org + MESA3D_HEADERS_DL_SUBDIR = mesa3d +@@ -37,14 +37,14 @@ ifeq ($(BR2_PACKAGE_XORG7),y) + # contains -i. + define MESA3D_HEADERS_BUILD_DRI_PC + sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ +- package/mesa3d-headers/dri.pc \ +- >$(@D)/src/mesa/drivers/dri/dri.pc ++ $(MESA3D_HEADERS_PKGDIR)/dri.pc \ ++ >$(@D)/src/gallium/frontends/dri/dri.pc + endef + + define MESA3D_HEADERS_INSTALL_DRI_PC + $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ + $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h +- $(INSTALL) -D -m 0644 $(@D)/src/mesa/drivers/dri/dri.pc \ ++ $(INSTALL) -D -m 0644 $(@D)/src/gallium/frontends/dri/dri.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc + endef + diff --git a/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file mode 100644 index 0000000000..e3c70c3f24 --- /dev/null +++ b/custom/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch @@ -0,0 +1,41 @@ +From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 17 Apr 2019 23:07:42 +0200 +Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR + +LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +will look for OpenCL "headers" on the target, when building the OpenCL +kernels. + +The value returned by pkg-config for includedir is relevant when +cross-compiling, on the build machine. But in this specific case, we +really need a value that is valid on the target. + +Those headers are installed by the libclc package in /usr/share so +that they are not removed by Buildroot target-finalize logic. + +Based on the patch for autotools provided by Valentin Korenblit. + +Signed-off-by: Romain Naour +Signed-off-by: Bernd Kuhls +[rebased for 20.2.0 & 20.3.0] +--- + src/gallium/frontends/clover/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build +index 62ac5f5278d..ecdeb39669c 100644 +--- a/src/gallium/frontends/clover/meson.build ++++ b/src/gallium/frontends/clover/meson.build +@@ -27,7 +27,7 @@ + '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) + ] + clover_spirv_cpp_args = [] +-- +2.20.1 + diff --git a/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch new file mode 100644 index 0000000000..bb5ef00a9f --- /dev/null +++ b/custom/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -0,0 +1,84 @@ +From e3b47c1b84964c62b3e1fa782f1ffa4be0ae62f9 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 9 Mar 2020 13:01:14 +0100 +Subject: [PATCH] vc4: add meson option to disable optional neon support + +Not all toolchains are able to compile the runtime +optional vc4 neon support, so add an meson option +to force disabling it at compile time. + +[Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114] +Signed-off-by: Peter Seiderer +Signed-off-by: Bernd Kuhls +[rebased for 20.2.0, 20.3.0 & 21.1.0] +--- + meson_options.txt | 7 +++++++ + src/gallium/drivers/vc4/meson.build | 4 ++-- + src/gallium/drivers/vc4/vc4_tiling.h | 4 ++-- + 3 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index a39596a6f19..0f6b6c62b55 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -123,6 +123,13 @@ option( + choices : ['auto', 'true', 'false', 'enabled', 'disabled'], + description : 'enable gallium va frontend.', + ) ++option( ++ 'gallium-vc4-neon', ++ type : 'combo', ++ value : 'auto', ++ choices : ['auto', 'disabled'], ++ description : 'enable gallium vc4 optional neon support.', ++) + option( + 'va-libs-path', + type : 'string', +diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build +index 5ce5af5f6b4..e3f7d8d62ae 100644 +--- a/src/gallium/drivers/vc4/meson.build ++++ b/src/gallium/drivers/vc4/meson.build +@@ -84,7 +84,7 @@ files_libvc4 = files( + vc4_c_args = [] + + libvc4_neon = [] +-if host_machine.cpu_family() == 'arm' ++if host_machine.cpu_family() == 'arm' and get_option('gallium-vc4-neon') != 'disabled' + libvc4_neon = static_library( + 'vc4_neon', + 'vc4_tiling_lt_neon.c', +@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' + ], + c_args : '-mfpu=neon', + ) +- vc4_c_args += '-DUSE_ARM_ASM' ++ vc4_c_args += '-DVC4_TILING_LT_NEON' + endif + + if dep_simpenrose.found() +diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h +index 66767e7f1f8..7446f1c3d0c 100644 +--- a/src/gallium/drivers/vc4/vc4_tiling.h ++++ b/src/gallium/drivers/vc4/vc4_tiling.h +@@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, + void *src, uint32_t src_stride, + int cpp, const struct pipe_box *box) + { +-#ifdef USE_ARM_ASM ++#ifdef VC4_TILING_LT_NEON + if (util_get_cpu_caps()->has_neon) { + vc4_load_lt_image_neon(dst, dst_stride, src, src_stride, + cpp, box); +@@ -105,7 +105,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride, + void *src, uint32_t src_stride, + int cpp, const struct pipe_box *box) + { +-#ifdef USE_ARM_ASM ++#ifdef VC4_TILING_LT_NEON + if (util_get_cpu_caps()->has_neon) { + vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, + cpp, box); +-- +2.25.1 + diff --git a/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch new file mode 100644 index 0000000000..538aa74e0c --- /dev/null +++ b/custom/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch @@ -0,0 +1,40 @@ +From fdc8b5a205e2116408aeb9fd305e57f656e2e89d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 9 Aug 2020 17:06:26 +0200 +Subject: [PATCH] src/util/rand_xor: Include stddef.h to fix build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes + +In file included from ../src/util/rand_xor.c:29: +output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: + error: unknown type name ‘size_t’ + extern int getrandom(void *__buf, size_t count, unsigned int flags) + +seen with gcc version 8.3.0 (Buildroot 2020.02) and uClibc. + +Patch sent upstream: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6248 + +Signed-off-by: Bernd Kuhls +--- + src/util/rand_xor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c +index 81b64f1ea71..fcb481487fa 100644 +--- a/src/util/rand_xor.c ++++ b/src/util/rand_xor.c +@@ -25,6 +25,7 @@ + #include "detect_os.h" + + #if !DETECT_OS_WINDOWS ++#include + #if defined(HAVE_GETRANDOM) + #include + #endif +-- +2.27.0 + diff --git a/custom/package/mesa3d/0004-Fix-uClibc-build.patch b/custom/package/mesa3d/0004-Fix-uClibc-build.patch new file mode 100644 index 0000000000..95ca95fd67 --- /dev/null +++ b/custom/package/mesa3d/0004-Fix-uClibc-build.patch @@ -0,0 +1,70 @@ +From 09ce52fe375a6fc1ccf51b6b691aaa2c3f53fbd5 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 3 Jun 2022 16:26:03 +0200 +Subject: [PATCH] Fix uClibc build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build errors with uClibc and gcc-9.3.0: + +../src/gallium/drivers/lima/lima_texture.c:47:15: error: expected + declaration specifiers or ‘...’ before ‘__builtin_offsetof’ + 47 | static_assert(offsetof(lima_tex_desc, va) == 24, + "lima_tex_desc->va offset isn't 24"); + +../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: + ../src/egl/main/egldisplay.c:101:4: error: implicit declaration of + function ‘static_assert’ [-Werror=implicit-function-declaration] 101 | + static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, + +../src/util/macros.h:74:4: error: implicit declaration of function + ‘static_assert’ [-Werror=implicit-function-declaration] + 74 | static_assert(cond, #cond); \ + | ^~~~~~~~~~~~~ + +Patch sent upstream: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 + +Signed-off-by: Bernd Kuhls +--- + src/util/compiler.h | 10 ++++++++++ + src/util/macros.h | 1 + + 2 files changed, 11 insertions(+) + +diff --git a/src/util/compiler.h b/src/util/compiler.h +index d184ad455af..b5c56807acc 100644 +--- a/src/util/compiler.h ++++ b/src/util/compiler.h +@@ -36,6 +36,16 @@ + + #include + ++/* ++ * C11 static_assert() macro ++ * assert.h only defines that name for C11 and above ++ */ ++#if !defined(__cplusplus) ++#ifndef static_assert ++#define static_assert _Static_assert ++#endif ++#endif ++ + #include "util/macros.h" + + +diff --git a/src/util/macros.h b/src/util/macros.h +index 22b18303826..8f73ee72693 100644 +--- a/src/util/macros.h ++++ b/src/util/macros.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include "util/compiler.h" + + /* Compute the size of an array */ + #ifndef ARRAY_SIZE +-- +2.34.1 + diff --git a/custom/package/mesa3d/Config.in b/custom/package/mesa3d/Config.in new file mode 100644 index 0000000000..cae2161aa3 --- /dev/null +++ b/custom/package/mesa3d/Config.in @@ -0,0 +1,403 @@ +menuconfig BR2_PACKAGE_MESA3D + bool "mesa3d" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_1 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_ZLIB + help + Mesa 3D, an open-source implementation of the OpenGL + specification. + + http://mesa3d.org + +if BR2_PACKAGE_MESA3D + +# Some Gallium driver needs libelf when built with LLVM support +config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS + bool + +config BR2_PACKAGE_MESA3D_LLVM + bool "llvm support" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # std::wstring + depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + select BR2_PACKAGE_LLVM + +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_HOST_GCC_AT_LEAST_5 + +comment "llvm support needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +# clang and libclc dependencies are satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_OPENCL + bool "OpenCL support" + depends on BR2_PACKAGE_MESA3D_LLVM + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + select BR2_PACKAGE_LLVM_RTTI + select BR2_PACKAGE_CLANG + select BR2_PACKAGE_LIBCLC + select BR2_PACKAGE_HAS_LIBOPENCL + +# inform the .mk file of gallium, dri, dri3 or vulkan driver selection +config BR2_PACKAGE_MESA3D_DRI3 + bool + select BR2_PACKAGE_XLIB_LIBXSHMFENCE + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + bool + select BR2_PACKAGE_MESA3D_DRIVER + +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER + bool + select BR2_PACKAGE_MESA3D_DRIVER + +config BR2_PACKAGE_MESA3D_DRIVER + bool + +# Gallium xa state tracker. +# Quote from mesa3d meson.build: "XA state tracker requires at least +# one of the following gallium drivers: nouveau, freedreno, i915, svga. +config BR2_PACKAGE_MESA3D_NEEDS_XA + bool + +# OpenGL GLX and Gallium VDPAU both needs X11 +config BR2_PACKAGE_MESA3D_NEEDS_X11 + bool + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXDAMAGE + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XORGPROTO + +comment "Gallium drivers" + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS + bool "Gallium crocus driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Mesa driver for gen4-7 Intel GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV + bool "Gallium Etnaviv driver" + depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_ETNAVIV + help + Mesa driver for Vivante GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO + bool "Gallium freedreno driver" + depends on BR2_arm || BR2_aarch64 || BR2_aarch64_be # libdrm-freedreno + # libdrm's freedreno option depends on LIBDRM_HAS_ATOMIC. Propagating + # that dependency here causes a circular dependency that Kconfig + # can't see is just spurious. However, that dependency is about + # the toolchain having sync4 primitives, which is always a given + # for arm/aarch64. + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_FREEDRENO + help + Mesa driver for Freedreno GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 + bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Support for i915-based Intel GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS + bool "Gallium iris driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Mesa driver for iris-based Intel GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA + bool "Gallium lima driver" + depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Mesa driver for ARM Mali Utgard GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU + bool "Gallium nouveau driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_NOUVEAU + select BR2_PACKAGE_MESA3D_NEEDS_XA + select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM + help + Supports all Nvidia GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST + bool "Gallium panfrost driver" + depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Mesa driver for ARM Mali Midgard and Bifrost GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 + bool "Gallium Radeon R300 driver" + depends on BR2_i386 || BR2_x86_64 + # lbdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating + # that dependency here causes a circular dependency that Kconfig + # can't see is just spurious. However, that dependency is about + # the toolchain having sync4 primitives, which is always a given + # for x86. + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Driver for ATI/AMD Radeon R300/R400/R500 GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + bool "Gallium Radeon R600 driver" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_MESA3D_LLVM || \ + (BR2_PACKAGE_MESA3D_LLVM && (BR2_TOOLCHAIN_USES_UCLIBC || \ + BR2_TOOLCHAIN_USES_GLIBC)) # elfutils + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM + help + Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs. + +# R600 needs libelf when Mesa3D is built with LLVM support +# musl is not currently compatible with elfutils +comment "R600 driver needs a uClibc or glibc toolchain when llvm is enabled" + depends on BR2_PACKAGE_MESA3D_LLVM + depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + bool "Gallium Radeon SI driver" + depends on BR2_USE_MMU # libdrm + depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_MESA3D_LLVM + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_AMDGPU + select BR2_PACKAGE_LIBDRM_RADEON + select BR2_PACKAGE_LLVM_AMDGPU + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS + help + Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs. + +# Radeon SI needs libelf +# musl is not currently compatible with elfutils +comment "Radeon SI driver needs a uClibc or glibc toolchain" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_MESA3D_LLVM + depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA + bool "Gallium vmware svga driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_VMWGFX + select BR2_PACKAGE_MESA3D_NEEDS_XA + help + This is a virtual GPU driver for VMWare virtual machines. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + bool "Gallium swrast driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + This is a software opengl implementation using the Gallium3D + infrastructure. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA + bool "Gallium tegra driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU + select BR2_PACKAGE_LIBDRM_NOUVEAU + select BR2_PACKAGE_MESA3D_NEEDS_XA + help + Adds support for Nvidia Tegra GPUs, requires nouveau. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D + bool "Gallium v3d driver" + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Driver for Broadcom VC6 (rpi4) GPUs (needs vc4). + + It requires a kernel 4.18+ with DRM V3D support enabled: + + - CONFIG_DRM_V3D + - CONFIG_DRM_VC4 + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 + bool "Gallium vc4 driver" + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_VC4 + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Driver for Broadcom VC4 (rpi2/3) GPUs. + It requires a vanilla 4.5+ kernel with drm vc4 (open) support. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL + bool "Gallium virgl driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + virgl is the 3D acceleration backend for the virtio-gpu + shipping with qemu. + +config BR2_PACKAGE_MESA3D_VDPAU + bool "Gallium VDPAU state tracker" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + select BR2_PACKAGE_MESA3D_NEEDS_X11 + select BR2_PACKAGE_LIBVDPAU + help + VDPAU state tracker (needs r300, r600, radeonsi or nouveau + gallium drivers). + +comment "Gallium VDPAU state tracker needs X.org and gallium drivers r300, r600, radeonsi or nouveau" + depends on !BR2_PACKAGE_XORG7 || \ + !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) + +comment "Vulkan drivers" + +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL + bool "Vulkan Intel driver" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h + depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert + select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan driver for Intel hardware from Ivy Bridge onward. + +comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ + !BR2_TOOLCHAIN_USES_GLIBC + +comment "Off-screen Rendering" + +config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM + bool "OSMesa (Gallium) library" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + help + The OSMesa API provides functions for off-screen rendering. + +if BR2_PACKAGE_MESA3D_DRIVER + +comment "OpenGL API Support" + +config BR2_PACKAGE_MESA3D_GBM + bool "gbm" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && \ + BR2_PACKAGE_MESA3D_OPENGL_EGL + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + help + Enable Generic Buffer Management (gbm) + +comment "gbm support needs a gallium driver w/ EGL support." + depends on !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) + +config BR2_PACKAGE_MESA3D_OPENGL_GLX + bool "OpenGL GLX" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_MESA3D_NEEDS_X11 + help + Enable GLX graphic acceleration (OpenGL + X11). + +comment "OpenGL GLX support needs X11" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_MESA3D_OPENGL_EGL + bool "OpenGL EGL" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_MESA3D_GBM + help + Use the Khronos EGL APIs. EGL is a window manager for OpenGL + applications similar to GLX, for X, and WGL, for Windows. + +config BR2_PACKAGE_MESA3D_OPENGL_ES + bool "OpenGL ES" + select BR2_PACKAGE_HAS_LIBGLES if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_GLES if BR2_PACKAGE_LIBGLVND + help + Use the Khronos OpenGL ES APIs. This is commonly used on + embedded systems and represents a subset of the OpenGL API. + +endif # BR2_PACKAGE_MESA3D_DRIVER + +config BR2_PACKAGE_PROVIDES_LIBGBM + default "mesa3d" if BR2_PACKAGE_MESA3D_GBM + +config BR2_PACKAGE_PROVIDES_LIBGL + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX && !BR2_PACKAGE_LIBGLVND + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_LIBGLVND + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES && !BR2_PACKAGE_LIBGLVND + +config BR2_PACKAGE_PROVIDES_LIBOPENCL + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL + +endif # BR2_PACKAGE_MESA3D + +comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_1 + +comment "mesa3d needs a toolchain w/ gcc >= 7" + depends on BR2_m68k + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/custom/package/mesa3d/Config.in.patch b/custom/package/mesa3d/Config.in.patch new file mode 100644 index 0000000000..6876c3b398 --- /dev/null +++ b/custom/package/mesa3d/Config.in.patch @@ -0,0 +1,163 @@ +diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in +index e41da562dc..cae2161aa3 100644 +--- a/package/mesa3d/Config.in ++++ b/package/mesa3d/Config.in +@@ -24,19 +24,21 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS + config BR2_PACKAGE_MESA3D_LLVM + bool "llvm support" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS +- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 ++ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR # std::wstring ++ depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm + select BR2_PACKAGE_LLVM + +-comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" ++comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ +- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ +- || BR2_STATIC_LIBS || !BR2_USE_WCHAR ++ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ ++ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ ++ || !BR2_HOST_GCC_AT_LEAST_5 + + comment "llvm support needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS +@@ -63,16 +65,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + bool + select BR2_PACKAGE_MESA3D_DRIVER + +-config BR2_PACKAGE_MESA3D_DRI_DRIVER +- bool +- select BR2_PACKAGE_MESA3D_DRI3 if \ +- (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \ +- !BR2_RISCV_32) +- select BR2_PACKAGE_MESA3D_DRIVER +- select BR2_PACKAGE_MESA3D_GBM if \ +- !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ +- !BR2_PACKAGE_MESA3D_OPENGL_EGL +- + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER + bool + select BR2_PACKAGE_MESA3D_DRIVER +@@ -134,16 +126,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 + bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 +- depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Support for i915-based Intel GPUs. + +-comment "Gallium i915: Only one i915 provider can be built" +- depends on BR2_i386 || BR2_x86_64 +- depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 +- + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS + bool "Gallium iris driver" + depends on BR2_i386 || BR2_x86_64 +@@ -312,67 +299,6 @@ comment "Gallium VDPAU state tracker needs X.org and gallium drivers r300, r600, + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) + +-config BR2_PACKAGE_MESA3D_XVMC +- bool "Gallium XvMC state tracker" +- depends on BR2_i386 || BR2_x86_64 +- depends on BR2_PACKAGE_XORG7 +- depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ +- || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 +- select BR2_PACKAGE_MESA3D_NEEDS_X11 +- select BR2_PACKAGE_XLIB_LIBXV +- select BR2_PACKAGE_XLIB_LIBXVMC +- help +- XvMC state tracker (needs r600 or nouveau gallium drivers). +- +-comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouveau" +- depends on BR2_i386 || BR2_x86_64 +- depends on !BR2_PACKAGE_XORG7 || \ +- !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ +- || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) +- +-comment "DRI drivers" +- +-config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 +- bool "DRI i915 driver" +- depends on BR2_i386 || BR2_x86_64 +- select BR2_PACKAGE_MESA3D_DRI_DRIVER +- select BR2_PACKAGE_LIBDRM_INTEL +- help +- Support for i915-based Intel GPUs. +- +-config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 +- bool "DRI i965 driver" +- depends on BR2_i386 || BR2_x86_64 +- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h +- select BR2_PACKAGE_MESA3D_DRI_DRIVER +- select BR2_PACKAGE_LIBDRM_INTEL +- help +- Support for i965-based Intel GPUs. +- +-comment "DRI i965 driver needs a toolchain w/ headers >= 3.17" +- depends on BR2_i386 || BR2_x86_64 +- depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 +- +-config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU +- bool "DRI nouveau driver" +- select BR2_PACKAGE_MESA3D_DRI_DRIVER +- select BR2_PACKAGE_LIBDRM_NOUVEAU +- help +- Support for Nvidia-based GPUs. +- +-config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON +- bool "DRI radeon r100 driver" +- depends on BR2_i386 || BR2_x86_64 +- # libdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating +- # that dependency here causes a circular dependency that Kconfig +- # can't see is just spurious. However, that dependency is about +- # the toolchain having sync4 primitives, which is always a given +- # for i386 and x86_64. +- select BR2_PACKAGE_MESA3D_DRI_DRIVER +- select BR2_PACKAGE_LIBDRM_RADEON +- help +- Legacy Radeon driver for R100 series GPUs. +- + comment "Vulkan drivers" + + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL +@@ -406,17 +332,16 @@ comment "OpenGL API Support" + + config BR2_PACKAGE_MESA3D_GBM + bool "gbm" +- depends on BR2_PACKAGE_MESA3D_DRI_DRIVER \ +- || (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) ++ depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && \ ++ BR2_PACKAGE_MESA3D_OPENGL_EGL + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + help + Enable Generic Buffer Management (gbm) + +-comment "gbm support needs a dri driver or a gallium driver w/ EGL support." +- depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER \ +- && !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) ++comment "gbm support needs a gallium driver w/ EGL support." ++ depends on !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) + + config BR2_PACKAGE_MESA3D_OPENGL_GLX + bool "OpenGL GLX" +@@ -432,7 +357,7 @@ comment "OpenGL GLX support needs X11" + + config BR2_PACKAGE_MESA3D_OPENGL_EGL + bool "OpenGL EGL" +- depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER ++ depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND diff --git a/custom/package/mesa3d/mesa3d.hash b/custom/package/mesa3d/mesa3d.hash new file mode 100644 index 0000000000..e4de997f0e --- /dev/null +++ b/custom/package/mesa3d/mesa3d.hash @@ -0,0 +1,5 @@ +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html +sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz +sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# License +sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/custom/package/mesa3d/mesa3d.hash.patch b/custom/package/mesa3d/mesa3d.hash.patch new file mode 100644 index 0000000000..f4443828b2 --- /dev/null +++ b/custom/package/mesa3d/mesa3d.hash.patch @@ -0,0 +1,15 @@ +diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash +index 5b74e14fef..e4de997f0e 100644 +--- a/package/mesa3d/mesa3d.hash ++++ b/package/mesa3d/mesa3d.hash +@@ -1,6 +1,5 @@ +-# From https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html +-sha256 e70d273bdc53a4e931871bb5550ba3900e6a3deab2fff64184107c33e92d9da7 mesa-21.3.8.tar.xz +-sha512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz +- ++# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html ++sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz ++sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz + # License +-sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst ++sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/custom/package/mesa3d/mesa3d.mk b/custom/package/mesa3d/mesa3d.mk new file mode 100644 index 0000000000..cf2352a355 --- /dev/null +++ b/custom/package/mesa3d/mesa3d.mk @@ -0,0 +1,267 @@ +################################################################################ +# +# mesa3d +# +################################################################################ + +# When updating the version, please also update mesa3d-headers +MESA3D_VERSION = 22.3.4 +MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz +MESA3D_SITE = https://archive.mesa3d.org +MESA3D_LICENSE = MIT, SGI, Khronos +MESA3D_LICENSE_FILES = docs/license.rst +MESA3D_CPE_ID_VENDOR = mesa3d +MESA3D_CPE_ID_PRODUCT = mesa + +MESA3D_INSTALL_STAGING = YES + +MESA3D_PROVIDES = + +MESA3D_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-python-mako \ + expat \ + libdrm \ + zlib + +MESA3D_CONF_OPTS = \ + -Dgallium-omx=disabled \ + -Dpower8=disabled + +# Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker +# flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) +MESA3D_CONF_OPTS += -Db_asneeded=false +endif + +ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) +MESA3D_CONF_OPTS += -Ddri3=enabled +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) +MESA3D_DEPENDENCIES += xlib_libxshmfence +endif +else +MESA3D_CONF_OPTS += -Ddri3=disabled +endif + +ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) +MESA3D_DEPENDENCIES += host-llvm llvm +MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' +MESA3D_CONF_OPTS += -Dllvm=enabled +ifeq ($(BR2_PACKAGE_LLVM_RTTI),y) +MESA3D_CONF_OPTS += -Dcpp_rtti=true +else +MESA3D_CONF_OPTS += -Dcpp_rtti=false +endif +else +# Avoid automatic search of llvm-config +MESA3D_CONF_OPTS += -Dllvm=disabled +endif + +# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of +# libMesaOpenCL and CL headers are installed +ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) +MESA3D_PROVIDES += libopencl +MESA3D_DEPENDENCIES += clang libclc +MESA3D_CONF_OPTS += -Dgallium-opencl=standalone +else +MESA3D_CONF_OPTS += -Dgallium-opencl=disabled +endif + +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) +MESA3D_DEPENDENCIES += elfutils +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) +# Disable-mangling not yet supported by meson build system. +# glx: +# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# xlib : xlib conflicts with any dri driver +# Always enable glx-direct; without it, many GLX applications don't work. +MESA3D_CONF_OPTS += \ + -Dglx=dri \ + -Dglx-direct=true +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) +MESA3D_CONF_OPTS += -Dgallium-xa=enabled +else +MESA3D_CONF_OPTS += -Dgallium-xa=disabled +endif +else +MESA3D_CONF_OPTS += \ + -Dglx=disabled \ + -Dgallium-xa=disabled +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +MESA3D_CONF_OPTS += -Dgallium-vc4-neon=auto +else +MESA3D_CONF_OPTS += -Dgallium-vc4-neon=disabled +endif + +# Drivers + +#Gallium Drivers +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS) += crocus +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl +# Vulkan Drivers +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel + +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) +MESA3D_CONF_OPTS += \ + -Dgallium-drivers= \ + -Dgallium-extra-hud=false +else +MESA3D_CONF_OPTS += \ + -Dshared-glapi=enabled \ + -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ + -Dgallium-extra-hud=true +endif + +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) +MESA3D_CONF_OPTS += \ + -Dvulkan-drivers= +else +MESA3D_CONF_OPTS += \ + -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) +endif + +# APIs + +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) +MESA3D_CONF_OPTS += -Dosmesa=true +else +MESA3D_CONF_OPTS += -Dosmesa=false +endif + +# Always enable OpenGL: +# - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. +MESA3D_CONF_OPTS += -Dopengl=true + +# libva and mesa3d have a circular dependency +# we do not need libva support in mesa3d, therefore disable this option +MESA3D_CONF_OPTS += -Dgallium-va=disabled + +# libGL is only provided for a full xorg stack, without libglvnd +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgl) +else +define MESA3D_REMOVE_OPENGL_HEADERS + rm -rf $(STAGING_DIR)/usr/include/GL/ +endef + +MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS +endif + +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y) +MESA3D_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXdamage \ + xlib_libXfixes \ + xlib_libXrandr \ + xlib_libXxf86vm \ + xorgproto \ + libxcb +MESA3D_PLATFORMS += x11 +endif +ifeq ($(BR2_PACKAGE_WAYLAND),y) +MESA3D_DEPENDENCIES += wayland wayland-protocols +MESA3D_PLATFORMS += wayland +endif + +MESA3D_CONF_OPTS += \ + -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) + +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +MESA3D_CONF_OPTS += \ + -Dgbm=enabled +else +MESA3D_CONF_OPTS += \ + -Dgbm=disabled +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libegl) +MESA3D_CONF_OPTS += \ + -Degl=enabled +else +MESA3D_CONF_OPTS += \ + -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +MESA3D_PROVIDES += $(if $(BR2_PACKAGE_LIBGLVND),,libgles) +MESA3D_CONF_OPTS += -Dgles1=enabled -Dgles2=enabled +else +MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled +endif + +ifeq ($(BR2_PACKAGE_VALGRIND),y) +MESA3D_CONF_OPTS += -Dvalgrind=enabled +MESA3D_DEPENDENCIES += valgrind +else +MESA3D_CONF_OPTS += -Dvalgrind=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +MESA3D_CONF_OPTS += -Dlibunwind=enabled +MESA3D_DEPENDENCIES += libunwind +else +MESA3D_CONF_OPTS += -Dlibunwind=disabled +endif + +ifeq ($(BR2_PACKAGE_MESA3D_VDPAU),y) +MESA3D_DEPENDENCIES += libvdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=enabled +else +MESA3D_CONF_OPTS += -Dgallium-vdpau=disabled +endif + +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +MESA3D_CONF_OPTS += -Dlmsensors=enabled +MESA3D_DEPENDENCIES += lm-sensors +else +MESA3D_CONF_OPTS += -Dlmsensors=disabled +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +MESA3D_CONF_OPTS += -Dzstd=enabled +MESA3D_DEPENDENCIES += zstd +else +MESA3D_CONF_OPTS += -Dzstd=disabled +endif + +MESA3D_CFLAGS = $(TARGET_CFLAGS) + +# m68k needs 32-bit offsets in switch tables to build +ifeq ($(BR2_m68k),y) +MESA3D_CFLAGS += -mlong-jump-table-offsets +endif + +ifeq ($(BR2_PACKAGE_LIBGLVND),y) +ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) +MESA3D_DEPENDENCIES += libglvnd +MESA3D_CONF_OPTS += -Dglvnd=true +else +MESA3D_CONF_OPTS += -Dglvnd=false +endif +else +MESA3D_CONF_OPTS += -Dglvnd=false +endif + +$(eval $(meson-package)) diff --git a/custom/package/mesa3d/mesa3d.mk.patch b/custom/package/mesa3d/mesa3d.mk.patch new file mode 100644 index 0000000000..35d38d660d --- /dev/null +++ b/custom/package/mesa3d/mesa3d.mk.patch @@ -0,0 +1,63 @@ +diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk +index 4af388f13f..cf2352a355 100644 +--- a/package/mesa3d/mesa3d.mk ++++ b/package/mesa3d/mesa3d.mk +@@ -5,7 +5,7 @@ + ################################################################################ + + # When updating the version, please also update mesa3d-headers +-MESA3D_VERSION = 21.3.8 ++MESA3D_VERSION = 22.3.4 + MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz + MESA3D_SITE = https://archive.mesa3d.org + MESA3D_LICENSE = MIT, SGI, Khronos +@@ -77,7 +77,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) + # glx: + # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi + # xlib : xlib conflicts with any dri driver +-# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. + # Always enable glx-direct; without it, many GLX applications don't work. + MESA3D_CONF_OPTS += \ + -Dglx=dri \ +@@ -119,11 +118,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra + MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d + MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 + MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl +-# DRI Drivers +-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 +-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 +-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau +-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 + # Vulkan Drivers + MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel + +@@ -138,15 +132,6 @@ MESA3D_CONF_OPTS += \ + -Dgallium-extra-hud=true + endif + +-ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +-MESA3D_CONF_OPTS += \ +- -Ddri-drivers= +-else +-MESA3D_CONF_OPTS += \ +- -Dshared-glapi=enabled \ +- -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) +-endif +- + ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) + MESA3D_CONF_OPTS += \ + -Dvulkan-drivers= +@@ -226,13 +211,6 @@ else + MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled + endif + +-ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) +-MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC +-MESA3D_CONF_OPTS += -Dgallium-xvmc=enabled +-else +-MESA3D_CONF_OPTS += -Dgallium-xvmc=disabled +-endif +- + ifeq ($(BR2_PACKAGE_VALGRIND),y) + MESA3D_CONF_OPTS += -Dvalgrind=enabled + MESA3D_DEPENDENCIES += valgrind -- GitLab From 68a3d057d27e4ef01c8402fd83e5ca01c2141437 Mon Sep 17 00:00:00 2001 From: Pit64 Date: Thu, 29 Dec 2022 19:42:25 +0100 Subject: [PATCH 3/3] feat(kodi): update modules - updated modules to use the latest version - reorganized the modules .mk files to integrate the release and plugin name more included --- .../kodi_plugin_video_netflix.mk | 9 +++++---- package/kodi-plugin-video-twitch/Config.in | 2 +- .../kodi_plugin_video_twitch.mk | 7 ++++--- package/kodi-plugin-video-youtube/Config.in | 2 +- .../kodi_plugin_video_youtube.mk | 11 ++++++----- package/kodi-resource-language-de_de/Config.in | 4 ++-- .../kodi_resource_language_de_de.mk | 11 ++++++----- package/kodi-resource-language-es_es/Config.in | 4 ++-- .../kodi_resource_language_es_es.mk | 9 +++++---- package/kodi-resource-language-eu_es/Config.in | 4 ++-- .../kodi_resource_language_eu_es.mk | 9 +++++---- package/kodi-resource-language-fr_fr/Config.in | 4 ++-- .../kodi_resource_language_fr_fr.mk | 11 ++++++----- package/kodi-resource-language-it_it/Config.in | 4 ++-- .../kodi_resource_language_it_it.mk | 11 ++++++----- package/kodi-resource-language-pt_br/Config.in | 4 ++-- .../kodi_resource_language_pt_br.mk | 9 +++++---- package/kodi-resource-language-sv_se/Config.in | 4 ++-- .../kodi_resource_language_sv_se.mk | 9 +++++---- package/kodi-resource-language-tr_tr/Config.in | 4 ++-- .../kodi_resource_language_tr_tr.mk | 9 +++++---- package/kodi-resource-language-zh_cn/Config.in | 4 ++-- .../kodi_resource_language_zh_cn.mk | 9 +++++---- package/kodi-script-module-addon-signals/Config.in | 2 +- .../kodi_script_module_addon_signals.mk | 7 ++++--- package/kodi-script-module-certifi/Config.in | 8 ++++---- .../kodi_script_module_certifi.mk | 7 ++++--- package/kodi-script-module-chardet/Config.in | 4 ++-- .../kodi_script_module_chardet.mk | 7 ++++--- package/kodi-script-module-future/Config.in | 2 +- .../kodi_script_module_future.mk | 7 ++++--- package/kodi-script-module-idna/Config.in | 4 ++-- .../kodi_script_module_idna.mk | 5 +++-- .../kodi-script-module-inputstreamhelper/Config.in | 2 +- .../kodi_script_module_inputstreamhelper.mk | 9 +++++---- package/kodi-script-module-myconnpy/Config.in | 2 +- .../kodi_script_module_myconnpy.mk | 7 ++++--- package/kodi-script-module-python-twitch/Config.in | 2 +- .../kodi_script_module_python_twitch.mk | 9 +++++---- package/kodi-script-module-requests/Config.in | 2 +- .../kodi_script_module_requests.mk | 7 ++++--- package/kodi-script-module-six/Config.in | 2 +- .../kodi-script-module-six/kodi_script_module_six.mk | 7 ++++--- package/kodi-script-module-urllib3/Config.in | 4 ++-- .../kodi_script_module_urllib3.mk | 7 ++++--- package/kodi-script.module.t0mm0.common/Config.in | 2 +- .../kodi_script_module_t0mm0_common.mk | 9 +++++---- package/kodi-skin-confluence-480/Config.in | 4 ++-- .../kodi_skin_confluence_480.mk | 6 +++--- 49 files changed, 156 insertions(+), 132 deletions(-) diff --git a/package/kodi-plugin-video-netflix/kodi_plugin_video_netflix.mk b/package/kodi-plugin-video-netflix/kodi_plugin_video_netflix.mk index d45e37d92c..63cfa56b06 100644 --- a/package/kodi-plugin-video-netflix/kodi_plugin_video_netflix.mk +++ b/package/kodi-plugin-video-netflix/kodi_plugin_video_netflix.mk @@ -4,13 +4,14 @@ # ################################################################################ -KODI_PLUGIN_VIDEO_NETFLIX_VERSION = 1.20.2 -KODI_PLUGIN_VIDEO_NETFLIX_SOURCE = plugin.video.netflix-$(KODI_PLUGIN_VIDEO_NETFLIX_VERSION)+matrix.1.zip -KODI_PLUGIN_VIDEO_NETFLIX_SITE = https://github.com/CastagnaIT/plugin.video.netflix/releases/download/v$(KODI_PLUGIN_VIDEO_NETFLIX_VERSION) +KODI_PLUGIN_VIDEO_NETFLIX_RELEASE = matrix +KODI_PLUGIN_VIDEO_NETFLIX_VERSION = 1.20.4 KODI_PLUGIN_VIDEO_NETFLIX_PLUGINNAME = plugin.video.netflix +KODI_PLUGIN_VIDEO_NETFLIX_SOURCE = $(KODI_PLUGIN_VIDEO_NETFLIX_PLUGINNAME)-$(KODI_PLUGIN_VIDEO_NETFLIX_VERSION)+$(KODI_PLUGIN_VIDEO_NETFLIX_RELEASE).1.zip +KODI_PLUGIN_VIDEO_NETFLIX_SITE = https://github.com/CastagnaIT/$(KODI_PLUGIN_VIDEO_NETFLIX_PLUGINNAME)/releases/download/v$(KODI_PLUGIN_VIDEO_NETFLIX_VERSION) KODI_PLUGIN_VIDEO_NETFLIX_DEPENDENCIES = python-pycryptodomex KODI_PLUGIN_VIDEO_NETFLIX_LICENSE = MIT -KODI_PLUGIN_VIDEO_NETFLIX_LICENSE_FILES = plugin.video.netflix/README.md +KODI_PLUGIN_VIDEO_NETFLIX_LICENSE_FILES = $(KODI_PLUGIN_VIDEO_NETFLIX_PLUGINNAME)/README.md KODI_PLUGIN_VIDEO_NETFLIX_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-plugin-video-twitch/Config.in b/package/kodi-plugin-video-twitch/Config.in index 6782d3f37c..b133a6c277 100644 --- a/package/kodi-plugin-video-twitch/Config.in +++ b/package/kodi-plugin-video-twitch/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_KODI_PLUGIN_VIDEO_TWITCH help Kodi Twitch Plugin - source https://kodi.tv/addon/plugins-video-add-ons/twitch + source https://github.com/anxdpanic/plugin.video.twitch/ diff --git a/package/kodi-plugin-video-twitch/kodi_plugin_video_twitch.mk b/package/kodi-plugin-video-twitch/kodi_plugin_video_twitch.mk index 47aa8be89d..f7976476cf 100644 --- a/package/kodi-plugin-video-twitch/kodi_plugin_video_twitch.mk +++ b/package/kodi-plugin-video-twitch/kodi_plugin_video_twitch.mk @@ -4,12 +4,13 @@ # ################################################################################ +KODI_PLUGIN_VIDEO_TWITCH_RELEASE = matrix KODI_PLUGIN_VIDEO_TWITCH_VERSION = 2.6.2 -KODI_PLUGIN_VIDEO_TWITCH_SOURCE = plugin.video.twitch-$(KODI_PLUGIN_VIDEO_TWITCH_VERSION)+matrix.1.zip -KODI_PLUGIN_VIDEO_TWITCH_SITE = https://github.com/anxdpanic/plugin.video.twitch/releases/download/v$(KODI_PLUGIN_VIDEO_TWITCH_VERSION) KODI_PLUGIN_VIDEO_TWITCH_PLUGINNAME = plugin.video.twitch +KODI_PLUGIN_VIDEO_TWITCH_SOURCE = $(KODI_PLUGIN_VIDEO_TWITCH_PLUGINNAME)-$(KODI_PLUGIN_VIDEO_TWITCH_VERSION)+$(KODI_PLUGIN_VIDEO_TWITCH_RELEASE).1.zip +KODI_PLUGIN_VIDEO_TWITCH_SITE = https://github.com/anxdpanic/$(KODI_PLUGIN_VIDEO_TWITCH_PLUGINNAME)/releases/download/v$(KODI_PLUGIN_VIDEO_TWITCH_VERSION) KODI_PLUGIN_VIDEO_TWITCH_LICENSE = GPL-3.0-only -KODI_PLUGIN_VIDEO_TWITCH_LICENSE_FILES = plugin.video.twitch/LICENSES/GPL-3.0-only +KODI_PLUGIN_VIDEO_TWITCH_LICENSE_FILES = $(KODI_PLUGIN_VIDEO_TWITCH_PLUGINNAME)/LICENSES/GPL-3.0-only KODI_PLUGIN_VIDEO_TWITCH_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-plugin-video-youtube/Config.in b/package/kodi-plugin-video-youtube/Config.in index f09a644553..31e3e1a2c8 100644 --- a/package/kodi-plugin-video-youtube/Config.in +++ b/package/kodi-plugin-video-youtube/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_KODI_PLUGIN_VIDEO_YOUTUBE help Kodi Youtube Plugin - https://kodi.tv/addon/plugins-video-add-ons/youtube + https://github.com/anxdpanic/plugin.video.youtube/ diff --git a/package/kodi-plugin-video-youtube/kodi_plugin_video_youtube.mk b/package/kodi-plugin-video-youtube/kodi_plugin_video_youtube.mk index 12c5ad961a..f12515bf6d 100644 --- a/package/kodi-plugin-video-youtube/kodi_plugin_video_youtube.mk +++ b/package/kodi-plugin-video-youtube/kodi_plugin_video_youtube.mk @@ -4,12 +4,13 @@ # ################################################################################ -KODI_PLUGIN_VIDEO_YOUTUBE_VERSION = 6.8.23 -KODI_PLUGIN_VIDEO_YOUTUBE_SOURCE = plugin.video.youtube-$(KODI_PLUGIN_VIDEO_YOUTUBE_VERSION)+matrix.1.zip -KODI_PLUGIN_VIDEO_YOUTUBE_SITE = https://github.com/anxdpanic/plugin.video.youtube/releases/download/v$(KODI_PLUGIN_VIDEO_YOUTUBE_VERSION) -KODI_PLUGIN_VIDEO_YOUTUBE_PLUGINNAME=plugin.video.youtube +KODI_PLUGIN_VIDEO_YOUTUBE_RELEASE = matrix +KODI_PLUGIN_VIDEO_YOUTUBE_VERSION = 6.8.24 +KODI_PLUGIN_VIDEO_YOUTUBE_PLUGINNAME = plugin.video.youtube +KODI_PLUGIN_VIDEO_YOUTUBE_SOURCE = $(KODI_PLUGIN_VIDEO_YOUTUBE_PLUGINNAME)-$(KODI_PLUGIN_VIDEO_YOUTUBE_VERSION)+$(KODI_PLUGIN_VIDEO_YOUTUBE_RELEASE).1.zip +KODI_PLUGIN_VIDEO_YOUTUBE_SITE = https://github.com/anxdpanic/$(KODI_PLUGIN_VIDEO_YOUTUBE_PLUGINNAME)/releases/download/v$(KODI_PLUGIN_VIDEO_YOUTUBE_VERSION) KODI_PLUGIN_VIDEO_YOUTUBE_LICENSE = GPL-2.0 -KODI_PLUGIN_VIDEO_YOUTUBE_LICENSE_FILES = plugin.video.youtube/LICENSES/GPL-2.0-only +KODI_PLUGIN_VIDEO_YOUTUBE_LICENSE_FILES = $(KODI_PLUGIN_VIDEO_YOUTUBE_PLUGINNAME)/LICENSES/GPL-2.0-only KODI_PLUGIN_VIDEO_YOUTUBE_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-de_de/Config.in b/package/kodi-resource-language-de_de/Config.in index 2835b51ad7..b54c79f35c 100644 --- a/package/kodi-resource-language-de_de/Config.in +++ b/package/kodi-resource-language-de_de/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_DE_DE default y depends on BR2_PACKAGE_KODI help - Kodi de_de language resource + Kodi German language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.de_de/ diff --git a/package/kodi-resource-language-de_de/kodi_resource_language_de_de.mk b/package/kodi-resource-language-de_de/kodi_resource_language_de_de.mk index 0fbca4cb7d..67b26d5b26 100644 --- a/package/kodi-resource-language-de_de/kodi_resource_language_de_de.mk +++ b/package/kodi-resource-language-de_de/kodi_resource_language_de_de.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi de_de language resource +# kodi german language resource # ################################################################################ -KODI_RESOURCE_LANGUAGE_DE_DE_VERSION = 9.0.49 -KODI_RESOURCE_LANGUAGE_DE_DE_SOURCE = resource.language.de_de-$(KODI_RESOURCE_LANGUAGE_DE_DE_VERSION).zip -KODI_RESOURCE_LANGUAGE_DE_DE_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.de_de -KODI_RESOURCE_LANGUAGE_DE_DE_PLUGINNAME=resource.language.de_de +KODI_RESOURCE_LANGUAGE_DE_DE_RELEASE = matrix +KODI_RESOURCE_LANGUAGE_DE_DE_VERSION = 9.0.52 +KODI_RESOURCE_LANGUAGE_DE_DE_PLUGINNAME = resource.language.de_de +KODI_RESOURCE_LANGUAGE_DE_DE_SOURCE = $(KODI_RESOURCE_LANGUAGE_DE_DE_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_DE_DE_VERSION).zip +KODI_RESOURCE_LANGUAGE_DE_DE_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_DE_DE_RELEASE)/$(KODI_RESOURCE_LANGUAGE_DE_DE_PLUGINNAME) KODI_RESOURCE_LANGUAGE_DE_DE_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_DE_DE_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-es_es/Config.in b/package/kodi-resource-language-es_es/Config.in index b055e8c1f7..417c2ae3b3 100644 --- a/package/kodi-resource-language-es_es/Config.in +++ b/package/kodi-resource-language-es_es/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_ES_ES default y depends on BR2_PACKAGE_KODI help - Kodi es_es language resource + Kodi Spanish language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.es_es/ diff --git a/package/kodi-resource-language-es_es/kodi_resource_language_es_es.mk b/package/kodi-resource-language-es_es/kodi_resource_language_es_es.mk index 6eb77737c5..bde99123ec 100644 --- a/package/kodi-resource-language-es_es/kodi_resource_language_es_es.mk +++ b/package/kodi-resource-language-es_es/kodi_resource_language_es_es.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi es_es language resource +# kodi spanish language resource # ################################################################################ +KODI_RESOURCE_LANGUAGE_ES_ES_RELEASE = matrix KODI_RESOURCE_LANGUAGE_ES_ES_VERSION = 9.0.44 -KODI_RESOURCE_LANGUAGE_ES_ES_SOURCE = resource.language.es_es-$(KODI_RESOURCE_LANGUAGE_ES_ES_VERSION).zip -KODI_RESOURCE_LANGUAGE_ES_ES_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.es_es -KODI_RESOURCE_LANGUAGE_ES_ES_PLUGINNAME=resource.language.es_es +KODI_RESOURCE_LANGUAGE_ES_ES_PLUGINNAME = resource.language.es_es +KODI_RESOURCE_LANGUAGE_ES_ES_SOURCE = $(KODI_RESOURCE_LANGUAGE_ES_ES_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_ES_ES_VERSION).zip +KODI_RESOURCE_LANGUAGE_ES_ES_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_ES_ES_RELEASE)/$(KODI_RESOURCE_LANGUAGE_ES_ES_PLUGINNAME) KODI_RESOURCE_LANGUAGE_ES_ES_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_ES_ES_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-eu_es/Config.in b/package/kodi-resource-language-eu_es/Config.in index a90b0e08ba..fb71cbd85a 100644 --- a/package/kodi-resource-language-eu_es/Config.in +++ b/package/kodi-resource-language-eu_es/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_EU_ES default y depends on BR2_PACKAGE_KODI help - Kodi eu_es language resource + Kodi Basque language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.eu_es/ diff --git a/package/kodi-resource-language-eu_es/kodi_resource_language_eu_es.mk b/package/kodi-resource-language-eu_es/kodi_resource_language_eu_es.mk index cdffa16192..00053a91ab 100644 --- a/package/kodi-resource-language-eu_es/kodi_resource_language_eu_es.mk +++ b/package/kodi-resource-language-eu_es/kodi_resource_language_eu_es.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi eu_es language resource +# kodi basque language resource # ################################################################################ +KODI_RESOURCE_LANGUAGE_EU_ES_RELEASE = matrix KODI_RESOURCE_LANGUAGE_EU_ES_VERSION = 9.0.31 -KODI_RESOURCE_LANGUAGE_EU_ES_SOURCE = resource.language.eu_es-$(KODI_RESOURCE_LANGUAGE_EU_ES_VERSION).zip -KODI_RESOURCE_LANGUAGE_EU_ES_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.eu_es -KODI_RESOURCE_LANGUAGE_EU_ES_PLUGINNAME=resource.language.eu_es +KODI_RESOURCE_LANGUAGE_EU_ES_PLUGINNAME = resource.language.eu_es +KODI_RESOURCE_LANGUAGE_EU_ES_SOURCE = $(KODI_RESOURCE_LANGUAGE_EU_ES_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_EU_ES_VERSION).zip +KODI_RESOURCE_LANGUAGE_EU_ES_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_EU_ES_RELEASE)/$(KODI_RESOURCE_LANGUAGE_EU_ES_PLUGINNAME) KODI_RESOURCE_LANGUAGE_EU_ES_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_EU_ES_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-fr_fr/Config.in b/package/kodi-resource-language-fr_fr/Config.in index 5a4bafd550..6e127f2fed 100644 --- a/package/kodi-resource-language-fr_fr/Config.in +++ b/package/kodi-resource-language-fr_fr/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_FR_FR default y depends on BR2_PACKAGE_KODI help - Kodi fr_fr language resource + Kodi French language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.fr_fr/ diff --git a/package/kodi-resource-language-fr_fr/kodi_resource_language_fr_fr.mk b/package/kodi-resource-language-fr_fr/kodi_resource_language_fr_fr.mk index 7b217c19f9..9ea2f57d02 100644 --- a/package/kodi-resource-language-fr_fr/kodi_resource_language_fr_fr.mk +++ b/package/kodi-resource-language-fr_fr/kodi_resource_language_fr_fr.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi fr_fr language resource +# kodi french language resource # ################################################################################ -KODI_RESOURCE_LANGUAGE_FR_FR_VERSION = 9.0.52 -KODI_RESOURCE_LANGUAGE_FR_FR_SOURCE = resource.language.fr_fr-$(KODI_RESOURCE_LANGUAGE_FR_FR_VERSION).zip -KODI_RESOURCE_LANGUAGE_FR_FR_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.fr_fr -KODI_RESOURCE_LANGUAGE_FR_FR_PLUGINNAME=resource.language.fr_fr +KODI_RESOURCE_LANGUAGE_FR_FR_RELEASE = matrix +KODI_RESOURCE_LANGUAGE_FR_FR_VERSION = 9.0.53 +KODI_RESOURCE_LANGUAGE_FR_FR_PLUGINNAME = resource.language.fr_fr +KODI_RESOURCE_LANGUAGE_FR_FR_SOURCE = $(KODI_RESOURCE_LANGUAGE_FR_FR_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_FR_FR_VERSION).zip +KODI_RESOURCE_LANGUAGE_FR_FR_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_FR_FR_RELEASE)/$(KODI_RESOURCE_LANGUAGE_FR_FR_PLUGINNAME) KODI_RESOURCE_LANGUAGE_FR_FR_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_FR_FR_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-it_it/Config.in b/package/kodi-resource-language-it_it/Config.in index 3887e0faea..7e00b72765 100644 --- a/package/kodi-resource-language-it_it/Config.in +++ b/package/kodi-resource-language-it_it/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_IT_IT default y depends on BR2_PACKAGE_KODI help - Kodi it_it language resource + Kodi Italian language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.it_it/ diff --git a/package/kodi-resource-language-it_it/kodi_resource_language_it_it.mk b/package/kodi-resource-language-it_it/kodi_resource_language_it_it.mk index d9ad6988f4..acfe62839f 100644 --- a/package/kodi-resource-language-it_it/kodi_resource_language_it_it.mk +++ b/package/kodi-resource-language-it_it/kodi_resource_language_it_it.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi it_it language resource +# kodi italian language resource # ################################################################################ -KODI_RESOURCE_LANGUAGE_IT_IT_VERSION = 9.0.43 -KODI_RESOURCE_LANGUAGE_IT_IT_SOURCE = resource.language.it_it-$(KODI_RESOURCE_LANGUAGE_IT_IT_VERSION).zip -KODI_RESOURCE_LANGUAGE_IT_IT_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.it_it -KODI_RESOURCE_LANGUAGE_IT_IT_PLUGINNAME=resource.language.it_it +KODI_RESOURCE_LANGUAGE_IT_IT_RELEASE = matrix +KODI_RESOURCE_LANGUAGE_IT_IT_VERSION = 9.0.44 +KODI_RESOURCE_LANGUAGE_IT_IT_PLUGINNAME = resource.language.it_it +KODI_RESOURCE_LANGUAGE_IT_IT_SOURCE = $(KODI_RESOURCE_LANGUAGE_IT_IT_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_IT_IT_VERSION).zip +KODI_RESOURCE_LANGUAGE_IT_IT_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_IT_IT_RELEASE)/$(KODI_RESOURCE_LANGUAGE_IT_IT_PLUGINNAME) KODI_RESOURCE_LANGUAGE_IT_IT_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_IT_IT_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-pt_br/Config.in b/package/kodi-resource-language-pt_br/Config.in index 7e784c13e6..9177847675 100644 --- a/package/kodi-resource-language-pt_br/Config.in +++ b/package/kodi-resource-language-pt_br/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_PT_BR default y depends on BR2_PACKAGE_KODI help - Kodi pt_br language resource + Kodi Portuguese (Brazil) language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.pt_br/ diff --git a/package/kodi-resource-language-pt_br/kodi_resource_language_pt_br.mk b/package/kodi-resource-language-pt_br/kodi_resource_language_pt_br.mk index 54132690d0..fb13531f66 100644 --- a/package/kodi-resource-language-pt_br/kodi_resource_language_pt_br.mk +++ b/package/kodi-resource-language-pt_br/kodi_resource_language_pt_br.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi pt_br language resource +# kodi portuguese brazil language resource # ################################################################################ +KODI_RESOURCE_LANGUAGE_PT_BR_RELEASE = matrix KODI_RESOURCE_LANGUAGE_PT_BR_VERSION = 9.0.48 -KODI_RESOURCE_LANGUAGE_PT_BR_SOURCE = resource.language.pt_br-$(KODI_RESOURCE_LANGUAGE_PT_BR_VERSION).zip -KODI_RESOURCE_LANGUAGE_PT_BR_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.pt_br -KODI_RESOURCE_LANGUAGE_PT_BR_PLUGINNAME=resource.language.pt_br +KODI_RESOURCE_LANGUAGE_PT_BR_PLUGINNAME = resource.language.pt_br +KODI_RESOURCE_LANGUAGE_PT_BR_SOURCE = $(KODI_RESOURCE_LANGUAGE_PT_BR_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_PT_BR_VERSION).zip +KODI_RESOURCE_LANGUAGE_PT_BR_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_PT_BR_RELEASE)/$(KODI_RESOURCE_LANGUAGE_PT_BR_PLUGINNAME) KODI_RESOURCE_LANGUAGE_PT_BR_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_PT_BR_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-sv_se/Config.in b/package/kodi-resource-language-sv_se/Config.in index 0c023fe80d..2f287a6af2 100644 --- a/package/kodi-resource-language-sv_se/Config.in +++ b/package/kodi-resource-language-sv_se/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_SV_SE default y depends on BR2_PACKAGE_KODI help - Kodi sv_se language resource + Kodi Swedish language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.sv_se/ diff --git a/package/kodi-resource-language-sv_se/kodi_resource_language_sv_se.mk b/package/kodi-resource-language-sv_se/kodi_resource_language_sv_se.mk index 641bc19c61..8afff557ea 100644 --- a/package/kodi-resource-language-sv_se/kodi_resource_language_sv_se.mk +++ b/package/kodi-resource-language-sv_se/kodi_resource_language_sv_se.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi sv_se language resource +# kodi swedish language resource # ################################################################################ +KODI_RESOURCE_LANGUAGE_SV_SE_RELEASE = matrix KODI_RESOURCE_LANGUAGE_SV_SE_VERSION = 9.0.45 -KODI_RESOURCE_LANGUAGE_SV_SE_SOURCE = resource.language.sv_se-$(KODI_RESOURCE_LANGUAGE_SV_SE_VERSION).zip -KODI_RESOURCE_LANGUAGE_SV_SE_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.sv_se -KODI_RESOURCE_LANGUAGE_SV_SE_PLUGINNAME=resource.language.sv_se +KODI_RESOURCE_LANGUAGE_SV_SE_PLUGINNAME = resource.language.sv_se +KODI_RESOURCE_LANGUAGE_SV_SE_SOURCE = $(KODI_RESOURCE_LANGUAGE_SV_SE_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_SV_SE_VERSION).zip +KODI_RESOURCE_LANGUAGE_SV_SE_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_SV_SE_RELEASE)/$(KODI_RESOURCE_LANGUAGE_SV_SE_PLUGINNAME) KODI_RESOURCE_LANGUAGE_SV_SE_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_SV_SE_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-tr_tr/Config.in b/package/kodi-resource-language-tr_tr/Config.in index e6cc7a6f62..7f01f65931 100644 --- a/package/kodi-resource-language-tr_tr/Config.in +++ b/package/kodi-resource-language-tr_tr/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_TR_TR default y depends on BR2_PACKAGE_KODI help - Kodi tr_tr language resource + Kodi Turkish language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.tr_tr/ diff --git a/package/kodi-resource-language-tr_tr/kodi_resource_language_tr_tr.mk b/package/kodi-resource-language-tr_tr/kodi_resource_language_tr_tr.mk index 969d21b1af..b2534712b8 100644 --- a/package/kodi-resource-language-tr_tr/kodi_resource_language_tr_tr.mk +++ b/package/kodi-resource-language-tr_tr/kodi_resource_language_tr_tr.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi tr_tr language resource +# kodi turkish language resource # ################################################################################ +KODI_RESOURCE_LANGUAGE_TR_TR_RELEASE = matrix KODI_RESOURCE_LANGUAGE_TR_TR_VERSION = 9.0.37 -KODI_RESOURCE_LANGUAGE_TR_TR_SOURCE = resource.language.tr_tr-$(KODI_RESOURCE_LANGUAGE_TR_TR_VERSION).zip -KODI_RESOURCE_LANGUAGE_TR_TR_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.tr_tr -KODI_RESOURCE_LANGUAGE_TR_TR_PLUGINNAME=resource.language.tr_tr +KODI_RESOURCE_LANGUAGE_TR_TR_PLUGINNAME = resource.language.tr_tr +KODI_RESOURCE_LANGUAGE_TR_TR_SOURCE = $(KODI_RESOURCE_LANGUAGE_TR_TR_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_TR_TR_VERSION).zip +KODI_RESOURCE_LANGUAGE_TR_TR_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_TR_TR_RELEASE)/$(KODI_RESOURCE_LANGUAGE_TR_TR_PLUGINNAME) KODI_RESOURCE_LANGUAGE_TR_TR_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_TR_TR_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-resource-language-zh_cn/Config.in b/package/kodi-resource-language-zh_cn/Config.in index a4e47ca841..9a8e87c9e1 100644 --- a/package/kodi-resource-language-zh_cn/Config.in +++ b/package/kodi-resource-language-zh_cn/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_RESOURCE_LANGUAGE_ZH_CN default y depends on BR2_PACKAGE_KODI help - Kodi zh_cn language resource + Kodi Chinese (Simple) language resource - https://kodi.tv + https://mirrors.kodi.tv/addons/matrix/resource.language.zh_cn/ diff --git a/package/kodi-resource-language-zh_cn/kodi_resource_language_zh_cn.mk b/package/kodi-resource-language-zh_cn/kodi_resource_language_zh_cn.mk index 57162a4449..e87dc23068 100644 --- a/package/kodi-resource-language-zh_cn/kodi_resource_language_zh_cn.mk +++ b/package/kodi-resource-language-zh_cn/kodi_resource_language_zh_cn.mk @@ -1,13 +1,14 @@ ################################################################################ # -# kodi zh_cn language resource +# kodi chinese simple language resource # ################################################################################ +KODI_RESOURCE_LANGUAGE_ZH_CN_RELEASE = matrix KODI_RESOURCE_LANGUAGE_ZH_CN_VERSION = 9.0.39 -KODI_RESOURCE_LANGUAGE_ZH_CN_SOURCE = resource.language.zh_cn-$(KODI_RESOURCE_LANGUAGE_ZH_CN_VERSION).zip -KODI_RESOURCE_LANGUAGE_ZH_CN_SITE = http://mirrors.kodi.tv/addons/matrix/resource.language.zh_cn -KODI_RESOURCE_LANGUAGE_ZH_CN_PLUGINNAME=resource.language.zh_cn +KODI_RESOURCE_LANGUAGE_ZH_CN_PLUGINNAME = resource.language.zh_cn +KODI_RESOURCE_LANGUAGE_ZH_CN_SOURCE = $(KODI_RESOURCE_LANGUAGE_ZH_CN_PLUGINNAME)-$(KODI_RESOURCE_LANGUAGE_ZH_CN_VERSION).zip +KODI_RESOURCE_LANGUAGE_ZH_CN_SITE = https://mirrors.kodi.tv/addons/$(KODI_RESOURCE_LANGUAGE_ZH_CN_RELEASE)/$(KODI_RESOURCE_LANGUAGE_ZH_CN_PLUGINNAME) KODI_RESOURCE_LANGUAGE_ZH_CN_LICENSE = COPYRIGHT KODI_RESOURCE_LANGUAGE_ZH_CN_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-addon-signals/Config.in b/package/kodi-script-module-addon-signals/Config.in index 758a416c5d..ff12992d1d 100644 --- a/package/kodi-script-module-addon-signals/Config.in +++ b/package/kodi-script-module-addon-signals/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_ADDON_SIGNALS help Kodi Addon Signals script - https://kodi.wiki/view/Add-on:Addon_Signals + https://mirrors.kodi.tv/addons/matrix/script.module.addon.signals/ diff --git a/package/kodi-script-module-addon-signals/kodi_script_module_addon_signals.mk b/package/kodi-script-module-addon-signals/kodi_script_module_addon_signals.mk index caea5c19b4..302e4623e8 100644 --- a/package/kodi-script-module-addon-signals/kodi_script_module_addon_signals.mk +++ b/package/kodi-script-module-addon-signals/kodi_script_module_addon_signals.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_ADDON_SIGNALS_VERSION = 0.0.6 -KODI_SCRIPT_MODULE_ADDON_SIGNALS_SOURCE = script.module.addon.signals-$(KODI_SCRIPT_MODULE_ADDON_SIGNALS_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_ADDON_SIGNALS_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.addon.signals +KODI_SCRIPT_MODULE_ADDON_SIGNALS_RELEASE = matrix +KODI_SCRIPT_MODULE_ADDON_SIGNALS_VERSION = 0.0.6+$(KODI_SCRIPT_MODULE_ADDON_SIGNALS_RELEASE).1 KODI_SCRIPT_MODULE_ADDON_SIGNALS_PLUGIN_NAME = script.module.addon.signals +KODI_SCRIPT_MODULE_ADDON_SIGNALS_SOURCE = $(KODI_SCRIPT_MODULE_ADDON_SIGNALS_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_ADDON_SIGNALS_VERSION).zip +KODI_SCRIPT_MODULE_ADDON_SIGNALS_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_ADDON_SIGNALS_RELEASE)/$(KODI_SCRIPT_MODULE_ADDON_SIGNALS_PLUGIN_NAME) KODI_SCRIPT_MODULE_ADDON_SIGNALS_LICENSE = LGPL-2.0 KODI_SCRIPT_MODULE_ADDON_SIGNALS_LICENSE_FILES = LICENSE.txt diff --git a/package/kodi-script-module-certifi/Config.in b/package/kodi-script-module-certifi/Config.in index 80fe298580..5c02cba24e 100644 --- a/package/kodi-script-module-certifi/Config.in +++ b/package/kodi-script-module-certifi/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KODI_SCRIPT_MODULE_FUTURE - bool "kodi-script-module-future" +config BR2_PACKAGE_KODI_SCRIPT_MODULE_CERTIFI + bool "kodi-script-module-certifi" default n depends on BR2_PACKAGE_KODI help - Kodi Future script module + Kodi Certifi script module - https://kodi.wiki/view/Add-on:Future + https://mirrors.kodi.tv/addons/matrix/script.module.certifi/ diff --git a/package/kodi-script-module-certifi/kodi_script_module_certifi.mk b/package/kodi-script-module-certifi/kodi_script_module_certifi.mk index 4215ae3826..cebc826dea 100644 --- a/package/kodi-script-module-certifi/kodi_script_module_certifi.mk +++ b/package/kodi-script-module-certifi/kodi_script_module_certifi.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_CERTIFI_VERSION = 2022.5.18 -KODI_SCRIPT_MODULE_CERTIFI_SOURCE = script.module.certifi-$(KODI_SCRIPT_MODULE_CERTIFI_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_CERTIFI_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.certifi +KODI_SCRIPT_MODULE_CERTIFI_RELEASE = matrix +KODI_SCRIPT_MODULE_CERTIFI_VERSION = 2022.5.18+$(KODI_SCRIPT_MODULE_CERTIFI_RELEASE).1 KODI_SCRIPT_MODULE_CERTIFI_PLUGIN_NAME = script.module.certifi +KODI_SCRIPT_MODULE_CERTIFI_SOURCE = $(KODI_SCRIPT_MODULE_CERTIFI_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_CERTIFI_VERSION).zip +KODI_SCRIPT_MODULE_CERTIFI_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_CERTIFI_RELEASE)/$(KODI_SCRIPT_MODULE_CERTIFI_PLUGIN_NAME) KODI_SCRIPT_MODULE_CERTIFI_LICENSE = MPL-2.0 KODI_SCRIPT_MODULE_CERTIFI_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-chardet/Config.in b/package/kodi-script-module-chardet/Config.in index 83442575cb..ce95023320 100644 --- a/package/kodi-script-module-chardet/Config.in +++ b/package/kodi-script-module-chardet/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_CHARDET - bool "kodi-script-module-future" + bool "kodi-script-module-chardet" default n depends on BR2_PACKAGE_KODI help Kodi Chardet script module - https://kodi.wiki/view/Add-on:Chardet + https://mirrors.kodi.tv/addons/matrix/script.module.chardet/ diff --git a/package/kodi-script-module-chardet/kodi_script_module_chardet.mk b/package/kodi-script-module-chardet/kodi_script_module_chardet.mk index dc88ea2ea6..2d79cf9024 100644 --- a/package/kodi-script-module-chardet/kodi_script_module_chardet.mk +++ b/package/kodi-script-module-chardet/kodi_script_module_chardet.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_CHARDET_VERSION = 4.0.0 -KODI_SCRIPT_MODULE_CHARDET_SOURCE = script.module.chardet-$(KODI_SCRIPT_MODULE_CHARDET_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_CHARDET_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.chardet +KODI_SCRIPT_MODULE_CHARDET_RELEASE = matrix +KODI_SCRIPT_MODULE_CHARDET_VERSION = 4.0.0+$(KODI_SCRIPT_MODULE_CHARDET_RELEASE).1 KODI_SCRIPT_MODULE_CHARDET_PLUGIN_NAME = script.module.chardet +KODI_SCRIPT_MODULE_CHARDET_SOURCE = $(KODI_SCRIPT_MODULE_CHARDET_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_CHARDET_VERSION).zip +KODI_SCRIPT_MODULE_CHARDET_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_CHARDET_RELEASE)/$(KODI_SCRIPT_MODULE_CHARDET_PLUGIN_NAME) KODI_SCRIPT_MODULE_CHARDET_LICENSE = LGPL-2.0 KODI_SCRIPT_MODULE_CHARDET_LICENSE_FILES = LICENSE.txt diff --git a/package/kodi-script-module-future/Config.in b/package/kodi-script-module-future/Config.in index 80fe298580..397516581c 100644 --- a/package/kodi-script-module-future/Config.in +++ b/package/kodi-script-module-future/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_FUTURE help Kodi Future script module - https://kodi.wiki/view/Add-on:Future + https://mirrors.kodi.tv/addons/matrix/script.module.future/ diff --git a/package/kodi-script-module-future/kodi_script_module_future.mk b/package/kodi-script-module-future/kodi_script_module_future.mk index 548e18efe5..4783f1f136 100644 --- a/package/kodi-script-module-future/kodi_script_module_future.mk +++ b/package/kodi-script-module-future/kodi_script_module_future.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_FUTURE_VERSION = 0.18.2 -KODI_SCRIPT_MODULE_FUTURE_SOURCE = script.module.future-$(KODI_SCRIPT_MODULE_FUTURE_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_FUTURE_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.future +KODI_SCRIPT_MODULE_FUTURE_RELEASE = matrix +KODI_SCRIPT_MODULE_FUTURE_VERSION = 0.18.2+$(KODI_SCRIPT_MODULE_FUTURE_RELEASE).1 KODI_SCRIPT_MODULE_FUTURE_PLUGIN_NAME = script.module.future +KODI_SCRIPT_MODULE_FUTURE_SOURCE = $(KODI_SCRIPT_MODULE_FUTURE_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_FUTURE_VERSION).zip +KODI_SCRIPT_MODULE_FUTURE_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_FUTURE_RELEASE)/$(KODI_SCRIPT_MODULE_FUTURE_PLUGIN_NAME) KODI_SCRIPT_MODULE_FUTURE_LICENSE = COPYRIGHT KODI_SCRIPT_MODULE_FUTURE_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-idna/Config.in b/package/kodi-script-module-idna/Config.in index e2e742444a..76322a5504 100644 --- a/package/kodi-script-module-idna/Config.in +++ b/package/kodi-script-module-idna/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_IDNA - bool "kodi-script-module-future" + bool "kodi-script-module-idna" default n depends on BR2_PACKAGE_KODI help Kodi Idna script module - https://kodi.wiki/view/Add-on:Idna + https://mirrors.kodi.tv/addons/matrix/script.module.idna/ diff --git a/package/kodi-script-module-idna/kodi_script_module_idna.mk b/package/kodi-script-module-idna/kodi_script_module_idna.mk index f20b57c389..2a915f4e2a 100644 --- a/package/kodi-script-module-idna/kodi_script_module_idna.mk +++ b/package/kodi-script-module-idna/kodi_script_module_idna.mk @@ -4,10 +4,11 @@ # ################################################################################ +KODI_SCRIPT_MODULE_IDNA_RELEASE = matrix KODI_SCRIPT_MODULE_IDNA_VERSION = 3.4.0 -KODI_SCRIPT_MODULE_IDNA_SOURCE = script.module.idna-$(KODI_SCRIPT_MODULE_IDNA_VERSION).zip -KODI_SCRIPT_MODULE_IDNA_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.idna KODI_SCRIPT_MODULE_IDNA_PLUGIN_NAME = script.module.idna +KODI_SCRIPT_MODULE_IDNA_SOURCE = $(KODI_SCRIPT_MODULE_IDNA_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_IDNA_VERSION).zip +KODI_SCRIPT_MODULE_IDNA_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_IDNA_RELEASE)/$(KODI_SCRIPT_MODULE_IDNA_PLUGIN_NAME) KODI_SCRIPT_MODULE_IDNA_LICENSE = COPYRIGHT KODI_SCRIPT_MODULE_IDNA_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-inputstreamhelper/Config.in b/package/kodi-script-module-inputstreamhelper/Config.in index 8ba4962d55..c16906dc88 100644 --- a/package/kodi-script-module-inputstreamhelper/Config.in +++ b/package/kodi-script-module-inputstreamhelper/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_INPUTSTREAMHELPER help Kodi inputstreamhelper script module - https://kodi.wiki/view/Add-on:InputStream_Helper + https://mirrors.kodi.tv/addons/matrix/script.module.inputstreamhelper/ diff --git a/package/kodi-script-module-inputstreamhelper/kodi_script_module_inputstreamhelper.mk b/package/kodi-script-module-inputstreamhelper/kodi_script_module_inputstreamhelper.mk index 9a1e50ddce..8841dca8fc 100644 --- a/package/kodi-script-module-inputstreamhelper/kodi_script_module_inputstreamhelper.mk +++ b/package/kodi-script-module-inputstreamhelper/kodi_script_module_inputstreamhelper.mk @@ -4,12 +4,13 @@ # ################################################################################ -KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_VERSION = 0.5.10 -KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_SOURCE = script.module.inputstreamhelper-$(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.inputstreamhelper +KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_RELEASE = matrix +KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_VERSION = 0.5.10+$(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_RELEASE).1 KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_PLUGIN_NAME = script.module.inputstreamhelper +KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_SOURCE = $(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_VERSION).zip +KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_RELEASE)/$(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_PLUGIN_NAME) KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_LICENSE = MIT -KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_LICENSE_FILES = script.module.inputstreamhelper/LICENSE.txt +KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_LICENSE_FILES = $(KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_PLUGIN_NAME)/LICENSE.txt KODI_SCRIPT_MODULE_INPUTSTREAMHELPER_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-myconnpy/Config.in b/package/kodi-script-module-myconnpy/Config.in index ee66981860..4473383a11 100644 --- a/package/kodi-script-module-myconnpy/Config.in +++ b/package/kodi-script-module-myconnpy/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_MYCONNPY help Kodi Myconnpy script module - https://kodi.tv + hhttps://mirrors.kodi.tv/addons/matrix/script.module.myconnpy/ diff --git a/package/kodi-script-module-myconnpy/kodi_script_module_myconnpy.mk b/package/kodi-script-module-myconnpy/kodi_script_module_myconnpy.mk index bd0972b83d..2730de966d 100644 --- a/package/kodi-script-module-myconnpy/kodi_script_module_myconnpy.mk +++ b/package/kodi-script-module-myconnpy/kodi_script_module_myconnpy.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_MYCONNPY_VERSION = 8.0.18 -KODI_SCRIPT_MODULE_MYCONNPY_SOURCE = script.module.myconnpy-$(KODI_SCRIPT_MODULE_MYCONNPY_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_MYCONNPY_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.myconnpy +KODI_SCRIPT_MODULE_MYCONNPY_RELEASE = matrix +KODI_SCRIPT_MODULE_MYCONNPY_VERSION = 8.0.18+$(KODI_SCRIPT_MODULE_MYCONNPY_RELEASE).1 KODI_SCRIPT_MODULE_MYCONNPY_PLUGIN_NAME = script.module.myconnpy +KODI_SCRIPT_MODULE_MYCONNPY_SOURCE = $(KODI_SCRIPT_MODULE_MYCONNPY_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_MYCONNPY_VERSION).zip +KODI_SCRIPT_MODULE_MYCONNPY_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_MYCONNPY_RELEASE)/$(KODI_SCRIPT_MODULE_MYCONNPY_PLUGIN_NAME) KODI_SCRIPT_MODULE_MYCONNPY_LICENSE = LGPL-2.0 KODI_SCRIPT_MODULE_MYCONNPY_LICENSE_FILES = LICENSE.txt diff --git a/package/kodi-script-module-python-twitch/Config.in b/package/kodi-script-module-python-twitch/Config.in index c87ddcac0e..6d5650f24c 100644 --- a/package/kodi-script-module-python-twitch/Config.in +++ b/package/kodi-script-module-python-twitch/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_PYTHON_TWITCH help Kodi Python Twitch script module - https://kodi.wiki/view/Add-on:Python-twitch_for_Kodi + https://mirrors.kodi.tv/addons/matrix/script.module.python.twitch/ diff --git a/package/kodi-script-module-python-twitch/kodi_script_module_python_twitch.mk b/package/kodi-script-module-python-twitch/kodi_script_module_python_twitch.mk index 4a720db3cb..c7ae7b40cf 100644 --- a/package/kodi-script-module-python-twitch/kodi_script_module_python_twitch.mk +++ b/package/kodi-script-module-python-twitch/kodi_script_module_python_twitch.mk @@ -4,12 +4,13 @@ # ################################################################################ -KODI_SCRIPT_MODULE_PYTHON_TWITCH_VERSION = 2.0.21 -KODI_SCRIPT_MODULE_PYTHON_TWITCH_SOURCE = script.module.python.twitch-$(KODI_SCRIPT_MODULE_PYTHON_TWITCH_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_PYTHON_TWITCH_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.python.twitch +KODI_SCRIPT_MODULE_PYTHON_TWITCH_RELEASE = matrix +KODI_SCRIPT_MODULE_PYTHON_TWITCH_VERSION = 2.0.21+$(KODI_SCRIPT_MODULE_PYTHON_TWITCH_RELEASE).1 KODI_SCRIPT_MODULE_PYTHON_TWITCH_PLUGIN_NAME = script.module.python.twitch +KODI_SCRIPT_MODULE_PYTHON_TWITCH_SOURCE = $(KODI_SCRIPT_MODULE_PYTHON_TWITCH_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_PYTHON_TWITCH_VERSION).zip +KODI_SCRIPT_MODULE_PYTHON_TWITCH_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_PYTHON_TWITCH_RELEASE)/$(KODI_SCRIPT_MODULE_PYTHON_TWITCH_PLUGIN_NAME) KODI_SCRIPT_MODULE_PYTHON_TWITCH_LICENSE = GPL-3.0-only -KODI_SCRIPT_MODULE_PYTHON_TWITCH_LICENSE_FILES = script.module.python.twitch/LICENSES/GPL-3.0-only +KODI_SCRIPT_MODULE_PYTHON_TWITCH_LICENSE_FILES = $(KODI_SCRIPT_MODULE_PYTHON_TWITCH_PLUGIN_NAME)/LICENSES/GPL-3.0-only KODI_SCRIPT_MODULE_PYTHON_TWITCH_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-requests/Config.in b/package/kodi-script-module-requests/Config.in index 1ab01abf4c..abd0af946e 100644 --- a/package/kodi-script-module-requests/Config.in +++ b/package/kodi-script-module-requests/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_REQUESTS help Kodi Requests script module - https://gitlab.com/recalbox/recalbox-configgen/-/pipelines + https://mirrors.kodi.tv/addons/matrix/script.module.requests/ diff --git a/package/kodi-script-module-requests/kodi_script_module_requests.mk b/package/kodi-script-module-requests/kodi_script_module_requests.mk index 3a0ccc3500..2208ec0145 100644 --- a/package/kodi-script-module-requests/kodi_script_module_requests.mk +++ b/package/kodi-script-module-requests/kodi_script_module_requests.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_REQUESTS_VERSION = 2.27.1 -KODI_SCRIPT_MODULE_REQUESTS_SOURCE = script.module.requests-$(KODI_SCRIPT_MODULE_REQUESTS_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_REQUESTS_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.requests +KODI_SCRIPT_MODULE_REQUESTS_RELEASE = matrix +KODI_SCRIPT_MODULE_REQUESTS_VERSION = 2.27.1+$(KODI_SCRIPT_MODULE_REQUESTS_RELEASE).1 KODI_SCRIPT_MODULE_REQUESTS_PLUGIN_NAME = script.module.requests +KODI_SCRIPT_MODULE_REQUESTS_SOURCE = $(KODI_SCRIPT_MODULE_REQUESTS_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_REQUESTS_VERSION).zip +KODI_SCRIPT_MODULE_REQUESTS_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_REQUESTS_RELEASE)/$(KODI_SCRIPT_MODULE_REQUESTS_PLUGIN_NAME) KODI_SCRIPT_MODULE_REQUESTS_LICENSE = Apache-2.0 KODI_SCRIPT_MODULE_REQUESTS_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-six/Config.in b/package/kodi-script-module-six/Config.in index 479af8a490..4c57493822 100644 --- a/package/kodi-script-module-six/Config.in +++ b/package/kodi-script-module-six/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_SIX help Kodi Six script module - https://kodi.wiki/view/Add-on:Six + https://mirrors.kodi.tv/addons/matrix/script.module.six/ diff --git a/package/kodi-script-module-six/kodi_script_module_six.mk b/package/kodi-script-module-six/kodi_script_module_six.mk index 54b05669ca..c50014c368 100644 --- a/package/kodi-script-module-six/kodi_script_module_six.mk +++ b/package/kodi-script-module-six/kodi_script_module_six.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_SIX_VERSION = 1.15.0 -KODI_SCRIPT_MODULE_SIX_SOURCE = script.module.six-$(KODI_SCRIPT_MODULE_SIX_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_SIX_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.six +KODI_SCRIPT_MODULE_SIX_RELEASE = matrix +KODI_SCRIPT_MODULE_SIX_VERSION = 1.15.0+$(KODI_SCRIPT_MODULE_SIX_RELEASE).1 KODI_SCRIPT_MODULE_SIX_PLUGIN_NAME = script.module.six +KODI_SCRIPT_MODULE_SIX_SOURCE = $(KODI_SCRIPT_MODULE_SIX_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_SIX_VERSION).zip +KODI_SCRIPT_MODULE_SIX_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_SIX_RELEASE)/$(KODI_SCRIPT_MODULE_SIX_PLUGIN_NAME) KODI_SCRIPT_MODULE_SIX_LICENSE = LICENSE KODI_SCRIPT_MODULE_SIX_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script-module-urllib3/Config.in b/package/kodi-script-module-urllib3/Config.in index cf3b47afb1..5e3509733f 100644 --- a/package/kodi-script-module-urllib3/Config.in +++ b/package/kodi-script-module-urllib3/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_URLLIB3 - bool "kodi-script-module-future" + bool "kodi-script-module-urllib3" default n depends on BR2_PACKAGE_KODI help Kodi Urllib3 script module - https://kodi.wiki/view/Add-on:Urllib3 + https://mirrors.kodi.tv/addons/matrix/script.module.urllib3/ diff --git a/package/kodi-script-module-urllib3/kodi_script_module_urllib3.mk b/package/kodi-script-module-urllib3/kodi_script_module_urllib3.mk index 4c6af68984..87c168e53b 100644 --- a/package/kodi-script-module-urllib3/kodi_script_module_urllib3.mk +++ b/package/kodi-script-module-urllib3/kodi_script_module_urllib3.mk @@ -4,10 +4,11 @@ # ################################################################################ -KODI_SCRIPT_MODULE_URLLIB3_VERSION = 1.26.13 -KODI_SCRIPT_MODULE_URLLIB3_SOURCE = script.module.urllib3-$(KODI_SCRIPT_MODULE_URLLIB3_VERSION)+matrix.1.zip -KODI_SCRIPT_MODULE_URLLIB3_SITE = https://mirrors.kodi.tv/addons/matrix/script.module.urllib3 +KODI_SCRIPT_MODULE_URLLIB3_RELEASE = matrix +KODI_SCRIPT_MODULE_URLLIB3_VERSION = 1.26.13+$(KODI_SCRIPT_MODULE_URLLIB3_RELEASE).1 KODI_SCRIPT_MODULE_URLLIB3_PLUGIN_NAME = script.module.urllib3 +KODI_SCRIPT_MODULE_URLLIB3_SOURCE = $(KODI_SCRIPT_MODULE_URLLIB3_PLUGIN_NAME)-$(KODI_SCRIPT_MODULE_URLLIB3_VERSION).zip +KODI_SCRIPT_MODULE_URLLIB3_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_URLLIB3_RELEASE)/$(KODI_SCRIPT_MODULE_URLLIB3_PLUGIN_NAME) KODI_SCRIPT_MODULE_URLLIB3_LICENSE = MIT KODI_SCRIPT_MODULE_URLLIB3_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons diff --git a/package/kodi-script.module.t0mm0.common/Config.in b/package/kodi-script.module.t0mm0.common/Config.in index f9ca2f80b7..b8e59f19e2 100644 --- a/package/kodi-script.module.t0mm0.common/Config.in +++ b/package/kodi-script.module.t0mm0.common/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_KODI_SCRIPT_MODULE_T0MM0_COMMON help Kodi Collection of commonly used addon routines - https://kodi.tv + https://mirrors.kodi.tv/addons/leia/script.module.t0mm0.common/ diff --git a/package/kodi-script.module.t0mm0.common/kodi_script_module_t0mm0_common.mk b/package/kodi-script.module.t0mm0.common/kodi_script_module_t0mm0_common.mk index 6f50f028b0..55c3b1c4e1 100644 --- a/package/kodi-script.module.t0mm0.common/kodi_script_module_t0mm0_common.mk +++ b/package/kodi-script.module.t0mm0.common/kodi_script_module_t0mm0_common.mk @@ -1,19 +1,20 @@ ################################################################################ # -# kodi filmon plugin +# kodi collection of commonly used addon routines plugin # ################################################################################ +KODI_SCRIPT_MODULE_T0MM0_COMMON_RELEASE = leia KODI_SCRIPT_MODULE_T0MM0_COMMON_VERSION = 2.1.1 -KODI_SCRIPT_MODULE_T0MM0_COMMON_SOURCE = script.module.t0mm0.common-$(KODI_SCRIPT_MODULE_T0MM0_COMMON_VERSION).zip -KODI_SCRIPT_MODULE_T0MM0_COMMON_SITE = "http://mirrors.kodi.tv/addons/leia/script.module.t0mm0.common" KODI_SCRIPT_MODULE_T0MM0_COMMON_PLUGINNAME=script.module.t0mm0.common +KODI_SCRIPT_MODULE_T0MM0_COMMON_SOURCE = $(KODI_SCRIPT_MODULE_T0MM0_COMMON_PLUGINNAME)-$(KODI_SCRIPT_MODULE_T0MM0_COMMON_VERSION).zip +KODI_SCRIPT_MODULE_T0MM0_COMMON_SITE = https://mirrors.kodi.tv/addons/$(KODI_SCRIPT_MODULE_T0MM0_COMMON_RELEASE)/$(KODI_SCRIPT_MODULE_T0MM0_COMMON_PLUGINNAME) KODI_SCRIPT_MODULE_T0MM0_COMMON_LICENSE = GPL-2.0 KODI_SCRIPT_MODULE_T0MM0_COMMON_PLUGIN_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons define KODI_SCRIPT_MODULE_T0MM0_COMMON_EXTRACT_CMDS - @unzip -q -o $(DL_DIR)/kodi-script.module.t0mm0.common/$(KODI_SCRIPT_MODULE_T0MM0_COMMON_SOURCE) -d $(@D) + @unzip -q -o $(DL_DIR)/kodi-$(KODI_SCRIPT_MODULE_T0MM0_COMMON_PLUGINNAME)/$(KODI_SCRIPT_MODULE_T0MM0_COMMON_SOURCE) -d $(@D) endef define KODI_SCRIPT_MODULE_T0MM0_COMMON_INSTALL_TARGET_CMDS diff --git a/package/kodi-skin-confluence-480/Config.in b/package/kodi-skin-confluence-480/Config.in index f15447f2ce..49353aa643 100644 --- a/package/kodi-skin-confluence-480/Config.in +++ b/package/kodi-skin-confluence-480/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_KODI_SKIN_CONFLUENCE_480 default y depends on BR2_PACKAGE_KODI help - Kodi Skin confluence 480 + Kodi Skin Confluence 480 - https://kodi.tv/addons/matrix/skin.confluence + https://github.com/YggdrasiI/skin.confluence.480/ diff --git a/package/kodi-skin-confluence-480/kodi_skin_confluence_480.mk b/package/kodi-skin-confluence-480/kodi_skin_confluence_480.mk index c195909c3e..2ec8e1dd71 100644 --- a/package/kodi-skin-confluence-480/kodi_skin_confluence_480.mk +++ b/package/kodi-skin-confluence-480/kodi_skin_confluence_480.mk @@ -5,11 +5,11 @@ ################################################################################ KODI_SKIN_CONFLUENCE_480_VERSION = 4.7.15 -KODI_SKIN_CONFLUENCE_480_SOURCE = skin.confluence.480_v$(KODI_SKIN_CONFLUENCE_480_VERSION).zip -KODI_SKIN_CONFLUENCE_480_SITE = https://github.com/YggdrasiI/skin.confluence.480/releases/download/v$(KODI_SKIN_CONFLUENCE_480_VERSION) KODI_SKIN_CONFLUENCE_480_PLUGINNAME = skin.confluence.480 +KODI_SKIN_CONFLUENCE_480_SOURCE = $(KODI_SKIN_CONFLUENCE_480_PLUGINNAME)_v$(KODI_SKIN_CONFLUENCE_480_VERSION).zip +KODI_SKIN_CONFLUENCE_480_SITE = https://github.com/YggdrasiI/$(KODI_SKIN_CONFLUENCE_480_PLUGINNAME)/releases/download/v$(KODI_SKIN_CONFLUENCE_480_VERSION) KODI_SKIN_CONFLUENCE_480_LICENSE = GPL-2.0 -KODI_SKIN_CONFLUENCE_480_LICENSE_FILES = skin.confluence.480/LICENSE.txt +KODI_SKIN_CONFLUENCE_480_LICENSE_FILES = $(KODI_SKIN_CONFLUENCE_480_PLUGINNAME)/LICENSE.txt KODI_SKIN_CONFLUENCE_480_TARGET_DIR=$(TARGET_DIR)/usr/share/kodi/addons -- GitLab