diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
commit | 2f8db31405fac68eea6f7257d58529243815033b (patch) | |
tree | 54259cc8988a98a10586fc0496b1f3501cd1e2a1 /media-plugins/vdr-dvbapi | |
parent | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (diff) |
gentoo resync : 30.04.2018
Diffstat (limited to 'media-plugins/vdr-dvbapi')
-rw-r--r-- | media-plugins/vdr-dvbapi/Manifest | 5 | ||||
-rw-r--r-- | media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff | 15 | ||||
-rw-r--r-- | media-plugins/vdr-dvbapi/metadata.xml | 11 | ||||
-rw-r--r-- | media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild | 93 |
4 files changed, 123 insertions, 1 deletions
diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest index b263adff6a90..c35efd747e50 100644 --- a/media-plugins/vdr-dvbapi/Manifest +++ b/media-plugins/vdr-dvbapi/Manifest @@ -1,5 +1,8 @@ +AUX kernel-4.14-fix.diff 398 BLAKE2B b431d027c62f709ed4cd7ed663c10fb42a91390fe5b3bdcc4600f1e8593b2c5031912981aec0333ec2c87c3c924aa624e7ffef7ca216d340f04ea5ee13581e16 SHA512 c8f2662cb82dcd1686d3809b75ad0f3dfe67fe6e781dacb3a907d65b68061e993d7fba075319a3ad97b56454bdc12e713030181a1a43b692052de2383bcf3c77 DIST vdr-dvbapi-2.1.1.tar.gz 82813 BLAKE2B 2dd2b4aa11a645b4168ebbae962371f94a6e70ff905b06230048a69921f31521468506f2959ce5d5327b4cf61edc620686210520239e751e142e524751640e0d SHA512 fb632e66c9e477663eb1edf5e630a20b2165495c89d5bd6294d74d6a28c8386021d90914c9c6b958ea3c5c1d0958cc69efa5c65ef72c510c224d676f1eca39ae DIST vdr-dvbapi-2.2.2.tar.gz 83995 BLAKE2B 6ddd9cc4e3edbd504505b7bbb9c40e203d53faab43b3d1afe9b9834cf3d751ba469536b5f27c24cfb04afeba1378ee3ac8dc0885db8a4576ce7a275233c88ca6 SHA512 01d3a6368e0233a7b96b6ea57b28884a004a130d63da2b2958b1616a1108e83389b68cbe32ec7fc6be65d6741912c4f46621b659fb13dba56e594a1a18af2c63 +DIST vdr-plugin-dvbapi-2.2.4.tar.gz 94419 BLAKE2B 326346b418ece22674aa0d84efd798a9eb8e958586d24385b4e468c11478f63ed89e94c742c57c5b1e955dc598db29a39e3730d71c93005aa6dcda262545e4e2 SHA512 d1313e927978fcf150ae14e570c16059caeeec07992066b03282295147872da3bdb191209408539c2a70c2ada868f731e9e5504a8dd737143f86e33a85fdf0c7 EBUILD vdr-dvbapi-2.1.1.ebuild 2530 BLAKE2B c89a4b7a4c2c87fcf92b0e110bc6af3e9b4419a198d3f93b57aa269d3c85908e96a2f199126d49a0d1047096a071304bb158964771fdda275192eb2bffc4ee5e SHA512 7016fab9b4d196415afb2b3fe3351e968a85e7a1a45c0b32616933e21938f56567b8254cc8eda89c25e551c55ff4b8f3b6b6dbef034753b3cb8b7e7303699c44 EBUILD vdr-dvbapi-2.2.2.ebuild 2574 BLAKE2B 9e31c575bbf54c7c2372e7f94a449e903cad6d444e49332339b627e1587e61f7bf8e6a7c70a6c5b7d9540246b584d8d9b53480af512b4a301aa177ad7de35d5b SHA512 f709f31b511f7ab778b311b6cffd43d79c80897d830fbbab3dfde52ef6bc54800b3245a4bc3e17d10b1ded000ef45ea3ce9c8f7f08600d4c11972de6dce60e39 -MISC metadata.xml 340 BLAKE2B a7b844cc65e96e24bb6cceb86f9238095ffca8a6cd47a619628b3067d7ce8207a57c4ba5c7ad4f2a8219e27ac54307cd76ca49d175df4b75dc5bb03599190027 SHA512 e6fdc579dd3a03d90f96e0a5cf4413ee380eeb9a44edb48e117cb347bb1f564bccec4de0da9d70dceef3fc59d9f698ce912639e4599136896fd3715f36ad71a1 +EBUILD vdr-dvbapi-2.2.4.ebuild 2949 BLAKE2B 395a2c3121e979d66c8a3660ac6d48eaf06dc4de971eb3a9a36633d0fca99c710d6c036303eb12b8103ffae7772ee6392e5bca87d32e285d4f16ddaea33f9bd1 SHA512 97ea158101db128c72f5a338cf3c9d2ec5d36322754c8d4672bb8abcfbcf8d2e0222f28f4d54ddffa05c5afcbc9f9f09f8d1cf4c4796728a784777f239327975 +MISC metadata.xml 707 BLAKE2B 0256470ad919b7c1ad7d09b3a4c14c66ea38902227ad1ec858e87925a759e62e9e98faeecb5db0745d4a24ad30e3c3dbf6d1a65b93689743580404f415cfe5da SHA512 7273c05a6f55b571a1f7ee46143ec3fe72eff8b1b736b76edaa83fa2ef04206bdba1d17437e00baf3832616ac47fd89d677713288d7645421ccaf7844337a43f diff --git a/media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff b/media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff new file mode 100644 index 000000000000..07644ab418ca --- /dev/null +++ b/media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff @@ -0,0 +1,15 @@ +--- a/CA.h 2017-03-28 11:14:07.000000000 +0200 ++++ b/CA.h 2018-03-27 00:47:51.231750662 +0200 +@@ -9,4 +9,12 @@ + unsigned char cw[16]; + } ca_descr_aes_t; + ++#ifndef CA_SET_PID /* removed in kernel 4.14 */ ++typedef struct ca_pid { ++ unsigned int pid; ++ int index; /* -1 == disable */ ++} ca_pid_t; ++#define CA_SET_PID _IOW('o', 135, struct ca_pid) + #endif ++ ++#endif // __CA_H diff --git a/media-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml index 9e2a4b763c8e..e82c63acca54 100644 --- a/media-plugins/vdr-dvbapi/metadata.xml +++ b/media-plugins/vdr-dvbapi/metadata.xml @@ -5,6 +5,17 @@ <email>hd_brummy@gentoo.org</email> <name>Joerg Bornkessel</name> </maintainer> + <maintainer type="person"> + <email>martin.dummer@gmx.net</email> + <name>Martin Dummer</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="dvbcsa">use <pkg>media-libs/libdvbcsa</pkg> free implementation of the DVB Common Scrambling Algorithm</flag> + </use> <upstream> <remote-id type="github">manio/vdr-plugin-dvbapi</remote-id> </upstream> diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild new file mode 100644 index 000000000000..8f22cdaedc30 --- /dev/null +++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit vdr-plugin-2 + +MY_P="vdr-plugin-dvbapi-${PV}" + +DESCRIPTION="VDR Plugin: allows connect VDR to OScam" +HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi" +SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2+" +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa" + +DEPEND=">=media-video/vdr-2.1.4 + dvbcsa? ( media-libs/libdvbcsa )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +DOCS=( "FAQ" "HISTORY" "INSTALL" "README" "FFdecsa/docs" ) + +src_prepare() { + vdr-plugin-2_src_prepare + + if use dvbcsa; then + sed -e "/PLUGIN = dvbapi/a LIBDVBCSA = 1" -i Makefile || die "modifying Makefile" + fi + + # respect the system CXXFLAGS + sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile || die "modifying FFdecsa/Makefile" + + # Prepare flags for FFdeCSA + if [[ -n "${VDR_DVBAPI_PARALLEL}" ]]; then + PARALLEL="${VDR_DVBAPI_PARALLEL}" + else + # [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE + # [64] Athlon64 (SSE2) does much better with 64_LONG + # [32] Athlon64 (SSE2) does best with MMX + # [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE + # [32] AthlonXP (SSE) has MMX faster + + # To avoid parsing -march=, we use ugly assumption that Intels don't + # have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs, + # and LONG is best on 64-bit AMD CPUs. + + if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then + PARALLEL=PARALLEL_128_SSE2 + elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then + PARALLEL=PARALLEL_128_SSE + elif use amd64; then + PARALLEL=PARALLEL_64_LONG + elif use cpu_flags_x86_mmx; then + PARALLEL=PARALLEL_64_MMX + else + # fallback values: + # PARALLEL_32_INT fails with gcc4.4 on x86&amd64 + # PARALLEL_64_2INT fails with gcc4.4 on x86 + # PARALLEL_128_4INT seems to be the fastest non-failing fallback + PARALLEL=PARALLEL_128_4INT + fi + + ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing" + ewarn "value from CPU_FLAGS_X86 USEflags, result: ${PARALLEL}" + ewarn "This setting may be suboptimal, so you'll probably want to tweak" + ewarn "it yourself." + ewarn + ewarn "To do this, unpack the source and run the script in" + ewarn "\t<unpackdir>/${MY_P}/extra/FFdecsa-benchmark.sh" + ewarn "and add the output value from PARALLEL_MODE= to your system make.conf as" + ewarn "\tVDR_DVBAPI_PARALLEL=<your parameter>" + ewarn + fi + + export PARALLEL + + eapply "${FILESDIR}/kernel-4.14-fix.diff" +} + +pkg_postinst() { + vdr-plugin-2_pkg_postinst + + elog "This software might be illegal in some countries or violate" + elog "rules of your DVB provider. Please respect these rules." + elog + elog "We do not offer support of any kind." + elog "Asking for keys or for installation help will be ignored by gentoo developers!" + elog +} |