commit: e67dfee2ac77d29107a204c4485367c8f7d6e919 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Thu Nov 8 16:25:33 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 3 22:57:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e67dfee2
media-tv/v4l-dvb-saa716x: fix AUDIO_GET_PTS undeclared fix compile error "... AUDIO_GET_PTS undeclared" with kernel >=4.17 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://bugs.gentoo.org/670156 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Closes: https://github.com/gentoo/gentoo/pull/10363 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch | 12 +++++ .../v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild | 60 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch new file mode 100644 index 00000000000..8e418c82868 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch @@ -0,0 +1,12 @@ +--- a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:44:10.479886225 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:45:19.981237523 +0100 +@@ -108,6 +108,9 @@ + #define VIDEO_CAPTURE_OFF 0 + #define VIDEO_CAPTURE_ONE_SHOT 1 + ++#ifndef AUDIO_GET_PTS ++#define AUDIO_GET_PTS _IOR('o', 19, __u64) ++#endif + + /* place to store all the necessary device information */ + struct sti7109_dev { diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild new file mode 100644 index 00000000000..66babc6091c --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD" +HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"; + +HG_REVISION="3b9fce66666a" +HG_REVISION_DATE="20160322" + +SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz +-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+firmware" + +DEPEND="" +RDEPEND="${DEPEND} + firmware? ( sys-firmware/tt-s2-6400-firmware )" + +S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}" + +BUILD_TARGETS="modules" +MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)" + +CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x" + +src_prepare() { + default + + eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff" + eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff" + kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch" + kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch" + kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch" + kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch" + 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" + kernel_is ge 4 17 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch" +} + +src_compile() { + BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \ + CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \ + CONFIG_DVB_SAA716X_HYBRID=m" + addpredict "${EROOT%/}"/usr/src/linux/ + linux-mod_src_compile +}
