From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6D3B138334 for ; Fri, 27 Dec 2019 19:16:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0208EE0BA1; Fri, 27 Dec 2019 19:16:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C207DE0BA1 for ; Fri, 27 Dec 2019 19:16:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B628F34DBDD for ; Fri, 27 Dec 2019 19:16:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B16FA9 for ; Fri, 27 Dec 2019 19:15:59 +0000 (UTC) From: "Jörg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jörg Bornkessel" Message-ID: <1577474141.5d19eff23739b80c2c5e58c08fa1537e5aed9034.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-dvbapi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-dvbapi/Manifest media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild X-VCS-Directories: media-plugins/vdr-dvbapi/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Jörg Bornkessel X-VCS-Revision: 5d19eff23739b80c2c5e58c08fa1537e5aed9034 X-VCS-Branch: master Date: Fri, 27 Dec 2019 19:15:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c9ebe63d-a8d6-4b11-a090-7d077d866345 X-Archives-Hash: d2048d86972ad91f4f8434ad1e56d364 commit: 5d19eff23739b80c2c5e58c08fa1537e5aed9034 Author: Joerg Bornkessel gentoo org> AuthorDate: Fri Dec 27 19:14:19 2019 +0000 Commit: Jörg Bornkessel gentoo org> CommitDate: Fri Dec 27 19:15:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d19eff2 media-plugins/vdr-dvbapi: fixed depend for vdr-2.4.1 cleanup old vdr-dvbapi-2.2.5 need vdr-2.4.x Suggested-by: Martin Dummer gmx.net> Bug: https://bugs.gentoo.org/703898 Closes: https://bugs.gentoo.org/703898 Package-Manager: Portage-2.3.83, Repoman-2.3.18 Signed-off-by: Joerg Bornkessel gentoo.org> media-plugins/vdr-dvbapi/Manifest | 2 - media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild | 77 ----------------------- media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild | 79 ------------------------ media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild | 2 +- 4 files changed, 1 insertion(+), 159 deletions(-) diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest index cba8d0ff97a..5eda0bbb5d9 100644 --- a/media-plugins/vdr-dvbapi/Manifest +++ b/media-plugins/vdr-dvbapi/Manifest @@ -1,4 +1,2 @@ -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 DIST vdr-plugin-dvbapi-2.2.5.tar.gz 95270 BLAKE2B dbab07bc7df8fdc7ec009b82723631a5e61cb1d4a9afdad16e32282a3e71d6bc87e7c78ec8cea73690606bda504c19bdd9123d1ca7a4e712b15ca884c77dabaa SHA512 7036705ddf706192774f511cab813c64d092a1db1c635003e28d6960d3d46ef484f44b86c15fae782d29ada728eae1861d009d91cb71ad77cb0a1b2ad316069b diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild deleted file mode 100644 index 78e77603474..00000000000 --- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -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 -> vdr-dvbapi-${PV}.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" - -DEPEND=">=media-video/vdr-2.1.4" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/vdr-plugin-dvbapi-${PV}" - -src_prepare() { - vdr-plugin-2_src_prepare - - # respect the system CXXFLAGS - sed -e "s:FLAGS:CXXFLAGS:" -i 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 value from USEflags (${PARALLEL})." - ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself." - ewarn "\n\tRun the script ${WORKDIR}/extra/FFdecsa-benchmark.sh" - ewarn "\tand add the output parameter from PARALLEL= to your system make.conf" - ewarn "\tVDR_DVBAPI_PARALLEL= your parameter" - fi - - export PARALLEL -} - -pkg_postinst() { - vdr-plugin-2_pkg_postinst - - elog "This software might be illegal in some countries or violate" - elog "rules of your DVB provider" - elog "Please respect these rules.\n" - - elog "We do not offer support of any kind" - elog "Asking for keys or for installation help will be ignored by gentoo developers!\n" -} diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild deleted file mode 100644 index 58a6b05bf7c..00000000000 --- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit vdr-plugin-2 - -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 -> vdr-dvbapi-${PV}.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" - -DEPEND=">=media-video/vdr-2.1.4" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/vdr-plugin-dvbapi-${PV}" - -DOCS="HISTORY INSTALL README FFdecsa/docs" - -src_prepare() { - vdr-plugin-2_src_prepare - - # respect the system CXXFLAGS - sed -e "s:FLAGS:CXXFLAGS:" -i 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 value from USEflags (${PARALLEL})." - ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself." - ewarn "\n\tRun the script ${WORKDIR}/extra/FFdecsa-benchmark.sh" - ewarn "\tand add the output parameter from PARALLEL= to your system make.conf" - ewarn "\tVDR_DVBAPI_PARALLEL= your parameter" - fi - - export PARALLEL -} - -pkg_postinst() { - vdr-plugin-2_pkg_postinst - - elog "This software might be illegal in some countries or violate" - elog "rules of your DVB provider" - elog "Please respect these rules.\n" - - elog "We do not offer support of any kind" - elog "Asking for keys or for installation help will be ignored by gentoo developers!\n" -} diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild index 975b899864a..226f7268108 100644 --- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild +++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" 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 +DEPEND=">=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa )" RDEPEND="${DEPEND}"