commit: 818cb97c13ec267bf12b024f6c94b43b78c492c3 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Sun Oct 19 09:41:38 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 20 09:38:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818cb97c
media-plugins/vdr-vdrmanager: add 0.15, drop 0.14 update EAPI 7 -> 8 new HOME, SRC_URI introduce subslot dependency on media-video/vdr Closes: https://bugs.gentoo.org/919461 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Part-of: https://github.com/gentoo/gentoo/pull/44250 Signed-off-by: Sam James <sam <AT> gentoo.org> media-plugins/vdr-vdrmanager/Manifest | 2 +- media-plugins/vdr-vdrmanager/files/confd | 13 +++++++ media-plugins/vdr-vdrmanager/files/confd-0.12 | 41 ---------------------- .../vdr-vdrmanager/files/rc-addon-0.12.sh | 28 --------------- media-plugins/vdr-vdrmanager/files/rc-addon.sh | 9 ++++- media-plugins/vdr-vdrmanager/metadata.xml | 3 ++ ...ager-0.14.ebuild => vdr-vdrmanager-0.15.ebuild} | 20 +++++------ 7 files changed, 34 insertions(+), 82 deletions(-) diff --git a/media-plugins/vdr-vdrmanager/Manifest b/media-plugins/vdr-vdrmanager/Manifest index 0911aad1ec6d..eb0e63b2b4ee 100644 --- a/media-plugins/vdr-vdrmanager/Manifest +++ b/media-plugins/vdr-vdrmanager/Manifest @@ -1 +1 @@ -DIST vdr-vdrmanager-0.14.tgz 30543 BLAKE2B d2ccfbd13b811681daa67d9df841d5add7d0068a1a3f49d901c75d35c7462b50d86faeb8c710069249dd6ae2104508b5be7860bfef56162359c340b052933b1c SHA512 6b8604a5311b64fad82e3934f38524cc0f122968c707989606a5e06755a9c817ab3e7144afa4f561d8aaef8b239b758fe886ee3265410de25491243a8ef18fc3 +DIST vdr-vdrmanager-0.15.tar.gz 7189489 BLAKE2B d6ca1da6dae43a5a99a8f1f7ee7752fb523df85190950bf75755906af9c3973d614e65cc8a3df940937ac349f28e9377fbcabfabdbdf30fe118ad361e48e94fe SHA512 b79a2629048f964091368d06a15a614c4acbd384d128a12efa046aeda831f2700ead87c1157b2dfc7ff54d178dfbc52af86c5ae288a7f3bd04f805c69ea95f99 diff --git a/media-plugins/vdr-vdrmanager/files/confd b/media-plugins/vdr-vdrmanager/files/confd index 3f9b97c9e869..a63cfb03f646 100644 --- a/media-plugins/vdr-vdrmanager/files/confd +++ b/media-plugins/vdr-vdrmanager/files/confd @@ -8,6 +8,10 @@ # Set the port where the plugin is listen on # allowed values: port number # default: 6420 +# default port on ssl connection is always VDRMANAGER_PORT +1 +# this means, if you enable ssl support on your android vdrmanager app +# add +1 in the app port setup, else it will still the non ssl connection be used +# try to remember on this ;) # #VDRMANAGER_PORT="6420" @@ -26,3 +30,12 @@ VDRMANAGER_PASS="" # #SVDRPHOSTS_CHECK="no" +# Compressionsmode for data transfer +# 'g' for gzip, if you has use-flag gzip enabled on plugin install +# 'z' for zlib, if you has use-flag zlib enabled on plugin install +# 'n' for none, if you would like to disable compression +# +# allowed values: g | z | n +# default: unset +# +#VDRMANAGER_COMPRESSION="" diff --git a/media-plugins/vdr-vdrmanager/files/confd-0.12 b/media-plugins/vdr-vdrmanager/files/confd-0.12 deleted file mode 100644 index a63cfb03f646..000000000000 --- a/media-plugins/vdr-vdrmanager/files/confd-0.12 +++ /dev/null @@ -1,41 +0,0 @@ -# /etc/conf.d/vdr.vdrmanager - -# Parameters for vdr-plugin-vdrmanager -# -# For more details see: -# http://projects.vdr-developer.org/projects/vdr-manager/wiki - -# Set the port where the plugin is listen on -# allowed values: port number -# default: 6420 -# default port on ssl connection is always VDRMANAGER_PORT +1 -# this means, if you enable ssl support on your android vdrmanager app -# add +1 in the app port setup, else it will still the non ssl connection be used -# try to remember on this ;) -# -#VDRMANAGER_PORT="6420" - -# Set the password where the plugin/app is listen on -# allowed values: your_password -# default: -# -VDRMANAGER_PASS="" - -# Force check against svdrphosts.conf -# change this to yes, if you have added a static IP -# for access outside from your LAN -# -# allowed values: yes | no -# default: no -# -#SVDRPHOSTS_CHECK="no" - -# Compressionsmode for data transfer -# 'g' for gzip, if you has use-flag gzip enabled on plugin install -# 'z' for zlib, if you has use-flag zlib enabled on plugin install -# 'n' for none, if you would like to disable compression -# -# allowed values: g | z | n -# default: unset -# -#VDRMANAGER_COMPRESSION="" diff --git a/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh b/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh deleted file mode 100644 index 9ee9e52a4318..000000000000 --- a/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh +++ /dev/null @@ -1,28 +0,0 @@ -# -# rc-addon plugin-startup-skript for vdr-vdrmanager -# - -: ${VDRMANAGER_PORT:=6420} - -# default path from ebuild merge; no option in config file to overwrite -: ${VDRMANAGER_CERTFILE:=/etc/vdr/plugins/vdrmanager/vdrmanager.pem} - -if [[ -z ${VDRMANAGER_PASS} ]]; then - eerror "Empty password in /etc/conf.d/vdr.vdrmanager" - logger -t vdr "ERROR: need password for plugin vdr-manager" -fi - -plugin_pre_vdr_start() { - - add_plugin_param "-p${VDRMANAGER_PORT}" - add_plugin_param "-P${VDRMANAGER_PASS}" - - if yesno ${SVDRPHOSTS_CHECK:-no}; then - add_plugin_param "-s" - fi - - add_plugin_param "-k ${VDRMANAGER_CERTFILE}" - - # vdrmanager_compression - add_plugin_param "-c ${VDRMANAGER_COMPRESSION}" -} diff --git a/media-plugins/vdr-vdrmanager/files/rc-addon.sh b/media-plugins/vdr-vdrmanager/files/rc-addon.sh index 5abcad497e08..9ee9e52a4318 100644 --- a/media-plugins/vdr-vdrmanager/files/rc-addon.sh +++ b/media-plugins/vdr-vdrmanager/files/rc-addon.sh @@ -4,6 +4,9 @@ : ${VDRMANAGER_PORT:=6420} +# default path from ebuild merge; no option in config file to overwrite +: ${VDRMANAGER_CERTFILE:=/etc/vdr/plugins/vdrmanager/vdrmanager.pem} + if [[ -z ${VDRMANAGER_PASS} ]]; then eerror "Empty password in /etc/conf.d/vdr.vdrmanager" logger -t vdr "ERROR: need password for plugin vdr-manager" @@ -17,5 +20,9 @@ plugin_pre_vdr_start() { if yesno ${SVDRPHOSTS_CHECK:-no}; then add_plugin_param "-s" fi -} + add_plugin_param "-k ${VDRMANAGER_CERTFILE}" + + # vdrmanager_compression + add_plugin_param "-c ${VDRMANAGER_COMPRESSION}" +} diff --git a/media-plugins/vdr-vdrmanager/metadata.xml b/media-plugins/vdr-vdrmanager/metadata.xml index 35a6bde076c2..cbb22d6c12b2 100644 --- a/media-plugins/vdr-vdrmanager/metadata.xml +++ b/media-plugins/vdr-vdrmanager/metadata.xml @@ -16,4 +16,7 @@ <use> <flag name="stream">Add support for streaming Video to Android client</flag> </use> + <upstream> + <remote-id type="github">vdr-projects/vdr-plugin-vdrmanager</remote-id> + </upstream> </pkgmetadata> diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.15.ebuild similarity index 80% rename from media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild rename to media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.15.ebuild index 3550b3f6c72e..e9bc0816012f 100644 --- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild +++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,22 +8,20 @@ inherit vdr-plugin-2 ssl-cert VERSION="1971" # every bump, new version DESCRIPTION="VDR Plugin: remote programming VDR using VDR-Manager running on Android devices" -HOMEPAGE="https://projects.vdr-developer.org/projects/vdr-manager/wiki"; -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" -S="${WORKDIR}/${P}" +HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-vdrmanager/"; +SRC_URI="https://github.com/vdr-projects/vdr-plugin-vdrmanager/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/vdr-plugin-vdrmanager-${PV}/vdr-vdrmanager" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gzip +ssl stream zlib" -DEPEND=">=media-video/vdr-2 - ssl? ( dev-libs/openssl )" -RDEPEND="stream? ( media-plugins/vdr-streamdev[server] ) - zlib? ( sys-libs/zlib )" - -VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.12.sh" -VDR_CONFD_FILE="${FILESDIR}/confd-0.12" +DEPEND="media-video/vdr:= + ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND} + stream? ( media-plugins/vdr-streamdev[server] ) + zlib? ( sys-libs/zlib )" VDRMANAGER_SSL_KEY_DIR="/etc/vdr/plugins/vdrmanager" VDRMANAGER_SSL_KEY_FILE="${VDRMANAGER_SSL_KEY_DIR}/vdrmanager"
