Merge pull request #4188 from CvH/10.0/dvb

dvb-update
This commit is contained in:
MilhouseVH 2020-03-03 18:15:35 +00:00 committed by GitHub
commit 4608eb29d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 34 additions and 121 deletions

View File

@ -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}
}

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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');

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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)"

View File

@ -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');

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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