diff --git a/packages/linux-driver-addons/dvb/dvb-latest/package.mk b/packages/linux-driver-addons/dvb/dvb-latest/package.mk index a2df2f707f..b601ae3b10 100644 --- a/packages/linux-driver-addons/dvb/dvb-latest/package.mk +++ b/packages/linux-driver-addons/dvb/dvb-latest/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dvb-latest" -PKG_VERSION="0f25e6fb13b6bc345218800ad9ac863deb2ee9c8" -PKG_SHA256="71294995cff2bc556bcf9aa7ade595a4ccd91a1972b73d1e537d99d2ce86dbed" +PKG_VERSION="d1db2a6142b75428f972165fe647a0d01345e085" +PKG_SHA256="97fb72725f60f0cb5f4fd1b2fcf2d5f02fd2b8276d7cf48f5a10f3bef1ba2b8d" PKG_LICENSE="GPL" PKG_SITE="http://git.linuxtv.org/media_build.git" -PKG_URL="https://git.linuxtv.org/media_build.git/snapshot/${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/LibreELEC/media_build/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_UNPACK="media_tree" PKG_SECTION="driver.dvb" PKG_LONGDESC="DVB drivers from the latest kernel (media_build)" diff --git a/packages/linux-driver-addons/dvb/dvb-latest/patches/disable-pci/dvb-latest-03-disable-partly-pci.patch b/packages/linux-driver-addons/dvb/dvb-latest/patches/disable-pci/dvb-latest-03-disable-partly-pci.patch index 2a19f863c3..7ca74970b5 100644 --- a/packages/linux-driver-addons/dvb/dvb-latest/patches/disable-pci/dvb-latest-03-disable-partly-pci.patch +++ b/packages/linux-driver-addons/dvb/dvb-latest/patches/disable-pci/dvb-latest-03-disable-partly-pci.patch @@ -1,22 +1,11 @@ --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl -@@ -626,6 +626,9 @@ ($$) +@@ -626,6 +626,8 @@ ($$) close OUT; # These options should default to off -+disable_config('VIDEO_CX25840'); +disable_config('VIDEO_SAA7146'); +disable_config('VIDEO_SAA7146_VV'); - disable_config('MEDIA_ANALOG_TV_SUPPORT'); - disable_config('MEDIA_CAMERA_SUPPORT'); - disable_config('MEDIA_CEC_SUPPORT'); ---- a/v4l/versions.txt -+++ b/v4l/versions.txt -@@ -2,6 +2,7 @@ - [9.255.255] - VIDEO_IPU3_IMGU - VIDEO_DW9714 -+DVB_MXL5XX - CEC_NOTIFIER - MEDIA_CEC_RC - MEDIA_CEC_SUPPORT + disable_config('DVB_AV7110_FIRMWARE'); + disable_config('DVB_CINERGYT2_TUNING'); + disable_config('VIDEO_HELPER_CHIPS_AUTO'); diff --git a/packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-01-remove-rmmod.pl.patch b/packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-01-remove-rmmod.pl.patch deleted file mode 100644 index 13435136c9..0000000000 --- a/packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-01-remove-rmmod.pl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/v4l/Makefile b/v4l/Makefile ---- a/v4l/Makefile -+++ b/v4l/Makefile -@@ -51,7 +51,6 @@ default:: prepare firmware - @echo Kernel build directory is $(OUTDIR) - $(MAKE) -C ../linux apply_patches - $(MAKE) -C $(OUTDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules -- ./scripts/rmmod.pl check - # $(MAKE) checkpatch - - mismatch:: prepare firmware diff --git a/packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-02-disable-modules.patch b/packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-02-disable-modules.patch deleted file mode 100644 index dd270284ec..0000000000 --- a/packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-02-disable-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/v4l/scripts/make_kconfig.pl -+++ b/v4l/scripts/make_kconfig.pl -@@ -626,6 +626,11 @@ ($$) - close OUT; - - # These options should default to off -+disable_config('MEDIA_ANALOG_TV_SUPPORT'); -+disable_config('MEDIA_CAMERA_SUPPORT'); -+disable_config('MEDIA_CEC_SUPPORT'); -+disable_config('SOC_CAMERA'); -+disable_config('CEC_CORE'); - disable_config('DVB_AV7110_FIRMWARE'); - disable_config('DVB_CINERGYT2_TUNING'); - disable_config('VIDEO_HELPER_CHIPS_AUTO'); ---- a/v4l/versions.txt -+++ b/v4l/versions.txt -@@ -2,6 +2,9 @@ - [9.255.255] - VIDEO_IPU3_IMGU - VIDEO_DW9714 -+CEC_NOTIFIER -+MEDIA_CEC_RC -+MEDIA_CEC_SUPPORT - - [4.19.0] - # Needs union ec_response_get_next_data_v1.cec_message