commit: d994d79812c21406bacc28fbc6b90bc8fa811bc6 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Sun Mar 25 10:51:28 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Mar 29 19:16:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d994d798
media-tv/v4l-dvb-saa716x: fix compile issue, #631854 fix compile issue with kernel >=4.14 Closes: https://bugs.gentoo.org/631854 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/v4l-dvb-saa716x-4.14.0-fix-compile.patch | 11 +++++ .../v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild | 56 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch new file mode 100644 index 00000000000..fce2d517798 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch @@ -0,0 +1,11 @@ +--- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2018-03-24 11:39:20.777643694 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2018-03-24 11:41:02.135696671 +0100 +@@ -39,7 +39,7 @@ + for (i = 0; i < SAA716x_MSI_MAX_VECTORS; i++) + saa716x->msix_entries[i].entry = i; + +- ret = pci_enable_msix(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS); ++ ret = pci_enable_msix_range(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS, SAA716x_MSI_MAX_VECTORS); + if (ret < 0) + dprintk(SAA716x_ERROR, 1, "MSI-X request failed <%d>", ret); + if (ret > 0) 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 new file mode 100644 index 00000000000..665d4501782 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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" +} + +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 +}
