Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/ed4190837c5fd4da4846c55e610ed263c201b793)

3 files changed, 162 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bc263b254de..b55c8d1ed95b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.2.2
-# Sun Aug  2 17:34:18 UTC 2020
+# Mon Oct  5 12:38:04 UTC 2020
 pkgbase = vdr-iptv
 	pkgdesc = Integrates multicast IPTV transport streams seamlessly into VDR
 	pkgver = 2.4.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.saunalahti.fi/~rahrenbe/vdr/iptv/
 	arch = x86_64
 	arch = i686
@@ -25,6 +25,7 @@ pkgbase = vdr-iptv
 	backup = etc/vdr/plugins/iptv/vlcinput/zdf_info-iptv.conf
 	backup = etc/vdr/plugins/iptv/vlcinput/zdf_kultur-iptv.conf
 	source = http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-2.4.0.tgz
+	source = vdr-iptv-fix_vlc2iptv.patch
 	source = https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/3Sat.conf
 	source = https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/Bundesligen-TV.conf
 	source = https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/Daytona-Beach.conf
@@ -35,17 +36,18 @@ pkgbase = vdr-iptv
 	source = https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/zdf_info-iptv.conf
 	source = https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/zdf_kultur-iptv.conf
 	source = 50-iptv.conf
-	md5sums = 4de2b227c24f362b452870dbee05b30f
-	md5sums = 5e960f7a71ee493c0bb7a7c56ea109c4
-	md5sums = 8b51a64c8278f62dd9721a83a0654933
-	md5sums = 48c790160833a16bc29aff1e0410995b
-	md5sums = 7b70a8121d1ae0bc9dabc803589b89d0
-	md5sums = cbfba3010acd61c93ac6ca2b18de6c23
-	md5sums = 433df5f08b933040bf81684f45006f09
-	md5sums = cf7e544dd2eba58ebef78131706749e4
-	md5sums = b611bef1267193d056f8e0b3eae3a63d
-	md5sums = 793750d284f06285ea317128abcc398c
-	md5sums = 5ffc4e10ee120975540a7b3bff916d56
+	sha256sums = 73d91b6ffc87e39a7bad235abff73dea4be08638cf2bd34b13c2ad46dff33185
+	sha256sums = d4a39fae860ce961b2aab8b721cef7f37e80640c50cc9c06d5f9d2b9c265379d
+	sha256sums = 9c8e99d0c82ef5af5141ff89ffd411e0feb3ee6ff2416fee03d9b09e2edb2a6c
+	sha256sums = c5ead86e396eb0f2bbfced5913f381764131575379b2930bd0e86f6d2df3f774
+	sha256sums = 040d48f0384e8e3afc3a7cb8ccd35127c7b4a795c4a7a0591e45f386060140c7
+	sha256sums = d1bc5cda831d59d2520fddad69061dd4498ab12a08ebbc7824f96a34de43ee5c
+	sha256sums = c5dd96d8bf4924f33df9e75a0e65fb60db53b60b7ec5385ea0d45268c5b670dc
+	sha256sums = 2ffcb0906e2412f706c9f6316f0f8bdaf1d4e9a79c37558c93826fdf4cf6335b
+	sha256sums = d4f0bf84f02b429dd68b8fedb8a892cedba50a932c5178c887e03305cee43e80
+	sha256sums = 73e12fd7132b9fbe277299fa36378fabbe9a3ebba3966f36c64831968b6e7272
+	sha256sums = a82edea74b3834462ffd7e504c9afb00c2297ddb5aa624c62c0a738e512523e9
+	sha256sums = 0aa1a3f9050345774ff3a7aa1b581ce80416d81fc5fdf8dcc7112f29045be27e
 
 pkgname = vdr-iptv
 
diff --git a/PKGBUILD b/PKGBUILD
index 82dc7e877e09..b1fd017192e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=vdr-iptv
 pkgver=2.4.0
 _vdrapi=2.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Integrates multicast IPTV transport streams seamlessly into VDR"
 url="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -13,6 +13,7 @@ depends=('curl' "vdr-api=${_vdrapi}")
 optdepends=('vlc: Needed for vlc2iptv')
 _plugname=${pkgname//vdr-/}
 source=("http://www.saunalahti.fi/~rahrenbe/vdr/$_plugname/files/$pkgname-$pkgver.tgz"
+        "$pkgname-fix_vlc2iptv.patch"
         'https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/3Sat.conf'
         'https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/Bundesligen-TV.conf'
         'https://github.com/yavdr/yavdr-base/raw/stable-0.5/etc/vdr/plugins/iptv/vlcinput/Daytona-Beach.conf'
@@ -33,17 +34,24 @@ backup=("etc/vdr/conf.avail/50-$_plugname.conf"
         'etc/vdr/plugins/iptv/vlcinput/zdf-iptv.conf'
         'etc/vdr/plugins/iptv/vlcinput/zdf_info-iptv.conf'
         'etc/vdr/plugins/iptv/vlcinput/zdf_kultur-iptv.conf')
-md5sums=('4de2b227c24f362b452870dbee05b30f'
-         '5e960f7a71ee493c0bb7a7c56ea109c4'
-         '8b51a64c8278f62dd9721a83a0654933'
-         '48c790160833a16bc29aff1e0410995b'
-         '7b70a8121d1ae0bc9dabc803589b89d0'
-         'cbfba3010acd61c93ac6ca2b18de6c23'
-         '433df5f08b933040bf81684f45006f09'
-         'cf7e544dd2eba58ebef78131706749e4'
-         'b611bef1267193d056f8e0b3eae3a63d'
-         '793750d284f06285ea317128abcc398c'
-         '5ffc4e10ee120975540a7b3bff916d56')
+sha256sums=('73d91b6ffc87e39a7bad235abff73dea4be08638cf2bd34b13c2ad46dff33185'
+            'd4a39fae860ce961b2aab8b721cef7f37e80640c50cc9c06d5f9d2b9c265379d'
+            '9c8e99d0c82ef5af5141ff89ffd411e0feb3ee6ff2416fee03d9b09e2edb2a6c'
+            'c5ead86e396eb0f2bbfced5913f381764131575379b2930bd0e86f6d2df3f774'
+            '040d48f0384e8e3afc3a7cb8ccd35127c7b4a795c4a7a0591e45f386060140c7'
+            'd1bc5cda831d59d2520fddad69061dd4498ab12a08ebbc7824f96a34de43ee5c'
+            'c5dd96d8bf4924f33df9e75a0e65fb60db53b60b7ec5385ea0d45268c5b670dc'
+            '2ffcb0906e2412f706c9f6316f0f8bdaf1d4e9a79c37558c93826fdf4cf6335b'
+            'd4f0bf84f02b429dd68b8fedb8a892cedba50a932c5178c887e03305cee43e80'
+            '73e12fd7132b9fbe277299fa36378fabbe9a3ebba3966f36c64831968b6e7272'
+            'a82edea74b3834462ffd7e504c9afb00c2297ddb5aa624c62c0a738e512523e9'
+            '0aa1a3f9050345774ff3a7aa1b581ce80416d81fc5fdf8dcc7112f29045be27e')
+
+prepare() {
+  cd "${srcdir}/${_plugname}-${pkgver}"
+
+  patch -p1 -i "$srcdir/$pkgname-fix_vlc2iptv.patch"
+}
 
 build() {
   cd "${srcdir}/${_plugname}-${pkgver}"
@@ -55,6 +63,7 @@ package() {
   make DESTDIR="${pkgdir}" install-lib install-i18n
 
   install -Dm755 iptv/vlc2iptv "$pkgdir/usr/share/vdr/plugins/iptv/vlc2iptv"
+  install -Dm755 iptv/vlc2iptv_raw "$pkgdir/usr/share/vdr/plugins/iptv/vlc2iptv_raw"
 
   mkdir -p "$pkgdir/etc/vdr/plugins/iptv/vlcinput"
   cp "$srcdir"/*.conf "$pkgdir/etc/vdr/plugins/iptv/vlcinput"
diff --git a/vdr-iptv-fix_vlc2iptv.patch b/vdr-iptv-fix_vlc2iptv.patch
new file mode 100644
index 000000000000..af0daa1073e5
--- /dev/null
+++ b/vdr-iptv-fix_vlc2iptv.patch
@@ -0,0 +1,126 @@
+--- a/iptv/vlc2iptv
++++ b/iptv/vlc2iptv
+@@ -66,9 +66,9 @@
+ {
+     local CHANNEL_SETTINGS_FILE="$CHANNEL_SETTINGS_DIR/$CHANNEL_NAME.conf"
+ 
+-    [ ! -e $CHANNEL_SETTINGS_FILE ] && \
++    [ ! -e "$CHANNEL_SETTINGS_FILE" ] && \
+       exit_with_error "No vlc input configuration for channel '$CHANNEL_NAME'"
+-    . $CHANNEL_SETTINGS_FILE
++    . "$CHANNEL_SETTINGS_FILE"
+     
+     [ -z "$URL" ] && \
+       exit_with_error "No URL specified for channel '$CHANNEL_NAME'"
+@@ -88,7 +88,7 @@
+     RESIZE_OPTIONS=""
+ fi
+ 
+-vlc "${URL}" \
++LC_NUMERIC=C vlc "${URL}" \
+   --sout "#transcode{vcodec=mp2v$RESIZE_OPTIONS,acodec=mpga,vb=${VIDEO_BITRATE},ab=${AUDIO_BITRATE}}:standard{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}" \
+   --intf dummy &
+ 
+--- /dev/null
++++ b/iptv/vlc2iptv_raw
+@@ -0,0 +1,100 @@
++#!/bin/sh
++#
++# vlc2iptv is used by the VDR iptv plugin to transcode external sources
++#
++# (C) 2007 Rolf Ahrenberg, Antti Seppälä
++# (C) 2007 Tobias Grimm
++#
++# vlc2iptv is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This package is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this package; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++# MA 02110-1301, USA.
++#
++
++#
++# <Global Settings>
++#
++
++CHANNELS_CONF=/var/lib/vdr/channels.conf
++CHANNEL_SETTINGS_DIR=/etc/vdr/plugins/iptv/vlcinput/
++VIDEO_BITRATE=2400
++AUDIO_BITRATE=320
++
++#
++# </Global Settings>
++#
++
++exit_with_error()
++{
++    logger "vlc2iptv: error: $*"
++    exit 1
++}
++
++read_arguments()
++{
++    [ $# -ne 2 ] && exit_with_error "Invalid parameter count '$#' $*"
++    PARAMETER=$1
++    PORT=$2
++}
++
++lookup_channel_and_pids()
++{
++    [ ! -e "$CHANNELS_CONF" ] && \
++      exit_with_error "channels.conf not found ($CHANNELS_CONF)"
++
++    local CHANNEL_RECORD=`grep "[:]S=[10][|]P=[10][|]F=EXT[|]U=vlc2iptv_raw[|]A=$PARAMETER[:]I" $CHANNELS_CONF`
++    [ -z "$CHANNEL_RECORD" ] && \
++      exit_with_error "no iptv channel with parameter $PARAMETER found"
++
++    CHANNEL_NAME=`echo $CHANNEL_RECORD | awk "-F[;,:]" '{print $1}'`
++    VPID=`echo $CHANNEL_RECORD | awk -F: '{print $6}'`
++    APID=`echo $CHANNEL_RECORD | awk -F: '{print $7}'`
++    SPID=0
++}
++
++load_channel_configuration()
++{
++    local CHANNEL_SETTINGS_FILE="$CHANNEL_SETTINGS_DIR/$CHANNEL_NAME.conf"
++
++    [ ! -e "$CHANNEL_SETTINGS_FILE" ] && \
++      exit_with_error "No vlc input configuration for channel '$CHANNEL_NAME'"
++    . "$CHANNEL_SETTINGS_FILE"
++
++    [ -z "$URL" ] && \
++      exit_with_error "No URL specified for channel '$CHANNEL_NAME'"
++}
++
++read_arguments $*
++lookup_channel_and_pids
++load_channel_configuration
++
++#
++# Start VLC
++#
++
++if [ -n "$WIDTH" -a -n "$HEIGHT" ] ; then
++    RESIZE_OPTIONS=",width=${WIDTH},height=${HEIGHT}"
++else
++    RESIZE_OPTIONS=""
++fi
++
++LC_NUMERIC=C vlc "${URL}" \
++  --sout "#duplicate{dst=std{access=udp,mux=ts{pid-video=${VPID},pid-audio=${APID},pid-spu=${SPID}},dst=127.0.0.1:${PORT}}}" \
++  --intf dummy &
++
++PID=${!}
++
++trap 'kill -INT ${PID} 2> /dev/null' INT EXIT QUIT TERM
++
++# Waiting for the given PID to terminate
++wait ${PID}