From 2b135717d1c9c29d75f2acc1f873d8597a5dc404 Mon Sep 17 00:00:00 2001 From: Stefan Reiff Date: Sun, 3 Jan 2021 23:39:24 +0100 Subject: community/vdr: update to 2.4.6 and update plugins --- community/vdr/APKBUILD | 18 ++++++++---------- community/vdr/libwebsockets-4.1.patch | 16 ---------------- 2 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 community/vdr/libwebsockets-4.1.patch diff --git a/community/vdr/APKBUILD b/community/vdr/APKBUILD index 69d0a60b37a..bef7378f6f5 100644 --- a/community/vdr/APKBUILD +++ b/community/vdr/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter # Maintainer: Taner Tas pkgname=vdr -pkgver=2.4.4 -pkgrel=3 +pkgver=2.4.6 +pkgrel=0 pkgdesc="Video Disk Recorder" url="http://www.tvdr.de/" arch="all !mips64" # ftbfs @@ -34,7 +34,7 @@ subpackages=" #no testsuite available options="!check" -_femon_ver=d366856c719874ddf13886a00d741c4faa14130c +_femon_ver=ff59839f7d5246b286d12352c3e67fc96f698e9a _mpv_ver=87543f7058b88a3ace8550551bb3982cc304720e _vnsiserver_ver=a06ad5fbd4f5d2d547a17db291178d113dfbc699 _streamdev_ver=e2a9b979d3fb92967c7a6a8221e674eb7e55c813 @@ -42,7 +42,7 @@ _epgsearch_ver=d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3 _dvbapi_ver=197e7524e563923d4b86e74a121f7174373818d9 _svdrpservice_ver=1.0.0 _vdrmanager_ver=0398f105bcc166d2695f3b8b2f91327c04acca48 -_osd2web_ver=0.2.52 +_osd2web_ver=25309c0723ba9060ebd5a2dab26899523c94dc22 _confd_dir=etc/vdr/conf.d _plugins_conf_dir=etc/vdr/plugins @@ -75,7 +75,6 @@ source="ftp://ftp.tvdr.de/vdr/vdr-$pkgver.tar.bz2 include-missing-limits.patch streamdev_makefile.patch osd2web.patch - libwebsockets-4.1.patch " prepare() { @@ -179,10 +178,10 @@ _plugin_defaults() { done } -sha512sums="52a9047e2fdfbf80f1ee9b4c5d1bd414bc05632147e82e0ee0f25eb9bca03e52a0e73d3fdf7debfad6712e7dc124fe40a09a8d1663deabcd3745ed7c51b2449f vdr-2.4.4.tar.bz2 +sha512sums="bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4 vdr-2.4.6.tar.bz2 52a6221096f543d7af76f14d1e9227bd9a84151eb1c41654c048f5fcb95759e4d98639ba84921c3306742815f4ee3ba8f93ac1799215cfb1a19370b84f80041f vdr.initd 43502a337324910c8f5db71097336b55a7a58629f201f3a5032397e406ddaf631c647f64220241a84b2eb1b2e0e85af05fa1b017d3d05732c643a754455609d2 00-vdr.conf -741c84ef3769e7b101288315cbbed7c9e9c047b382f888e9789e40c7a6ee734028a41aff03fc0d688a9e5b9091ea2f33896adb6b5ec47f21ff09e29f860500c1 vdr-plugin-femon-d366856c719874ddf13886a00d741c4faa14130c.tar.gz +d54f74b0a8db0e606f9f3ba8c94c867e36aaabb103763810075659af86aae477dd7d0f5f5aaa0f668025dd73e3d1549084feb28c62b8c4d156597a78d03e45da vdr-plugin-femon-ff59839f7d5246b286d12352c3e67fc96f698e9a.tar.gz c80295dd6b4d27eed0639131e104bd071ea3ff55503fc5fdbed4e7668221775a062d37d9e4ff322e4cdc554f0f4ba29adbe3f6424504a74c93f5d302f8f0a904 femon.conf a9047da75cc11e675123d418c15a9712ac019658836630c7949699e39a0ade555dd2d52845abffd2cce0857e2c810f4bb5a7bf8b80dbc1a3c1b75002392dece3 vdr-plugin-mpv-87543f7058b88a3ace8550551bb3982cc304720e.tar.gz c3663b890af2be949e4faffac1ccc1064bb377aa3ba85b4d136ce71db3a1c49b01e9c327e13cd5d02c3d0d850677c3f97a42628957738c17a74d04ec86950bdf mpv.conf @@ -200,11 +199,10 @@ f9c1cc50297b5210aa31b92b17769d4afe20ca0f9f15e190f6e34033b1e2c89a37e332e9f2e9fe4b 2395aed428a072b568ed790e0ee8b3e1d17be62fb28a21bc030c021cef778ba00d7e17451eccf26f09da63c8d5b7786fd12e377d904b23ca1b24c040dc5ce429 vdr-plugin-svdrpservice-1.0.0.tar.gz 9cffb3d8347cfc1028bf39a3b14202ea0bc85d7944a7b12863998abca55d113c36ad327c159bc56d1f58bbe9c43c7beae2bf5b21ffbab70a5bc6c632b8b7c4eb svdrpservice.conf 4d6592c3573f2b786bf8995648b4d4eee5c1658cf1faf1479de52264ea2c38f148bb6ca09ee47bcecdc4470dcea740d154917fe30dba62f14ab49af45573dd36 vdr-plugin-vdrmanager--0398f105bcc166d2695f3b8b2f91327c04acca48.tar.gz -a0ce4485eafd2c9e4694aa79c5875dc797ab669e6be50e511c982f63f7d20fb5b2adf0cde99e9bc1cfe9fded83c88672f4a919e31c9a55698584e3e3bb17f09d vdr-plugin-osd2web-0.2.52.tar.gz +f2fcf3a8d1dd864200f1efd8bf356b49ab6dd5d8c6428fc821f2ccb476953196391118537fb69b83f54dba33ecd2b467fda88341b02059662d68354402521a93 vdr-plugin-osd2web-25309c0723ba9060ebd5a2dab26899523c94dc22.tar.gz 0a31a07399e37516343d9b3b9b4d6984b91ed34c437dae9ee3377417b601f30f344714ee4965616019be1defccbfc3629a1bea89851fa0c28987674c29796936 osd2web.conf f47461445515e44f5cdb9c6d3b1bcae323bb83ba3de7c77a3be4d9ac99ed9e76ebe2ee720660c5593fa4b6995366b9d98bf1683f7b8786518a444de7754731ca musl-compat.patch 6b7102f609bf0272159753dca3b019482e97053a69a666fa0658f45d9d6dbd406070ac9320d127920c2e6d9b32f90b8b47d50d8490b3ce8575830938bb6b84e0 Make.config 7715ef27c820d9e7964dcc24dd12288f66fdf0a6db34d0da43cf6f16e2f815f23bd714654ffa9c3b7d28854bd1e0f7f201dcc5320f99556be92dd248b73bb86f include-missing-limits.patch d65877bb0b2e983cf7b1c4b9e3ed8e4105c25f6ef4bb3c400255f4a30f7e177aa41d7a89871e2c4e2afae1447d6bbe26e79105d5ca20b8593ea49c35ae048952 streamdev_makefile.patch -76eb4074a4a811da458e5ecf855925d295718228c9467c633054c3c6751494af3e06113a549f212f398485f947fb3a283fafe34c198967ab4e2d5c1bf5419495 osd2web.patch -c8abbf0f08af3f400f5d38677429a3735c4ac44ff5b4540ffa069c9498dd1f3f240c0c60f6a5040a62e56ddbb90e60ce0ae858266df58b20955c80c0014cc687 libwebsockets-4.1.patch" +76eb4074a4a811da458e5ecf855925d295718228c9467c633054c3c6751494af3e06113a549f212f398485f947fb3a283fafe34c198967ab4e2d5c1bf5419495 osd2web.patch" diff --git a/community/vdr/libwebsockets-4.1.patch b/community/vdr/libwebsockets-4.1.patch deleted file mode 100644 index c8eb8a45fb9..00000000000 --- a/community/vdr/libwebsockets-4.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add suport for building libwebsockets-4.1 - -diff --git a/PLUGINS/src/osd2web/websock.c b/PLUGINS/src/osd2web/websock.c -index 5df6975..8e5a7c3 100644 ---- a/PLUGINS/src/osd2web/websock.c -+++ b/PLUGINS/src/osd2web/websock.c -@@ -79,7 +79,9 @@ int cWebSock::init(int aPort, int aTimeout) - info.protocols = protocols; - info.ssl_cert_filepath = certPath; - info.ssl_private_key_filepath = keyPath; -+#if LWS_LIBRARY_VERSION_NUMBER >= 2001000 && LWS_LIBRARY_VERSION_NUMBER < 4000000 - info.ws_ping_pong_interval = timeout; -+#endif - info.gid = -1; - info.uid = -1; - info.options = 0; -- cgit v1.2.3