testing/vdr: revise plugin versions.

2 files changed, 7 insertions, 55 deletions

diff --git a/testing/vdr/APKBUILD b/testing/vdr/APKBUILD
index 50e16d9d34..68b3f48757 100644
--- a/testing/vdr/APKBUILD
+++ b/testing/vdr/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Taner Tas <taner76@gmail.com>
 pkgname=vdr
 pkgver=2.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Video Disk Recorder"
 url="http://www.tvdr.de/"
 arch="all"
@@ -16,10 +16,10 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-softhddevice $pkgn
 options="!check"
 
 _femon_ver=28e4fb8de8578a1b8a36eb38d2e710dc60be7e3f
-_softhddevice_ver=9c90c5afbd85a113781a7d8fb10e7d68a109c698
+_softhddevice_ver=4e5da1ac3df6b7c387e1bf666327d2cd3f807048
 _mpv_ver=87543f7058b88a3ace8550551bb3982cc304720e
-_vnsiserver_ver=2c42df3cf1ba37184e9106091f383ea6009490da
-_streamdev_ver=b84b7d858cf4f6f3473ba72d456326c048946cb0
+_vnsiserver_ver=02f1631e482002da38f4df4d067cfe2e4c44d255
+_streamdev_ver=e2a9b979d3fb92967c7a6a8221e674eb7e55c813
 
 source="ftp://ftp.tvdr.de/vdr/Developer/vdr-${pkgver}.tar.bz2
 	vdr-plugin-femon-${_femon_ver}.tar.gz::https://github.com/rofafor/vdr-plugin-femon/archive/${_femon_ver}.tar.gz
@@ -29,7 +29,6 @@ source="ftp://ftp.tvdr.de/vdr/Developer/vdr-${pkgver}.tar.bz2
 	vdr-plugin-streamdev-${_streamdev_ver}.tar.gz::https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-${_streamdev_ver}.tar.gz
 	musl-compat.patch
 	softhddevice-musl.patch
-	streamdev-for-2.3.7.patch
 	Make.config
 	include-missing-limits-ppc64le.patch"
 
@@ -94,12 +93,11 @@ package() {
 }
 sha512sums="9dd8d90b365c255bfdf334f6f20a65671dbaf02da68dffdba003fe59243fc0636213b9df47bd6d350046fe4c6b3cb7568f2d9fd5ccdbff534328bc82e5a18d0b  vdr-2.3.8.tar.bz2
 4f09246b0293617ee959ea768f215724c3996e10d7ee09399ce7c571d30e34da062df84d44465142261ea06069b09bac8b4a683a8dee54713385cc73f485c426  vdr-plugin-femon-28e4fb8de8578a1b8a36eb38d2e710dc60be7e3f.tar.gz
-e6f0a6c92ab4ce282ece053eb254fe8be51c2284651a6c1c215d5cf2a51093dd387490a8731b8d41ba7c0f87ea9e0f638a89e56f718f73691fb4e195a5fbf409  vdr-plugin-softhddevice-9c90c5afbd85a113781a7d8fb10e7d68a109c698.tar.gz
+bf8ee08c8b61ae5acf13b8b50c12f4022347960adb94cb5c7b4a477866b7241bc9e2b8496d5a0ffe702df0cd825d2c5dc0ee6a11b3c75cd3628d76692c199610  vdr-plugin-softhddevice-4e5da1ac3df6b7c387e1bf666327d2cd3f807048.tar.gz
 a9047da75cc11e675123d418c15a9712ac019658836630c7949699e39a0ade555dd2d52845abffd2cce0857e2c810f4bb5a7bf8b80dbc1a3c1b75002392dece3  vdr-plugin-mpv-87543f7058b88a3ace8550551bb3982cc304720e.tar.gz
-8fd60ff87bdc5eeadd6438902171340df940293c275fde0bda413c7bb788a8d08942b24523998692111621117b0b47e35eb8c65c55a7365c18bf520afa019167  vdr-plugin-vnsiserver-2c42df3cf1ba37184e9106091f383ea6009490da.tar.gz
-63b0fb071f0bd38a2f8077ae5a71a484217c5c887ae815161c757058ecd75360a4f78c86eb12060b45404113581f3bcb0b2ea814aa6b60d18f88f84eba8b8f5b  vdr-plugin-streamdev-b84b7d858cf4f6f3473ba72d456326c048946cb0.tar.gz
+49bde576df4266d1c27d2372cf81739faccd106a50cd236970fd7fc438b5daf6a42689bfba3bb0066e18fc0a64bcae602fb1f438173029dfc28178d5e9a15707  vdr-plugin-vnsiserver-02f1631e482002da38f4df4d067cfe2e4c44d255.tar.gz
+4bd1cb3115ec6d9e91b1ff38f761fb7cd95d314f96ec00e619a993afc8422f2dc5b30f2638e9fbf27afe20fbd9597318aa8e347efca29d4cabeff7e2e4f3c25c  vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.gz
 f47461445515e44f5cdb9c6d3b1bcae323bb83ba3de7c77a3be4d9ac99ed9e76ebe2ee720660c5593fa4b6995366b9d98bf1683f7b8786518a444de7754731ca  musl-compat.patch
 c6f89ba45bf02c0d85963797ff579f3ae0616a827f2b883685b44241bddea7916c3d6da21790553d161884c39d12ee21fc10f7d9d5aee9767cdde10cde02baac  softhddevice-musl.patch
-60262ccb296bb098a469cce102f97da191af811ba7b0cbabc9d071275b1262f71e57933541b9a30fa0f4336384b2a5a711577e772ff7c751ddb07a9cbdd067dc  streamdev-for-2.3.7.patch
 0add913727ebc2ab290211354e2310573f7ece14fcad8636b0a1d7cff49e32027e2d5a6aab3050e577f62387efff8aecc73dfc16e0f876ae28c5257fc9b6c67f  Make.config
 b77b705601f583eda11f72d9f5e55f5d9af447f4a0d5d80c01dc10cbb4a5e3c3a1c457cd07f276dbcd907b321e607fec26efdae79bc3bddc7d89184edf7febfc  include-missing-limits-ppc64le.patch"
diff --git a/testing/vdr/streamdev-for-2.3.7.patch b/testing/vdr/streamdev-for-2.3.7.patch
deleted file mode 100644
index 0b9b9e1023..0000000000
--- a/testing/vdr/streamdev-for-2.3.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ce74c3ab559d579c37ad8ac29ddfc188d2f3ba26 Mon Sep 17 00:00:00 2001
-From: Jasmin Jessich <jasmin@anw.at>
-Date: Sun, 11 Jun 2017 21:01:01 +0200
-Subject: [PATCH] Fixed compilation for vdr 2.3.7
-
---- a/PLUGINS/src/streamdev/server/connectionVTP.c
-+++ b/PLUGINS/src/streamdev/server/connectionVTP.c
-@@ -41,7 +41,9 @@ private:
- 	enum eStates { Channel, Event, Title, Subtitle, Description, Vps, Content, Rating,
- 	               EndEvent, EndChannel, EndEPG };
- 	cConnectionVTP    *m_Client;
-+#if APIVERSNUM < 20300
- 	cSchedulesLock    *m_SchedulesLock;
-+#endif
- 	const cSchedules  *m_Schedules;
- 	const cSchedule   *m_Schedule;
- 	const cEvent      *m_Event;
-@@ -210,7 +212,9 @@ cLSTEHandler::cLSTEHandler(cConnectionVTP *Client, const char *Option):
- 
- cLSTEHandler::~cLSTEHandler()
- {
-+#if APIVERSNUM < 20300
- 	delete m_SchedulesLock;
-+#endif
- }
- 
- bool cLSTEHandler::Next(bool &Last)
---- a/PLUGINS/src/streamdev/Makefile.orig
-+++ b/PLUGINS/src/streamdev/Makefile
-@@ -16,7 +16,7 @@
- ### The directory environment:
- 
- # Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
-+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
- LIBDIR = $(call PKGCFG,libdir)
- LOCDIR = $(call PKGCFG,locdir)
- PLGCFG = $(call PKGCFG,plgcfg)
-@@ -37,8 +37,6 @@
- -include $(PLGCFG)
- 
- ### export all vars for sub-makes, using absolute paths
--LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd)
--LOCDIR := $(shell cd $(LOCDIR) >/dev/null 2>&1 && pwd)
- export
- unexport PLUGIN