gentoo resync : 03.11.2019

4 files changed, 82 insertions, 19 deletions

diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest
index 69284e4607d6..8ac28919200a 100644
--- a/media-plugins/vdr-satip/Manifest
+++ b/media-plugins/vdr-satip/Manifest
@@ -1,6 +1,8 @@
-AUX confd 951 BLAKE2B 68943b68c686cc9f20f96e9658d86cf8d0692c507f4f06c0e6eb5e3badd8403a52f01fc09fdfd2cf42a2e918c3d0953f7a21b1a14e94ecc4fe301457c8f266f9 SHA512 3980ca86e4e5af99cc0582e6171355313da8b11a31041fd1327f1fa625f13eded55ad7a841d084fe32279e9d1e892d9fbe5999761153200cc09055cf03b67d3d
+AUX confd 2025 BLAKE2B 56f5d7cd65289204c5ca05e9f885110064cef68283dda7619c7efa6e0653db00d82af627c2523d1b732cdf32ab7f3a7202938c59970ec1e8275c5007d83b4020 SHA512 514a4b6a6b920410a83220b8345d8b918f922b096b356d690d771947cfaf8705797fd15498c21c44201a2ecda8cd1aff7deedde4489d24497c7dc3206354b16c
 AUX vdr-satip-2.2.3_c++11.patch 1337 BLAKE2B 30f61831ebf10a040433e231f902c1559c1dbe4243cafa8a6e583ff2d1091739adec7de89fa013687581c0c58bcb48afebed2f46833ff454b8131790709e10cb SHA512 e1c8a4d0e414d886563d8273e46380528e5d67ad02281667cb607f0643cd27c08f00d919a1f62f8de97bbd401317f6dc25a96e4a8c1588a57d691a95e4593210
 AUX vdr-satip-2.2.3_missinginclude.patch 472 BLAKE2B fd2a608deb3edb3dbbfd0cdee01261586b16bf8f7683dcce85e7f019bde6dd1bbb60e5b7dee821a04528fe07f0d62265a4899928cbcb53cb31bb7b339b3ffb79 SHA512 a2e3e56557a91d6a2efe0d236ddde821236a0c94981764eb101545db67da0e437851fee4fe9715b4eec1c49aef082bfd7f3933d1eef1a738bf621b27841e2e20
 DIST vdr-satip-2.2.3.tgz 62722 BLAKE2B 408fe520b4210fa24667d4244560d5132260ce08067d482a50b12446c42c0c34fd922b3429d00c4e3550a7b1dc1d21bfac534cae9de478594751b9cf0f558d52 SHA512 451606b52831c009aaec894f0547c59a9447279d7f96a4b2291614eab09a3539849abcb6974b7c2c4b34e7b43a2f9c782ab1ea6bfd4e35f9747349065fb6a5e7
+DIST vdr-satip-2.2.5.tgz 74669 BLAKE2B e586297f0f0c1ca776d4c9f83b46da7f7afe82b80ac7e79ec2da7107c793f5c8a5092590ad23030a435e2d034b084373b9b069bac6ef81822723d33ff6c7fab2 SHA512 3f8ab1d9e84843e71bc6fc8f712d178fa3d304d0959ec977de1b11829e27b575feb78735c6770b15d4dfb8f4fce933aed7df07a6d9ba0b20e937aacd3c643a21
 EBUILD vdr-satip-2.2.3-r2.ebuild 815 BLAKE2B 3eb5ac32d26a1d9fea1d93305c1a696b76f664931ed4db1f62ee754e082c9339a49cbfa2b1db724a2f35f000c10194666f32bda88ded9d421b3c76b784f21ef2 SHA512 96d5d97b75d831c1a33e2e893a7807370aaab66ab6c70bff6d354b8fbaaa64db7f9468d2f132c5b6fdeb1fd68bb4aa3cfe7f3646c79dfbf65a41f416e055b327
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
+EBUILD vdr-satip-2.2.5.ebuild 780 BLAKE2B 89a68d6ae200ef016abd27f999697520bc1479c7fbaf863e55050b7a9e7c8975bc2702a80acbdb045a16d8574e1f2417a12c2cefae73460ccef60dfdeed559c7 SHA512 977d02ff9e65aee2fd28d4895d3861d45c38f1d1a55a731eae9f14f7624a4e1357f8f10ed301ba09e5debbc4d0aca676440b1444582ab5d18c96fbbfe1557ea2
+MISC metadata.xml 465 BLAKE2B 13cded0da3a72588225358dda5fd14556174ee71474c6b45f1a7e90cdf292febd74d5377ce20ae8a09a76c39ddc558a60d4cca25803131c4c8ca88ed77a5f00f SHA512 8ac89613741c22f977e5d4860aabf70a3b369d2ac8f1ce4015fbbf66e5ef1ea07d6df9f65cc3b625102edc7ab78d96b39e131642629d195c492134912aebf995
diff --git a/media-plugins/vdr-satip/files/confd b/media-plugins/vdr-satip/files/confd
index 6f70479f0bae..74f89381ae35 100644
--- a/media-plugins/vdr-satip/files/confd
+++ b/media-plugins/vdr-satip/files/confd
@@ -1,24 +1,46 @@
 # /etc/conf.d/vdr.satip:
 
-#Configuration:
+# Configuration:
 
-#The plugin accepts a "--devices" (-d) command-line parameter defaulting
-#to one. This parameter defines how many simultaneous transponders can
-#be received, if there are available SAT>IP tuners.
+# The plugin accepts a "--devices" (-d) command-line parameter defaulting
+# to one. This parameter defines how many simultaneous transponders can
+# be received, if there are available SAT>IP tuners.
 
-#The plugin accepts also a "--server" (-s) command-line parameter, that
-#can be used to manually configure static SAT>IP servers if autodetection
-#via UPnP somehow can't be used. The parameter string is a semicolon
-#separated list of "<ipaddress>|<model>|<description>" entries. The model
-#consists of a DVB system (DVBS2,DVBT2,DVBT,DVBC) and number of available
-#frontends separated by a hyphen:
+# The plugin accepts also a "--server" (-s) command-line parameter, that
+# can be used to manually configure static SAT>IP servers if autodetection
+# via UPnP somehow can't be used. The parameter string is a semicolon
+# separated list of "<ipaddress>|<model>|<description>" entries. The model
+# consists of a DVB system (DVBS2,DVBT2,DVBT,DVBC) and number of available
+# frontends separated by a hyphen:
 
-#vdr -P 'satip -s <ipaddress>|<model>|<description>;...'
-#vdr -P 'satip -s 192.168.0.1|DVBS2-2,DVBT2-2|Octo1'
-#vdr -P 'satip -s 192.168.0.1|DVBS2-4|Octo1;192.168.0.2|DVBT2-4|Octo2'
+#   vdr -P 'satip -s <ipaddress>|<model>|<description>;...'
+#   vdr -P 'satip -s 192.168.0.1|DVBS2-2,DVBT2-2|Octo1'
+#   vdr -P 'satip -s 192.168.0.1|DVBS2-4|Octo1;192.168.0.2|DVBT2-4|Octo2'
+
+# Some SAT>IP tuners need quirks, which the plugin tries to autodetect.
+# Check vdr log for lines like "SATIP: Adding server" what devices are found
+# and added.
+# If this autodetection is not enough, quirks can be overridden with a hexadecimal
+# number behind the description:
+
+#   vdr -P 'satip -s 192.168.0.1|DVBS2-2,DVBT2-2|EXIP414:0x40'
+
+# available quirks:
+#   eSatipQuirkSessionId  = 0x01   fix a session id bug
+#   eSatipQuirkPlayPids   = 0x02   fix a play (add/delpids) parameter bug
+#   eSatipQuirkForceLock  = 0x04   fix a frontend locking bug
+#   eSatipQuirkRtpOverTcp = 0x08   support for RTP over TCP
+#   eSatipQuirkCiXpmt     = 0x10   support the X_PMT protocol extension
+#   eSatipQuirkCiTnr      = 0x20   support the TNR protocol extension
+#   eSatipQuirkForcePilot = 0x40   fix not-supported auto-detection of pilot tones
+#
+# the quirks parameter must be the summary of the single quirks needed
+
+# Warning: specify <description> always without spaces - the gentoo vdr framework
+# will break parameters 
 
 # no default parameters
 # uncomment the next line and add your personal settings,
 # depend on the infos from ahead
-#
-#_EXTRAOPTS""
+
+#_EXTRAOPTS="-d 2 -s 192.168.0.1|DVBS2-2|Octo1"
diff --git a/media-plugins/vdr-satip/metadata.xml b/media-plugins/vdr-satip/metadata.xml
index 27f419c289c3..0f020916bb47 100644
--- a/media-plugins/vdr-satip/metadata.xml
+++ b/media-plugins/vdr-satip/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+	<email>martin.dummer@gmx.net</email>
+	<name>Martin Dummer</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
+	<email>vdr@gentoo.org</email>
+	<name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild
new file mode 100644
index 000000000000..026fed5a737c
--- /dev/null
+++ b/media-plugins/vdr-satip/vdr-satip-2.2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
+HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
+SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="
+	>=media-video/vdr-2.2.0
+	>=net-misc/curl-7.36
+	|| ( dev-libs/tinyxml
+		dev-libs/pugixml )
+"
+RDEPEND="${DEPEND}"
+QA_FLAGS_IGNORED="usr/lib/vdr/plugins/libvdr-satip.* usr/lib64/vdr/plugins/libvdr-satip.*"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version "dev-libs/tinyxml" ; then
+		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile || die "sed failed"
+	fi
+}