gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 99 insertions, 4 deletions

diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index 3696b0643192..37384843c846 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -1,3 +1,5 @@
 DIST vdr-plugin-dvbapi-2.2.5.tar.gz 95270 BLAKE2B dbab07bc7df8fdc7ec009b82723631a5e61cb1d4a9afdad16e32282a3e71d6bc87e7c78ec8cea73690606bda504c19bdd9123d1ca7a4e712b15ca884c77dabaa SHA512 7036705ddf706192774f511cab813c64d092a1db1c635003e28d6960d3d46ef484f44b86c15fae782d29ada728eae1861d009d91cb71ad77cb0a1b2ad316069b
-EBUILD vdr-dvbapi-2.2.5.ebuild 3056 BLAKE2B 7e15e8380ce9b3c2a131bc6a2d49d2e0805ffc10ad0f477b9691b40e11f2d1ad8cc907b6b9069ff239b31cf626ce29eb89fe0abdf78b4f9e8dbc3fd2a0b28fd1 SHA512 7f3965f918bec1264cf4849f65a948fa85ac712117d16c6e27acba5e983f88c8f7750b1f73ce70f27cf94188df1fad5e9785cbcca03da6f3a5ff55e8e1fbe7d1
+DIST vdr-plugin-dvbapi-d0fb10b0bc67ad172e7b383f5da2de9d87f74d7f.tar.gz 105677 BLAKE2B ddaee8e5ea4cd22564a6b8679c2ac89e609c9eca9a3c1299dd7f776185d9b9ea3fe618b3435c17e9146f6ebd9fc502360c9bae5b68b081df6fcf34b0f418f4d5 SHA512 c7c9a19c5aa59318e2664ac6015d77013d59f97740269cafbb8cfc40e63188accde8ea16cfacb58a9e80fc7b957d982d2c5c5e7bdfa3813f564df73c9cb16297
+EBUILD vdr-dvbapi-2.2.5.ebuild 3056 BLAKE2B 9dadb2e22f86b2c6dbb9572123aac8d0b0a8bb0f5300c847d41ec878ec571252c5d2fb449b3771ff4312395d2159176654c7f7911986da7f067e6edd5cdcd105 SHA512 4bc260a1c5346ed3ca3a1a5cf9d07ca46677af4995e8ccd782df67e49bb1c0a8fb219ac0b6e29d4a37f88b70aa55506d1c22c47bed865f277137f2285ad5493b
+EBUILD vdr-dvbapi-2.2.6_p20230121.ebuild 3159 BLAKE2B 36d4b818334111573292d7133c4e9d4526532466806e22e23cb91ad1725de97b88282b9c60e490ade9e43767e307c64c513fcc06c4288c72d2b17b91795be575 SHA512 a44eec2ec3e776efd5697ea70ba4820a8c7dbd2f377d74c23f554303a2fe45c8366cee3524751abd065a6076bdb95738c823d08fbf72b2e89cb3e9d043bb063e
 MISC metadata.xml 625 BLAKE2B f7cb93e522f0ad36c6dda8c460ef73187372447b8f0171cce77ce018bb712d53809e4e74c09e347bc20a28fa6efdd6029d42ccc667c9629ef0c7179b784dd0bb SHA512 718a0b0179657947967921188a6257cfbcb20a54efc94a4d26bf7c7725a675188001a5c04156debec298371c157bfdd0f6a20d8c33a7633bad76b5834a9f9691
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 21c925cb0abb..240e962101fa 100644
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild
+++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit vdr-plugin-2
 
@@ -10,6 +10,7 @@ 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"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -24,7 +25,6 @@ DOCS=( "FAQ" "HISTORY" "INSTALL" "README" "FFdecsa/docs" )
 QA_FLAGS_IGNORED="
 	usr/lib/vdr/plugins/libvdr-dvbapi.*
 	usr/lib64/vdr/plugins/libvdr-dvbapi.*"
-S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.6_p20230121.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.6_p20230121.ebuild
new file mode 100644
index 000000000000..c309450eb6e8
--- /dev/null
+++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.6_p20230121.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vdr-plugin-2
+
+GIT_COMMIT="d0fb10b0bc67ad172e7b383f5da2de9d87f74d7f"
+MY_P="vdr-plugin-dvbapi-${GIT_COMMIT}"
+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/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+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.4.1
+	dvbcsa? ( media-libs/libdvbcsa )"
+RDEPEND="${DEPEND}"
+# You also need OScam svn rev >= 11534
+
+DOCS=( "FAQ" "HISTORY" "INSTALL" "README" "FFdecsa/docs" )
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-dvbapi.*
+	usr/lib64/vdr/plugins/libvdr-dvbapi.*"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# respect the system CXXFLAGS
+	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile || die "modifying FFdecsa/Makefile"
+
+	if use dvbcsa; then
+		sed -e "s:PLUGIN = dvbapi:PLUGIN = dvbapi\nLIBDVBCSA = 1:" -i Makefile || die "modifying Makefile"
+	else
+		# 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
+	fi
+}
+
+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
+}