diff --git a/packages/linux-driver-addons/dvb/crazycat/package.mk b/packages/linux-driver-addons/dvb/crazycat/package.mk index e2a83b450e..9175b55305 100644 --- a/packages/linux-driver-addons/dvb/crazycat/package.mk +++ b/packages/linux-driver-addons/dvb/crazycat/package.mk @@ -27,8 +27,8 @@ pre_make_target() { make_target() { cp -RP $(get_build_dir media_tree_cc)/* $PKG_BUILD/linux - # make staging config (all + experimental) - kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) stagingconfig + # make config all + kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) allyesconfig # hack to workaround media_build bug if [ "$PROJECT" = Rockchip ]; then diff --git a/packages/linux-driver-addons/dvb/crazycat/patches/driver.dvb.crazycat-02-disable-modules.patch b/packages/linux-driver-addons/dvb/crazycat/patches/driver.dvb.crazycat-02-disable-modules.patch new file mode 100644 index 0000000000..e2659408e8 --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat/patches/driver.dvb.crazycat-02-disable-modules.patch @@ -0,0 +1,13 @@ +--- a/v4l/scripts/make_kconfig.pl ++++ b/v4l/scripts/make_kconfig.pl +@@ -626,6 +626,10 @@ ($$) + 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('DVB_AV7110_FIRMWARE'); + disable_config('DVB_CINERGYT2_TUNING'); + disable_config('VIDEO_HELPER_CHIPS_AUTO'); diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/changelog.txt b/packages/linux-driver-addons/dvb/crazycat_aml/changelog.txt new file mode 100755 index 0000000000..32d81ca428 --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat_aml/changelog.txt @@ -0,0 +1,2 @@ +100 +- Initial add-on diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/icon/icon.png b/packages/linux-driver-addons/dvb/crazycat_aml/icon/icon.png new file mode 100644 index 0000000000..22a6c6a0d9 Binary files /dev/null and b/packages/linux-driver-addons/dvb/crazycat_aml/icon/icon.png differ diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/package.mk b/packages/linux-driver-addons/dvb/crazycat_aml/package.mk new file mode 100644 index 0000000000..9ce3cfe7de --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat_aml/package.mk @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="crazycat_aml" +PKG_VERSION="835dc72da3ee63df7f4057bd0507887454c005d1" +PKG_SHA256="3d68d368a9eda15688c6686caa854a045a753740ec93553d80a4bcfc14c2950a" +PKG_ARCH="any" +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_DEPENDS_TARGET="toolchain linux media_tree_cc_aml" +PKG_NEED_UNPACK="$LINUX_DEPENDS media_tree_cc_aml" +PKG_SECTION="driver.dvb" +PKG_LONGDESC="DVB driver for TBS cards with CrazyCats additions" + +PKG_IS_ADDON="embedded" +PKG_IS_KERNEL_PKG="yes" +PKG_ADDON_IS_STANDALONE="yes" +PKG_ADDON_NAME="DVB drivers for TBS" +PKG_ADDON_TYPE="xbmc.service" +PKG_ADDON_VERSION="${ADDON_VERSION}.${PKG_REV}" + +pre_make_target() { + export KERNEL_VER=$(get_module_dir) + export LDFLAGS="" +} + +make_target() { + cp -RP $(get_build_dir media_tree_cc_aml)/* $PKG_BUILD/linux + + # compile modules + echo "obj-y += video_dev/" >> "$PKG_BUILD/linux/drivers/media/platform/meson/Makefile" + echo "obj-y += wetek/" >> "$PKG_BUILD/linux/drivers/media/platform/meson/Makefile" + + # make config all + kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) allyesconfig + + # deactivate several build options + sed '/CONFIG_VIDEO_S5C73M3=m/d' -i $PKG_BUILD/v4l/.config + + # enable AML drivers + echo "CONFIG_IR_MESON=m" >> $PKG_BUILD/v4l/.config + echo "CONFIG_V4L_AMLOGIC_VIDEO=m" >> $PKG_BUILD/v4l/.config + echo "CONFIG_VIDEOBUF_RESOURCE=m" >> $PKG_BUILD/v4l/.config + + kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) +} + +makeinstall_target() { + install_driver_addon_files "$PKG_BUILD/v4l/" +} diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-01-remove-rmmod.pl.patch b/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-01-remove-rmmod.pl.patch new file mode 100644 index 0000000000..b7a80a6434 --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-01-remove-rmmod.pl.patch @@ -0,0 +1,13 @@ +[Patch] without this patch you need to install libproc-processtable-perl at host system + +--- a/v4l/Makefile ++++ b/v4l/Makefile +@@ -51,7 +51,7 @@ + @echo Kernel build directory is $(OUTDIR) + $(MAKE) -C ../linux apply_patches + $(MAKE) -C $(OUTDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules +- ./scripts/rmmod.pl check ++# ./scripts/rmmod.pl check + # $(MAKE) checkpatch + + mismatch:: prepare firmware diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-02-disable-modules.patch b/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-02-disable-modules.patch new file mode 100644 index 0000000000..e2659408e8 --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-02-disable-modules.patch @@ -0,0 +1,13 @@ +--- a/v4l/scripts/make_kconfig.pl ++++ b/v4l/scripts/make_kconfig.pl +@@ -626,6 +626,10 @@ ($$) + 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('DVB_AV7110_FIRMWARE'); + disable_config('DVB_CINERGYT2_TUNING'); + disable_config('VIDEO_HELPER_CHIPS_AUTO'); diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-03-config_mycompat_h.patch b/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-03-config_mycompat_h.patch new file mode 100644 index 0000000000..3e4ae4f68d --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat_aml/patches/driver.dvb.crazycat_aml-03-config_mycompat_h.patch @@ -0,0 +1,8 @@ +--- /dev/null ++++ b/v4l/config-mycompat.h +@@ -0,0 +1,4 @@ ++#undef NEED_SMP_MB_AFTER_ATOMIC ++#undef NEED_PFN_TO_PHYS ++#undef NEED_WRITEL_RELAXED ++#undef NEED_PM_RUNTIME_GET +-- diff --git a/packages/linux-driver-addons/dvb/crazycat_aml/source/default.py b/packages/linux-driver-addons/dvb/crazycat_aml/source/default.py new file mode 100644 index 0000000000..9002b050de --- /dev/null +++ b/packages/linux-driver-addons/dvb/crazycat_aml/source/default.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) 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 a454a6b15c..a6f3198ac9 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk @@ -2,12 +2,13 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="media_tree" -PKG_VERSION="2018-08-08-8179de98cd35" -PKG_SHA256="e4a2c0cddb306c22ccbd0ea997bd020bf2b9c6946b1cc9467ecffbbbafde7f54" +PKG_VERSION="2018-10-09-8caec72e8cbf" +PKG_SHA256="39f579c936ac78dec82825840142d5f856203e8133aa238aca5fe95c7a70e8ae" 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" PKG_DEPENDS_TARGET="toolchain" +PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Source of Linux Kernel media_tree subsystem to build with media_build." PKG_TOOLCHAIN="manual" 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 18900037ad..c8828add65 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,12 +2,13 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="media_tree_cc" -PKG_VERSION="2018-08-17" -PKG_SHA256="1ffaafeeec85eece9697693efa22c8955a5ff63b7697eb0976f830ba92247147" +PKG_VERSION="2018-09-23" +PKG_SHA256="d336e004b6a1f995fa335dadb2b70f48e45d5e9e48a09ded288e7bc8445169c6" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/CrazyCat/media_build/downloads/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" +PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Source of Linux Kernel media_tree subsystem to build with media_build." PKG_TOOLCHAIN="manual" diff --git a/packages/linux-driver-addons/dvb/depends/media_tree_cc_aml/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree_cc_aml/package.mk new file mode 100644 index 0000000000..4b17779c9a --- /dev/null +++ b/packages/linux-driver-addons/dvb/depends/media_tree_cc_aml/package.mk @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="media_tree_cc_aml" +PKG_VERSION="2018-09-23" +PKG_SHA256="3b0cf3699317c04d9184b7e25056065fd374b20b851ee86a63ea2c70e219ee9e" +PKG_LICENSE="GPL" +PKG_SITE="https://bitbucket.org/CrazyCat/media_build/downloads/" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS_TARGET="toolchain" +PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_LONGDESC="Source of Linux Kernel media_tree subsystem to build with media_build." +PKG_TOOLCHAIN="manual" + +unpack() { + mkdir -p $PKG_BUILD/ + tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz -C $PKG_BUILD/ + + # hack/workaround for borked upstream kernel/media_build + # without removing atomisp there a lot additional includes that + # slowdown build process after modpost from 3min to 6min + # even if atomisp is disabled via kernel.conf + rm -rf $PKG_BUILD/drivers/staging/media/atomisp + sed -i 's|^.*drivers/staging/media/atomisp.*$||' \ + $PKG_BUILD/drivers/staging/media/Kconfig +} diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-02-linux-901-extend-rc6-toggle-support.patch b/packages/linux-driver-addons/dvb/depends/media_tree_cc_aml/patches/media_tree_cc_aml-02-linux-901-extend-rc6-toggle-support.patch similarity index 100% rename from packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-02-linux-901-extend-rc6-toggle-support.patch rename to packages/linux-driver-addons/dvb/depends/media_tree_cc_aml/patches/media_tree_cc_aml-02-linux-901-extend-rc6-toggle-support.patch diff --git a/packages/linux-driver-addons/dvb/digital_devices/package.mk b/packages/linux-driver-addons/dvb/digital_devices/package.mk index 2964033f71..99dbed95ed 100644 --- a/packages/linux-driver-addons/dvb/digital_devices/package.mk +++ b/packages/linux-driver-addons/dvb/digital_devices/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="digital_devices" -PKG_VERSION="03ce6c980c437b9545f1c0f609425424dd0c7f71" -PKG_SHA256="6189d7833cd6bfa3a7a6b432bd4e8aea462b970eb32eabf0a4ac1cbf087bdde6" +PKG_VERSION="21aefddd4bbff5ac2915cfde05bd5d373ce413c3" +PKG_SHA256="0ef1e9c2edd9c574c67b30f2e5d79d21e95169ed08968704cf25cd77d885da58" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/DigitalDevices/dddvb/" diff --git a/packages/linux-driver-addons/dvb/dvb-latest/package.mk b/packages/linux-driver-addons/dvb/dvb-latest/package.mk index 6b02236048..711265f2f5 100644 --- a/packages/linux-driver-addons/dvb/dvb-latest/package.mk +++ b/packages/linux-driver-addons/dvb/dvb-latest/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dvb-latest" -PKG_VERSION="baf45935ffad914f33faf751ad9f4d0dd276c021" -PKG_SHA256="591f0c4c039f4b2453982187447232fa2e72a48dfd915ed307ae11c7a6427031" +PKG_VERSION="9f419c414672676f63e85a61ea99df0ddcd6e9a7" +PKG_SHA256="284026f37db8880247f94e8fb763107c47ac44460d1b7819e076c61ccec9b86c" 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" @@ -27,8 +27,8 @@ pre_make_target() { make_target() { cp -RP $(get_build_dir media_tree)/* $PKG_BUILD/linux - # make staging config (all + experimental) - kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) stagingconfig + # make config all + kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) allyesconfig kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) } diff --git a/packages/linux-driver-addons/dvb/dvb-latest/patches/driver.dvb.dvb-latest-02-disable-modules.patch b/packages/linux-driver-addons/dvb/dvb-latest/patches/driver.dvb.dvb-latest-02-disable-modules.patch new file mode 100644 index 0000000000..e2659408e8 --- /dev/null +++ b/packages/linux-driver-addons/dvb/dvb-latest/patches/driver.dvb.dvb-latest-02-disable-modules.patch @@ -0,0 +1,13 @@ +--- a/v4l/scripts/make_kconfig.pl ++++ b/v4l/scripts/make_kconfig.pl +@@ -626,6 +626,10 @@ ($$) + 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('DVB_AV7110_FIRMWARE'); + disable_config('DVB_CINERGYT2_TUNING'); + disable_config('VIDEO_HELPER_CHIPS_AUTO'); diff --git a/projects/Amlogic/options b/projects/Amlogic/options index a7762ea86b..f4133b7c50 100644 --- a/projects/Amlogic/options +++ b/projects/Amlogic/options @@ -147,9 +147,9 @@ ADDITIONAL_PACKAGES="u-boot-tools-aml dtc" # build and install driver addons (yes / no) - DRIVER_ADDONS_SUPPORT="no" + DRIVER_ADDONS_SUPPORT="yes" # driver addons to install: # for a list of additinoal drivers see packages/linux-driver-addons # Space separated list is supported, - DRIVER_ADDONS="crazycat" + DRIVER_ADDONS="crazycat_aml"