From ad0fd3bd8b2b8de0d9980f825ad4258294d21ac5 Mon Sep 17 00:00:00 2001 From: Martin Dummer Date: Sun, 12 Mar 2017 14:26:36 +0100 Subject: media-tv/v4l-dvb-saa716x: updated ebuild for kernel 4.6 and up, #612420 Also fix repoman issue: shorten the ebuild description Package-Manager: Portage-2.3.4, Repoman-2.3.2 --- media-tv/v4l-dvb-saa716x/Manifest | 1 + .../files/v4l-dvb-saa716x-4.6.0-fix-compile.patch | 24 ++++++++++ .../v4l-dvb-saa716x-0.0.1_p20170225.ebuild | 53 ++++++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch create mode 100644 media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild (limited to 'media-tv/v4l-dvb-saa716x') diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest index 7a6f599326a0..8b99088e5d80 100644 --- a/media-tv/v4l-dvb-saa716x/Manifest +++ b/media-tv/v4l-dvb-saa716x/Manifest @@ -1,2 +1,3 @@ DIST v4l-dvb-saa716x-0.0.1_p20140322.tar.gz 5026505 SHA256 79ff65c1354506ffb951e23bc1667c372cf22e9eca8309f9b7486fcfec22ef29 SHA512 2b452f6951064f01e88ccf1a2a6f0c9db8ac96779f7b8d56d33cf387d6ed196922edf6b6234d5887ce9dfdb7013772dc874be5ad5893b8e92b23ffe1f2b5d6ea WHIRLPOOL c6f63e835a670455aa871d179283d283d1e3da23f83c868040a48a402178d73d0c7f44ee807076e3cbd72a7b3e1f050d3e6103d2a49c778eddfe19efdba815a7 DIST v4l-dvb-saa716x-0.0.1_p20141109.tar.gz 5028238 SHA256 2c6608f94df9da7681e2b22fdbdd842cdd1e97dd1dac6017c713c1fc037cd2bd SHA512 a67f095d4878b4ceb3b340e725925385fee33b289e875e9e0903370d0ec909d66893d9ac846d5c7fedf469129a3327e3458668db5a83ff2718c04174e6e07c66 WHIRLPOOL 156cac6e08c57c1a4c2b5511d211de784d941c22d6bc7c2aa8188e9c01b8cf043e4f7a3af595180c68af4de6be7d1bfba4f27323c14a18afdd3110e8629802a3 +DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 SHA256 daef53afa986ef74f035ab82c7b85bbfc51641b13a544241ee7db95cab2fd5b7 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343 WHIRLPOOL 0fdc8fcbb3197c6bc4bbe678f179b352180b5045ef0fd635967092ed94572569a0884c3de113d1849ee5db12f6c1ed4a08401519303395e2cd2e69735ed55dca diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch new file mode 100644 index 000000000000..5aeaabd29af1 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch @@ -0,0 +1,24 @@ +--- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2017-02-26 18:48:27.196949325 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2017-02-26 18:50:28.149283794 +0100 +@@ -1,9 +1,6 @@ + #include + #include +-#include + #include +-#include +-#include + #include + #include + #include +@@ -20,11 +17,6 @@ + + #define DRIVER_NAME "SAA716x Core" + +-static irqreturn_t saa716x_msi_handler(int irq, void *dev_id) +-{ +- return IRQ_HANDLED; +-} +- + static int saa716x_enable_msi(struct saa716x_dev *saa716x) + { + struct pci_dev *pdev = saa716x->pdev; diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild new file mode 100644 index 000000000000..7a1ee35379db --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 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:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_hybrid(misc:${ROOT}/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" +} + +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 "${ROOT}"/usr/src/linux/ + linux-mod_src_compile +} -- cgit v1.2.3-65-gdbad