From 1a8e8137a3bbbd793b8f03b827738e07b6bc70ed Mon Sep 17 00:00:00 2001 From: cvh Date: Fri, 14 Jul 2017 21:30:56 +0100 Subject: [PATCH] media_build: update to 19.06.2017 --- packages/linux-drivers/media_build/package.mk | 2 +- .../media_build-02-add-to-backports.patch | 3 +- .../linux-260-fix-for-kernel-4.11.patch | 38 ------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 packages/linux-drivers/media_build/sources/backports/linux-260-fix-for-kernel-4.11.patch diff --git a/packages/linux-drivers/media_build/package.mk b/packages/linux-drivers/media_build/package.mk index e526236c13..89583a3ae5 100644 --- a/packages/linux-drivers/media_build/package.mk +++ b/packages/linux-drivers/media_build/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="media_build" -PKG_VERSION="2017-04-17-rpi" +PKG_VERSION="2017-06-19-rpi" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/crazycat69/linux_media" diff --git a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch index 644d918c37..9374cc8b88 100644 --- a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch +++ b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch @@ -1,6 +1,6 @@ --- a/backports/backports.txt +++ b/backports/backports.txt -@@ -25,6 +25,14 @@ +@@ -25,6 +25,13 @@ add pr_fmt.patch add debug.patch add drx39xxj.patch @@ -10,7 +10,6 @@ +add linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch +add linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch +add linux-062-imon_pad_ignore_diagonal.patch -+add linux-260-fix-for-kernel-4.11.patch +add cxd2880-support.patch [4.8.255] diff --git a/packages/linux-drivers/media_build/sources/backports/linux-260-fix-for-kernel-4.11.patch b/packages/linux-drivers/media_build/sources/backports/linux-260-fix-for-kernel-4.11.patch deleted file mode 100644 index 24d41b41e3..0000000000 --- a/packages/linux-drivers/media_build/sources/backports/linux-260-fix-for-kernel-4.11.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c -index d845336..a89d7bd 100644 ---- a/drivers/media/rc/rc-main.c -+++ b/drivers/media/rc/rc-main.c -@@ -1699,6 +1699,16 @@ static int rc_setup_rx_device(struct rc_dev *dev) - if (dev->close) - dev->input_dev->close = ir_close; - -+ dev->input_dev->dev.parent = &dev->dev; -+ memcpy(&dev->input_dev->id, &dev->input_id, sizeof(dev->input_id)); -+ dev->input_dev->phys = dev->input_phys; -+ dev->input_dev->name = dev->input_name; -+ -+ /* rc_open will be called here */ -+ rc = input_register_device(dev->input_dev); -+ if (rc) -+ goto out_table; -+ - /* - * Default delay of 250ms is too short for some protocols, especially - * since the timeout is currently set to 250ms. Increase it to 500ms, -@@ -1714,16 +1724,6 @@ static int rc_setup_rx_device(struct rc_dev *dev) - */ - dev->input_dev->rep[REP_PERIOD] = 125; - -- dev->input_dev->dev.parent = &dev->dev; -- memcpy(&dev->input_dev->id, &dev->input_id, sizeof(dev->input_id)); -- dev->input_dev->phys = dev->input_phys; -- dev->input_dev->name = dev->input_name; -- -- /* rc_open will be called here */ -- rc = input_register_device(dev->input_dev); -- if (rc) -- goto out_table; -- - return 0; - - out_table: