commit: 7611642848ad5a520e7a1d193002b7724561f767 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Wed Apr 4 06:40:06 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 4 23:27:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76116428
media-tv/v4l-dvb-saa716x: fix compile with kernel 4.16 adjust sources due to moved DVB header files in kernel 4.16 Closes: https://bugs.gentoo.org/652346 Closes: https://bugs.gentoo.org/652184 Package-Manager: Portage-2.3.27, Repoman-2.3.9 .../files/v4l-dvb-saa716x-4.16-fix-compile.patch | 49 ++++++++++++++++++++++ .../v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild | 1 + 2 files changed, 50 insertions(+) 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 00000000000..d6e63ef3b5a --- /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 9e77e9d3986..b83bae3ad71 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 @@ -47,6 +47,7 @@ src_prepare() { 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() {
