summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin23858 -> 23858 bytes
-rw-r--r--media-video/obs-studio/Manifest8
-rw-r--r--media-video/obs-studio/obs-studio-30.1.0.ebuild264
-rw-r--r--media-video/obs-studio/obs-studio-30.1.2.ebuild (renamed from media-video/obs-studio/obs-studio-30.1.1.ebuild)0
-rw-r--r--media-video/obs-studio/obs-studio-9999.ebuild7
-rw-r--r--media-video/projectx/Manifest1
-rw-r--r--media-video/projectx/files/build-0.91.0.10.xml77
-rw-r--r--media-video/vdr/Manifest7
-rw-r--r--media-video/vdr/files/vdr-2.2.0_gentoo.patch11
-rw-r--r--media-video/vdr/files/vdr-2.6.7_pinplugin.patch447
-rw-r--r--media-video/vdr/vdr-2.2.0-r7.ebuild2
-rw-r--r--media-video/vdr/vdr-2.6.7.ebuild2
12 files changed, 470 insertions, 356 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 57b58235e429..a1e99e7aef3c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 263c0c621bef..b44842ae82bd 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,9 +1,7 @@
DIST cef_binary_5060_linux_x86_64_v3.tar.xz 91352460 BLAKE2B 443f4b1bc638d3fe462fd8b8dd167e96f65aebb2b8de3616beac298449e2786c746f9a1fa4a0dbe2e3ef2d593139938e97538890d3ca3b74018b3afb9c7fc661 SHA512 1fbdf1d4ed117f3b8af20476c57502145d652b451ba8e0a544081403d292cc7a78642e9071b8f0283a19ef7ad507ef6e0d9df32b00afc51605ab74f650a7d755
DIST obs-browser-996b5a7bc43d912f1f4992e0032d4f263ac8b060.tar.gz 112416 BLAKE2B c82b5b55184130caaca0aad066ce1253c28206522e8d130cb3b940ee283c8a2dffc409a5d4774cad17535f958f52f4fe632a6b4462a18c10a4b5bbe02b60b4e9 SHA512 f6f7dbeb1d28b6c47663f36cb119cbc90a18c46fc6e81ca6db87e901ae4cee1fafd4a4a8c3f8cae94619d2f8f92baf1c52ca5c7df182f3df7521397638b0660d
-DIST obs-studio-30.1.0.tar.gz 16023246 BLAKE2B 7e1caa214501a23c6a99b64ec5254d620836b190f98417763419b894e72b33b79cf6893000b70ef725845463e78cd0f3a32808043c08dba16ed88962ddee0efd SHA512 68ec8665399539846d5759414c07de3ce8005318a9bb433f170cd013d3974cb7686f15e079ec97af51ebda773475b0a1d958bbaf986646f9c88e931557457571
-DIST obs-studio-30.1.1.tar.gz 16023779 BLAKE2B d3a723cd83b1287b0cf24b3b3d7a34a391f6c2699955ba7351cd31c117168fb8643dd9d810697ad4cfde61e4e066761e6f23ce49a837b445c9a7d000b2658ac0 SHA512 31aba14cf9db6b6c41d87ea0b814d38e1ba2794d07f1aff025c810e9dda32b0915d3f6d2679383755d0a4e47fc26c2aef981e26a80b792cf7fb893e672b6609a
+DIST obs-studio-30.1.2.tar.gz 16023853 BLAKE2B 8886b7c07240e5f83a37f046c0a68aad6432cfc7056959caa25c33dd9a830de44f27c821809116000f82939e1684222c1f8343bc83b362f0f3f3338923bbf196 SHA512 8d6102f3431c1c6c530f22b09612cb955c1877e5aba07aa0ba1d7b014471ebf9f0c1f8e898eb9373c64417455e75d8b9cf2ae4d9010b6a09330bac9f4e5aa01e
DIST obs-websocket-d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32.tar.gz 246888 BLAKE2B 6e06c85ee47cb088a50b9d5eae9a8d68441989c1f76fdcd7806d59597062af5eb36e1722600b1a8d544e5f11533985b9bac243f7ca1002eed616e2f5c11a9a3f SHA512 31d5e1817aab341e55cbc5c759f28509f442695afb90d08a235c07359a65d2c2d3dfae2bf9c8a5086db310bb127dc59945ebe23fb219fda7408ee82d05b43938
-EBUILD obs-studio-30.1.0.ebuild 6476 BLAKE2B 2cdfe291e3a85adde42db787d24284eba4fa3dcdb45cb9d1845d817698ffdd935a21ac1281edecc4c6f518989d637566c0671e1da745dab22aa73c55ec5b52e2 SHA512 0af5f8c4e8c0d895433f2357a6058c58326b11490e800d1f8171264b1bd8dce476cdcf23c3fd4adb947d92904cb11b93c896af7a863485216a473bf74ca99b95
-EBUILD obs-studio-30.1.1.ebuild 6640 BLAKE2B 241a80f92daea4928520509f91381bccc022afe21aa41ad71f011bc44f90460363912801f02a6073b7453d8d75d224e619c854756fdf22567a6a2388ccb7e8a6 SHA512 d529ac6361cbb04317d204fae7d8aad901bb0a90c656acee0d5bf61c3e880b15090edbf5679c51b53482cdfa9e77488a8e62703627df4eef102f8bdb7e5dcf73
-EBUILD obs-studio-9999.ebuild 6678 BLAKE2B b343916b2d258e544fcbbdacfbe255f79967d9a66817a0ef95d7f623636fa531381334588e00d5df3415452e568511cc4f0c17e3327a6a21da569f3ca205c51c SHA512 6999ce5b91b34b5379c9eedc462c4b586b2cc7165e88258eb07d6acafff8230ecbdccfb956922b2070ab509bab948d71733acc1af16f83d475df828330e8d318
+EBUILD obs-studio-30.1.2.ebuild 6640 BLAKE2B 241a80f92daea4928520509f91381bccc022afe21aa41ad71f011bc44f90460363912801f02a6073b7453d8d75d224e619c854756fdf22567a6a2388ccb7e8a6 SHA512 d529ac6361cbb04317d204fae7d8aad901bb0a90c656acee0d5bf61c3e880b15090edbf5679c51b53482cdfa9e77488a8e62703627df4eef102f8bdb7e5dcf73
+EBUILD obs-studio-9999.ebuild 6653 BLAKE2B 36b84ccedab58ab3cc4c4cbe419b4b3b3703cf748bbbb91f40820f3b66c8c65fb1aea99387794a2e08c4e109f0879c616ab1d4fc0db5ac0f2867b3a96bc67937 SHA512 b138c4b8636aefab25b16194efbcc76f51d9c75a95c57f7d0295c6325e2102237fd2020b91dce14453d792d69c08d268ed7174bf70e30db4498244b6138ec19a
MISC metadata.xml 1470 BLAKE2B ce34216dcee69e90450a9cce810db3a494db1cafe6a8cd1029b0a749a7d69e0503fc5c5f6f298bebc2422e57f623ef63e17ac3814fd495e14c2b6e02bba1a9bd SHA512 0479dd3a4de659f8ce00b663129ca20ca31b837cd29bfca43bf7cca02d6762dabf0778c96c1b47d9814e3f6045c4793cc8f47f74d2a8940c8b2a1969ed69e895
diff --git a/media-video/obs-studio/obs-studio-30.1.0.ebuild b/media-video/obs-studio/obs-studio-30.1.0.ebuild
deleted file mode 100644
index 7878bb19a448..000000000000
--- a/media-video/obs-studio/obs-studio-30.1.0.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake lua-single optfeature python-single-r1 xdg
-
-CEF_DIR="cef_binary_5060_linux_x86_64"
-CEF_REVISION="_v3"
-OBS_BROWSER_COMMIT="996b5a7bc43d912f1f4992e0032d4f263ac8b060"
-OBS_WEBSOCKET_COMMIT="d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
- EGIT_SUBMODULES=(
- plugins/obs-browser
- plugins/obs-websocket
- )
-else
- SRC_URI="
- https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
- https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
- "
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
-SLOT="0"
-IUSE="
- +alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
- python qsv speex +ssl test truetype v4l vlc wayland websocket
-"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- browser? ( || ( alsa pulseaudio ) )
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
- lua? ( dev-lang/swig )
- python? ( dev-lang/swig )
-"
-# media-video/ffmpeg[opus] required due to bug 909566
-DEPEND="
- dev-libs/glib:2
- dev-libs/jansson:=
- dev-qt/qtbase:6[network,widgets,xml(+)]
- dev-qt/qtsvg:6
- media-libs/libglvnd
- media-libs/libva
- media-libs/rnnoise
- media-libs/x264:=
- media-video/ffmpeg:=[nvenc?,opus,x264]
- net-misc/curl
- sys-apps/dbus
- sys-apps/pciutils
- sys-apps/util-linux
- sys-libs/zlib:=
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/libXcomposite
- x11-libs/libXfixes
- x11-libs/libxkbcommon
- alsa? ( media-libs/alsa-lib )
- browser? (
- || (
- >=app-accessibility/at-spi2-core-2.46.0:2
- ( app-accessibility/at-spi2-atk dev-libs/atk )
- )
- dev-cpp/nlohmann_json
- dev-libs/expat
- dev-libs/glib
- dev-libs/nspr
- dev-libs/nss
- dev-libs/wayland
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/mesa[gbm(+)]
- net-print/cups
- x11-libs/cairo
- x11-libs/libdrm
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence
- x11-libs/libXtst
- x11-libs/pango
- )
- fdk? ( media-libs/fdk-aac:= )
- jack? ( virtual/jack )
- lua? ( ${LUA_DEPS} )
- mpegts? (
- net-libs/librist
- net-libs/srt
- )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-libs/libpulse )
- python? ( ${PYTHON_DEPS} )
- qsv? ( media-libs/libvpl )
- speex? ( media-libs/speexdsp )
- ssl? ( net-libs/mbedtls:= )
- test? ( dev-util/cmocka )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype
- )
- v4l? (
- media-libs/libv4l
- virtual/udev
- )
- vlc? ( media-video/vlc:= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
- )
- websocket? (
- dev-cpp/asio
- dev-cpp/nlohmann_json
- dev-cpp/websocketpp
- dev-libs/qr-code-generator
- )
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
- usr/lib*/obs-plugins/chrome-sandbox
- usr/lib*/obs-plugins/libcef.so
- usr/lib*/obs-plugins/libEGL.so
- usr/lib*/obs-plugins/libGLESv2.so
- usr/lib*/obs-plugins/libvk_swiftshader.so
- usr/lib*/obs-plugins/libvulkan.so.1
- usr/lib*/obs-plugins/swiftshader/libEGL.so
- usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- rm -d ${P}/plugins/obs-browser || die
- mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
-
- rm -d ${P}/plugins/obs-websocket || die
- mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
- fi
-}
-
-src_prepare() {
- default
-
- sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
- -DCALM_DEPRECATION=ON
- -DCCACHE_SUPPORT=OFF
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AJA=OFF
- -DENABLE_BROWSER=$(usex browser)
- -DENABLE_DECKLINK=$(usex decklink)
- -DENABLE_FREETYPE=$(usex truetype)
- -DENABLE_JACK=$(usex jack)
- -DENABLE_LIBFDK=$(usex fdk)
- -DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
- -DENABLE_PIPEWIRE=$(usex pipewire)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_QSV11=$(usex qsv)
- -DENABLE_RNNOISE=ON
- -DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
- -DENABLE_SPEEXDSP=$(usex speex)
- -DENABLE_UNIT_TESTS=$(usex test)
- -DENABLE_V4L2=$(usex v4l)
- -DENABLE_VLC=$(usex vlc)
- -DENABLE_VST=ON
- -DENABLE_WAYLAND=$(usex wayland)
- -DENABLE_WEBRTC=OFF # Requires libdatachannel.
- -DENABLE_WEBSOCKET=$(usex websocket)
- -DOBS_MULTIARCH_SUFFIX=${libdir#lib}
- -DUNIX_STRUCTURE=1
- )
-
- if [[ ${PV} != 9999 ]]; then
- mycmakeargs+=(
- -DOBS_VERSION_OVERRIDE=${PV}
- )
- fi
-
- if use lua || use python; then
- mycmakeargs+=(
- -DENABLE_SCRIPTING_LUA=$(usex lua)
- -DENABLE_SCRIPTING_PYTHON=$(usex python)
- -DENABLE_SCRIPTING=ON
- )
- else
- mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
- fi
-
- if use browser && use ssl; then
- mycmakeargs+=( -DENABLE_WHATSNEW=ON )
- else
- mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # external plugins may need some things not installed by default, install them here
- insinto /usr/include/obs/UI/obs-frontend-api
- doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use alsa && ! use pulseaudio; then
- elog
- elog "For the audio capture features to be available,"
- elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
- elog "be enabled."
- elog
- fi
-
- if use v4l && has_version media-video/v4l2loopback; then
- elog
- elog "Depending on system configuration, the v4l2loopback kernel module"
- elog "may need to be loaded manually, and needs to be re-built after"
- elog "kernel changes."
- elog
- fi
-
- optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
- optfeature "virtual camera support" media-video/v4l2loopback
-}
diff --git a/media-video/obs-studio/obs-studio-30.1.1.ebuild b/media-video/obs-studio/obs-studio-30.1.2.ebuild
index 6ddcf823b797..6ddcf823b797 100644
--- a/media-video/obs-studio/obs-studio-30.1.1.ebuild
+++ b/media-video/obs-studio/obs-studio-30.1.2.ebuild
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index dba2fd8a5fb4..16fc96a56f01 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -11,8 +11,8 @@ inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
CEF_DIR="cef_binary_5060_linux_x86_64"
CEF_REVISION="_v3"
-OBS_BROWSER_COMMIT="996b5a7bc43d912f1f4992e0032d4f263ac8b060"
-OBS_WEBSOCKET_COMMIT="d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32"
+OBS_BROWSER_COMMIT="c81851a1d7696c2d7ba319122eec387c1568ad44"
+OBS_WEBSOCKET_COMMIT="f8bc7c4f593c7957ecdb45a24faaff3e95f24e8b"
DESCRIPTION="Software for Recording and Streaming Live Video Content"
HOMEPAGE="https://obsproject.com"
@@ -54,6 +54,7 @@ BDEPEND="
"
# media-video/ffmpeg[opus] required due to bug 909566
DEPEND="
+ dev-cpp/nlohmann_json
dev-libs/glib:2
dev-libs/jansson:=
dev-qt/qtbase:6[network,widgets,xml(+)]
@@ -79,7 +80,6 @@ DEPEND="
>=app-accessibility/at-spi2-core-2.46.0:2
( app-accessibility/at-spi2-atk dev-libs/atk )
)
- dev-cpp/nlohmann_json
dev-libs/expat
dev-libs/glib
dev-libs/nspr
@@ -132,7 +132,6 @@ DEPEND="
)
websocket? (
dev-cpp/asio
- dev-cpp/nlohmann_json
dev-cpp/websocketpp
dev-libs/qr-code-generator
)
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index b8016f573553..5c9ad7125fdb 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -1,4 +1,3 @@
-AUX build-0.91.0.10.xml 2026 BLAKE2B fd29c13f89695542d16908aae974b17faf52dd0a663954f54a94a8c8cf1c673ae26276a3f94e812461ac0b336db7c0f8a3fa87110b099eed210eca488535e644 SHA512 6fbe6fdb00f814c5fa72dc52542c3d9950ff4229939090161a208c0013ec0e2867ff6fc656249f2de68c58a26ef2bd059ffe767be1498318a8cb9eddadbb72ea
AUX projectx-0.91.0.10-bl2.patch 535 BLAKE2B aeeba4ee7d33c77c64563e48005260c68d5f3da6f126df4d2c0ea3be7276748be944cb80705110dcad0cb5410bfcb084add24ff01d98bc098b690a1012359412 SHA512 88f8602ed85760c5be7ff3db2ce4347cc13c0d440d97c1a878bbef9ba62f7bf5c763c901384615db92cc63755c6534f730b32d253bea18f913d92d6503884427
AUX projectx-0.91.0.10-idctfast.patch 1089 BLAKE2B 9dbef016e8ce6ac93f8554fe0414191434ac9364ddb51dafb9505c125a887e72dcd38e58f6eecd8595f9b735f099592730debf7948f97927ca3930c30731fa62 SHA512 309beac4a582a3abe25a4f28acf2a69d55f3a7824a18d845a2c46cfb3a05bd1fba1021a01da396eb395a633cc999a96527d53654b2b8cf3c5f87add9ebc2e24d
AUX projectx-0.91.0.10-stdout-corrupt.patch 378 BLAKE2B 7a92d7c16688e75e6d0510a93a02ac52fec7aec83ea768b70011d5dc8016c7f31cb4194bfd44f6696b6067c0c4fd179e03bf922d49358846b62c33914641128c SHA512 22f859c66d723f501002ca507a3a246716adf584d94d84fbb75b870b3418d93f073b6f46495232a9a9215007283e0acbe21871a4af74695dcbd0fc3a3ecbb2f3
diff --git a/media-video/projectx/files/build-0.91.0.10.xml b/media-video/projectx/files/build-0.91.0.10.xml
deleted file mode 100644
index f35638733b13..000000000000
--- a/media-video/projectx/files/build-0.91.0.10.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="projectx" default="jar">
- <!-- some properties -->
- <property name="src.dir" value="src" />
- <property name="build.dir" value="build" />
- <property name="docs.dir" value="apidocs" />
- <property name="dist.dir" value="dist" />
- <property name="lib.dir" value="lib" />
- <property name="resources.dir" value="resources" />
- <property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
- <property name="target.jdk" value="1.5" />
-
- <!-- classpath -->
- <path id="refcp">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- init -->
- <target name="init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${docs.dir}" />
- <mkdir dir="${build.dir}" />
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}"
- classpathref="refcp"
- encoding="ISO-8859-1"/>
- <copy todir="${build.dir}">
- <fileset dir="${resources.dir}" />
- </copy>
- </target>
-
- <!-- build the jar files -->
- <target name="build" depends="compile">
- <jar jarfile="${project.jar}" basedir="${build.dir}">
- <manifest>
- <attribute name="Main-Class" value="${manifest.mainclass}" />
- </manifest>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target name="javadoc" depends="init">
- <javadoc sourcepath="${src.dir}"
- packagenames="*"
- destdir="${docs.dir}"
- author="true"
- version="true"
- use="true"
- charset="UTF-8"
- encoding="ISO-8859-1"
- windowtitle="${ant.project.name} API" />
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${docs.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <!-- zip the sources -->
- <target name="sourcezip">
- <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
- <zipfileset dir="${src.dir}" />
- </zip>
- </target>
-
-</project>
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 5d69a9fcbf44..e59fd70f463e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,7 +2,7 @@ AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774
AUX vdr-2.2.0-jpeg-9c.patch 917 BLAKE2B 8d5e55585daccbbc94cc57b602bba6df2d364e8841fe4bdc6adff3d10ce5c9ca10edaf14146f43fb35b5d954afcd4e8137b7f003e2349752fe209a9205ca4762 SHA512 162ff2b6aa5cd7df29265de2889ba354140ce2ae2ec1877559db2e9164faed8944bbb8d680963fa3212b9d8916aed34a63d2d4f69e1d742e860a57be58f252c9
AUX vdr-2.2.0_gcc11.patch 1297 BLAKE2B 2dd5c2e2003a29fb1420cd633738ec36818b0162b96790a85bfd499200ba53f35f61b4774b54b4c157492122badc4bac888736717ef13db99c2f9aebeae515c9 SHA512 065fb291a23dc85c3d190f01fd05f9e95cc9b4a6325bb8afcbbdea96b782a98cb9e1ac5bc6a2de9b9b2961239dcde8aa0cc029505936aa9425caf552003815de
AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b
-AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da3b47ec009a5126f38bcfe5adec8657f9ca69dced3202c12f0751e88ce1fec0231feeb9b4e8e019556df3b61b SHA512 64c299db8e2fa0545ba9379330ecc365ec0dda9991ef5e85af3fd3a842bdef196aa811b083b50edca5db757e437e181248b5825e32dd463bd916167b4ddda5c7
+AUX vdr-2.2.0_gentoo.patch 2573 BLAKE2B 37e4363474ad7b7525bc2c47b2ed37b9699ede0394973294c1362eb61bbf4651b3d84252c9e70a1f0d711d0cd9a7cbf5551a8dc23cc6379109d298d176bc0c8e SHA512 cf0e4ddb090157e993921da52dfd514545b2001ffcf64f380aaaddccc8b190c94b43b6a6ff6e40e37bee084d8284544b34eb83e4c300cd12a9bb9cd10f671617
AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
AUX vdr-2.2.0_glibc-2.31.patch 818 BLAKE2B f63347ecac626d06477e7bf3f5d203dc81d988d8f69590b5c1bcbcefc44657a36f3a3edc7b97c4cbb1f5a6019b5109cf4fb12042b62872c176b8b68d3b032e98 SHA512 b800bc04b984b06b5943473d1726ef198558a62f8c633791272a4ed0ce18ac54b85eefe973b18531beaa8626401c7b38687790692182c787c9b04380b2ebecb0
AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45
@@ -14,6 +14,7 @@ AUX vdr-2.6.1-patch-for-permashift.patch 18981 BLAKE2B 01da7d33401a7d73b37f30e53
AUX vdr-2.6.1_naludump.patch 19594 BLAKE2B 012b92b265c0721ae7baf0f193c9b50fe3bee1e0fd8396e79e05deebef05a34acc5c7eb9ecad225f084449799c8e04a8285b41aa6cac5b24d582e4797dc60888 SHA512 3482d7d921c4b73f12426538cab6d7923d5ca3013efa9d16998bb48bd75557ace04af683401fc93b7c77bf4d619f4ded74f7f4568acdceb0406de0472bef074a
AUX vdr-2.6.1_pinplugin.patch 19274 BLAKE2B 19cc70e16f956087ace9a52d646c7003abba0be5894b05314e96880114f07584309756a4102bf8569c6612c21037ae1a4ec45fbcc91b6e2df42d89e4febfc0c7 SHA512 d5e875f8f51c4f946b9f305a36d15b760720b0495c6abaf6c2fbab4d200799741088026e9edb83458cc75cabc390a72173f33620010aedc4eaf22ed1a3d57973
AUX vdr-2.6.6_gentoo.patch 2012 BLAKE2B a1260419cf4175268fbdee4e4d49ba30c382693915ec6f0681d29d7b216d8ba0149ccac4ff3e1eab95d4f09d6e5be1b616c664f45df24f01b89c97be18797e00 SHA512 de038378218888fb4755aad27508fc51f6e53fc3828e6f62b65e707d7ed8b7989bc8841472589215c5420c6f793f47687d6318c1b758dec513a052cf36654b0c
+AUX vdr-2.6.7_pinplugin.patch 19683 BLAKE2B 3a1d2929db2a435c2cafa06f5c02ae45d4122c68f63f26fccb98d2d13df3ab30334900b105bcaeaa3de2e650c93a4467eb9ae7a974821b2d1a0d3fd986910514 SHA512 680f1992b98fef24710a90d594785fb493b53ba24665d35c4b59e9c6c0273989d4af69e032c60293116f3761e577c51628e2a4713e09824698ad89bbfcc95789
DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
DIST vdr-2.6.6.tbz2 946758 BLAKE2B 22ad6d0d4048347ff16a48ad137900f32dda7adfc7fb54bb1501f14cfc426185f942ffa4997de1e0318ca8c6b67a7dfc48d49b30bfda9367d7337b2d601544fc SHA512 4e798d3e39be0e851ec2e7f7cc563b070c3aa9438165a6aab8fcfc1cee5d7255cdc7dd4f6d4c4c84be770223491a9660bb41874e7b4d1ae504bbb16fe11f2a71
@@ -21,7 +22,7 @@ DIST vdr-2.6.6_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f66
DIST vdr-2.6.7.tbz2 948424 BLAKE2B 61a8e80feed5a90567093ae2a89e570fb2cba51e7ce8cb47cf5748af9141b0f41deb759c35e8e0a6e0d5e1bb2106834a84d2932b6b0a97f9766d221a60486a15 SHA512 e0d63d0414288bb7c09155f0014ba492a87e46650aaa20cdae098365e227075ae5f5d98f69750ac925e96e5054f7a8a41c59816038ffa0a0bc94b55d4e924f83
DIST vdr-2.6.7_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f SHA512 590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r7.ebuild 8236 BLAKE2B da3fa4a0871018e4e72e188448a4aa6f8efe3bd843ea3543665f71403bbc0ed4a951b9f87c634a8df361bbb23474270eb14f5b7db77ae5ac2cb27f02f20a0944 SHA512 5e451b6eb64d224c5ea48e5a88335daf03c893a89f3466a798fa3250c442759e5b9d2f8819b48065ea9424c301cbddbfd299f3fa6980f16d9db54f9a87df58d4
+EBUILD vdr-2.2.0-r7.ebuild 8236 BLAKE2B 4d528752b314d7400fbdf4bbfc92926f8a3b442794150865c7680a7289ee1e139b1ce1ee7a32f618bd8fcb20b2e8bb26a69252f521d267053bf39d5f7633975e SHA512 3dc086dccd1b3dd6b4b572aabbdce6268a16ec6492c2410f12d47af3b6beef2a0e7e9c0fb2525d9cdf1c107848643fa98547cdc195e77c6524f7d5b2151262ef
EBUILD vdr-2.6.6.ebuild 5514 BLAKE2B 100848bb4fa40be9ba072fbc18f2eee95afb088510a502347d101abdbcbb93df63082244ce6c60f34e4a3d7c89b013fd28ce5bb51bdc3b28e8ed5094d65bab9d SHA512 f0a2d067dac9fbac7a16813c6dca29d3a2d24d021e9d36e56d69f0fdc215aa0c12c022a0bbf6c5a536fbfc11eb3dd49b4ad0315a598d8d8ffc6e3449192715bb
-EBUILD vdr-2.6.7.ebuild 5521 BLAKE2B f1323469838bbbb1a3df0fc63b8d86ead005653f07b54885a30a0f7e2c967fa13a7ca955757bbb038994348e708439d032c97426f2f3ee5015e3d96c483ab395 SHA512 65b1415e6a14c5711ccc62094b1faf44b040b587685c11f251036fa5ec70b0b2b25e8be642e143f1dc62f18f27788f249baca3ceb93a4e0024223329daf489f1
+EBUILD vdr-2.6.7.ebuild 5514 BLAKE2B d6045972603bedd241f2ee6e80de2f2f26d6eb7f3e3a7749aeb508c925cace71693a15f79468d365ffdb1e4518455bac896a3c525efe7a32f2b5810aa9af89b5 SHA512 3f6b081032d03cebf0813d4de8aad0ff330d4b534982607d9eef0b0d3e963f8584dbd33df06540e43cc4e6df76d9bbe9f2792475a0a8aa2f807e81d0db297466
MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/files/vdr-2.2.0_gentoo.patch b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
index 70066f5b0c86..9fba406f39fb 100644
--- a/media-video/vdr/files/vdr-2.2.0_gentoo.patch
+++ b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
@@ -1,5 +1,16 @@
--- a/Makefile
+++ b/Makefile
+@@ -54,8 +54,8 @@
+
+ # Mandatory compiler flags:
+
+-CFLAGS += -fPIC
+-CXXFLAGS += -fPIC
++CFLAGS += -fPIC -std=c++14
++CXXFLAGS += -fPIC -std=c++14
+
+ # Common include files:
+
@@ -124,7 +124,7 @@
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
diff --git a/media-video/vdr/files/vdr-2.6.7_pinplugin.patch b/media-video/vdr/files/vdr-2.6.7_pinplugin.patch
new file mode 100644
index 000000000000..281a3e2dbf5f
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.6.7_pinplugin.patch
@@ -0,0 +1,447 @@
+original vdr-pinplugin_vdr-2.3.1.diff
+rebased for media-video/vdr-2.6.7
+
+Signed-off-by: Christian Kunkel <ch.kunkel@gmx.de> ( 2021 Feb 12 )
+Reviewed-by: Martin Dummer <martin.dummer@gmx.net> ( 2024-06-18 )
+diff -Naur vdr-2.6.7.orig/Makefile vdr-2.6.7/Makefile
+--- vdr-2.6.7.orig/Makefile 2024-06-18 22:37:59.172119452 +0200
++++ vdr-2.6.7/Makefile 2024-06-18 22:38:53.723925736 +0200
+@@ -356,7 +356,7 @@
+ clean:
+ @$(MAKE) --no-print-directory -C $(LSIDIR) clean
+ @-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~
+- @-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
++ @-rm -rf $(LOCALEDIR) $(PODIR)/*~ $(PODIR)/*.mo $(PODIR)/*.pot
+ @-rm -rf include
+ @-rm -rf srcdoc
+ CLEAN: clean
+diff -Naur vdr-2.6.7.orig/device.c vdr-2.6.7/device.c
+--- vdr-2.6.7.orig/device.c 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/device.c 2024-06-18 22:38:53.727925721 +0200
+@@ -847,6 +847,7 @@
+ const cChannel *Channel;
+ while ((Channel = Channels->GetByNumber(n, Direction)) != NULL) {
+ // try only channels which are currently available
++ if (!cStatus::MsgChannelProtected(0, Channel)) // PIN PATCH
+ if (GetDevice(Channel, LIVEPRIORITY, true, true))
+ break;
+ n = Channel->Number() + Direction;
+@@ -868,6 +869,12 @@
+
+ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
+ {
++ // I hope 'LiveView = false' indicates a channel switch for recording, // PIN PATCH
++ // I really don't know, but it works ... // PIN PATCH
++
++ if (LiveView && cStatus::MsgChannelProtected(this, Channel)) // PIN PATCH
++ return scrNotAvailable; // PIN PATCH
++
+ cMutexLock MutexLock(&mutexChannel); // to avoid a race between SVDRP CHAN and HasProgramme()
+ cStatus::MsgChannelSwitch(this, 0, LiveView);
+
+diff -Naur vdr-2.6.7.orig/menu.c vdr-2.6.7/menu.c
+--- vdr-2.6.7.orig/menu.c 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/menu.c 2024-06-18 22:38:53.727925721 +0200
+@@ -1035,6 +1035,18 @@
+ Add(new cMenuEditBitItem( tr("VPS"), &data.flags, tfVps));
+ Add(new cMenuEditIntItem( tr("Priority"), &data.priority, 0, MAXPRIORITY));
+ Add(new cMenuEditIntItem( tr("Lifetime"), &data.lifetime, 0, MAXLIFETIME));
++
++ // PIN PATCH
++ if (cOsd::pinValid || !data.fskProtection) Add(new cMenuEditBoolItem(tr("Childlock"),&data.fskProtection));
++ else {
++ char* buf = 0;
++ int res = 0;
++ res = asprintf(&buf, "%s\t%s", tr("Childlock"), data.fskProtection ? tr("yes") : tr("no"));
++ if (res < 0) ; // memory problems :o
++ Add(new cOsdItem(buf));
++ free(buf);
++ }
++
+ Add(file = new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file)));
+ SetFirstDayItem();
+ SetPatternItem(true);
+@@ -3129,7 +3141,8 @@
+ }
+ }
+ }
+- if (*Item->Text() && !LastDir) {
++ if (*Item->Text() && !LastDir
++ && (!cStatus::MsgReplayProtected(Item->Recording(), Item->Name(), base, Item->IsDirectory(), true))) { // PIN PATCH
+ Add(Item);
+ LastItem = Item;
+ if (Item->IsDirectory())
+@@ -3200,6 +3213,9 @@
+ {
+ cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
+ if (ri) {
++ if (cStatus::MsgReplayProtected(ri->Recording(), ri->Name(), base,
++ ri->IsDirectory()) == true) // PIN PATCH
++ return osContinue;
+ if (ri->IsDirectory())
+ Open();
+ else {
+@@ -4515,28 +4531,32 @@
+
+ // Basic menu items:
+
+- Add(new cOsdItem(hk(tr("Schedule")), osSchedule));
+- Add(new cOsdItem(hk(tr("Channels")), osChannels));
+- Add(new cOsdItem(hk(tr("Timers")), osTimers));
+- Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
++ // PIN PATCH
++ if (!cStatus::MsgMenuItemProtected("Schedule", true)) Add(new cOsdItem(hk(tr("Schedule")), osSchedule));
++ if (!cStatus::MsgMenuItemProtected("Channels", true)) Add(new cOsdItem(hk(tr("Channels")), osChannels));
++ if (!cStatus::MsgMenuItemProtected("Timers", true)) Add(new cOsdItem(hk(tr("Timers")), osTimers));
++ if (!cStatus::MsgMenuItemProtected("Recordings", true)) Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
+
+ // Plugins:
+
+ for (int i = 0; ; i++) {
+ cPlugin *p = cPluginManager::GetPlugin(i);
+ if (p) {
++ if (!cStatus::MsgPluginProtected(p, true)) { // PIN PATCH
+ const char *item = p->MainMenuEntry();
+ if (item)
+ Add(new cMenuPluginItem(hk(item), i));
+ }
++ }
+ else
+ break;
+ }
+
+ // More basic menu items:
+
+- Add(new cOsdItem(hk(tr("Setup")), osSetup));
++ if (!cStatus::MsgMenuItemProtected("Setup", true)) Add(new cOsdItem(hk(tr("Setup")), osSetup)); // PIN PATCH
+ if (Commands.Count())
++ if (!cStatus::MsgMenuItemProtected("Commands", true)) // PIN PATCH
+ Add(new cOsdItem(hk(tr("Commands")), osCommands));
+
+ Update(true);
+@@ -4609,6 +4629,14 @@
+ eOSState state = cOsdMenu::ProcessKey(Key);
+ HadSubMenu |= HasSubMenu();
+
++ // > PIN PATCH
++ cOsdItem* item = Get(Current());
++
++ if (item && item->Text() && state != osContinue && state != osUnknown && state != osBack)
++ if (cStatus::MsgMenuItemProtected(item->Text()))
++ return osContinue;
++ // PIN PATCH <
++
+ switch (state) {
+ case osSchedule: return AddSubMenu(new cMenuSchedule);
+ case osChannels: return AddSubMenu(new cMenuChannels);
+@@ -4633,6 +4661,7 @@
+ if (item) {
+ cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
+ if (p) {
++ if (!cStatus::MsgPluginProtected(p)) { // PIN PATCH
+ cOsdObject *menu = p->MainMenuAction();
+ if (menu) {
+ if (menu->IsMenu())
+@@ -4644,6 +4673,7 @@
+ }
+ }
+ }
++ }
+ state = osEnd;
+ }
+ break;
+@@ -4823,6 +4853,7 @@
+ Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel);
+ if (!Channel && Setup.ChannelsWrap)
+ Channel = Direction > 0 ? Channels->First() : Channels->Last();
++ if (!cStatus::MsgChannelProtected(0, Channel)) // PIN PATCH
+ if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, LIVEPRIORITY, true, true))
+ return Channel;
+ }
+@@ -5500,6 +5531,7 @@
+ for (int i = 0; i < MAXRECORDCONTROLS; i++) {
+ if (!RecordControls[i]) {
+ RecordControls[i] = new cRecordControl(device, Timers, Timer, Pause);
++ cStatus::MsgRecordingFile(RecordControls[i]->FileName()); // PIN PATCH
+ return RecordControls[i]->Process(time(NULL));
+ }
+ }
+diff -Naur vdr-2.6.7.orig/osd.c vdr-2.6.7/osd.c
+--- vdr-2.6.7.orig/osd.c 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/osd.c 2024-06-18 22:38:53.731925707 +0200
+@@ -1907,6 +1907,7 @@
+ cSize cOsd::maxPixmapSize(INT_MAX, INT_MAX);
+ cVector<cOsd *> cOsd::Osds;
+ cMutex cOsd::mutex;
++bool cOsd::pinValid = false; // PIN PATCH
+
+ cOsd::cOsd(int Left, int Top, uint Level)
+ {
+diff -Naur vdr-2.6.7.orig/osd.h vdr-2.6.7/osd.h
+--- vdr-2.6.7.orig/osd.h 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/osd.h 2024-06-18 22:38:53.731925707 +0200
+@@ -994,6 +994,7 @@
+ ///<
+ ///< If a plugin uses a derived cPixmap implementation, it needs to use that
+ ///< type instead of cPixmapMemory.
++ static bool pinValid; // PIN PATCH
+ };
+
+ #define MAXOSDIMAGES 64
+diff -Naur vdr-2.6.7.orig/status.c vdr-2.6.7/status.c
+--- vdr-2.6.7.orig/status.c 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/status.c 2024-06-18 22:38:53.731925707 +0200
+@@ -136,3 +136,55 @@
+ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+ sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle);
+ }
++
++bool cStatus::MsgChannelProtected(const cDevice* Device, const cChannel* Channel) // PIN PATCH
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ if (sm->ChannelProtected(Device, Channel) == true)
++ return true;
++
++ return false;
++}
++
++bool cStatus::MsgReplayProtected(const cRecording* Recording, const char* Name,
++ const char* Base, bool isDirectory, int menuView) // PIN PATCH
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ if (sm->ReplayProtected(Recording, Name, Base, isDirectory, menuView) == true)
++ return true;
++ return false;
++}
++
++void cStatus::MsgRecordingFile(const char* FileName)
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) // PIN PATCH
++ sm->RecordingFile(FileName);
++}
++
++void cStatus::MsgTimerCreation(cTimer* Timer, const cEvent *Event)
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) // PIN PATCH
++ sm->TimerCreation(Timer, Event);
++}
++
++bool cStatus::MsgPluginProtected(cPlugin* Plugin, int menuView) // PIN PATCH
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ if (sm->PluginProtected(Plugin, menuView) == true)
++ return true;
++ return false;
++}
++
++void cStatus::MsgUserAction(const eKeys key) // PIN PATCH
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ sm->UserAction(key);
++}
++
++bool cStatus::MsgMenuItemProtected(const char* Name, int menuView) // PIN PATCH
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ if (sm->MenuItemProtected(Name, menuView) == true)
++ return true;
++ return false;
++}
+diff -Naur vdr-2.6.7.orig/status.h vdr-2.6.7/status.h
+--- vdr-2.6.7.orig/status.h 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/status.h 2024-06-18 22:38:53.731925707 +0200
+@@ -14,6 +14,7 @@
+ #include "device.h"
+ #include "player.h"
+ #include "tools.h"
++#include "plugin.h"
+
+ // Several member functions of the following classes are called with a pointer to
+ // an object from a global list (cTimer, cChannel, cRecording or cEvent). In these
+@@ -99,6 +100,22 @@
+ // The OSD displays the single line Text with the current channel information.
+ virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {}
+ // The OSD displays the given programme information.
++ virtual bool ChannelProtected(const cDevice *Device, const cChannel* Channel) { return false; } // PIN PATCH
++ // Checks if a channel is protected.
++ virtual bool ReplayProtected(const cRecording* Recording, const char* Name,
++ const char* Base, bool isDirectory, int menuView = false) { return false; } // PIN PATCH
++ // Checks if a recording is protected.
++ virtual void RecordingFile(const char* FileName) {} // PIN PATCH
++ // The given DVB device has started recording to FileName. FileName is the name of the
++ // recording directory
++ virtual void TimerCreation(cTimer* Timer, const cEvent *Event) {} // PIN PATCH
++ // The given timer is created
++ virtual bool PluginProtected(cPlugin* Plugin, int menuView = false) { return false; } // PIN PATCH
++ // Checks if a plugin is protected.
++ virtual void UserAction(const eKeys key) {} // PIN PATCH
++ // report user action
++ virtual bool MenuItemProtected(const char* Name, int menuView = false) { return false; } // PIN PATCH
++
+ public:
+ cStatus(void);
+ virtual ~cStatus();
+@@ -122,6 +139,14 @@
+ static void MsgOsdTextItem(const char *Text, bool Scroll = false);
+ static void MsgOsdChannel(const char *Text);
+ static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle);
++ static bool MsgChannelProtected(const cDevice* Device, const cChannel* Channel); // PIN PATCH
++ static bool MsgReplayProtected(const cRecording* Recording, const char* Name,
++ const char* Base, bool isDirectory, int menuView = false); // PIN PATCH
++ static void MsgRecordingFile(const char* FileName); // PIN PATCH
++ static void MsgTimerCreation(cTimer* Timer, const cEvent *Event); // PIN PATCH
++ static bool MsgPluginProtected(cPlugin* Plugin, int menuView = false); // PIN PATCH
++ static void MsgUserAction(const eKeys key); // PIN PATCH
++ static bool MsgMenuItemProtected(const char* Name, int menuView = false); // PIN PATCH
+ };
+
+ #endif //__STATUS_H
+diff -Naur vdr-2.6.7.orig/timers.c vdr-2.6.7/timers.c
+--- vdr-2.6.7.orig/timers.c 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/timers.c 2024-06-18 22:41:36.147349313 +0200
+@@ -85,6 +85,7 @@
+ stop -= 2400;
+ priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
+ lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
++ fskProtection = 0; // PIN PATCH
+ if (Instant && channel)
+ snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
+ }
+@@ -218,11 +219,13 @@
+ stop -= 2400;
+ priority = PatternTimer ? PatternTimer->Priority() : Setup.DefaultPriority;
+ lifetime = PatternTimer ? PatternTimer->Lifetime() : Setup.DefaultLifetime;
++ fskProtection = 0; // PIN PATCH
+ if (!FileName)
+ FileName = Event->Title();
+ if (!isempty(FileName))
+ Utf8Strn0Cpy(file, FileName, sizeof(file));
+ SetEvent(Event);
++ cStatus::MsgTimerCreation(this, Event); // PIN PATCH
+ }
+
+ cTimer::cTimer(const cTimer &Timer)
+@@ -261,6 +264,7 @@
+ stop = Timer.stop;
+ priority = Timer.priority;
+ lifetime = Timer.lifetime;
++ fskProtection = Timer.fskProtection; // PIN PATCH
+ vpsNotRunning = 0;
+ vpsActive = false;
+ strncpy(pattern, Timer.pattern, sizeof(pattern));
+@@ -492,6 +496,7 @@
+ result = false;
+ }
+ }
++ fskProtection = aux && strstr(aux, "<pin-plugin><protected>yes</protected></pin-plugin>"); // PIN PATCH
+ free(channelbuffer);
+ free(daybuffer);
+ free(filebuffer);
+@@ -1069,6 +1074,36 @@
+ Matches(); // refresh start and end time
+ }
+
++void cTimer::SetFskProtection(int aFlag) // PIN PATCH
++{
++ char* p;
++ char* tmp = 0;
++ int res = 0;
++
++ fskProtection = aFlag;
++
++ if (fskProtection && (!aux || !strstr(aux, "<pin-plugin><protected>yes</protected></pin-plugin>")))
++ {
++ // add protection info to aux
++
++ if (aux) { tmp = strdup(aux); free(aux); }
++ res = asprintf(&aux, "%s<pin-plugin><protected>yes</protected></pin-plugin>", tmp ? tmp : "");
++ }
++ else if (!fskProtection && aux && (p = strstr(aux, "<pin-plugin><protected>yes</protected></pin-plugin>")))
++ {
++ // remove protection info from aux
++
++ res = asprintf(&tmp, "%.*s%s", (int)(p-aux), aux, p+strlen("<pin-plugin><protected>yes</protected></pin-plugin>"));
++ free(aux);
++ aux = strdup(tmp);
++ }
++
++ if (res < 0) ; // memory problems :o
++
++ if (tmp)
++ free(tmp);
++}
++
+ // --- cTimers ---------------------------------------------------------------
+
+ cTimers cTimers::timers;
+diff -Naur vdr-2.6.7.orig/timers.h vdr-2.6.7/timers.h
+--- vdr-2.6.7.orig/timers.h 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/timers.h 2024-06-18 22:38:53.731925707 +0200
+@@ -47,6 +47,7 @@
+ int start; ///< the start and stop time of this timer as given by the user,
+ int stop; ///< in the form hhmm, with hh (00..23) and mm (00..59) added as hh*100+mm
+ int priority;
++ int fskProtection; // PIN PATCH
+ int lifetime;
+ mutable char pattern[NAME_MAX * 2 + 1]; // same size as 'file', to be able to initially fill 'pattern' with 'file' in the 'Edit timer' menu
+ mutable char file[NAME_MAX * 2 + 1]; // *2 to be able to hold 'title' and 'episode', which can each be up to 255 characters long
+@@ -72,6 +73,7 @@
+ int Start(void) const { return start; }
+ int Stop(void) const { return stop; }
+ int Priority(void) const { return priority; }
++ int FskProtection(void) const { return fskProtection; } // PIN PATCH
+ int Lifetime(void) const { return lifetime; }
+ const char *Pattern(void) const { return pattern; }
+ const char *File(void) const { return file; }
+@@ -122,6 +124,7 @@
+ void SetRemote(const char *Remote);
+ void SetDeferred(int Seconds);
+ void SetFlags(uint Flags);
++ void SetFskProtection(int aFlag); // PIN PATCH
+ void ClrFlags(uint Flags);
+ void InvFlags(uint Flags);
+ bool HasFlags(uint Flags) const;
+diff -Naur vdr-2.6.7.orig/vdr.c vdr-2.6.7/vdr.c
+--- vdr-2.6.7.orig/vdr.c 2024-04-02 09:05:33.000000000 +0200
++++ vdr-2.6.7/vdr.c 2024-06-18 22:38:53.735925694 +0200
+@@ -72,6 +72,7 @@
+ #include "tools.h"
+ #include "transfer.h"
+ #include "videodir.h"
++#include "status.h" // PIN PATCH
+
+ #define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings
+ #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
+@@ -1217,6 +1218,7 @@
+ if (!Menu)
+ Interact = Control = cControl::Control(ControlMutexLock);
+ if (ISREALKEY(key)) {
++ cStatus::MsgUserAction(key); // PIN PATCH
+ EITScanner.Activity();
+ // Cancel shutdown countdown:
+ if (ShutdownHandler.countdown)
+@@ -1289,10 +1291,12 @@
+ Control->Hide();
+ cPlugin *plugin = cPluginManager::GetPlugin(PluginName);
+ if (plugin) {
++ if (!cStatus::MsgPluginProtected(plugin)) { // PIN PATCH
+ Menu = plugin->MainMenuAction();
+ if (Menu)
+ Menu->Show();
+ }
++ }
+ else
+ esyslog("ERROR: unknown plugin '%s'", PluginName);
+ }
+@@ -1512,9 +1516,11 @@
+ case kPlay:
+ if (cReplayControl::LastReplayed()) {
+ Control = NULL;
++ if (cStatus::MsgReplayProtected(0, cReplayControl::LastReplayed(), 0, false) == false) { // PIN PATCH
+ cControl::Shutdown();
+ cControl::Launch(new cReplayControl);
+ }
++ }
+ else
+ DirectMainFunction(osRecordings); // no last viewed recording, so enter the Recordings menu
+ break;
diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild
index 1f82375d5508..89490df1119d 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -17,7 +17,6 @@ EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
MY_PV="${PV%_p*}"
MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
EXT_P="extpng-${P}-gentoo-edition-v1"
@@ -25,6 +24,7 @@ DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DV
HOMEPAGE="http://www.tvdr.de/"
SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
mirror://gentoo/${EXT_P}.patch.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/media-video/vdr/vdr-2.6.7.ebuild b/media-video/vdr/vdr-2.6.7.ebuild
index d9ec76a88b84..40b47d8d5566 100644
--- a/media-video/vdr/vdr-2.6.7.ebuild
+++ b/media-video/vdr/vdr-2.6.7.ebuild
@@ -120,7 +120,7 @@ src_prepare() {
use naludump && eapply "${FILESDIR}/${PN}-2.6.1_naludump.patch"
use permashift && eapply "${FILESDIR}/${PN}-2.6.1-patch-for-permashift.patch"
- use pinplugin && eapply "${FILESDIR}/${PN}-2.6.1_pinplugin.patch"
+ use pinplugin && eapply "${FILESDIR}/${P}_pinplugin.patch"
use ttxtsubs && eapply "${DISTDIR}/${P}_ttxtsubs_v2.patch"
use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
use mainmenuhooks && eapply "${FILESDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 07:28:41 +0000