From 3627ca1ec82c3d971dfbf99ba874e7a2a3b9a198 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 15 Feb 2020 17:56:07 +0100 Subject: [PATCH 1/6] media_tree: update to 2020-02-09 --- .../dvb/depends/media_tree/package.mk | 4 ++-- .../patches/media_tree-01-m88ds3103b.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk index 95cfb17466..eebf1ad748 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="media_tree" -PKG_VERSION="2019-07-11-22be8233b34f" -PKG_SHA256="14363b1aacfe59805a1fe93739caed53036879e7b871f1d8d7061527c3cb9eb8" +PKG_VERSION="2020-02-09-bb6d3fb354c5" +PKG_SHA256="d6b7088393b4676a94f628b37722e9a36efef65408d003e0b3bafa4933a5416b" PKG_LICENSE="GPL" PKG_SITE="https://git.linuxtv.org/media_tree.git" PKG_URL="http://linuxtv.org/downloads/drivers/linux-media-${PKG_VERSION}.tar.bz2" diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch b/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch index 5a9d93737b..c20d641d75 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch +++ b/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch @@ -3,7 +3,7 @@ https://git.linuxtv.org/brad/media_tree.git/log/?h=Montage-3103b.v2 support for m88ds3103b diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c -index 3a367a5..0d3b81d 100644 +index c96f05f..a95461e 100644 --- a/drivers/media/dvb-frontends/m88ds3103.c +++ b/drivers/media/dvb-frontends/m88ds3103.c @@ -64,6 +64,92 @@ err: @@ -613,7 +613,7 @@ index c825032..d656ec2 100644 struct m88ds3103_reg_val { diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c -index 1283c7c..6561f7b 100644 +index def9cdd..a8c321d 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -2397,6 +2397,20 @@ const struct em28xx_board em28xx_boards[] = { @@ -637,7 +637,7 @@ index 1283c7c..6561f7b 100644 /* * 2013:025f PCTV tripleStick (292e). * Empia EM28178, Silicon Labs Si2168, Silicon Labs Si2157 -@@ -2678,6 +2692,10 @@ struct usb_device_id em28xx_id_table[] = { +@@ -2696,6 +2710,10 @@ struct usb_device_id em28xx_id_table[] = { .driver_info = EM2765_BOARD_SPEEDLINK_VAD_LAPLACE }, { USB_DEVICE(0x2013, 0x0258), .driver_info = EM28178_BOARD_PCTV_461E }, @@ -649,7 +649,7 @@ index 1283c7c..6561f7b 100644 .driver_info = EM28178_BOARD_PCTV_292E }, { USB_DEVICE(0x2013, 0x0264), /* Hauppauge WinTV-soloHD 292e SE */ diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c -index a73faf1..e2ddc25 100644 +index 0ab6c49..cd7e40c 100644 --- a/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c @@ -1219,6 +1219,65 @@ static int em28178_dvb_init_pctv_461e(struct em28xx *dev) @@ -731,14 +731,14 @@ index a73faf1..e2ddc25 100644 result = em28178_dvb_init_pctv_292e(dev); if (result) diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h -index a551072..1affdd1 100644 +index 4ecadd5..ec38598 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h -@@ -149,6 +149,7 @@ - #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100 +@@ -150,6 +150,7 @@ #define EM2884_BOARD_TERRATEC_H6 101 #define EM2882_BOARD_ZOLID_HYBRID_TV_STICK 102 -+#define EM28178_BOARD_PCTV_461E_V2 103 + #define EM2861_BOARD_MAGIX_VIDEOWANDLER2 103 ++#define EM28178_BOARD_PCTV_461E_V2 104 /* Limits minimum and default number of buffers */ #define EM28XX_MIN_BUF 4 From 748e24bfff6163437ed564ffbf763005b8bb3591 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 15 Feb 2020 17:56:07 +0100 Subject: [PATCH 2/6] dvb-latest: updated to 2020-02-14 --- .../dvb/dvb-latest/package.mk | 6 ++--- .../dvb-latest-03-disable-partly-pci.patch | 19 +++----------- .../dvb-latest-01-remove-rmmod.pl.patch | 11 -------- .../dvb-latest-02-disable-modules.patch | 26 ------------------- 4 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-01-remove-rmmod.pl.patch delete mode 100644 packages/linux-driver-addons/dvb/dvb-latest/patches/dvb-latest-02-disable-modules.patch 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 From 11217d354db1799c7a240b2ebcf4b3c33977d823 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 15 Feb 2020 17:56:07 +0100 Subject: [PATCH 3/6] media_tree_cc: update to 2020-02-14 --- .../linux-driver-addons/dvb/depends/media_tree_cc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk index 5962f98a5d..61b3512866 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="media_tree_cc" -PKG_VERSION="2019-07-10" -PKG_SHA256="c1d4467a7771d4a3e3f80cdce7065b4a1a9b61a306f35586e4c198812661e883" +PKG_VERSION="2020-02-14" +PKG_SHA256="c81d0412c8f237ecf30100ba1260625ca25df463102af331b063f4a7dca164f5" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/CrazyCat/media_build/downloads/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" From 1511cf0e6db83e3ac0b3b611bffc50410ea23324 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 15 Feb 2020 17:56:07 +0100 Subject: [PATCH 4/6] =?UTF-8?q?crazycat:=20update=20to=202020=E2=80=9102?= =?UTF-8?q?=E2=80=9114?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dvb/crazycat/package.mk | 6 ++--- .../patches/crazycat-01-remove-rmmod.pl.patch | 12 --------- .../patches/crazycat-02-disable-modules.patch | 26 ------------------- .../crazycat-03-disable-partly-pci.patch | 9 +++---- 4 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 packages/linux-driver-addons/dvb/crazycat/patches/crazycat-01-remove-rmmod.pl.patch delete mode 100644 packages/linux-driver-addons/dvb/crazycat/patches/crazycat-02-disable-modules.patch diff --git a/packages/linux-driver-addons/dvb/crazycat/package.mk b/packages/linux-driver-addons/dvb/crazycat/package.mk index d735b6e870..1aaade4781 100644 --- a/packages/linux-driver-addons/dvb/crazycat/package.mk +++ b/packages/linux-driver-addons/dvb/crazycat/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="crazycat" -PKG_VERSION="ca1ea9fc2cfaedfc32bd0ac628e03e9aa379e3ad" -PKG_SHA256="6b44a96d82c4a3e052864a995baceaede46b37c048c5718a6f62a009492d08ff" +PKG_VERSION="18984b1ae3b4bd558e72a4196d9b392f31fd8447" +PKG_SHA256="90f2e4248102baa8935bd835cfc1cd4106b0013ff7482bf06aebc87485b1ffd1" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/CrazyCat/media_build" -PKG_URL="https://bitbucket.org/CrazyCat/media_build/get/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/media_build/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_UNPACK="media_tree_cc" PKG_SECTION="driver.dvb" PKG_LONGDESC="DVB driver for TBS cards with CrazyCats additions" diff --git a/packages/linux-driver-addons/dvb/crazycat/patches/crazycat-01-remove-rmmod.pl.patch b/packages/linux-driver-addons/dvb/crazycat/patches/crazycat-01-remove-rmmod.pl.patch deleted file mode 100644 index d7b472a3d3..0000000000 --- a/packages/linux-driver-addons/dvb/crazycat/patches/crazycat-01-remove-rmmod.pl.patch +++ /dev/null @@ -1,12 +0,0 @@ -[Patch] without this patch you need to install libproc-processtable-perl at host system - ---- 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/crazycat/patches/crazycat-02-disable-modules.patch b/packages/linux-driver-addons/dvb/crazycat/patches/crazycat-02-disable-modules.patch deleted file mode 100644 index dd270284ec..0000000000 --- a/packages/linux-driver-addons/dvb/crazycat/patches/crazycat-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 diff --git a/packages/linux-driver-addons/dvb/crazycat/patches/disable-pci/crazycat-03-disable-partly-pci.patch b/packages/linux-driver-addons/dvb/crazycat/patches/disable-pci/crazycat-03-disable-partly-pci.patch index 9597215214..7ca74970b5 100644 --- a/packages/linux-driver-addons/dvb/crazycat/patches/disable-pci/crazycat-03-disable-partly-pci.patch +++ b/packages/linux-driver-addons/dvb/crazycat/patches/disable-pci/crazycat-03-disable-partly-pci.patch @@ -1,12 +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'); + disable_config('DVB_AV7110_FIRMWARE'); + disable_config('DVB_CINERGYT2_TUNING'); + disable_config('VIDEO_HELPER_CHIPS_AUTO'); From 47890f87e0c39e3d6cd709b53f4ee1e9368a6c64 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 15 Feb 2020 17:56:07 +0100 Subject: [PATCH 5/6] Generic/RPi: enable crazycat, dvb-latest --- projects/Generic/options | 2 +- projects/RPi/options | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Generic/options b/projects/Generic/options index 675138dae4..e4b35e65cd 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -74,7 +74,7 @@ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta intel_nuc_led" # build and install driver addons (yes / no) - DRIVER_ADDONS_SUPPORT="no" + DRIVER_ADDONS_SUPPORT="yes" # driver addons to install: # for a list of additional drivers see packages/linux-driver-addons diff --git a/projects/RPi/options b/projects/RPi/options index 0d401f5bab..5edd9acc6b 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -115,7 +115,7 @@ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config bcm2835-driver" # build and install driver addons (yes / no) - DRIVER_ADDONS_SUPPORT="no" + DRIVER_ADDONS_SUPPORT="yes" # driver addons to install: # for a list of additional drivers see packages/linux-driver-addons From 1ebd7516dc51181c634f7070ae8ae5a2689acf36 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 16 Feb 2020 21:49:17 +0100 Subject: [PATCH 6/6] driverselect: update to python3 --- packages/addons/script/driverselect/package.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/addons/script/driverselect/package.mk b/packages/addons/script/driverselect/package.mk index 7eb3330abf..3053826d58 100644 --- a/packages/addons/script/driverselect/package.mk +++ b/packages/addons/script/driverselect/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="driverselect" -PKG_VERSION="2b79180" -PKG_SHA256="ed1e9defa185b46d4400794681f21f2bf1ddf8ccdfdb20e49ddde3edccdd6b7f" +PKG_VERSION="ee784f2d79bc5b3125dd77733b55f0227f2f5914" +PKG_SHA256="9ae121a31f1a204fac9888bca327a8e876be3dfaf2924ccf88a6c0192bb1fa9c" PKG_REV="100" PKG_ARCH="any" PKG_LICENSE="OSS" @@ -20,8 +20,8 @@ PKG_ADDON_NAME="Driver Select" PKG_ADDON_TYPE="xbmc.python.script" unpack() { - mkdir -p $PKG_BUILD/addon - tar --strip-components=1 -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz -C $PKG_BUILD/addon + mkdir -p ${PKG_BUILD}/addon + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz -C ${PKG_BUILD}/addon } make_target() { @@ -29,6 +29,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME} - cp -rP $PKG_BUILD/addon/* $INSTALL/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME} + mkdir -p ${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME} + cp -rP ${PKG_BUILD}/addon/* ${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME} }