gentoo resync : 05.04.2018

6 files changed, 204 insertions, 1 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 3c44e80f8910..d818a8eee5b7 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 222c78701ca4..e198d17dade8 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -2,12 +2,15 @@ AUX OSD_RAW_CMD_patch_2.diff 843 BLAKE2B 5bfe6200c3cb86cf42e359fd345af1b92f01bd8
 AUX v4l-dvb-saa716x-3.19-set_gpio.patch 733 BLAKE2B d85a95e36fb0bb1d81035e7e2ed0b43b8e1b1fe0ba5da7ae5c76c285a83ee14ed58cb87f6489d0c5b4597db159368f28159cf1be5ca36ea7e470d5591b2eecd8 SHA512 e713779f02ebdc090a364e2339217c7f4fa2d54ba53d26f61a1a0241d19078e0278da14c8ba6520354d8a037c6834ae90271e39cdda279cfd8f4047277f24116
 AUX v4l-dvb-saa716x-4.10-fix-compile.patch 515 BLAKE2B 1617e86b85b411dd807a50353fe97ed6230362b3df79272cdcc2775e0b1a212bd394731e33ccfcfb72d85e4051ec7ee97480d3488ef40c7345628ef50b034d8f SHA512 6dc1b7b24c0d4c4b21f765ee0ac72f8b48f85ec40bb2cb7d51e589d03e64521d026a4e49f4b8c5d0e5b46b4e9332ac3785fa9a682a19dbad94f3b7ac50950653
 AUX v4l-dvb-saa716x-4.14.0-fix-compile.patch 572 BLAKE2B 28e625d28b81899e3cdb9cdbcdf01b7b14d359d3861de0507f0d4d1dcde5dd4d112c7de551a6a58fd2147d6f24c49d3c76272522ed34d49dadf976adde08d83e SHA512 b57bdd443d3ad33c170d4b40f35e7e8c5bb9a9bc7ba5f3defd2deff08c8ec377ffdae14c0d5fc8fab3ea1df10607fe9883904757ea359b4048ce43004645c453
+AUX v4l-dvb-saa716x-4.15-fix-autorepeat.patch 3274 BLAKE2B 60e6fb292be26b4a142eed4405c30c0aed973d81fbb76637894e7df90440278a23840a1dc953de66e5fd1d2feb16835aec08df440f6924e388d0bdc962231619 SHA512 7f65d977ae200714d04dc8ced2285f67e6059aed284b7e6a9efddd22a15e1ae59ae4024ee5d78e5ddb244892a2a97a6c3e29cd94eb78601b55f44b3f68ddc9b4
+AUX v4l-dvb-saa716x-4.15-fix-timers.patch 1399 BLAKE2B 9cf740de7b20e7bc62cd0835fe82d9e56fe8979ccbb3896b2ee6c5877658ccdcf7e0ea64f3c2188d1048ec4693369ab5b6522a72f27fd2d93564f4e50fce05ec SHA512 1383b1cb401311d94b47e07bd9d4b98bdb1aa3d9e378ae5a19c3405bd87ac79ea73f939540730f27240d55b8548b1c1b0e67d091e0eb302055f88110b3ae133d
+AUX v4l-dvb-saa716x-4.16-fix-compile.patch 2239 BLAKE2B 59bbe5d68bd09ef2a39ea83d96a4f6b3d5d4b830f0d65035dde5a15d2aa7d00cc891647e2655b341053c61576b41314a44fc338a5802bce00588017e8bbd2d32 SHA512 739049a4960f7aa697b05c19784ad82414865bfe1349546b0eaa3b9f206440df72454e676b2520daa3c04d9cd5df757df8a2589561eec039c45f0e53f0b31c0d
 AUX v4l-dvb-saa716x-4.2-fix-compile.patch 2397 BLAKE2B f6b82c6441524d5045971e3b1fc723074733e95bfac85da03c7cdf39ee327ca0ceda98b1715feaea38d1cb5cf47cb00c996beba9c31251b7778f2e4f9e5fefba SHA512 621852c315437a9f5ada9f5624f08d25154d331cd0a95c479f3835ba9452cd0a17ecf6fdc4b37b5eb7504456ab8565e8d6670be8680e4ea6052b5f5c22c15c12
 AUX v4l-dvb-saa716x-4.5.2-fix-compile.patch 498 BLAKE2B 584300132b72ef0385c3e0b430df36788b57ff49884ee874b610d15fba024a949a81a014883c24b5ac4de77393bbc645715d68b55ec44139d8d5c6006421c9ed SHA512 3c94389b3ffb380a585d51b7e27e3fdf36b053524983fd58531e1d00b1ade2680759822df41363fa2e2ef279570f364178c7f4870c9c6b2fb52124f83eb4afb1
 AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 BLAKE2B f3dd9279abafc087f38233f8285409e3d6f4991e3fdd0b7593b5ec816f737ff2d2fc3e457ae6370efa6396e844af314de6986902e0e7de90cf294ff839b31e48 SHA512 64b03e316d938a3830b7aad3c6b6431a9360202470e62d3c696c4203ee98b15595be3bda727468b28a6f43b539931530a408582aab6fe280b8a0200224f2b96f
 AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 BLAKE2B 178bb6bf0c391ce3c2a9e2a69c2b1938ebb6137891eab2d18e3bda42547efbfdea98677a4175bb610b21a45c4b3d543166791b517b8d116ea1361b645d612170 SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901
 AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 BLAKE2B 77adb5d5c67e14dddfce8462a98d565bc092b4e2f4dc48016602dfe0f1fa98d87e2c1317c0c3db1d1d1de8b91076e84cdd50d5b86350c060400fc2dd7ae9e5c1 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0
 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff376b1bb1e55a36421568cc7b9221f4724c9e24a9bb6334c201d99f48c92965365ada2cd085b22ca9758e55ca621deb5eb65de3ef3e9a38 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343
-EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild 2107 BLAKE2B 386fa03512228d6ffa69e4e8502d000142b3d007b2e7fce3f7cefb70af206901789e2a1ab177d7587e1c22f48af53b636371074cec91f135a020675a8fedc0d2 SHA512 1bbab03bcf60829ea4b7e4a19ed0455483ae1a61b6a473cc63b239d5207554c26c2f2ec1d416f55f07ef98aaa9c4cbf39ad8e017658b5d6644cbba8d7a8e67d5
+EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild 2361 BLAKE2B 7fde42a75c64ab9041b724dce638ae7998279902a8d89d17f2f2c14646f04248cb7e07c7f2ed2d6c125321ec43f38eb9873a4f76fc790786aa5fe593a01c4ff6 SHA512 b33928804780faac5f3ee48da97c90f2a4651c8bed2f231e3f75191e9c9d04976126423ce73fc41510d10c54d366b820dba13231612715d5fd8e8940c86eadf4
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225.ebuild 2017 BLAKE2B 77b4e83a6e100fc1a07c447682defdf0e8860594e5ae344a450ef878f787a12ab3262b8e3dd96aeccc888f4c4f7ac52999c84dc1d23636202b94ec2faeacb88e SHA512 5dd9acd0e0300de379ef7f8ed21a9e5b81ae2f8f2dcd93d909aea6385ec868a26eed82fd7ee648b655e3d947ba62b302eb5e8639ad1512c281921c9e1a1aa9c8
 MISC metadata.xml 635 BLAKE2B 2c8d153d32728595bc4e69133e1794d9adec5dd76ca2de200af8b8b799d3e76bebc33df93605ce80ad6a7c079d56ed8f6b39211dd1afef0120094c9c49355a93 SHA512 2f26fc45a2f6ef5f9fe30ea530ef217db685753279c9827124f550e193d8abd0fb675f889744c018fde9a7f41dd39a6352c748605bbda372e4812a0a913a1235
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch
new file mode 100644
index 000000000000..e3a3a737663f
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch
@@ -0,0 +1,107 @@
+# Source: https://github.com/s-moch/linux-saa716x/commit/0b2276ee2e6383ad577fce5c694f8c4062d5334b.patch
+
+From 0b2276ee2e6383ad577fce5c694f8c4062d5334b Mon Sep 17 00:00:00 2001
+From: Soeren Moch <smoch@web.de>
+Date: Sat, 2 Dec 2017 20:51:10 +0100
+Subject: [PATCH] saa716x_ff: Remove autorepeat handling
+
+Let the input layer handle autorepeat for the IR remote.
+So no repeat_key timer is required anymore.
+
+Signed-off-by: Soeren Moch <smoch@web.de>
+---
+ drivers/media/common/saa716x/saa716x_ff_ir.c | 45 ++++++++--------------------
+ 1 file changed, 12 insertions(+), 33 deletions(-)
+
+diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c
+index 35624789aa862..ad6f38611026c 100644
+--- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
++++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
+@@ -40,7 +40,7 @@ struct infrared {
+ 	u8			protocol;
+ 	u16			last_key;
+ 	u16			last_toggle;
+-	bool			delay_timer_finished;
++	bool			key_pressed;
+ };
+ 
+ #define IR_RC5		0
+@@ -52,11 +52,12 @@ static void ir_emit_keyup(unsigned long parm)
+ {
+ 	struct infrared *ir = (struct infrared *) parm;
+ 
+-	if (!ir || !test_bit(ir->last_key, ir->input_dev->key))
++	if (!ir || !ir->key_pressed)
+ 		return;
+ 
+ 	input_report_key(ir->input_dev, ir->last_key, 0);
+ 	input_sync(ir->input_dev);
++	ir->key_pressed = false;
+ }
+ 
+ 
+@@ -114,28 +115,18 @@ static void ir_emit_key(unsigned long parm)
+ 		return;
+ 	}
+ 
+-	if (timer_pending(&ir->keyup_timer)) {
+-		del_timer(&ir->keyup_timer);
+-		if (ir->last_key != keycode || toggle != ir->last_toggle) {
+-			ir->delay_timer_finished = false;
+-			input_event(ir->input_dev, EV_KEY, ir->last_key, 0);
+-			input_event(ir->input_dev, EV_KEY, keycode, 1);
+-			input_sync(ir->input_dev);
+-		} else if (ir->delay_timer_finished) {
+-			input_event(ir->input_dev, EV_KEY, keycode, 2);
+-			input_sync(ir->input_dev);
+-		}
+-	} else {
+-		ir->delay_timer_finished = false;
+-		input_event(ir->input_dev, EV_KEY, keycode, 1);
+-		input_sync(ir->input_dev);
+-	}
++	if (ir->key_pressed &&
++	    (ir->last_key != keycode || toggle != ir->last_toggle))
++		input_event(ir->input_dev, EV_KEY, ir->last_key, 0);
+ 
++	input_event(ir->input_dev, EV_KEY, keycode, 1);
++	input_sync(ir->input_dev);
++
++	ir->key_pressed = true;
+ 	ir->last_key = keycode;
+ 	ir->last_toggle = toggle;
+ 
+-	ir->keyup_timer.expires = jiffies + UP_TIMEOUT;
+-	add_timer(&ir->keyup_timer);
++	mod_timer(&ir->keyup_timer, jiffies + UP_TIMEOUT);
+ 
+ }
+ 
+@@ -166,16 +157,6 @@ static void ir_register_keys(struct infrared *ir)
+ 	ir->input_dev->keycodemax = ARRAY_SIZE(ir->key_map);
+ }
+ 
+-
+-/* called by the input driver after rep[REP_DELAY] ms */
+-static void ir_repeat_key(unsigned long parm)
+-{
+-	struct infrared *ir = (struct infrared *) parm;
+-
+-	ir->delay_timer_finished = true;
+-}
+-
+-
+ /* interrupt handler */
+ void saa716x_ir_handler(struct saa716x_dev *saa716x, u32 ir_cmd)
+ {
+@@ -236,9 +217,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x)
+ 		ir->key_map[i] = i+1;
+ 	ir_register_keys(ir);
+ 
+-	/* override repeat timer */
+-	input_dev->timer.function = ir_repeat_key;
+-	input_dev->timer.data = (unsigned long) ir;
++	input_enable_softrepeat(input_dev, 800, 200);
+ 
+ 	tasklet_init(&ir->tasklet, ir_emit_key, (unsigned long) saa716x);
+ 	saa716x->ir_priv = ir;
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch
new file mode 100644
index 000000000000..841c32e0515a
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch
@@ -0,0 +1,41 @@
+# Source: https://github.com/s-moch/linux-saa716x/commit/1002d79c4ba60de0dbeacba0f289119556d7450d.patch
+
+From 1002d79c4ba60de0dbeacba0f289119556d7450d Mon Sep 17 00:00:00 2001
+From: Soeren Moch <smoch@web.de>
+Date: Sat, 2 Dec 2017 21:23:34 +0100
+Subject: [PATCH] saa716x_ff: Convert to new timer API
+
+Convert to new timer API in linux-4.15.
+
+Signed-off-by: Soeren Moch <smoch@web.de>
+---
+ drivers/media/common/saa716x/saa716x_ff_ir.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c
+index ad6f38611026c..7894adff4d4f6 100644
+--- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
++++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
+@@ -48,9 +48,9 @@ struct infrared {
+ 
+ 
+ /* key-up timer */
+-static void ir_emit_keyup(unsigned long parm)
++static void ir_emit_keyup(struct timer_list *t)
+ {
+-	struct infrared *ir = (struct infrared *) parm;
++	struct infrared *ir = from_timer(ir, t, keyup_timer);
+ 
+ 	if (!ir || !ir->key_pressed)
+ 		return;
+@@ -184,9 +184,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x)
+ 	if (!ir)
+ 		return -ENOMEM;
+ 
+-	init_timer(&ir->keyup_timer);
+-	ir->keyup_timer.function = ir_emit_keyup;
+-	ir->keyup_timer.data = (unsigned long) ir;
++	timer_setup(&ir->keyup_timer, ir_emit_keyup, 0);
+ 
+ 	input_dev = input_allocate_device();
+ 	if (!input_dev)
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch
new file mode 100644
index 000000000000..d6e63ef3b5a0
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch
@@ -0,0 +1,49 @@
+diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c
+--- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c	2018-04-04 08:24:59.454708009 +0200
++++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c	2018-04-04 08:25:36.263560559 +0200
+@@ -1,9 +1,9 @@
+ #include <linux/bitops.h>
+ 
+-#include "dmxdev.h"
+-#include "dvbdev.h"
+-#include "dvb_demux.h"
+-#include "dvb_frontend.h"
++#include <media/dmxdev.h>
++#include <media/dvbdev.h>
++#include <media/dvb_demux.h>
++#include <media/dvb_frontend.h>
+ 
+ #include "saa716x_mod.h"
+ #include "saa716x_spi.h"
+diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h
+--- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h	2018-04-04 08:24:59.458708101 +0200
++++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h	2018-04-04 08:25:36.263560559 +0200
+@@ -1,7 +1,7 @@
+ #ifndef __SAA716x_FF_H
+ #define __SAA716x_FF_H
+ 
+-#include "dvb_ringbuffer.h"
++#include <media/dvb_ringbuffer.h>
+ #include <linux/version.h>
+ #include <linux/workqueue.h>
+ 
+diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h
+--- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h	2018-04-04 08:24:59.458708101 +0200
++++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h	2018-04-04 08:25:36.263560559 +0200
+@@ -18,11 +18,11 @@
+ #include "saa716x_spi.h"
+ #include "saa716x_vip.h"
+ 
+-#include "dvbdev.h"
+-#include "dvb_demux.h"
+-#include "dmxdev.h"
+-#include "dvb_frontend.h"
+-#include "dvb_net.h"
++#include <media/dvbdev.h>
++#include <media/dvb_demux.h>
++#include <media/dmxdev.h>
++#include <media/dvb_frontend.h>
++#include <media/dvb_net.h>
+ 
+ #define SAA716x_ERROR		0
+ #define SAA716x_NOTICE		1
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
index 665d4501782b..b83bae3ad71c 100644
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
@@ -45,6 +45,9 @@ src_prepare() {
 	kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch"
 	kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch"
 	kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch"
+	kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-autorepeat.patch"
+	kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-timers.patch"
+	kernel_is ge 4 16 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.16-fix-compile.patch"
 }
 
 src_compile() {