summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild63
-rw-r--r--media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild2
-rw-r--r--media-tv/channeleditor/files/build-1.9.2.1.xml43
-rw-r--r--media-tv/dvbstream/Manifest2
-rw-r--r--media-tv/dvbstream/dvbstream-0.8.2.ebuild (renamed from media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild)29
-rw-r--r--media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff26
-rw-r--r--media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff12
-rw-r--r--media-tv/kodi/Manifest1
-rw-r--r--media-tv/kodi/files/kodi-21-fix-dvd-playing.patch50
-rw-r--r--media-tv/kodi/files/kodi-21-fix-gcc14.patch42
-rw-r--r--media-tv/kodi/kodi-19.5-r2.ebuild (renamed from media-tv/kodi/kodi-19.5-r1.ebuild)14
-rw-r--r--media-tv/kodi/kodi-20.5-r1.ebuild (renamed from media-tv/kodi/kodi-20.3.ebuild)8
-rw-r--r--media-tv/kodi/kodi-21.0-r1.ebuild (renamed from media-tv/kodi/kodi-21.0.ebuild)11
-rw-r--r--media-tv/kodi/kodi-21.0-r2.ebuild (renamed from media-tv/kodi/kodi-20.5.ebuild)129
-rw-r--r--media-tv/kodi/kodi-21.9999.ebuild5
-rw-r--r--media-tv/kodi/kodi-9999.ebuild25
-rw-r--r--media-tv/kodi/metadata.xml2
-rw-r--r--media-tv/mythtv-status/Manifest1
-rw-r--r--media-tv/mythtv-status/mythtv-status-1.1.0.ebuild34
-rw-r--r--media-tv/plex-media-server/Manifest16
-rw-r--r--media-tv/plex-media-server/plex-media-server-1.40.0.7998.ebuild91
-rw-r--r--media-tv/plex-media-server/plex-media-server-1.40.1.8227.ebuild91
-rw-r--r--media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild (renamed from media-tv/plex-media-server/plex-media-server-1.32.8.7639.ebuild)7
-rw-r--r--media-tv/tvheadend/Manifest3
-rw-r--r--media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch24
-rw-r--r--media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch55
-rw-r--r--media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch36
-rw-r--r--media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch29
-rw-r--r--media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch28
-rw-r--r--media-tv/tvheadend/files/tvheadend.service5
-rw-r--r--media-tv/tvheadend/metadata.xml4
-rw-r--r--media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild138
-rw-r--r--media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild (renamed from media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild)15
-rw-r--r--media-tv/tvheadend/tvheadend-9999.ebuild8
-rw-r--r--media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch32
-rw-r--r--media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.17.patch217
-rw-r--r--media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch97
-rw-r--r--media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch192
-rw-r--r--media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild50
-rw-r--r--media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r6.ebuild2
40 files changed, 291 insertions, 1348 deletions
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
deleted file mode 100644
index 366dd6d32357..000000000000
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE=source
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
-
-DESCRIPTION="Editor for VDR channels.conf"
-HOMEPAGE="https://sites.google.com/site/reniershomepage/channeleditor"
-SRC_URI="https://downloads.sourceforge.net/project/channeleditor/channeleditor/$(ver_cut 1-3)/${P/-/_}_src.tar.gz"
-
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-PATCHES=(
- # include localisation changes
- "${FILESDIR}"/${P}-messages.properties.patch
- "${FILESDIR}"/${P}-messages_en.properties.patch
-)
-
-mainclass() {
- # read Main-Class from MANIFEST.MF
- sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
- || die "reading Main-Class failed"
-}
-
-src_prepare() {
- default
-
- xdg_environment_reset
-
- # move files out of build and remove stuff not needed in the package
- mv build/* "${S}" || die "cleaning build dir failed"
- rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
- || die "removing files failed"
-
- # copy build.xml
- cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
- || die "copying build.xml failed"
-
- # convert CRLF to LF
- edos2unix MANIFEST.MF
-}
-
-src_compile() {
- eant build -Dmanifest.mainclass=$(mainclass)
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
- java-pkg_dolauncher ${PN} --main $(mainclass)
-
- use source && java-pkg_dosrc src
-
- make_desktop_entry channeleditor Channeleditor "" "Utility"
-}
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
index e09a7fe8c5d0..47ea0cf6035b 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/media-tv/channeleditor/files/build-1.9.2.1.xml b/media-tv/channeleditor/files/build-1.9.2.1.xml
deleted file mode 100644
index 51e132550077..000000000000
--- a/media-tv/channeleditor/files/build-1.9.2.1.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<project name="channeleditor" default="build">
- <!-- some properties -->
- <property name="src.dir" value="src"/>
- <property name="resources.dir" value="src/java/"/>
- <property name="build.dir" value="build"/>
- <property name="dist.dir" value="dist"/>
- <property name="project.jar" value="${dist.dir}/${ant.project.name}.jar"/>
- <property name="target.jdk" value="1.4"/>
-
- <!-- init -->
- <target name="init">
- <mkdir dir="${dist.dir}"/>
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}"
- encoding="ISO-8859-1"/>
- <copy todir="${build.dir}">
- <fileset dir="${resources.dir}" excludes="**/*.java"/>
- </copy>
- </target>
-
- <!-- build the jar files -->
- <target name="build" depends="compile">
- <jar jarfile="${project.jar}" basedir="${build.dir}">
- <manifest>
- <attribute name="Main-Class" value="${manifest.mainclass}"/>
- </manifest>
- </jar>
- </target>
-
- <!-- zip the sources -->
- <target name="sourcezip">
- <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
- <zipfileset dir="${src.dir}" />
- </zip>
- </target>
-</project>
diff --git a/media-tv/dvbstream/Manifest b/media-tv/dvbstream/Manifest
index 9390f2d260c4..e42ddb94526a 100644
--- a/media-tv/dvbstream/Manifest
+++ b/media-tv/dvbstream/Manifest
@@ -1 +1 @@
-DIST dvbstream-snapshot-20080302.tar.bz2 58089 BLAKE2B 9dd2fdd5e1dfa3741554b84cd5361697cef16b0ecba6ee5a8a2890959678dfc1497e54003d9b5ebb9e0092e5f3e71a4b5786a2c2e224d31a9243ecaafeea98e1 SHA512 7116310435584b61c51f642d38cfdbbdf706df27448af7824b5a050e374ad72d3d08c2eb03de0d5ed6ec1cb15461e3be90ee8bd3b045b6ba858b5896c5546671
+DIST dvbstream-0.8.2.tar.bz2 60542 BLAKE2B c2e57c9e94cf4b359025e1607e827a1e23330d2caa0ce0788b7366501df66781775a6e4cc3ac4ed670f619ce53b60cf970156257944c3baf1f344ee830ece307 SHA512 06d6fc6c62ee898726b240164a8f9cdd7f2a61dd148db052a6f37c3cf174ef9f3f886c1eafcc3e249fdc9fee057790efbc3baccf71dd6cad98b3fef06a2b7c9a
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.8.2.ebuild
index 9dfe663f071a..30868a4e4dea 100644
--- a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
+++ b/media-tv/dvbstream/dvbstream-0.8.2.ebuild
@@ -1,28 +1,21 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="RTP multicast stream server and other tools for DVB cards"
-HOMEPAGE="https://sourceforge.net/projects/dvbtools"
-MY_P="${PN}-snapshot-20080302"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.orcas.net/dvbstream/"
+SRC_URI="http://www.orcas.net/dvbstream/${P}.tar.bz2"
+S=${WORKDIR}/${PN}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND="dev-lang/perl"
-DEPEND="sys-kernel/linux-headers"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}/${P}-update.diff"
- "${FILESDIR}/${PN}-0.7_pre20080302-telnet-port-switch.diff"
-)
+BDEPEND="sys-kernel/linux-headers"
src_prepare() {
default
@@ -39,10 +32,14 @@ src_prepare() {
-i TELNET/*.sh \
|| die 'failed to rename the svdrpsend.pl command in scripts'
- sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' \
- -e 's:^TS2ES=.*$:TS2ES=ts2es:' \
- -i *.sh \
- || die 'failed to set DUMPRTP and TS2ES in scripts'
+ # bug 919183
+ sed -e '/#include "ringbuffy.h"/a #include <string.h>' \
+ -i mpegtools/ringbuffy.c || die 'failed to fix ringbuffy.c'
+
+ sed -e "s:-lcurses:$( $(tc-getPKG_CONFIG) --libs ncurses ):" \
+ -i Makefile || die 'failed to fix ncurses linking in Makefile'
+
+ sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' -i *.sh || die 'failed to set DUMPRTP and TS2ES in scripts'
}
src_compile() {
diff --git a/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff b/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff
deleted file mode 100644
index 6964b4f3e779..000000000000
--- a/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru dvbstream-orig/dvbstream.c dvbstream/dvbstream.c
---- dvbstream-orig/dvbstream.c 2008-05-16 18:23:03.023540289 +0200
-+++ dvbstream/dvbstream.c 2008-05-16 18:25:32.293536581 +0200
-@@ -929,6 +929,7 @@
-
- if (argc==1) {
- fprintf(stderr,"Usage: dvbtune [OPTIONS] pid1 pid2 ... pid8\n\n");
-+ fprintf(stderr,"-tp TELNET port\n");
- fprintf(stderr,"-i IP multicast address\n");
- fprintf(stderr,"-r IP multicast port\n");
- fprintf(stderr,"-net ip:prt IP address:port combination to be followed by pids list. Can be repeated to generate multiple RTP streams\n");
-@@ -1079,6 +1080,12 @@
- LOF2=atoi(argv[i]);
- LOF2*=1000UL;
- }
-+#ifdef ENABLE_TELNET
-+ else if (strcmp(argv[i],"-tp")==0) {
-+ i++;
-+ port=atoi(argv[i]);
-+ }
-+#endif
- else if (strcmp(argv[i],"-s")==0) {
- i++;
- srate=atoi(argv[i])*1000UL;
-Nur in dvbstream: dvbstream.c.orig.
-Nur in dvbstream: dvbstream.c.rej.
diff --git a/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff b/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff
deleted file mode 100644
index ed670e465376..000000000000
--- a/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru dvbstream-20080302/dvbstream.c dvbstream/dvbstream.c
---- dvbstream-20080302/dvbstream.c 2007-09-14 23:02:39.000000000 +0200
-+++ dvbstream/dvbstream.c 2008-03-24 19:28:16.000000000 +0100
-@@ -817,6 +817,8 @@
- return 0;
- else if(af == 3)
- l += buf[4] + 1;
-+ if(l >= TS_SIZE - 4)
-+ return 0;
-
- if(pid == 0)
- {
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 47f605fae4f9..3f1e09c883ae 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -5,7 +5,6 @@ DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae615894131
DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
-DIST kodi-20.3-Nexus.tar.gz 54567232 BLAKE2B 956be2d1bef16910d88f244331bdff60cce309d9596ec7939a459489b7fa7ab3ca7b29e2aca0de542f48f95321d86c9d7a606ac311a7a3c69e0e6f901511982e SHA512 cdec1383d33f421828f0249ac2929980c6eaa39e345a8a364d9f3479f873029a15f3f6e6d40707fd2df2067a71bdaa3c6a1e26277074c31c631c71afe7465cb4
DIST kodi-20.5-Nexus.tar.gz 54568445 BLAKE2B 15eb409918fa3768528d9abd24c52fd8b94c82699ef2ce10a529278fe25544dc335b66d137ae8ae304511cd92c1c0be34881937ec705ba936f5a4b0d737903f7 SHA512 a47a54ca11e1d3daeddea8c1ae716cd4461e3441de43a026a920c709b2ff5c7e0acc2a5fd4ac8c15f0da1940bd7f21a65eff32203ad8e167603c1576b21d4dcc
DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b
DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
diff --git a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
new file mode 100644
index 000000000000..febcdc2197e4
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/933370
+https://github.com/xbmc/xbmc/issues/24955
+https://github.com/xbmc/xbmc/pull/24968
+
+From e8493d3ac390bac4ca74fa5435bb258d6764dae5 Mon Sep 17 00:00:00 2001
+From: Jose Luis Marti <joseluis.marti@gmail.com>
+Date: Tue, 9 Apr 2024 23:06:10 +0200
+Subject: [PATCH] [DllLoader] Remove fstatvfs64 wrapper
+
+Co-authored-by: fuzzard <fuzzard@users.noreply.github.com>
+--- a/xbmc/cores/DllLoader/exports/wrapper.c
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -36,7 +36,6 @@ typedef fpos_t fpos64_t;
+ #endif
+
+ struct mntent;
+-struct statvfs64;
+
+ void* dllmalloc(size_t );
+ void* dllcalloc( size_t , size_t );
+@@ -92,7 +91,6 @@ int dll_ftrylockfile(FILE *file);
+ void dll_funlockfile(FILE *file);
+ int dll_fstat64(int fd, struct stat64 *buf);
+ int dll_fstat(int fd, struct _stat *buf);
+-int dll_fstatvfs64(int fildes, struct statvfs64 *buf);
+ FILE* dll_popen(const char *command, const char *mode);
+ void* dll_dlopen(const char *filename, int flag);
+ int dll_setvbuf(FILE *stream, char *buf, int type, size_t size);
+@@ -445,11 +443,6 @@ int __wrap_fstat64(int fd, struct stat64* buf)
+ return dll_fstat64(fd, buf);
+ }
+
+-int __wrap_fstatvfs64(int fd, struct statvfs64* buf)
+-{
+- return dll_fstatvfs64(fd, buf);
+-}
+-
+ int __wrap_setvbuf(FILE *stream, char *buf, int type, size_t size)
+ {
+ return dll_setvbuf(stream, buf, type, size);
+--- a/xbmc/cores/DllLoader/exports/wrapper_mach_alias
++++ b/xbmc/cores/DllLoader/exports/wrapper_mach_alias
+@@ -20,7 +20,6 @@ ___wrap_fread _fread
+ ___wrap_freopen _freopen
+ ___wrap_fseek _fseek
+ ___wrap_fsetpos _fsetpos
+-___wrap_fstatvfs64 _fstatvfs64
+ ___wrap_ftell _ftell
+ ___wrap_ftrylockfile _ftrylockfile
+ ___wrap_funlockfile _funlockfile
diff --git a/media-tv/kodi/files/kodi-21-fix-gcc14.patch b/media-tv/kodi/files/kodi-21-fix-gcc14.patch
new file mode 100644
index 000000000000..fdfa36723f1f
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21-fix-gcc14.patch
@@ -0,0 +1,42 @@
+https://github.com/xbmc/xbmc/pull/25106
+
+From 2bf5ab07731b3d4160196e6b8d9ab9e25bea2ef9 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 2 May 2024 08:02:42 +0000
+Subject: [PATCH 1/2] add missing c++ headers
+
+Add missing headers which are no longer indirectly included by
+other headers, fixes build with gcc-14
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+--- a/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
++++ b/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
+@@ -17,6 +17,7 @@
+
+ #include "platform/posix/filesystem/SMBWSDiscovery.h"
+
++#include <algorithm>
+ #include <array>
+ #include <chrono>
+ #include <mutex>
+
+From b6ddd8fb25ef20e8adb9a9f9b53bebf0cee3a970 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 2 May 2024 08:05:00 +0000
+Subject: [PATCH 2/2] Geometry: fix template-id not allowed for constructor
+
+fixes gcc-14 error:
+- warning: template-id not allowed for constructor in C++20
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+--- a/xbmc/utils/Geometry.h
++++ b/xbmc/utils/Geometry.h
+@@ -177,7 +177,7 @@ template <typename T> class CSizeGen
+ return {m_w, m_h};
+ }
+
+- template<class U> explicit CSizeGen<T>(const CSizeGen<U>& rhs)
++ template<class U> explicit CSizeGen(const CSizeGen<U>& rhs)
+ {
+ CheckSet(static_cast<T> (rhs.m_w), static_cast<T> (rhs.m_h));
+ }
diff --git a/media-tv/kodi/kodi-19.5-r1.ebuild b/media-tv/kodi/kodi-19.5-r2.ebuild
index d71c4c2b4261..7b7a084a897d 100644
--- a/media-tv/kodi/kodi-19.5-r1.ebuild
+++ b/media-tv/kodi/kodi-19.5-r2.ebuild
@@ -97,7 +97,12 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
x11-libs/libxkbcommon
)
gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
+ !raspberry-pi? (
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ )
+ )
)
lcms? ( media-libs/lcms:2 )
libusb? ( virtual/libusb:1 )
@@ -122,7 +127,12 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
!gles? ( media-libs/glu )
>=dev-libs/openssl-1.1.1k:0=
raspberry-pi? (
- || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
+ || (
+ media-libs/raspberrypi-userland
+ media-libs/raspberrypi-userland-bin
+ >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
+ <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
+ )
)
pulseaudio? ( media-sound/pulseaudio )
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
diff --git a/media-tv/kodi/kodi-20.3.ebuild b/media-tv/kodi/kodi-20.5-r1.ebuild
index 2270760f2e9f..a518af43864c 100644
--- a/media-tv/kodi/kodi-20.3.ebuild
+++ b/media-tv/kodi/kodi-20.5-r1.ebuild
@@ -149,7 +149,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
)
gles? (
!raspberry-pi? (
- media-libs/mesa[gles2]
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ )
)
)
!gles? (
@@ -183,7 +186,8 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
|| (
media-libs/raspberrypi-userland
media-libs/raspberrypi-userland-bin
- media-libs/mesa[gles2,video_cards_vc4]
+ >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
+ <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
)
)
samba? (
diff --git a/media-tv/kodi/kodi-21.0.ebuild b/media-tv/kodi/kodi-21.0-r1.ebuild
index 67eca7afe6c1..f1dbbd2a7b53 100644
--- a/media-tv/kodi/kodi-21.0.ebuild
+++ b/media-tv/kodi/kodi-21.0-r1.ebuild
@@ -67,7 +67,7 @@ else
MY_PV="${MY_PV}-${CODENAME}"
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ KEYWORDS="amd64 arm64 ~riscv ~x86"
S=${WORKDIR}/xbmc-${MY_PV}
fi
@@ -159,7 +159,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
x11-libs/libxkbcommon
)
gles? (
- media-libs/mesa[gles2]
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ )
)
!gles? (
media-libs/glu
@@ -256,6 +259,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/kodi-21-fix-gcc14.patch
+)
+
# bug #544020
CONFIG_CHECK="~IP_MULTICAST"
ERROR_IP_MULTICAST="
diff --git a/media-tv/kodi/kodi-20.5.ebuild b/media-tv/kodi/kodi-21.0-r2.ebuild
index 2270760f2e9f..f975ad26a22a 100644
--- a/media-tv/kodi/kodi-20.5.ebuild
+++ b/media-tv/kodi/kodi-21.0-r2.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-# FFmpeg can be unbundled, but is currently stuck at a very old version.
+CODENAME="Omega"
+
# libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
# Versions for the forked projects that are bundled
@@ -11,9 +12,12 @@ EAPI=8
LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
-FFMPEG_VERSION="4.4.1"
-CODENAME="Nexus"
-FFMPEG_KODI_VERSION="Alpha1"
+FFMPEG_VERSION="6.0.1"
+
+# Java bundles from xbmc/interfaces/swig/CMakeLists.txt
+GROOVY_VERSION="4.0.16"
+APACHE_COMMON_LANG_VERSION="3.14.0"
+APACHE_COMMON_TEXT_VERSION="1.11.0"
# Doesn't build with jdk-21
_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} )
@@ -23,11 +27,12 @@ JAVA_PKG_WANT_SOURCE="17"
JAVA_PKG_WANT_TARGET="17"
PYTHON_REQ_USE="sqlite,ssl"
-PYTHON_COMPAT=( python3_{10..11} ) # python3.12 support added in 21
+PYTHON_COMPAT=( python3_{10..12} )
CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
-inherit cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg
+inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
+ toolchain-funcs xdg
DESCRIPTION="A free and open source media-player and entertainment hub"
HOMEPAGE="https://kodi.tv/"
@@ -37,13 +42,15 @@ SRC_URI="
-> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz
-> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+ https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-${GROOVY_VERSION}.zip
+ https://mirrors.kodi.tv/build-deps/sources/commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+ https://mirrors.kodi.tv/build-deps/sources/commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
css? (
https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
-> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
)
!system-ffmpeg? (
- https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
- -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
+ https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
)
"
if [[ ${PV} == *9999 ]] ; then
@@ -56,11 +63,11 @@ else
MY_PV=${PV/_p/_r}
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/RC}
+ MY_PV=${MY_PV/_rc/rc}
MY_PV="${MY_PV}-${CODENAME}"
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
S=${WORKDIR}/xbmc-${MY_PV}
fi
@@ -69,13 +76,14 @@ SLOT="0"
# use flag is called libusb so that it doesn't fool people in thinking that
# it is _required_ for USB support. Otherwise they'll disable udev and
# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^^ ( gbm wayland X )
?? ( mariadb mysql )
bluray? ( udf )
gbm? ( udev )
+ soc? ( system-ffmpeg )
udev? ( !libusb )
vdpau? ( X !gles !gbm )
zeroconf? ( dbus )
@@ -84,7 +92,7 @@ RESTRICT="!test? ( test )"
# dev-libs/libcec[-cubox] bug #818262
COMMON_DEPEND="
- >=dev-libs/flatbuffers-1.12.0:=
+ >=dev-libs/flatbuffers-23.3.3:=
>=dev-libs/lzo-2.04:2
media-libs/giflib:=
>=media-libs/libjpeg-turbo-2.0.4:=
@@ -106,13 +114,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=dev-libs/openssl-1.1.1k:0=
>=dev-libs/spdlog-1.5.0:=
dev-libs/tinyxml[stl]
+ dev-libs/tinyxml2:=
media-fonts/roboto
media-libs/libglvnd[X?]
>=media-libs/freetype-2.10.1
media-libs/harfbuzz:=
- >=media-libs/libass-0.13.4:=
+ >=media-libs/libass-0.15.0:=
media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
>=media-libs/taglib-1.9.0
+ =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
sci-libs/kissfft
virtual/libiconv
virtual/ttf-fonts
@@ -145,11 +155,13 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
)
gbm? (
>=dev-libs/libinput-1.10.5:=
+ media-libs/libdisplay-info
x11-libs/libxkbcommon
)
gles? (
- !raspberry-pi? (
- media-libs/mesa[gles2]
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
)
)
!gles? (
@@ -174,29 +186,14 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=net-fs/libnfs-2.0.0:=
)
pipewire? (
- >=media-video/pipewire-0.3.24:=
+ >=media-video/pipewire-0.3.50:=
)
pulseaudio? (
media-libs/libpulse
)
- raspberry-pi? (
- || (
- media-libs/raspberrypi-userland
- media-libs/raspberrypi-userland-bin
- media-libs/mesa[gles2,video_cards_vc4]
- )
- )
samba? (
>=net-fs/samba-3.4.6[smbclient(+)]
)
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc,vaapi?,vdpau?,X?]
- =media-video/ffmpeg-4*[openssl]
- )
- !system-ffmpeg? (
- app-arch/bzip2
- media-libs/dav1d:=
- )
udf? (
>=dev-libs/libudfread-1.0.0
)
@@ -216,7 +213,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=x11-libs/libxkbcommon-0.4.1[wayland]
)
webserver? (
- >=net-libs/libmicrohttpd-0.9.55:=[messages(+)]
+ >=net-libs/libmicrohttpd-0.9.77:=[messages(+)]
)
X? (
x11-libs/libX11
@@ -238,7 +235,7 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
${COMMON_TARGET_DEPEND}
- dev-libs/rapidjson
+ >=dev-libs/rapidjson-1.0.2
test? (
>=dev-cpp/gtest-1.10.0
)
@@ -250,11 +247,11 @@ DEPEND="
x11-libs/libXrender
)
"
-# <dev-lang/swig-4.2.0 https://github.com/xbmc/xbmc/issues/24385
BDEPEND="
${COMMON_DEPEND}
+ app-arch/unzip
dev-build/cmake
- <dev-lang/swig-4.2.0
+ dev-lang/swig
virtual/pkgconfig
<=virtual/jre-17:*
doc? (
@@ -262,6 +259,11 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/kodi-21-fix-gcc14.patch
+ "${FILESDIR}"/kodi-21-fix-dvd-playing.patch
+)
+
# bug #544020
CONFIG_CHECK="~IP_MULTICAST"
ERROR_IP_MULTICAST="
@@ -269,11 +271,6 @@ In some cases Kodi needs to access multicast addresses.
Please consider enabling IP_MULTICAST under Networking options.
"
-PATCHES=(
- "${FILESDIR}"/kodi-20.2-binutils-2.41.patch
- "${FILESDIR}"/kodi-20.3-gcc-14.patch
-)
-
pkg_setup() {
check_extra_config
java-pkg-2_pkg_setup
@@ -286,6 +283,10 @@ src_unpack() {
else
unpack ${MY_P}.tar.gz
fi
+
+ unpack apache-groovy-binary-${GROOVY_VERSION}.zip
+ unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+ unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
}
src_prepare() {
@@ -302,6 +303,23 @@ src_prepare() {
-e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \
cmake/modules/FindKissFFT.cmake || die
done
+
+ if tc-is-cross-compiler; then
+ # These tools are automatically built with CMake during a native build
+ # but need to be built in advance using Autotools for a cross build.
+ NATIVE_TOOLS=(
+ TexturePacker
+ JsonSchemaBuilder
+ )
+
+ local t
+ for t in "${NATIVE_TOOLS[@]}" ; do
+ pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+ AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+ popd >/dev/null || die
+ done
+ elibtoolize
+ fi
}
src_configure() {
@@ -364,6 +382,8 @@ src_configure() {
-DENABLE_VDPAU=$(usex vdpau)
-DENABLE_XSLT=$(usex xslt)
+ -DWITH_FFMPEG=$(usex system-ffmpeg)
+
#To bundle or not
-DENABLE_INTERNAL_CROSSGUID=OFF
-DENABLE_INTERNAL_DAV1D=OFF
@@ -379,18 +399,21 @@ src_configure() {
-DENABLE_INTERNAL_TAGLIB=OFF
-DENABLE_INTERNAL_UDFREAD=OFF
- -DWITH_FFMPEG=$(usex system-ffmpeg)
-
+ -DTARBALL_DIR="${DISTDIR}"
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+ -Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}"
+ -Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}"
+ -Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}"
)
# Separated to avoid "Manually-specified variables were not used by the project:"
+ use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF )
use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" )
+ use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
use !system-ffmpeg && mycmakeargs+=(
- -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz"
+ -DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz"
)
- use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
@@ -409,10 +432,26 @@ src_configure() {
# https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e
filter-lto
+ if tc-is-cross-compiler; then
+ for t in "${NATIVE_TOOLS[@]}" ; do
+ pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+ econf_build
+ install -m0755 /dev/null "$t" || die # Actually build later.
+ mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" )
+ popd >/dev/null || die
+ done
+ fi
+
cmake_src_configure
}
src_compile() {
+ if tc-is-cross-compiler; then
+ for t in "${NATIVE_TOOLS[@]}" ; do
+ emake -C "${S}/tools/depends/native/$t/src"
+ done
+ fi
+
cmake_src_compile all
use doc && cmake_build doc
use test && cmake_build kodi-test
@@ -430,6 +469,8 @@ src_test() {
# bug #779184
# https://github.com/xbmc/xbmc/issues/18594
$(usev x86 TestDateTime.SetFromDBTime)
+ # Tries to ping localhost, naturally breaking network-sandbox
+ TestNetwork.PingHost
)
# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
diff --git a/media-tv/kodi/kodi-21.9999.ebuild b/media-tv/kodi/kodi-21.9999.ebuild
index a7ad762133ea..7ca90c8d20dd 100644
--- a/media-tv/kodi/kodi-21.9999.ebuild
+++ b/media-tv/kodi/kodi-21.9999.ebuild
@@ -159,7 +159,10 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
x11-libs/libxkbcommon
)
gles? (
- media-libs/mesa[gles2]
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ )
)
!gles? (
media-libs/glu
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ec93101fdd4d..e4efd7f63cd8 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -123,7 +123,6 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
>=media-libs/taglib-1.9.0
=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
- sci-libs/kissfft
virtual/libiconv
virtual/ttf-fonts
x11-libs/libdrm
@@ -155,11 +154,14 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
)
gbm? (
>=dev-libs/libinput-1.10.5:=
- media-libs/libdisplay-info
+ media-libs/libdisplay-info:=
x11-libs/libxkbcommon
)
gles? (
- media-libs/mesa[gles2]
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ )
)
!gles? (
media-libs/glu
@@ -180,13 +182,13 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
dev-db/mysql-connector-c:=
)
nfs? (
- >=net-fs/libnfs-2.0.0:=
+ >=net-fs/libnfs-3.0.0:=
)
pipewire? (
>=media-video/pipewire-0.3.50:=
)
pulseaudio? (
- media-libs/libpulse
+ >=media-libs/libpulse-11.0.0
)
samba? (
>=net-fs/samba-3.4.6[smbclient(+)]
@@ -289,13 +291,6 @@ src_prepare() {
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
xbmc/platform/linux/*.cpp || die
- # Add all possible names for kissfft libraries
- for datatype in {float,int16,int32,simd}; do
- sed -i \
- -e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \
- cmake/modules/FindKissFFT.cmake || die
- done
-
if tc-is-cross-compiler; then
# These tools are automatically built with CMake during a native build
# but need to be built in advance using Autotools for a cross build.
@@ -378,13 +373,13 @@ src_configure() {
#To bundle or not
-DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_INTERNAL_CURL=OFF
-DENABLE_INTERNAL_DAV1D=OFF
-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-DENABLE_INTERNAL_FLATBUFFERS=OFF
-DENABLE_INTERNAL_FMT=OFF
-DENABLE_INTERNAL_FSTRCMP=OFF
-DENABLE_INTERNAL_GTEST=OFF
- -DENABLE_INTERNAL_KISSFFT=OFF
-DENABLE_INTERNAL_PCRE=OFF
-DENABLE_INTERNAL_RapidJSON=OFF
-DENABLE_INTERNAL_SPDLOG=OFF
@@ -454,10 +449,6 @@ src_test() {
# Known failing, unreliable test
# bug #743938
TestCPUInfo.GetCPUFrequency
- # Test failure stemming from sci-libs/kissfft
- # The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i]
- # evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08.
- TestRFFT.SimpleSignal
# bug #779184
# https://github.com/xbmc/xbmc/issues/18594
$(usev x86 TestDateTime.SetFromDBTime)
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index d8114cac5535..00f1f2a7232c 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -33,7 +33,7 @@
<flag name="xslt">Enable metadata XSLT scrapers support with <pkg>dev-libs/libxslt</pkg></flag>
</use>
<upstream>
- <bugs-to>https://trac.kodi.tv/</bugs-to>
+ <bugs-to>https://github.com/xbmc/xbmc/issues/</bugs-to>
<doc>https://kodi.wiki/</doc>
<remote-id type="github">xbmc/xbmc</remote-id>
</upstream>
diff --git a/media-tv/mythtv-status/Manifest b/media-tv/mythtv-status/Manifest
index 6849e4b27dd1..9b8a91da9dde 100644
--- a/media-tv/mythtv-status/Manifest
+++ b/media-tv/mythtv-status/Manifest
@@ -1 +1,2 @@
DIST mythtv-status-1.0.1.tar.gz 45990 BLAKE2B 439d1b4a0d324a94e947139cd7038ba623532f414a43a8a6f481f5630cba9d6801288bd684e92c59c465f8f65683fc7b86efb47700b6ff58e1b299ca81442d19 SHA512 9f0a3a38c91ec451f2c95177d8acc7566705ec77e601fe40cdf97d8f8ccf5f9b55e419d42309e1601e128c0344103ffe75d10a06bcb15d5a1617ad30424dbc1a
+DIST mythtv-status-1.1.0.tar.gz 47393 BLAKE2B b444ac83c2c6d6d3dbcd28485de974201510e14d4d773be5fbe867ddcc25fec20369d40f52b3d87a72cfb2b04ffd8c61861dcf4e013d70974053bf732165fc4f SHA512 4a0fd49cb36624d0da677f901ae48ae7c2971e3d18e0a2669cbfe137ed540321373fe9118aa603ef6fcf0397c4af0ee5a5086d20481cdcedc47b5881ff8da3f5
diff --git a/media-tv/mythtv-status/mythtv-status-1.1.0.ebuild b/media-tv/mythtv-status/mythtv-status-1.1.0.ebuild
new file mode 100644
index 000000000000..8bae575f0074
--- /dev/null
+++ b/media-tv/mythtv-status/mythtv-status-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Displays the current status of MythTV at the command prompt"
+HOMEPAGE="http://www.etc.gen.nz/projects/mythtv/mythtv-status.html"
+SRC_URI="http://www.etc.gen.nz/projects/mythtv/tarballs/${P}.tar.gz"
+#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-perl/libwww-perl
+ dev-perl/XML-LibXML
+ dev-perl/Date-Manip
+ dev-perl/MIME-tools
+ dev-perl/Sys-SigAction
+ dev-perl/Config-Auto
+ media-tv/mythtv[perl]"
+
+src_compile() { :; }
+
+src_install() {
+ dobin bin/${PN}
+ newman "${FILESDIR}"/${PN}-1.0.1.man ${PN}.1
+ dodoc README FAQ ChangeLog THANKS
+}
+
+src_test() {
+ emake test
+}
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 5351b3dab70d..3b9c694401ab 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,16 +1,8 @@
-DIST plexmediaserver_1.32.8.7639-fb6452ebf_amd64.deb 76341142 BLAKE2B ec46ffb5a5b742b6196acdcf7e212070adc9a729c754dfd9e9cca8c5e0205060c80016a5cbffafabb9d5535baed202b09140699a7902c83289444ec3bb7d3aa9 SHA512 f4551584e99c84a0eaa474700a8d3baf95b0fd250e7d5e3b0c1d7e45e657eb0f097d21aa70ee4ad465f23999bbe2fe3fa88d21eb141d754a7cd422abcc425d78
-DIST plexmediaserver_1.32.8.7639-fb6452ebf_arm64.deb 70657050 BLAKE2B 80269c6ef68d30dc5882db06dc0dd77f6352ad72c5f983ff00f46bba93412bc7f2348295973f9ce48be4f6099713cd88e4ccfdbc94cbac97616c1ec139d1a4b3 SHA512 8b15232b91603096ca61d1283e3ee255906d4fc2e0f3e82d3ebbb79ddcb983e154b05e435ee5737532a3e4258c751ea6597e0a27d4bc3761107562fdb457c232
-DIST plexmediaserver_1.32.8.7639-fb6452ebf_armhf.deb 70785650 BLAKE2B e85177079d8cbc03a56dc0be3183198467c4fa0e0c242e77ad7a91bd008853ffee61ee61612819f41b11019da0dc4a8b776dc41ec0d983cb49d7f1f780ac2607 SHA512 0da3b288a488942119db5f609ba453083f5d4559da5089bcfec743aefc187e0218515ce16a025f015a9b9eccd0c04fefc904fbd0469072d19d8614aa402a331f
-DIST plexmediaserver_1.32.8.7639-fb6452ebf_i386.deb 74289812 BLAKE2B 5f0eb0dd865775e9091ef73c06e6797be22e2b1b61bac740891bae23535c5cfaf997b4100c52c51793bff8b0426ff0db1795b560a908be1a18185b2bc2c7ebe2 SHA512 e7484efde9d86f54cab48adf4dd90493b339d64dd7b2a91a5dfc69851dab5df744d92564cf30d11d92d21cff959a3f5e68c0bc526980d1d5cb08bce6b1bb5b82
-DIST plexmediaserver_1.40.0.7998-c29d4c0c8_amd64.deb 81786462 BLAKE2B b24b666b5b214e375296583e513359c2082bd7737e44815c9c06719b063b740a2bf3121974eefa3130ebd3c4f65ba72bd54f7d12c44de41f41b0d3d4463a3b23 SHA512 3907f7623b1c52b87fc2f3fbef6a0eef711a1152f7a04b2e4c16b687682b430bdfdd1c198aa8646a361fc4ba5483efc9d49c652def9103468ad47de48a4fe89f
-DIST plexmediaserver_1.40.0.7998-c29d4c0c8_arm64.deb 74643478 BLAKE2B 4831b0dd0030e191221d5c084b0f2a40c6e0d44e148e44fd94bfc239236dcffc589929213455a3f7781f21f1ace52cb3bec5eeec5a1f3c682be1e348c0698b4a SHA512 d932e955323854897e7d9553c3630b984587c6ab7c2bb5042de20d7285785d3e17f718e0164a3d3d475a6d8474c383079463d1394747e1f00ce9fb3dd848fecd
-DIST plexmediaserver_1.40.0.7998-c29d4c0c8_armhf.deb 70547854 BLAKE2B c9fd1c4bb38a0fb471031457a586d1a59715fb3d66c75223f4af1d17b6e3576152202bb239aa65fb682dbefa83e652a4ba3011f6538a0682913d571b8d26f418 SHA512 766bd566a84a240af92353eb18f0ea5dc5d6b5f00667930b89d0afeffb19bd37482428dfdd8c5559b8a720514c7130fa35a92cf65f60f5edbba59e4d24e8ba82
-DIST plexmediaserver_1.40.0.7998-c29d4c0c8_i386.deb 74085106 BLAKE2B eede6a7a9f316ead61a72901c5e262b9e84cf3b0dbe86eeecdac68b993e28ed55d496a09a8d20791fe6424862512e2c9aec772ea49fc7c3127624ccf4cb922d5 SHA512 e98aaca54592b7544c2cecc5c5049df07e8c1df0f97517184346d3b985a2d4ac34ff3d2df98ca8c4c0efcaf9750cd992a25b920f54e8c0327efddd677ccc8517
-DIST plexmediaserver_1.40.1.8227-c0dd5a73e_amd64.deb 81363214 BLAKE2B 85211d663ba536c08609e89afcdab6a9ecd3c8b39aa008bcb22af975d0a4fea518b978b5359c451c807392c734f4a73313ff81f4f02e02bf79edb00daf2a8e0f SHA512 411a4ff56fc99cccb1132c22209223e1f0287cfc2e41c2440494d41c7bd8394cf5f620ffbb4091a368ddb6ac621f369df63c76fa54bbf2716198bb32e6220ac4
-DIST plexmediaserver_1.40.1.8227-c0dd5a73e_arm64.deb 73578298 BLAKE2B c4afb9213521fe1a6279d6daeba3de625675477a8fdad302e52437236c09cad1c93136f8ec5101234821fc178af824c554eb2f6059baed9f4f360bb0e94234f4 SHA512 1a83482a79bebffcc02473104ccbbf94330e122a6ee0ba98f4df2902e5816b2a19c30a6242b8d69d92dea10224124db56c644301675d65fe6f2f1d2bf3235881
-DIST plexmediaserver_1.40.1.8227-c0dd5a73e_armhf.deb 70707730 BLAKE2B 67420c79609e10362072d382b472ce9bab4aebbf8b889fb7ca85b106264332d3f0b954318343d682623d493680f0c1908062225dec072300194e99f4b9c58828 SHA512 186443100732f2b6080fe674da4949b1e4a97de5c8cd8350cfe451fae28dfac49681014addb5d6406b218c2d925b113f308d2b389cfd5d1ec551a535269b9677
-DIST plexmediaserver_1.40.1.8227-c0dd5a73e_i386.deb 74304650 BLAKE2B f826ea8bfb17df3ca2e8767ba2704545a4f71c8d7425387b66aafcee4622b91d35aef1b85b443c5900f51df79e3b6005f4407dd8ca7ad71a2f853b0b78536f1d SHA512 06d5e2978131c06e579f3580534f51c43d04e8bb3a6f51fea52ba8a05d094e4ccc0f1aa162acd2c32ee4c451bfc7de084f14a009262efba0806b6aa883f991e6
DIST plexmediaserver_1.40.2.8395-c67dce28e_amd64.deb 82029834 BLAKE2B 3f0acd1d8dc554ee4539c0dc36976935c975b2ed54824805835d490d33d4d8319f5c67ec2926ca253fd1dcac97b3daad13e98e2a80f35403cf2d7c58f25786f5 SHA512 6a20b3e9af5097667fed5768262fcb4c5182cbf0db9edf2f8870e41063191c1420ea4a1e9abd39a5168a37b9445088e61d167731c9b5f3914d7c4ff25834ceb5
DIST plexmediaserver_1.40.2.8395-c67dce28e_arm64.deb 73766282 BLAKE2B d0ddf6718465aeae596c1a8391962b576beceb4cfdb3a23eee1bf18585e8fb42c0409ef3fbc43fd09a8977a1fa9143ea20fa8432accfc6e4bda7622bed59bfaf SHA512 58269cba44aaecb7c7720517bcdc3baee2cf42b265c6c910066459cfb462f9ccd5dd88fe2fa43bc19954782a5a6f4525d7436158a0662b80ce422cc7896f0922
DIST plexmediaserver_1.40.2.8395-c67dce28e_armhf.deb 70899814 BLAKE2B 87cb5cd21ed08f11609063a1836c51413193bec3a0fe4ba81212fd8383136805c591875ad42d170f08f41e986c50679841db6b4ba7517b9e78a01af7f4a5b8d5 SHA512 744d19fd708ab8e77fbeac15ad52069105ec92b7c391b1452e92417adaf7bfbb6d70d6fcabc556ea5467631433db08bbfea83fe7fa4e0b1462b473f32d6b91d6
DIST plexmediaserver_1.40.2.8395-c67dce28e_i386.deb 74590626 BLAKE2B fa42e617a02c3403a7fc2d45bb6c7e56a78ebfcf7bc34f45da2cc67a912a163001ef2f87383abde7d5de51e74bbcd439abd12e866f8106d4e7fd5a67e0172755 SHA512 89a6905b662a83e0af9872a1cf801ba1fa9b08976a606ef64fdee61f49709f0c5b4e3d2acd6d9e0e4e7605a16401902f5282ecb1a39f47833591dc054d3dedc2
+DIST plexmediaserver_1.40.3.8555-fef15d30c_amd64.deb 81659190 BLAKE2B 021322da3442e4288f6fd4b2cb9081073a9fdbce4039a6c518a1357c294369cbd571b2e51284cbd67e427118448919a189be65455e53378d2a5ec0fae9b0e300 SHA512 145f90d31d6384358b06d0fc9b0d7712435607b8806e16b84e8110190fe192ac7e86da4730d1de33ea824dd8c79026f69d315906e1a0ac3e418ba6ab8a862e1c
+DIST plexmediaserver_1.40.3.8555-fef15d30c_arm64.deb 73914470 BLAKE2B 901386536c2540230217fac7cbb37566fde4e5f809f4e1d0fc381a44974cad5ae13dbc7a9e7af62e9b138b8e4d40d726afef7c5813f2eef846e21e372f2152e1 SHA512 c15a6a454a0c0d09c75e02db93f6eec45d7127bfb38354bd565b5b83ec133dd8e32413a079a91d623987381e0eac02f5c0c43ff2b0cf8e08343699d70ceabf05
+DIST plexmediaserver_1.40.3.8555-fef15d30c_armhf.deb 73976334 BLAKE2B 4953ac4bc1e9138795c0abd0c04e9f83f4243d607bdcd40ba71ef8cbc646ffbc73139317f1218a499bc0e2da010ec4fe567da8fff20ceac0adee906e5012732e SHA512 a357385aa0424dc3b91299381eaa86a4dcc117009d2aab4cc6c079755a981c2de3ea23134400adaa7165f0621ae5679c4e33774c12aa0875ab32086d2de32e79
+DIST plexmediaserver_1.40.3.8555-fef15d30c_i386.deb 74919610 BLAKE2B 2303ebff407951a25442b26b812c45b535a5ad63b5988ecb63227e27335218c6972593144332308ba751d9ea9f4636a109fba5ec73b5aee36b0c0880ffaa0558 SHA512 2322db24d4dd1744bc42d1b94dda02477a328ae0cab06367031ede4a860f481b78358270c2e923e5fa3b5662fe5b546d11a964dec98582e3631159f3864121a2
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.0.7998.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.0.7998.ebuild
deleted file mode 100644
index 8ec38977c3b1..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.40.0.7998.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1 systemd unpacker pax-utils
-
-MY_PV="${PV}-c29d4c0c8"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
- amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
- arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
- arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
- x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
-"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist"
-
-DEPEND="
- acct-group/plex
- acct-user/plex"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}.service.patch"
-)
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
- "usr/lib/plexmediaserver/lib/.*"
- "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
- "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-BINS_TO_PAX_MARK=(
- "${ED}/usr/lib/plexmediaserver/Plex Script Host"
- "${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
-)
-
-src_install() {
- # Remove Debian specific files
- rm -r "usr/share/doc" || die
-
- # Copy main files over to image and preserve permissions so it is portable
- cp -rp usr/ "${ED}" || die
-
- # Make sure the logging directory is created
- keepdir /var/log/pms
- fowners plex:plex /var/log/pms
-
- keepdir /var/lib/plexmediaserver
- fowners plex:plex /var/lib/plexmediaserver
-
- # Install the OpenRC init/conf files
- newinitd "${FILESDIR}/${PN}.init.d" ${PN}
- newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
- # Install systemd service file
- systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
-
- # Add pax markings to some binaries so that they work on hardened setup
- local f
- for f in "${BINS_TO_PAX_MARK[@]}"; do
- pax-mark m "${f}"
- done
-
- # Adds the precompiled plex libraries to the revdep-rebuild's mask list
- # so it doesn't try to rebuild libraries that can't be rebuilt.
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/80plexmediaserver
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- einfo
- ewarn "IMPORTANT: This version makes changes to the database which will require 1.31.2 or higher to start"
- ewarn "Please also be patient when updating to this version, initial run may take time as database is upgraded"
- ewarn "Full release announcement, including instructions for rollback: https://forums.plex.tv/t/plex-media-server/30447/612"
-
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.1.8227.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.1.8227.ebuild
deleted file mode 100644
index e59748c1aaff..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.40.1.8227.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1 systemd unpacker pax-utils
-
-MY_PV="${PV}-c0dd5a73e"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
- amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
- arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
- arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
- x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
-"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist"
-
-DEPEND="
- acct-group/plex
- acct-user/plex"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}.service.patch"
-)
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
- "usr/lib/plexmediaserver/lib/.*"
- "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
- "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-BINS_TO_PAX_MARK=(
- "${ED}/usr/lib/plexmediaserver/Plex Script Host"
- "${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
-)
-
-src_install() {
- # Remove Debian specific files
- rm -r "usr/share/doc" || die
-
- # Copy main files over to image and preserve permissions so it is portable
- cp -rp usr/ "${ED}" || die
-
- # Make sure the logging directory is created
- keepdir /var/log/pms
- fowners plex:plex /var/log/pms
-
- keepdir /var/lib/plexmediaserver
- fowners plex:plex /var/lib/plexmediaserver
-
- # Install the OpenRC init/conf files
- newinitd "${FILESDIR}/${PN}.init.d" ${PN}
- newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
- # Install systemd service file
- systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
-
- # Add pax markings to some binaries so that they work on hardened setup
- local f
- for f in "${BINS_TO_PAX_MARK[@]}"; do
- pax-mark m "${f}"
- done
-
- # Adds the precompiled plex libraries to the revdep-rebuild's mask list
- # so it doesn't try to rebuild libraries that can't be rebuilt.
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/80plexmediaserver
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- einfo
- ewarn "IMPORTANT: This version makes changes to the database which will require 1.31.2 or higher to start"
- ewarn "Please also be patient when updating to this version, initial run may take time as database is upgraded"
- ewarn "Full release announcement, including instructions for rollback: https://forums.plex.tv/t/plex-media-server/30447/612"
-
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.32.8.7639.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild
index a981749bb154..9647666c641b 100644
--- a/media-tv/plex-media-server/plex-media-server-1.32.8.7639.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit readme.gentoo-r1 systemd unpacker pax-utils
-MY_PV="${PV}-fb6452ebf"
+MY_PV="${PV}-fef15d30c"
MY_URI="https://downloads.plex.tv/plex-media-server-new"
DESCRIPTION="Free media library that is intended for use with a plex client"
@@ -82,9 +82,4 @@ src_install() {
pkg_postinst() {
readme.gentoo_print_elog
-
- einfo
- einfo "Be advised beginning 2023-10-12 Plex has begun blocking servers"
- einfo "hosted at Hetzner. More information:"
- einfo "https://forums.plex.tv/t/not-allowed-to-use-hetzner/853570"
}
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 66b6b6e2df8e..4be00c4079ab 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1 @@
-DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
+DIST tvheadend-4.3_p20240618.tar.gz 22578849 BLAKE2B 49941eef965bdc5483116ba591ec92d1a2bd903df3a4fe610cfb77e5d1b90eb6328a2aff344bd1be0ed2b1a4299e3f3d7fd566035a649482f4b0f67f54b5218b SHA512 1fc2b5f7323ef5b919999fbb9c6ca86a12ff45c0fce10c86dc063070b62a9899b7320356153bd86cbd9b988a634a74b65737789006ff0b5928486f08a1869b46
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
deleted file mode 100644
index 64f6f691b976..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./configure.orig ./configure
---- ./configure.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./configure 2017-04-23 13:31:08.717237211 +0200
-@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then
- else
-
- if enabled_or_auto hdhomerun_client; then
-- if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
-+ if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
- enable hdhomerun_client
- LDFLAGS="$LDFLAGS -lhdhomerun"
- fi
-diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
---- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 2017-04-23 13:31:08.717237211 +0200
-@@ -24,7 +24,7 @@
- #include "htsbuf.h"
- #include "tvhdhomerun.h"
-
--#include "libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
-
- typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
- typedef struct tvhdhomerun_device tvhdhomerun_device_t;
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
deleted file mode 100644
index 23f48652f9de..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 15 May 2020 17:45:30 +0100
-Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
-
----
- src/input.h | 4 ++--
- src/input/mpegts.c | 2 ++
- src/input/mpegts.h | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/input.h b/src/input.h
-index a9c96df04..3dce355c6 100644
---- a/src/input.h
-+++ b/src/input.h
-@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
- extern const idclass_t tvh_input_class;
- extern const idclass_t tvh_input_instance_class;
-
--tvh_input_list_t tvh_inputs;
--tvh_hardware_list_t tvh_hardware;
-+extern tvh_input_list_t tvh_inputs;
-+extern tvh_hardware_list_t tvh_hardware;
-
- #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
- #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
-diff --git a/src/input/mpegts.c b/src/input/mpegts.c
-index e02d491f1..fca4f3429 100644
---- a/src/input/mpegts.c
-+++ b/src/input/mpegts.c
-@@ -20,6 +20,8 @@
- #include "mpegts/fastscan.h"
- #include "memoryinfo.h"
-
-+struct mpegts_listeners mpegts_listeners;
-+
- extern memoryinfo_t mpegts_input_queue_memoryinfo;
- extern memoryinfo_t mpegts_input_table_memoryinfo;
-
-diff --git a/src/input/mpegts.h b/src/input/mpegts.h
-index 9dda3baca..9c4c57b73 100644
---- a/src/input/mpegts.h
-+++ b/src/input/mpegts.h
-@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
- void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
- } mpegts_listener_t;
-
--LIST_HEAD(,mpegts_listener) mpegts_listeners;
-+extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
-
- #define mpegts_add_listener(ml)\
- LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
---
-2.26.2
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
deleted file mode 100644
index 9ccadb44c42c..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
---- ./src/plumbing/transcoding.c.orig 2019-01-12 09:58:47.000000000 +0100
-+++ ./src/plumbing/transcoding.c 2019-03-12 15:49:24.922314869 +0100
-@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s
- char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)];
- int codec_match=0;
-
-- strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-+ memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-
- tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n",
- tp->tp_src_vcodec,
-@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ
- transcoder_t *t = (transcoder_t *)st;
- transcoder_props_t *tp = &t->t_props;
-
-- strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
-- strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
-- strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
-- strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
-+ memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
-+ memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
-+ memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
-+ memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
- tp->tp_channels = props->tp_channels;
- tp->tp_vbitrate = props->tp_vbitrate;
- tp->tp_abitrate = props->tp_abitrate;
-@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ
-
- memcpy(tp->tp_language, props->tp_language, 4);
-
-- strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
-+ memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
- }
-
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
deleted file mode 100644
index c30af8aba2a1..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001
-From: Michael Marley <michael@michaelmarley.com>
-Date: Wed, 26 Jun 2019 19:35:50 -0400
-Subject: [PATCH] Fix compilation with libhdhomerun 20190621
-
-They renamed the symbol that was used to determine whether the
-"hdhomerun_discover_find_devices_custom" needed to be aliased,
-causing an FTBFS. Instead, recognize both the old and new symbols.
----
- src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-index 58dec51ab..18068faf5 100644
---- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-@@ -32,7 +32,8 @@
-
- #include "config.h"
-
--#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
-+#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \
-+ || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED)
- #define hdhomerun_discover_find_devices_custom \
- hdhomerun_discover_find_devices_custom_v2
- #endif
---
-2.23.0
-
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
deleted file mode 100644
index b398064292e5..000000000000
--- a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 10 May 2020 23:02:14 +0100
-Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all
-
----
- src/input/mpegts/dvb_psi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
-index 15203d98c..96b1689fb 100644
---- a/src/input/mpegts/dvb_psi.c
-+++ b/src/input/mpegts/dvb_psi.c
-@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
- psi_tables_atsc_t(mm);
- break;
- case DVB_SYS_DVBC_ANNEX_B:
-+#if ENABLE_MPEGTS_DVB
- if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class))
- psi_tables_dvb(mm);
- else
-+#endif
- psi_tables_atsc_c(mm);
- break;
- case DVB_SYS_NONE:
---
-2.26.2
-
diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
index 11d3fe7a814f..778786b7c1b7 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -7,9 +7,8 @@ Type=simple
User=tvheadend
Group=video
RuntimeDirectory=tvheadend
-PIDFile=/run/tvheadend/tvheadend.pid
EnvironmentFile=/etc/conf.d/tvheadend
-ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c ${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS
+ExecStart=/usr/bin/tvheadend -c ${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS
TimeoutStartSec=1m
TimeoutStopSec=20s
Restart=always
@@ -17,7 +16,7 @@ RestartSec=5s
DevicePolicy=closed
DeviceAllow=char-DVB rw
DeviceAllow=char-drm rw
-RestrictAddressFamilies=AF_INET AF_INET6
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
ProtectSystem=yes
ProtectHome=yes
NoNewPrivileges=yes
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 7dfa9e2d079e..8c2259f17cf7 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -6,12 +6,8 @@
<name>James Le Cuirot</name>
</maintainer>
<use>
- <flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
- <flag name="constcw">Enable support for the constcw protocol</flag>
- <flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
<flag name="ddci">Enable support for DDCI hardware</flag>
<flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag>
- <flag name="dvben50221">Enable support for hardware CAM</flag>
<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
<flag name="imagecache">Enable support for image caching</flag>
<flag name="iptv">Enable support for Internet Protocol TV</flag>
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
deleted file mode 100644
index 11b918469163..000000000000
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
-
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/gettext
- virtual/pkgconfig
-"
-# <ffmpeg-5 dep for bug #834399, https://github.com/tvheadend/tvheadend/pull/1460
-RDEPEND="
- acct-user/tvheadend
- virtual/libiconv
- dbus? ( sys-apps/dbus )
- dvbcsa? ( media-libs/libdvbcsa )
- dvben50221? ( media-tv/linuxtv-dvb-apps )
- ffmpeg? ( <media-video/ffmpeg-5:= )
- hdhomerun? ( media-libs/libhdhomerun )
- dev-libs/openssl:0=
- uriparser? ( dev-libs/uriparser )
- zeroconf? ( net-dns/avahi )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
- ${RDEPEND}
- dvb? ( sys-kernel/linux-headers )
-"
-
-RDEPEND+="
- dvb? ( media-tv/dtv-scan-tables )
- xmltv? ( media-tv/xmltv )
-"
-
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
-
-# Some patches from:
-# https://github.com/rpmfusion/tvheadend
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
- "${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch
- "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
- "${FILESDIR}"/${PN}-4.2.7-python3.patch
- "${FILESDIR}"/${PN}-4.2.8-gcc9.patch
- "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
- "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
-)
-
-DOCS=( README.md )
-
-pkg_setup() {
- python-any-r1_pkg_setup
-
- use inotify &&
- CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-}
-
-src_configure() {
- CC="$(tc-getCC)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- econf \
- --disable-bundle \
- --disable-ccache \
- --disable-dvbscan \
- --disable-ffmpeg_static \
- --disable-hdhomerun_static \
- --nowerror \
- $(use_enable capmt) \
- $(use_enable constcw) \
- $(use_enable cwc) \
- $(use_enable dbus dbus_1) \
- $(use_enable debug trace) \
- $(use_enable dvb linuxdvb) \
- $(use_enable dvbcsa) \
- $(use_enable dvben50221) \
- $(use_enable ffmpeg libav) \
- $(use_enable hdhomerun hdhomerun_client) \
- $(use_enable imagecache) \
- $(use_enable inotify) \
- $(use_enable iptv) \
- $(use_enable satip satip_server) \
- $(use_enable satip satip_client) \
- $(use_enable systemd libsystemd_daemon) \
- $(use_enable timeshift) \
- $(use_enable uriparser) \
- $(use_enable zeroconf avahi) \
- $(use_enable zlib)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/tvheadend.initd tvheadend
- newconfd "${FILESDIR}"/tvheadend.confd tvheadend
-
- use systemd &&
- systemd_dounit "${FILESDIR}"/tvheadend.service
-}
-
-pkg_postinst() {
- elog "The Tvheadend web interface can be reached at:"
- elog "http://localhost:9981/"
- elog
- elog "Make sure that you change the default username"
- elog "and password via the Configuration / Access control"
- elog "tab in the web interface."
-
- . "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
-
- if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
- echo
- ewarn "The HOME directory for the tvheadend user has changed from"
- ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
- ewarn "to use the old location until you update TVHEADEND_CONFIG in"
- ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
- ewarn "before you do so."
- fi
-}
diff --git a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild b/media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
index d151d6b97eea..ad4beb9c15f2 100644
--- a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
@@ -3,18 +3,18 @@
EAPI=8
-COMMIT="c63115464d8f6556fb4cac93ce8740afea1b00d5"
+COMMIT="e855f62e6697cf756ad2eed2ed03b8d06ba2019b"
PYTHON_COMPAT=( python3_{10..12} )
-inherit linux-info python-single-r1 systemd toolchain-funcs
+inherit flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
SRC_URI="https://github.com/tvheadend/tvheadend/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
REQUIRED_USE="
@@ -64,8 +64,6 @@ RDEPEND+="
xmltv? ( media-tv/xmltv )
"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
# Some patches from:
# https://github.com/rpmfusion/tvheadend
@@ -93,6 +91,11 @@ pkg_setup() {
# most of them only take effect when --enable-ffmpeg_static is given.
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/932794
+ # https://github.com/tvheadend/tvheadend/issues/1732
+ filter-lto
+
CC="$(tc-getCC)" \
PKG_CONFIG="$(tc-getPKG_CONFIG)" \
econf \
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 21d9095d7d84..d351184bd715 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -5,12 +5,11 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit git-r3 linux-info python-single-r1 systemd toolchain-funcs
+inherit flag-o-matic git-r3 linux-info python-single-r1 systemd toolchain-funcs
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-
LICENSE="GPL-3"
SLOT="0"
IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
@@ -89,6 +88,11 @@ pkg_setup() {
# most of them only take effect when --enable-ffmpeg_static is given.
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/932794
+ # https://github.com/tvheadend/tvheadend/issues/1732
+ filter-lto
+
CC="$(tc-getCC)" \
PKG_CONFIG="$(tc-getPKG_CONFIG)" \
econf \
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch
deleted file mode 100644
index 8abe888ff0e2..000000000000
--- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# file v4l-dvb-saa716x-4.10-fix-compile.patch
---- a/linux/drivers/media/common/saa716x/saa716x_ff.h
-+++ b/linux/drivers/media/common/saa716x/saa716x_ff.h
-@@ -1,7 +1,6 @@
- #ifndef __SAA716x_FF_H
- #define __SAA716x_FF_H
-
--#include "dvb_filter.h"
- #include "dvb_ringbuffer.h"
- #include <linux/version.h>
- #include <linux/workqueue.h>
-@@ -95,6 +94,7 @@
- #define MAX_RESULT_LEN 256
- #define MAX_DATA_LEN (1024 * 1024)
-
-+#define TS_SIZE 188
- #define TSOUT_LEN (1024 * TS_SIZE)
- #define TSOUT_LEVEL_FILL (350 * TS_SIZE)
- #define TSOUT_LEVEL_HIGH (30 * TS_SIZE)
-
-# file v4l-dvb-saa716x-4.14.0-fix-compile.patch
---- 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/files/v4l-dvb-saa716x-up-to-4.17.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.17.patch
deleted file mode 100644
index 58bae509ec85..000000000000
--- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.17.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-# file v4l-dvb-saa716x-4.15-fix-autorepeat.patch
-
-# Source: https://github.com/s-moch/linux-saa716x/commit/0b2276ee2e6383ad577fce5c694f8c4062d5334b.patch
-
-From 0b2276ee2e6383ad577fce5c694f8c4062d5334b Mon Sep 17 00:00:00 2001
-From: Soeren Moch <smoch@web.de>
-Date: Sat, 2 Dec 2017 20:51:10 +0100
-Subject: [PATCH] saa716x_ff: Remove autorepeat handling
-
-Let the input layer handle autorepeat for the IR remote.
-So no repeat_key timer is required anymore.
-
-Signed-off-by: Soeren Moch <smoch@web.de>
----
- drivers/media/common/saa716x/saa716x_ff_ir.c | 45 ++++++++--------------------
- 1 file changed, 12 insertions(+), 33 deletions(-)
-
-diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c
-index 35624789aa862..ad6f38611026c 100644
---- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
-+++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
-@@ -40,7 +40,7 @@ struct infrared {
- u8 protocol;
- u16 last_key;
- u16 last_toggle;
-- bool delay_timer_finished;
-+ bool key_pressed;
- };
-
- #define IR_RC5 0
-@@ -52,11 +52,12 @@ static void ir_emit_keyup(unsigned long parm)
- {
- struct infrared *ir = (struct infrared *) parm;
-
-- if (!ir || !test_bit(ir->last_key, ir->input_dev->key))
-+ if (!ir || !ir->key_pressed)
- return;
-
- input_report_key(ir->input_dev, ir->last_key, 0);
- input_sync(ir->input_dev);
-+ ir->key_pressed = false;
- }
-
-
-@@ -114,28 +115,18 @@ static void ir_emit_key(unsigned long parm)
- return;
- }
-
-- if (timer_pending(&ir->keyup_timer)) {
-- del_timer(&ir->keyup_timer);
-- if (ir->last_key != keycode || toggle != ir->last_toggle) {
-- ir->delay_timer_finished = false;
-- input_event(ir->input_dev, EV_KEY, ir->last_key, 0);
-- input_event(ir->input_dev, EV_KEY, keycode, 1);
-- input_sync(ir->input_dev);
-- } else if (ir->delay_timer_finished) {
-- input_event(ir->input_dev, EV_KEY, keycode, 2);
-- input_sync(ir->input_dev);
-- }
-- } else {
-- ir->delay_timer_finished = false;
-- input_event(ir->input_dev, EV_KEY, keycode, 1);
-- input_sync(ir->input_dev);
-- }
-+ if (ir->key_pressed &&
-+ (ir->last_key != keycode || toggle != ir->last_toggle))
-+ input_event(ir->input_dev, EV_KEY, ir->last_key, 0);
-
-+ input_event(ir->input_dev, EV_KEY, keycode, 1);
-+ input_sync(ir->input_dev);
-+
-+ ir->key_pressed = true;
- ir->last_key = keycode;
- ir->last_toggle = toggle;
-
-- ir->keyup_timer.expires = jiffies + UP_TIMEOUT;
-- add_timer(&ir->keyup_timer);
-+ mod_timer(&ir->keyup_timer, jiffies + UP_TIMEOUT);
-
- }
-
-@@ -166,16 +157,6 @@ static void ir_register_keys(struct infrared *ir)
- ir->input_dev->keycodemax = ARRAY_SIZE(ir->key_map);
- }
-
--
--/* called by the input driver after rep[REP_DELAY] ms */
--static void ir_repeat_key(unsigned long parm)
--{
-- struct infrared *ir = (struct infrared *) parm;
--
-- ir->delay_timer_finished = true;
--}
--
--
- /* interrupt handler */
- void saa716x_ir_handler(struct saa716x_dev *saa716x, u32 ir_cmd)
- {
-@@ -236,9 +217,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x)
- ir->key_map[i] = i+1;
- ir_register_keys(ir);
-
-- /* override repeat timer */
-- input_dev->timer.function = ir_repeat_key;
-- input_dev->timer.data = (unsigned long) ir;
-+ input_enable_softrepeat(input_dev, 800, 200);
-
- tasklet_init(&ir->tasklet, ir_emit_key, (unsigned long) saa716x);
- saa716x->ir_priv = ir;
-
-# file v4l-dvb-saa716x-4.15-fix-timers.patch
-# Source: https://github.com/s-moch/linux-saa716x/commit/1002d79c4ba60de0dbeacba0f289119556d7450d.patch
-
-From 1002d79c4ba60de0dbeacba0f289119556d7450d Mon Sep 17 00:00:00 2001
-From: Soeren Moch <smoch@web.de>
-Date: Sat, 2 Dec 2017 21:23:34 +0100
-Subject: [PATCH] saa716x_ff: Convert to new timer API
-
-Convert to new timer API in linux-4.15.
-
-Signed-off-by: Soeren Moch <smoch@web.de>
----
- drivers/media/common/saa716x/saa716x_ff_ir.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c
-index ad6f38611026c..7894adff4d4f6 100644
---- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
-+++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c
-@@ -48,9 +48,9 @@ struct infrared {
-
-
- /* key-up timer */
--static void ir_emit_keyup(unsigned long parm)
-+static void ir_emit_keyup(struct timer_list *t)
- {
-- struct infrared *ir = (struct infrared *) parm;
-+ struct infrared *ir = from_timer(ir, t, keyup_timer);
-
- if (!ir || !ir->key_pressed)
- return;
-@@ -184,9 +184,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x)
- if (!ir)
- return -ENOMEM;
-
-- init_timer(&ir->keyup_timer);
-- ir->keyup_timer.function = ir_emit_keyup;
-- ir->keyup_timer.data = (unsigned long) ir;
-+ timer_setup(&ir->keyup_timer, ir_emit_keyup, 0);
-
- input_dev = input_allocate_device();
- if (!input_dev)
-
-# file v4l-dvb-saa716x-4.16-fix-compile.patch
-diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c
---- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c 2018-04-04 08:24:59.454708009 +0200
-+++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c 2018-04-04 08:25:36.263560559 +0200
-@@ -1,9 +1,9 @@
- #include <linux/bitops.h>
-
--#include "dmxdev.h"
--#include "dvbdev.h"
--#include "dvb_demux.h"
--#include "dvb_frontend.h"
-+#include <media/dmxdev.h>
-+#include <media/dvbdev.h>
-+#include <media/dvb_demux.h>
-+#include <media/dvb_frontend.h>
-
- #include "saa716x_mod.h"
- #include "saa716x_spi.h"
-diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h
---- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-04-04 08:24:59.458708101 +0200
-+++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-04-04 08:25:36.263560559 +0200
-@@ -1,7 +1,7 @@
- #ifndef __SAA716x_FF_H
- #define __SAA716x_FF_H
-
--#include "dvb_ringbuffer.h"
-+#include <media/dvb_ringbuffer.h>
- #include <linux/version.h>
- #include <linux/workqueue.h>
-
-diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h
---- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h 2018-04-04 08:24:59.458708101 +0200
-+++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h 2018-04-04 08:25:36.263560559 +0200
-@@ -18,11 +18,11 @@
- #include "saa716x_spi.h"
- #include "saa716x_vip.h"
-
--#include "dvbdev.h"
--#include "dvb_demux.h"
--#include "dmxdev.h"
--#include "dvb_frontend.h"
--#include "dvb_net.h"
-+#include <media/dvbdev.h>
-+#include <media/dvb_demux.h>
-+#include <media/dmxdev.h>
-+#include <media/dvb_frontend.h>
-+#include <media/dvb_net.h>
-
- #define SAA716x_ERROR 0
- #define SAA716x_NOTICE 1
-
-# file v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch
---- a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:44:10.479886225 +0100
-+++ b/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:45:19.981237523 +0100
-@@ -108,6 +108,9 @@
- #define VIDEO_CAPTURE_OFF 0
- #define VIDEO_CAPTURE_ONE_SHOT 1
-
-+#ifndef AUDIO_GET_PTS
-+#define AUDIO_GET_PTS _IOR('o', 19, __u64)
-+#endif
-
- /* place to store all the necessary device information */
- struct sti7109_dev {
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch
deleted file mode 100644
index e719f4d629e2..000000000000
--- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# file OSD_RAW_CMD_patch_2.diff
---- a/linux/drivers/media/common/saa716x/saa716x_ff_cmd.h.orig 2011-11-12 14:46:51.175700236 +0100
-+++ b/linux/drivers/media/common/saa716x/saa716x_ff_cmd.h 2011-11-12 14:45:10.103702959 +0100
-@@ -1,6 +1,24 @@
- #ifndef __SAA716x_FF_CMD_H
- #define __SAA716x_FF_CMD_H
-
-+#if !defined OSD_RAW_CMD
-+typedef struct osd_raw_cmd_s {
-+ const void *cmd_data;
-+ int cmd_len;
-+ void *result_data;
-+ int result_len;
-+} osd_raw_cmd_t;
-+
-+typedef struct osd_raw_data_s {
-+ const void *data_buffer;
-+ int data_length;
-+ int data_handle;
-+} osd_raw_data_t;
-+
-+#define OSD_RAW_CMD _IOWR('o', 162, osd_raw_cmd_t)
-+#define OSD_RAW_DATA _IOWR('o', 163, osd_raw_data_t)
-+#endif
-+
- extern int sti7109_cmd_init(struct sti7109_dev *sti7109);
- extern int sti7109_raw_cmd(struct sti7109_dev * sti7109,
- osd_raw_cmd_t * cmd);
-
-# file v4l-dvb-saa716x-Makefilepatch-2.diff
---- v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile.orig 2013-03-02 07:44:51.112642592 +0100
-+++ v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile 2013-03-02 07:46:56.703138542 +0100
-@@ -24,3 +24,5 @@
- obj-$(CONFIG_DVB_SAA716X_FF) += saa716x_ff.o
-
- EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
-+EXTRA_CFLAGS += -Idrivers/media/common/tuners/ # up to kernel 3.6
-+EXTRA_CFLAGS += -Idrivers/media/tuners/ # kernel 3.7+
-
-
-# file v4l-dvb-saa716x-3.19-set_gpio.patch
---- a/linux/drivers/media/common/saa716x/saa716x_budget.c 2014-11-09 15:44:55.000000000 +0100
-+++ b/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-02-28 13:58:01.258743639 +0100
-@@ -497,10 +497,10 @@
- break;
- }
-
-- err = stv090x_set_gpio(fe, 2, 0, en, 0);
-+ err = skystar2_stv090x_config.set_gpio(fe, 2, 0, en, 0);
- if (err < 0)
- goto exit;
-- err = stv090x_set_gpio(fe, 3, 0, sel, 0);
-+ err = skystar2_stv090x_config.set_gpio(fe, 3, 0, sel, 0);
- if (err < 0)
- goto exit;
-
-@@ -519,7 +519,7 @@
- else
- value = 0;
-
-- err = stv090x_set_gpio(fe, 4, 0, value, 0);
-+ err = skystar2_stv090x_config.set_gpio(fe, 4, 0, value, 0);
- if (err < 0)
- goto exit;
-
-# file v4l-dvb-saa716x-4.2-fix-compile.patch
---- a/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200
-+++ b/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:31:03.899206845 +0200
-@@ -306,7 +306,7 @@
- #define SAA716x_MODEL_TWINHAN_VP1028 "Twinhan/Azurewave VP-1028"
- #define SAA716x_DEV_TWINHAN_VP1028 "DVB-S"
-
--static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
-+static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
- {
- struct saa716x_dev *saa716x = fe->dvb->priv;
-
---- a/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100
-+++ b/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2015-09-03 00:31:03.899206845 +0200
-@@ -321,7 +321,7 @@
- .request_firmware = tda1004x_vp6090_request_firmware,
- };
-
--static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
-+static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
- {
- struct saa716x_dev *saa716x = fe->dvb->priv;
-
---- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100
-+++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2015-09-03 00:31:03.900206839 +0200
-@@ -1,3 +1,5 @@
-+#include <asm/atomic.h>
-+#include <linux/spinlock_types.h>
- #include <asm/io.h>
- #include <asm/pgtable.h>
- #include <asm/page.h>
-
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch
deleted file mode 100644
index 72c27974bfd2..000000000000
--- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-# file v4l-dvb-saa716x-4.5.2-fix-compile.patch
-fix compile with kernel >= 4.5.2
-wrt bug 581450
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2016/05/05
---- a/linux/drivers/media/common/saa716x/saa716x_pci.c.old 2016-04-27 20:59:51.000000000 +0200
-+++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2016-04-27 21:19:03.117822874 +0200
-@@ -1,6 +1,7 @@
- #include <asm/atomic.h>
- #include <linux/spinlock_types.h>
- #include <asm/io.h>
-+#include <asm/processor.h>
- #include <asm/pgtable.h>
- #include <asm/page.h>
- #include <linux/kmod.h>
-
-
-
-# file v4l-dvb-saa716x-4.6.0-fix-compile.patch
---- 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 <asm/atomic.h>
- #include <linux/spinlock_types.h>
--#include <asm/io.h>
- #include <asm/processor.h>
--#include <asm/pgtable.h>
--#include <asm/page.h>
- #include <linux/kmod.h>
- #include <linux/vmalloc.h>
- #include <linux/init.h>
-@@ -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;
-
-
-
-# file v4l-dvb-saa716x-4.9-fix-warnings.patch
---- a/linux/drivers/media/common/saa716x/saa716x_rom.c 2015-12-29 19:40:55.000000000 +0100
-+++ a/linux/drivers/media/common/saa716x/saa716x_rom.c 2017-07-11 00:51:19.149941914 +0200
-@@ -113,7 +113,7 @@
- memcpy(rom_header, &buf[*offset], sizeof (struct saa716x_romhdr));
- if (rom_header->header_size != sizeof (struct saa716x_romhdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%zd bytes, Expected=%d",
- sizeof (struct saa716x_romhdr),
- rom_header->header_size);
-
-@@ -237,7 +237,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_decoder_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_decoder_hdr));
-
-@@ -268,7 +268,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_gpio_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_gpio_hdr));
-
-@@ -305,7 +305,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_video_decoder_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_video_decoder_hdr));
-
-@@ -386,7 +386,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_audio_decoder_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_audio_decoder_hdr));
-
-@@ -417,7 +417,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_evsrc_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_evsrc_hdr));
-
-@@ -448,7 +448,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_xbar_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_xbar_hdr));
-
-@@ -486,7 +486,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_tuner_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_tuner_hdr));
-
-@@ -516,7 +516,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_pll_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_pll_hdr));
-
-@@ -546,7 +546,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_channel_decoder_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_channel_decoder_hdr));
-
-@@ -576,7 +576,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_encoder_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_encoder_hdr));
-
-@@ -606,7 +606,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_ir_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_ir_hdr));
-
-@@ -637,7 +637,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_eeprom_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_eeprom_hdr));
-
-@@ -668,7 +668,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_filter_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_filter_hdr));
-
-@@ -699,7 +699,7 @@
- saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
- if (header.size != sizeof (struct saa716x_streamdev_hdr)) {
- dprintk(SAA716x_ERROR, 1,
-- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
-+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
- header.size,
- sizeof (struct saa716x_streamdev_hdr));
-
-@@ -789,7 +789,7 @@
-
- memcpy(device, &buf[*offset], sizeof (struct saa716x_devinfo));
- if (device->struct_size != sizeof (struct saa716x_devinfo)) {
-- dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%d bytes",
-+ dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%zd bytes",
- device->struct_size,
- sizeof (struct saa716x_devinfo));
-
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild
deleted file mode 100644
index 0d5c4c5f73d7..000000000000
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-REVISION="83f3bfd93a95"
-REVISION_DATE="20160322"
-
-SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${REVISION}.tar.bz2
--> v4l-dvb-saa716x-0.0.1_p${REVISION_DATE}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="sys-firmware/tt-s2-6400-firmware"
-
-S="${WORKDIR}/powARman-v4l-dvb-saa716x-${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
-
- kernel_is ge 4 4 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.4.patch"
- kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.9.patch"
- kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.14.patch"
- kernel_is ge 4 17 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.17.patch"
- kernel_is ge 5 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-5.6-fix-compile.patch"
-}
-
-src_compile() {
- kernel_is le 5 0 && BUILD_PARAMS="SUBDIRS" || BUILD_PARAMS="M"
- BUILD_PARAMS+="=${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 /usr/src/linux/
- linux-mod_src_compile
-}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r6.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r6.ebuild
index 18644b71e336..1b4fe67a81d7 100644
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r6.ebuild
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/powARman-v4l-dvb-saa716x-${REVISION}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="sys-firmware/tt-s2-6400-firmware"