subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-video\/vdr\/"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2024-04-14 Thread Arthur Zamarin

commit: b6e2a326bec994fbf259de5aca88dbf99f0ac57a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 14 18:55:58 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 14 18:55:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e2a326

media-video/vdr: Stabilize 2.6.6 amd64, #930013

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/vdr/vdr-2.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.6.ebuild b/media-video/vdr/vdr-2.6.6.ebuild
index ce2a7988cb75..953a907493f9 100644
--- a/media-video/vdr/vdr-2.6.6.ebuild
+++ b/media-video/vdr/vdr-2.6.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2024-04-14 Thread Arthur Zamarin

commit: 6e1c46e13d5ecdf02d729a3dcb8d424c6662dc9e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 14 18:22:39 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 14 18:22:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1c46e1

media-video/vdr: Stabilize 2.6.6 x86, #930013

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/vdr/vdr-2.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.6.ebuild b/media-video/vdr/vdr-2.6.6.ebuild
index 60383295f581..ce2a7988cb75 100644
--- a/media-video/vdr/vdr-2.6.6.ebuild
+++ b/media-video/vdr/vdr-2.6.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2024-02-15 Thread Joonas Niilola

commit: 22722eb0ac588c80aeb57cdfba8e27ca3b6f02b9
Author: Martin Dummer  gmx  net>
AuthorDate: Sun Jan 28 19:01:42 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 15 13:17:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22722eb0

media-video/vdr: add 2.6.6

Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/35056
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/Manifest |   2 +
 media-video/vdr/files/vdr-2.6.6_gentoo.patch |  60 
 media-video/vdr/vdr-2.6.6.ebuild | 199 +++
 3 files changed, 261 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 2fb16dc8acda..bddcc07e66bd 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,4 +2,6 @@ DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
 DIST vdr-2.6.4.tbz2 944257 BLAKE2B 
09f2867d84ad6ee722e37cd3f77160ba4d976c25e46394a50ecd53b22da2269a3988e5aaf07eb741aaf0c957e9a001b15767b61eb6b1169206b4434d3885dc2f
 SHA512 
2e69b67c82dd9dd1473c8776524b3888944957d4c6d7cf8f7713de4935819853dc481f04a87936bba8b1f56d9f3d8018f0820a3b1505bec2fceea6863e5d3776
 DIST vdr-2.6.4_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
+DIST vdr-2.6.6.tbz2 946758 BLAKE2B 
22ad6d0d4048347ff16a48ad137900f32dda7adfc7fb54bb1501f14cfc426185f942ffa4997de1e0318ca8c6b67a7dfc48d49b30bfda9367d7337b2d601544fc
 SHA512 
4e798d3e39be0e851ec2e7f7cc563b070c3aa9438165a6aab8fcfc1cee5d7255cdc7dd4f6d4c4c84be770223491a9660bb41874e7b4d1ae504bbb16fe11f2a71
+DIST vdr-2.6.6_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/files/vdr-2.6.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.6.6_gentoo.patch
new file mode 100644
index ..0fcf4c3de943
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.6.6_gentoo.patch
@@ -0,0 +1,60 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2024-01-25 09:44:48.0 +0100
 b/Makefile 2024-01-28 19:35:17.020243042 +0100
+@@ -193,7 +193,7 @@
+ 
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo= $(wildcard $(PODIR)/*.po)
++I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -220,7 +220,7 @@
+ 
+ install-i18n: i18n
+   @mkdir -p $(DESTDIR)$(LOCDIR)
+-  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -294,12 +294,11 @@
+ 
+ install-dirs:
+   @mkdir -p $(DESTDIR)$(VIDEODIR)
+-  @mkdir -p $(DESTDIR)$(CONFDIR)
+   @mkdir -p $(DESTDIR)$(ARGSDIR)
+-  @mkdir -p $(DESTDIR)$(CACHEDIR)
+   @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf: install-dirs
++  @mkdir -p $(DESTDIR)$(CONFDIR)
+   # 'cp -n' may be broken, so let's do it the hard way
+   @for i in *.conf; do\
+if ! [ -e $(DESTDIR)$(CONFDIR)/$$i ] ; then\
+@@ -312,9 +311,9 @@
+ install-doc:
+   @mkdir -p $(DESTDIR)$(MANDIR)/man1
+   @mkdir -p $(DESTDIR)$(MANDIR)/man5
+-  @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+-  @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
+-  @gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
++  @cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
++  @cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
++  @cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
+ 
+ # Plugins:
+ 
+@@ -331,8 +330,9 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-  @mkdir -p $(DESTDIR)$(INCDIR)
+-  @cp -pLR

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2024-02-15 Thread Joonas Niilola

commit: 248b89f60fc781f2d4b390fbb4bacff9557d90fa
Author: Martin Dummer  gmx  net>
AuthorDate: Sun Jan 28 18:58:53 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 15 13:17:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248b89f6

media-video/vdr: drop 2.6.3

Signed-off-by: Martin Dummer  gmx.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/Manifest |   2 -
 media-video/vdr/vdr-2.6.3.ebuild | 199 ---
 2 files changed, 201 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 6d4cb3b44c66..2fb16dc8acda 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,7 +1,5 @@
 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.1_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
-DIST vdr-2.6.3.tbz2 943867 BLAKE2B 
48dd2f19125dc60b68d835d3da457b4e2377b7b8ca31b9e1849b9f5ebe29391ed51c9460ec8efc9bdd349adba6d39a2b17f4a3e8f23bea3964b15bcbd9618ec9
 SHA512 
d84ca2cd797c80134a28cebc28172f45081d4f9580122f823dde396d106a15fa88d5f040252b8ee7caa7d44fa6f1cfba37a13c6a36ecd3fd2734b0140f7c438c
 DIST vdr-2.6.4.tbz2 944257 BLAKE2B 
09f2867d84ad6ee722e37cd3f77160ba4d976c25e46394a50ecd53b22da2269a3988e5aaf07eb741aaf0c957e9a001b15767b61eb6b1169206b4434d3885dc2f
 SHA512 
2e69b67c82dd9dd1473c8776524b3888944957d4c6d7cf8f7713de4935819853dc481f04a87936bba8b1f56d9f3d8018f0820a3b1505bec2fceea6863e5d3776
 DIST vdr-2.6.4_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
deleted file mode 100644
index 9dfbf7706e9a..
--- a/media-video/vdr/vdr-2.6.3.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic strip-linguas toolchain-funcs user-info
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> 
${P}.tbz2
-   menuorg? ( 
https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff
 )
-   ttxtsubs? ( 
https://md11.it.cx/download/${PN}/${PN}-2.6.1_ttxtsubs_v2.patch )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-   acct-group/vdr
-   acct-user/vdr
-   media-libs/fontconfig
-   media-libs/freetype
-   media-libs/libjpeg-turbo:=
-   sys-libs/libcap"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   media-tv/gentoo-vdr-scripts
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-REQUIRED_USE="permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-   VIDEO_DIR="$(egethome vdr)/video"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-lang_po() {
-   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-05-18 Thread Sam James

commit: a6dda4f89cbe76b402a633414f01f351d4eb741d
Author: Sam James  gentoo  org>
AuthorDate: Thu May 18 19:42:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 18 19:42:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6dda4f8

media-video/vdr: Stabilize 2.6.4 x86, #906673

Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild
index 9b6270423a68..f28d9906f94e 100644
--- a/media-video/vdr/vdr-2.6.4.ebuild
+++ b/media-video/vdr/vdr-2.6.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-05-18 Thread Sam James

commit: eada5a5ae11f4a02646e34c9a80aa75b8ad40f68
Author: Sam James  gentoo  org>
AuthorDate: Thu May 18 19:42:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 18 19:42:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eada5a5a

media-video/vdr: Stabilize 2.6.4 amd64, #906673

Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild
index 5e14d21c0390..9b6270423a68 100644
--- a/media-video/vdr/vdr-2.6.4.ebuild
+++ b/media-video/vdr/vdr-2.6.4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-04-07 Thread Conrad Kostecki

commit: 54c44cba30abe74050e34d70303fd088d84ff1be
Author: Martin Dummer  gmx  net>
AuthorDate: Fri Apr  7 19:35:18 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Apr  7 20:03:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c44cba

media-video/vdr: fix filename of ttxtsubs patch

Closes: https://bugs.gentoo.org/902897
Closes: https://bugs.gentoo.org/903173
Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/30516
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/vdr/vdr-2.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild
index 6f0f847cc9b0..5e14d21c0390 100644
--- a/media-video/vdr/vdr-2.6.4.ebuild
+++ b/media-video/vdr/vdr-2.6.4.ebuild
@@ -121,7 +121,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 ttxtsubs && eapply "${DISTDIR}/vdr-2.6.1_ttxtsubs_v2.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"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-03-14 Thread Conrad Kostecki

commit: f90375a6a07f068428cbbe2345317709e2d610ca
Author: Martin Dummer  gmx  net>
AuthorDate: Sun Mar 12 10:44:19 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Mar 14 23:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90375a6

media-video/vdr: add 2.6.4

Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/30074
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/vdr/Manifest |   2 +
 media-video/vdr/vdr-2.6.4.ebuild | 199 +++
 2 files changed, 201 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 6e905f5e27c4..6d4cb3b44c66 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,4 +2,6 @@ DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
 DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-2.6.3.tbz2 943867 BLAKE2B 
48dd2f19125dc60b68d835d3da457b4e2377b7b8ca31b9e1849b9f5ebe29391ed51c9460ec8efc9bdd349adba6d39a2b17f4a3e8f23bea3964b15bcbd9618ec9
 SHA512 
d84ca2cd797c80134a28cebc28172f45081d4f9580122f823dde396d106a15fa88d5f040252b8ee7caa7d44fa6f1cfba37a13c6a36ecd3fd2734b0140f7c438c
+DIST vdr-2.6.4.tbz2 944257 BLAKE2B 
09f2867d84ad6ee722e37cd3f77160ba4d976c25e46394a50ecd53b22da2269a3988e5aaf07eb741aaf0c957e9a001b15767b61eb6b1169206b4434d3885dc2f
 SHA512 
2e69b67c82dd9dd1473c8776524b3888944957d4c6d7cf8f7713de4935819853dc481f04a87936bba8b1f56d9f3d8018f0820a3b1505bec2fceea6863e5d3776
+DIST vdr-2.6.4_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/vdr-2.6.4.ebuild b/media-video/vdr/vdr-2.6.4.ebuild
new file mode 100644
index ..6f0f847cc9b0
--- /dev/null
+++ b/media-video/vdr/vdr-2.6.4.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic strip-linguas toolchain-funcs user-info
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> 
${P}.tbz2
+   menuorg? ( 
https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff
 )
+   ttxtsubs? ( https://md11.it.cx/download/${PN}/${P}_ttxtsubs_v2.patch )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+   acct-group/vdr
+   acct-user/vdr
+   media-libs/fontconfig
+   media-libs/freetype
+   media-libs/libjpeg-turbo:=
+   sys-libs/libcap"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   media-tv/gentoo-vdr-scripts
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+REQUIRED_USE="permashift? ( !naludump !pinplugin )"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+   VIDEO_DIR="$(egethome vdr)/video"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+lang_po() {
+   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
+}
+
+src_prepare() {
+   # apply maintenance-patches
+   ebegin "Changing paths for gentoo"
+
+   local DVBDIR=/usr/include
+   local i
+   for i in

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-03-14 Thread Conrad Kostecki

commit: c592536b35c87e8b833a5fb08b8129dd8563cef0
Author: Martin Dummer  gmx  net>
AuthorDate: Sun Mar 12 10:37:47 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Mar 14 23:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c592536b

media-video/vdr: drop 2.6.1

Signed-off-by: Martin Dummer  gmx.net>
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/vdr/Manifest |   1 -
 media-video/vdr/vdr-2.6.1.ebuild | 199 ---
 2 files changed, 200 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index ad6735144b89..6e905f5e27c4 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,5 @@
 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.1.tbz2 937103 BLAKE2B 
d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2
 SHA512 
235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f
 DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-2.6.3.tbz2 943867 BLAKE2B 
48dd2f19125dc60b68d835d3da457b4e2377b7b8ca31b9e1849b9f5ebe29391ed51c9460ec8efc9bdd349adba6d39a2b17f4a3e8f23bea3964b15bcbd9618ec9
 SHA512 
d84ca2cd797c80134a28cebc28172f45081d4f9580122f823dde396d106a15fa88d5f040252b8ee7caa7d44fa6f1cfba37a13c6a36ecd3fd2734b0140f7c438c
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild
deleted file mode 100644
index a59cf1f2c1aa..
--- a/media-video/vdr/vdr-2.6.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic strip-linguas toolchain-funcs user-info
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> 
${P}.tbz2
-   menuorg? ( 
https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff
 )
-   ttxtsubs? ( 
https://md11.it.cx/download/${PN}/${PN}-2.6.1_ttxtsubs_v2.patch )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-   acct-group/vdr
-   acct-user/vdr
-   media-libs/fontconfig
-   media-libs/freetype
-   media-libs/libjpeg-turbo
-   sys-libs/libcap"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   media-tv/gentoo-vdr-scripts
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-REQUIRED_USE="permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-   VIDEO_DIR="$(egethome vdr)/video"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-lang_po() {
-   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
-}
-
-src_prepare() {
-   # apply maintenance-patches
-   ebegin "Changing paths for gentoo"
-
-   local DVBDIR=/usr/include
-   local i
-   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-   [[ -d ${i} ]] || continue
-   if [[ -f

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-02-19 Thread Sam James

commit: be2e3d86cec68df2b8b947a3be00c6046d80bead
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 19 19:39:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 19 19:39:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2e3d86

media-video/vdr: Stabilize 2.6.3 amd64, #895454

Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
index af88c4cd3dc3..9dfbf7706e9a 100644
--- a/media-video/vdr/vdr-2.6.3.ebuild
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-02-19 Thread Sam James

commit: a372dc9fc8e354a865b5480c50d5543824fe995b
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 19 19:39:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 19 19:39:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a372dc9f

media-video/vdr: Stabilize 2.6.3 x86, #895454

Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
index dc7302616595..af88c4cd3dc3 100644
--- a/media-video/vdr/vdr-2.6.3.ebuild
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-01-09 Thread Joonas Niilola

commit: 99dfca3f264772c0c76c8ec7dba0422640cb1455
Author: Martin Dummer  gmx  net>
AuthorDate: Sat Dec  3 22:17:12 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jan  9 13:26:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dfca3f

media-video/vdr: add 2.6.3

Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/28531
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/Manifest |   1 +
 media-video/vdr/vdr-2.6.3.ebuild | 199 +++
 2 files changed, 200 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 655e5797b1c4..ad6735144b89 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,4 +2,5 @@ DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
 DIST vdr-2.6.1.tbz2 937103 BLAKE2B 
d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2
 SHA512 
235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f
 DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
+DIST vdr-2.6.3.tbz2 943867 BLAKE2B 
48dd2f19125dc60b68d835d3da457b4e2377b7b8ca31b9e1849b9f5ebe29391ed51c9460ec8efc9bdd349adba6d39a2b17f4a3e8f23bea3964b15bcbd9618ec9
 SHA512 
d84ca2cd797c80134a28cebc28172f45081d4f9580122f823dde396d106a15fa88d5f040252b8ee7caa7d44fa6f1cfba37a13c6a36ecd3fd2734b0140f7c438c
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
new file mode 100644
index ..71df06ea8867
--- /dev/null
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic strip-linguas toolchain-funcs user-info
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> 
${P}.tbz2
+   menuorg? ( 
https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff
 )
+   ttxtsubs? ( 
https://md11.it.cx/download/${PN}/${PN}-2.6.1_ttxtsubs_v2.patch )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+   acct-group/vdr
+   acct-user/vdr
+   media-libs/fontconfig
+   media-libs/freetype
+   media-libs/libjpeg-turbo
+   sys-libs/libcap"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   media-tv/gentoo-vdr-scripts
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+REQUIRED_USE="permashift? ( !naludump !pinplugin )"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+   VIDEO_DIR="$(egethome vdr)/video"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+lang_po() {
+   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
+}
+
+src_prepare() {
+   # apply maintenance-patches
+   ebegin "Changing paths for gentoo"
+
+   local DVBDIR=/usr/include
+   local i
+   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+   [[ -d ${i} ]] || continue
+   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+   einfo "Found DVB header files in ${i}"
+   DVBDIR=${i}
+   break
+   fi
+   done
+
+   #

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2023-01-09 Thread Joonas Niilola

commit: b63c79cb15c1d4289d93608ba3bf78a6ee6ee2a9
Author: Martin Dummer  gmx  net>
AuthorDate: Sat Dec  3 21:43:29 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jan  9 13:26:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63c79cb

media-video/vdr: remove redundant old versions

Signed-off-by: Martin Dummer  gmx.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/Manifest|   6 -
 media-video/vdr/files/vdr-2.4.7_gcc11.patch |  26 ---
 media-video/vdr/vdr-2.2.0-r6.ebuild | 301 
 media-video/vdr/vdr-2.4.7-r1.ebuild | 209 ---
 4 files changed, 542 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index b4c6683d67bb..655e5797b1c4 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,11 +1,5 @@
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B 
f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175
 SHA512 
d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B 
ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33
 SHA512 
3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
-DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f
 SHA512 
9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
-DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 
142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f
 SHA512 
d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
-DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B 
e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882
 SHA512 
14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
-DIST vdr-2.4.7.tbz2 919632 BLAKE2B 
be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab
 SHA512 
41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-2.6.1.tbz2 937103 BLAKE2B 
d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2
 SHA512 
235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f
 DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch 
b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
deleted file mode 100644
index 1e37b2f0010c..
--- a/media-video/vdr/files/vdr-2.4.7_gcc11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix compile with gcc-11, officially from kls
-
-Signed-off-by: Martin Dummer 
-
 a/tools.h 2021/01/19 20:38:28 5.3
-+++ b/tools.h 2021/05/05 15:16:45
-@@ -53,17 +53,15 @@
-
- // In case some plugin needs to use the STL and gets an error message 
regarding one
- // of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL 
before
--//

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2023-01-09 Thread Joonas Niilola

commit: b09e3eefa7c882772674282ed7a168ce55a45d96
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jan  9 13:27:38 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jan  9 13:27:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09e3eef

media-video/vdr: fix patch name in 2.6.3

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.6.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
index 71df06ea8867..dc7302616595 100644
--- a/media-video/vdr/vdr-2.6.3.ebuild
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="
acct-user/vdr
media-libs/fontconfig
media-libs/freetype
-   media-libs/libjpeg-turbo
+   media-libs/libjpeg-turbo:=
sys-libs/libcap"
 DEPEND="${COMMON_DEPEND}
>=virtual/linuxtv-dvb-headers-5.3"
@@ -121,7 +121,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 ttxtsubs && eapply "${DISTDIR}/${P}_ttxtsubs_v2.patch"
+   use ttxtsubs && eapply "${DISTDIR}/vdr-2.6.1_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"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-09-30 Thread Sam James

commit: 4534e2e354c898964bd7949fc8aaccc7c394873f
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 30 23:10:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 30 23:24:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4534e2e3

media-video/vdr: fix StaticSrcUri

Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.4.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild 
b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 992581e9e7e2..a7db9e18f489 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
 HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> 
${P}.tbz2
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> 
${P}.tbz2
mainmenuhooks? ( 
http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2
 )
menuorg? ( 
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
 )
naludump? ( 
https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-08-28 Thread Joonas Niilola

commit: b36eae739f4f3bd9df13100b78b4f3d9a4ac19f6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Aug 28 07:02:24 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Aug 28 07:02:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36eae73

media-video/vdr: Stabilize 2.6.1 x86, #866605

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild
index 516f2fde53aa..a59cf1f2c1aa 100644
--- a/media-video/vdr/vdr-2.6.1.ebuild
+++ b/media-video/vdr/vdr-2.6.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-08-28 Thread Joonas Niilola

commit: de3af8208e354999703f232579de49529611b7d1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Aug 28 06:57:01 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Aug 28 06:59:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3af820

media-video/vdr: Stabilize 2.6.1 amd64, #866605

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild
index d6ef75f71242..516f2fde53aa 100644
--- a/media-video/vdr/vdr-2.6.1.ebuild
+++ b/media-video/vdr/vdr-2.6.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-08-11 Thread Sam James

commit: b5cc05b8191c32a5086d7ab5e6e11a22ded905fe
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 11 10:53:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 11 10:54:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cc05b8

media-video/vdr: fix UnquotedVariable

Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild
index 306bbb8b220f..d6ef75f71242 100644
--- a/media-video/vdr/vdr-2.6.1.ebuild
+++ b/media-video/vdr/vdr-2.6.1.ebuild
@@ -58,7 +58,7 @@ add_cap() {
 }
 
 lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2022-07-03 Thread Joonas Niilola

commit: 8fb604b710052829970783edc8de32804b2ad7ca
Author: Martin Dummer  gmx  net>
AuthorDate: Mon Jun 20 09:38:59 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jul  3 08:57:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb604b7

media-video/vdr: version bump to 2.6.1

- new stable release
- rebase most patches for this version
- retirement of http://projects.vdr-developer.org: move some SRC_URI
  to github.com/vdr-projects

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/26000
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/Manifest   |   2 +
 .../vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch   | 114 
 .../vdr/files/vdr-2.6.1-patch-for-permashift.patch | 517 ++
 media-video/vdr/files/vdr-2.6.1_naludump.patch | 598 +
 media-video/vdr/files/vdr-2.6.1_pinplugin.patch| 447 +++
 media-video/vdr/vdr-2.6.1.ebuild   | 197 +++
 6 files changed, 1875 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 42d12f50673f..b4c6683d67bb 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -6,4 +6,6 @@ DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d07
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 
142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f
 SHA512 
d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B 
e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882
 SHA512 
14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-2.4.7.tbz2 919632 BLAKE2B 
be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab
 SHA512 
41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
+DIST vdr-2.6.1.tbz2 937103 BLAKE2B 
d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2
 SHA512 
235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f
+DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 
525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f
 SHA512 
590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch 
b/media-video/vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch
new file mode 100644
index ..deec2cd7cfdb
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_mainmenuhook-1.0.1.patch
@@ -0,0 +1,114 @@
+original 
https://raw.githubusercontent.com/VDR4Arch/vdr4arch/master/vdr/vdr-MainMenuHooks.patch
+
+rebased for media-video/vdr-2.4.1
+
+Signed-off-by: Joerg Bornkessel  ( 2019 Dez 22 )
+diff -Naur vdr-2.4.1.orig/config.h vdr-2.4.1/config.h
+--- vdr-2.4.1.orig/config.h2019-12-22 00:04:59.0 +0100
 vdr-2.4.1/config.h 2019-12-22 00:11:25.0 +0100
+@@ -36,6 +36,10 @@
+ // plugins to work with newer versions of the core VDR as long as no
+ // VDR header files have changed.
+ 
++// The MainMenuHook Patch's version number:
++#define MAINMENUHOOKSVERSION "1.0.1"
++#define MAINMENUHOOKSVERSNUM 10001  // Version * 1 + Major * 100 + Minor
++
+ #define MAXPRIORITY   99
+ #define MINPRIORITY   (-MAXPRIORITY)
+ #define LIVEPRIORITY  0  // priority used when selecting 
a device for live viewing
+diff -Naur vdr-2.4.1.orig/menu.c vdr-2.4.1/menu.c
+--- vdr-2.4.1.orig/menu.c  2019-12-22 00:04:59.0 +0100
 vdr-2.4.1/menu.c   2019-12-22 00:11:25.0 +0100
+@@ -4395,15 +4395,31 @@
+ 
+   // Initial submenus:
+ 
++  cOsdObject *menu = NULL;
+   switch (State) {
+-case osSchedule:   AddSubMenu(new cMenuSchedule); break;
+-case osChannels:   AddSubMenu(new cMenuChannels); break;
+-case osTimers: AddSubMenu(new cMenuTimers); break;
+-case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, 
OpenSubMenus)); break;
+-case osSetup:  AddSubMenu(new

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-07-03 Thread Joonas Niilola

commit: bb859df4012eea7a290f473423986a0e17c2f2b9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jul  3 08:41:29 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jul  3 08:57:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb859df4

media-video/vdr: adjust dependencies in 2.6.1

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.6.1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.6.1.ebuild b/media-video/vdr/vdr-2.6.1.ebuild
index 4300433dcc75..306bbb8b220f 100644
--- a/media-video/vdr/vdr-2.6.1.ebuild
+++ b/media-video/vdr/vdr-2.6.1.ebuild
@@ -17,6 +17,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="
+   acct-group/vdr
+   acct-user/vdr
media-libs/fontconfig
media-libs/freetype
media-libs/libjpeg-turbo
@@ -30,8 +32,8 @@ RDEPEND="${COMMON_DEPEND}
bidi? ( dev-libs/fribidi )
systemd? ( sys-apps/systemd )"
 BDEPEND="
-   acct-user/vdr
-   sys-devel/gettext"
+   sys-devel/gettext
+   virtual/pkgconfig"
 
 REQUIRED_USE="permashift? ( !naludump !pinplugin )"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-06-30 Thread Joonas Niilola

commit: e58a68e30cd385d5eddcbdaac462793fa37c9881
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 30 13:44:44 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 30 13:44:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58a68e3

media-video/vdr: Stabilize 2.2.0-r7 x86, #855131

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.2.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild 
b/media-video/vdr/vdr-2.2.0-r7.ebuild
index 168e96c420a5..bba06dbbb477 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-06-30 Thread Joonas Niilola

commit: 20ce4621b9b40f6966a51fdec7d488af0faa9ba1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 30 13:44:12 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 30 13:44:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ce4621

media-video/vdr: Stabilize 2.2.0-r7 amd64, #855131

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.2.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild 
b/media-video/vdr/vdr-2.2.0-r7.ebuild
index 92559ee415c9..168e96c420a5 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-06-30 Thread Joonas Niilola

commit: 3aec79272b7489587ab30a126ce3adb32381530d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 30 13:23:17 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 30 13:23:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aec7927

media-video/vdr: add a missing BDEPEND on 2.2.0-r7

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.2.0-r7.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild 
b/media-video/vdr/vdr-2.2.0-r7.ebuild
index ea4fd71aae83..92559ee415c9 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -44,7 +44,8 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/corefonts
bidi? ( dev-libs/fribidi )
systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
+BDEPEND="sys-devel/gettext
+   virtual/pkgconfig"
 
 CONF_DIR="/etc/vdr"
 CAP_FILE="${S}/capabilities.sh"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-06-30 Thread Joonas Niilola

commit: de3f3a002e26706e4dcd2d2e82ace56f17f875e1
Author: Martin Dummer  gmx  net>
AuthorDate: Thu Jun 30 12:57:44 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 30 13:23:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3f3a00

media-video/vdr: fix compile with USE=vanilla on 2.2.0-r7

fix error in patch logic with gcc-11
replace deprecated virtual/jpeg

Closes: https://bugs.gentoo.org/855269
Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/26164
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/vdr-2.2.0-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild 
b/media-video/vdr/vdr-2.2.0-r7.ebuild
index 63fed2e99446..ea4fd71aae83 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="
-   virtual/jpeg:*
+   media-libs/libjpeg-turbo
sys-libs/libcap
>=media-libs/fontconfig-2.4.2
>=media-libs/freetype-2"
@@ -212,9 +212,9 @@ src_prepare() {
eend $? "make depend failed"
 
eapply "${FILESDIR}/${P}_gcc7extpng.patch"
-   eapply "${FILESDIR}/${P}_gcc11.patch"
fi
 
+   eapply "${FILESDIR}/${P}_gcc11.patch"
eapply "${FILESDIR}/${P}_gentoo.patch"
eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
eapply "${FILESDIR}/${P}_glibc-2.24.patch"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2022-06-16 Thread Sam James

commit: 8826f1e7a1e19858bb6d9e754e508e42a9d311ce
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Wed Jun  8 20:09:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 16 16:30:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8826f1e7

media-video/vdr: fix unquoted variables

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Signed-off-by: Sam James  gentoo.org>

 media-video/vdr/vdr-2.2.0-r6.ebuild | 6 +++---
 media-video/vdr/vdr-2.2.0-r7.ebuild | 6 +++---
 media-video/vdr/vdr-2.4.7-r1.ebuild | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild 
b/media-video/vdr/vdr-2.2.0-r6.ebuild
index 73bef819af6e..372355cbe09d 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,7 +74,7 @@ enable_patch() {
# codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
-   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+   export DEFINES_IUSE=$( cat "${T}"/defines.IUSE )
done
 }
 
@@ -94,7 +94,7 @@ extensions_all_defines() {
 }
 
 lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
 }
 
 src_configure() {

diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild 
b/media-video/vdr/vdr-2.2.0-r7.ebuild
index ead539ebbd1f..63fed2e99446 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,7 +74,7 @@ enable_patch() {
# codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
-   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+   export DEFINES_IUSE=$( cat "${T}"/defines.IUSE )
done
 }
 
@@ -94,7 +94,7 @@ extensions_all_defines() {
 }
 
 lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
 }
 
 src_configure() {

diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild 
b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 0e8eed4d4ee5..992581e9e7e2 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,7 +65,7 @@ add_cap() {
 }
 
 lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+   LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' 
' )
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/

2021-09-20 Thread Conrad Kostecki

commit: 34adca8ab939de7cd6ac16f4862f1bd097382071
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Sep 20 17:12:30 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Sep 20 20:10:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34adca8a

media-video/vdr: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22345
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/vdr/files/vdr-2.4.1_gentoo.patch   | 66 --
 media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch   | 20 ---
 .../vdr/files/vdr-2.4.1_makefile-variables.patch   | 39 -
 .../vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch| 49 
 4 files changed, 174 deletions(-)

diff --git a/media-video/vdr/files/vdr-2.4.1_gentoo.patch 
b/media-video/vdr/files/vdr-2.4.1_gentoo.patch
deleted file mode 100644
index 71aca7f5f96..000
--- a/media-video/vdr/files/vdr-2.4.1_gentoo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-this patch will disable some handling in the core Makefile
-as we use for Linux FHS a different handling in gentoo
-demoplugins from core vdr install disabled
-support from Linguas variable
-
-Signed-off-by: Martin Dummer 
-Reviewed-by: Joerg Bornkessel 
 a/Makefile
-+++ b/Makefile
-@@ -182,7 +182,7 @@
- 
- PODIR = po
- LOCALEDIR = locale
--I18Npo= $(wildcard $(PODIR)/*.po)
-+I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -209,7 +209,7 @@
- 
- install-i18n: i18n
-   @mkdir -p $(DESTDIR)$(LOCDIR)
--  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -283,12 +283,11 @@
- 
- install-dirs:
-   @mkdir -p $(DESTDIR)$(VIDEODIR)
--  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @mkdir -p $(DESTDIR)$(ARGSDIR)
--  @mkdir -p $(DESTDIR)$(CACHEDIR)
-   @mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf: install-dirs
-+  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -296,9 +295,9 @@
- install-doc:
-   @mkdir -p $(DESTDIR)$(MANDIR)/man1
-   @mkdir -p $(DESTDIR)$(MANDIR)/man5
--  @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
--  @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
--  @gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
-+  @cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
-+  @cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
-+  @cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
- 
- # Plugins:
- 
-@@ -315,8 +314,9 @@
- # Includes:
- 
- install-includes: include-dir
--  @mkdir -p $(DESTDIR)$(INCDIR)
--  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 

diff --git a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch 
b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
deleted file mode 100644
index 0db8c5064ac..000
--- a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Replace obsolete stime() function with clock_settime()
-bug 708802
-
-
-Suggested-by: Manuel Reimer 
-Signed-off-by: Joerg Bornkessel  ( 2020 Feb 10 )
-diff -Naur vdr-2.4.1.orig/eit.c vdr-2.4.1/eit.c
 vdr-2.4.1.orig/eit.c   2020-02-10 21:25:03.594761113 +0100
-+++ vdr-2.4.1/eit.c2020-02-10 21:26:32.443761113 +0100
-@@ -391,7 +391,9 @@
-   if (abs(diff) > MAX_TIME_DIFF) {
-  mutex.Lock();
-  if (abs(diff) > MAX_ADJ_DIFF) {
--if (stime() == 0)
-+timespec ts = {};
-+ts.tv_sec = dvbtim;
-+if (clock_settime(CLOCK_REALTIME, ) == 0)
-isyslog("system time changed from %s (%ld) to %s (%ld)", 
*TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
- else
-esyslog("ERROR while setting system time: %m");

diff --git a/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch 
b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch
deleted file mode 100644
index 5923d643c13..000
--- a/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-we change some variables in the Makefile
-for a better handling in gentoo ebuild
-
-Signed-off-by: Joerg Bornkessel  ( 22 Dec 2019 )
 a/Makefile
-+++ b/Makefile
-@@ -54,7 +54,7 @@
- 
- # Output control
- 
--ifdef VERBOSE
-+ifeq ($(VERBOSE),1)
- Q =
- else
- Q = @
-@@ -89,7

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2021-09-19 Thread Andreas K. Hüttel

commit: 403ed3788d2d1f0681a65ae2b19ef8276f775169
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Sep 19 16:45:49 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Sep 19 16:47:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=403ed378

media-video/vdr: Remove old

Bug: https://bugs.gentoo.org/786882
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Huettel  gentoo.org>

 media-video/vdr/Manifest|   5 -
 media-video/vdr/vdr-2.4.1-r3.ebuild | 206 
 media-video/vdr/vdr-2.4.6-r1.ebuild | 206 
 3 files changed, 417 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index a46fe47fab9..42d12f50673 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,13 +1,8 @@
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B 
f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175
 SHA512 
d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B 
426139bd890e50e491d006445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de
 SHA512 
f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
 DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B 
ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33
 SHA512 
3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
-DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B 
d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9
 SHA512 
99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
-DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 
6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3
 SHA512 
b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f
 SHA512 
9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
-DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 
339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216
 SHA512 
f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
-DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 
52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd
 SHA512 
bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 
142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f
 SHA512 
d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B 
e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882
 SHA512 
14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-2.4.7.tbz2 919632 BLAKE2B 
be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab
 SHA512

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2021-07-17 Thread Mikle Kolyada

commit: bf6730d7db3e1d9c12696a64c0e7a01d2221c81b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jul 17 14:08:56 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jul 17 14:08:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6730d7

media-video/vdr: Stabilize 2.4.7-r1 x86, #794253

Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/vdr/vdr-2.4.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild 
b/media-video/vdr/vdr-2.4.7-r1.ebuild
index ba42df6cada..0e8eed4d4ee 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2021-07-17 Thread Mikle Kolyada

commit: bbc661f753985bc1434301add044508bc0603921
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jul 17 14:07:01 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jul 17 14:07:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc661f7

media-video/vdr: Stabilize 2.4.7-r1 amd64, #794253

Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/vdr/vdr-2.4.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild 
b/media-video/vdr/vdr-2.4.7-r1.ebuild
index a0e8811b5db..ba42df6cada 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2021-06-30 Thread Ulrich Müller

commit: 47323c39c314c5fee6f3870b09bd58c92866a739
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 28 10:04:19 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun 30 10:15:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47323c39

media-video/vdr: Update inherit from l10n to strip-linguas

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 media-video/vdr/vdr-2.2.0-r6.ebuild | 2 +-
 media-video/vdr/vdr-2.2.0-r7.ebuild | 2 +-
 media-video/vdr/vdr-2.4.1-r3.ebuild | 2 +-
 media-video/vdr/vdr-2.4.6-r1.ebuild | 2 +-
 media-video/vdr/vdr-2.4.7-r1.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild 
b/media-video/vdr/vdr-2.2.0-r6.ebuild
index 14af4f56648..73bef819af6 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin

diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild 
b/media-video/vdr/vdr-2.2.0-r7.ebuild
index 42c9e675b2b..ead539ebbd1 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin

diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild 
b/media-video/vdr/vdr-2.4.1-r3.ebuild
index 3655c860fee..98642f9c6fd 100644
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
 HOMEPAGE="http://www.tvdr.de/;

diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild 
b/media-video/vdr/vdr-2.4.6-r1.ebuild
index 0a8de8f2ee0..5c62f03f569 100644
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
 HOMEPAGE="http://www.tvdr.de/;

diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild 
b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 8fda32ee217..a0e8811b5db 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic l10n toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
 HOMEPAGE="http://www.tvdr.de/;

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2021-05-09 Thread Agostino Sarubbo

commit: 1f308ee14aab90311fb4e0245a823a058cb0a76e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May  9 09:15:42 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May  9 09:15:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f308ee1

media-video/vdr: amd64 stable wrt bug #788685

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/vdr/vdr-2.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild 
b/media-video/vdr/vdr-2.4.6-r1.ebuild
index 7ae4eaa38b9..0a8de8f2ee0 100644
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2021-05-06 Thread Joonas Niilola

commit: 124a95a62c264394f08d70dc0eb66db06b8c9d04
Author: Martin Dummer  gmx  net>
AuthorDate: Wed May  5 22:31:44 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu May  6 08:46:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124a95a6

media-video/vdr: add gcc-11 compile fix

vdr defines std:: functions "min" "max" and "swap" as Template, which
collides with gcc-11. Add a patch from upstream which fixes this, and fixes
also compile problems with all media-video/vdr-* plugins using this
functions, too

Closes: https://bugs.gentoo.org/786882
Closes: https://bugs.gentoo.org/787389
Closes: https://bugs.gentoo.org/787236
Closes: https://bugs.gentoo.org/787140
Closes: https://bugs.gentoo.org/786801
Closes: https://bugs.gentoo.org/786795
Closes: https://bugs.gentoo.org/786672
Closes: https://bugs.gentoo.org/786285
Closes: https://bugs.gentoo.org/786258
Closes: https://bugs.gentoo.org/788583
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/20695
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/files/vdr-2.2.0_gcc11.patch|  29 ++
 media-video/vdr/files/vdr-2.4.7_gcc11.patch| 314 ++---
 media-video/vdr/vdr-2.2.0-r7.ebuild| 302 
 .../vdr/{vdr-2.4.7.ebuild => vdr-2.4.7-r1.ebuild}  |   8 +-
 4 files changed, 359 insertions(+), 294 deletions(-)

diff --git a/media-video/vdr/files/vdr-2.2.0_gcc11.patch 
b/media-video/vdr/files/vdr-2.2.0_gcc11.patch
new file mode 100644
index 000..297cdceabf5
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_gcc11.patch
@@ -0,0 +1,29 @@
+Fix compile with gcc-11, officially from kls
+
+Signed-off-by: Martin Dummer 
+
+--- a/tools.h  2021-05-05 21:48:32.382919856 +0200
 b/tools.h  2021-05-05 21:53:10.184522278 +0200
+@@ -50,7 +50,10 @@
+ #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
+ #define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
+ 
+-#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
++// In case some plugin needs to use the STL and gets an error message 
regarding one
++// of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL 
before
++// including any VDR header files.
++#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
+ template inline T min(T a, T b) { return a <= b ? a : b; }
+ template inline T max(T a, T b) { return a >= b ? a : b; }
+ template inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
+--- a/recording.c  2021-05-05 22:08:23.898974097 +0200
 b/recording.c  2021-05-05 22:08:39.323280274 +0200
+@@ -2949,7 +2949,7 @@
+}
+ // found a non existing file suffix
+ }
+- if (Open() >= 0) {
++ if (Open()) {
+ if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != 
Offset) {
+LOG_ERROR_STR(fileName);
+return NULL;

diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch 
b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
index 866b018b5b7..1e37b2f0010 100644
--- a/media-video/vdr/files/vdr-2.4.7_gcc11.patch
+++ b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
@@ -1,292 +1,26 @@
-https://bugs.gentoo.org/786882
+Fix compile with gcc-11, officially from kls
 
-compile fix for gcc-11
+Signed-off-by: Martin Dummer 
 
-Signed-off-by: Joerg Bornkessel  (02 May 2021)
-diff -Naur vdr-2.4.7.orig/channels.c vdr-2.4.7/channels.c
 vdr-2.4.7.orig/channels.c  2021-05-02 19:34:32.312653108 +0200
-+++ vdr-2.4.7/channels.c   2021-05-02 19:39:19.241653108 +0200
-@@ -11,6 +11,7 @@
- #include 
- #include "device.h"
- #include "libsi/si.h"
-+using namespace std;
- 
- // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
- // format characters in order to allow any number of blanks after a numeric
-diff -Naur vdr-2.4.7.orig/ci.c vdr-2.4.7/ci.c
 vdr-2.4.7.orig/ci.c2021-05-02 19:34:32.313653108 +0200
-+++ vdr-2.4.7/ci.c 2021-05-02 19:49:53.216653108 +0200
-@@ -27,6 +27,8 @@
- #include "skins.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- // Set these to 'true' for debug output:
- static bool DumpTPDUDataTransfer = false;
- static bool DebugProtocol = false;
-diff -Naur vdr-2.4.7.orig/device.c vdr-2.4.7/device.c
 vdr-2.4.7.orig/device.c2021-05-02 19:34:32.313653108 +0200
-+++ vdr-2.4.7/device.c 2021-05-02 19:43:19.071653108 +0200
-@@ -20,6 +20,8 @@
- #include "status.h"
- #include "transfer.h"
- 
-+using namespace std;
-+
- // --- cLiveSubtitle -
- 
- class cLiveSubtitle : public cReceiver {
-diff -Naur vdr-2.4.7.orig/diseqc.c vdr-2.4.7/diseqc.c
 vdr-2.4.7.orig/diseqc.c2021-05-02 19:34:32.314653108 +0200
-+++ vdr-2.4.7/diseqc.c 2021-05-02 19:50:14.177653108 +0200
-@@ -14,6 +14,8 @@
- #include "sources.h"
- #include "thread.h"
- 
-+using namespace std;
-+
- #define ALL_DEVICES (~0) //

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2021-05-02 Thread Jörg Bornkessel

commit: 862ca1738ccf75e258934ba641d4bdb98f0d2a44
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun May  2 20:32:52 2021 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun May  2 20:33:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862ca173

media-video/vdr: version bump

in this bump is also the gcc11 compile error
fixed by patch
we skip here vdr-2.4.6 and go straid to vdr-2.4.7

Closes: https://bugs.gentoo.org/786882
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/Manifest|   1 +
 media-video/vdr/files/vdr-2.4.7_gcc11.patch | 292 
 media-video/vdr/vdr-2.4.7.ebuild| 209 
 3 files changed, 502 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 7611c3c1c5a..a46fe47fab9 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -10,4 +10,5 @@ DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 
339bb23ed0f505087bdbbefb192824d5
 DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 
52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd
 SHA512 
bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 
142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f
 SHA512 
d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B 
e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882
 SHA512 
14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
+DIST vdr-2.4.7.tbz2 919632 BLAKE2B 
be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab
 SHA512 
41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch 
b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
new file mode 100644
index 000..866b018b5b7
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
@@ -0,0 +1,292 @@
+https://bugs.gentoo.org/786882
+
+compile fix for gcc-11
+
+Signed-off-by: Joerg Bornkessel  (02 May 2021)
+diff -Naur vdr-2.4.7.orig/channels.c vdr-2.4.7/channels.c
+--- vdr-2.4.7.orig/channels.c  2021-05-02 19:34:32.312653108 +0200
 vdr-2.4.7/channels.c   2021-05-02 19:39:19.241653108 +0200
+@@ -11,6 +11,7 @@
+ #include 
+ #include "device.h"
+ #include "libsi/si.h"
++using namespace std;
+ 
+ // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
+ // format characters in order to allow any number of blanks after a numeric
+diff -Naur vdr-2.4.7.orig/ci.c vdr-2.4.7/ci.c
+--- vdr-2.4.7.orig/ci.c2021-05-02 19:34:32.313653108 +0200
 vdr-2.4.7/ci.c 2021-05-02 19:49:53.216653108 +0200
+@@ -27,6 +27,8 @@
+ #include "skins.h"
+ #include "tools.h"
+ 
++using namespace std;
++
+ // Set these to 'true' for debug output:
+ static bool DumpTPDUDataTransfer = false;
+ static bool DebugProtocol = false;
+diff -Naur vdr-2.4.7.orig/device.c vdr-2.4.7/device.c
+--- vdr-2.4.7.orig/device.c2021-05-02 19:34:32.313653108 +0200
 vdr-2.4.7/device.c 2021-05-02 19:43:19.071653108 +0200
+@@ -20,6 +20,8 @@
+ #include "status.h"
+ #include "transfer.h"
+ 
++using namespace std;
++
+ // --- cLiveSubtitle -
+ 
+ class cLiveSubtitle : public cReceiver {
+diff -Naur vdr-2.4.7.orig/diseqc.c vdr-2.4.7/diseqc.c
+--- vdr-2.4.7.orig/diseqc.c2021-05-02 19:34:32.314653108 +0200
 vdr-2.4.7/diseqc.c 2021-05-02 19:50:14.177653108 +0200
+@@ -14,6 +14,8 @@
+ #include "sources.h"
+ #include "thread.h"
+ 
++using namespace std;
++
+ #define ALL_DEVICES (~0) // all bits set to '1'
+ #define MAX_DEVICES 32   // each bit in a 32-bit integer represents one device
+ 
+diff -Naur vdr-2.4.7.orig/dvbdevice.c vdr-2.4.7/dvbdevice.c
+--- vdr-2.4.7.orig/dvbdevice.c 2021-05-02 19:34:32.314653108 +0200
 vdr-2.4.7/dvbdevice.c  2021-05-02 19:50:35.634653108 +0200
+@@ -21,6 +21,8 @@
+ #include "menuitems.h"
+ #include "sourceparams.h"
+ 
++using namespace std;
++
+ static int DvbApiVersion = 0x; // the version of the

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2021-03-21 Thread Jörg Bornkessel

commit: 947a0300ce46ae01c43173752f7003a099b8ca7c
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Mar 21 16:39:40 2021 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun Mar 21 16:53:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947a0300

media-video/vdr: cleanup old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 301 
 media-video/vdr/vdr-2.4.1-r2.ebuild | 198 
 2 files changed, 499 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
deleted file mode 100644
index 472f17daa0a..000
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
-   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-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"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-   mirror://gentoo/${EXT_P}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
-
-COMMON_DEPEND="
-   virtual/jpeg:*
-   sys-libs/libcap
-   >=media-libs/fontconfig-2.4.2
-   >=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   >=media-tv/gentoo-vdr-scripts-2.7
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-enable_patch() {
-   local arg ARG_UPPER
-   for arg; do
-   ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
-   echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 
Make.config"
-
-   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
-   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
-   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
-   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-   done
-}
-
-extensions_add_make_conf()
-{
-   # copy all ifdef for extensions-patch to Make.config
-   sed -e '1,/need to touch the following:/d' \
-   -e '/need to touch the following/,/^$/d' \
-   Make.config.template >> Make.config || die "cannot write to 
Make.config"
-}
-
-extensions_all_defines() {
-   # extract all possible settings for extensions-patch
-   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-   Make.config.template \
-   | sort \
-   | tr '[:upper:]' '[:lower:]' || die "error in function 
extensions_all_defines"
-}
-
-lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
-}
-
-src_configure() {
-   # support languages, written from right to left
-   export "BIDI=$(usex bidi 1 0)"
-   # systemd notification support
-   export "SDNOTIFY=$(usex systemd 1 0)"
-   # with/without keyboard
-   export "USE_KBD=$(usex keyboard 1 0)"
-}
-
-src_prepare() {
-   # apply maintenance-patches
-   ebegin "Changing paths for gentoo"
-
-   local DVBDIR="/usr/include"
-   local i
-   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-   [[ -d ${i} ]] || continue
-   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-   einfo "Found DVB header files in ${i}"
-   DVBDIR="${i}"
-   break
-   fi
-   done
-
-   # checking for s2api headers
-   local api_version
-   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
-   api_version=${api_version}*$(awk

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2021-02-16 Thread Jörg Bornkessel

commit: 114bdbd155023cbcd3532d8b1d9239e091153fed
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Tue Feb 16 16:42:14 2021 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Tue Feb 16 16:43:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114bdbd1

media-video/vdr: readded use-flag pinplugin, permashift; bug fixes

-use-flag pinplugin, permashift readded
-fixed clang/LLVM compile
 thx to Martin.Dummer to point this out
-fixed segfault in ttxtsubs patch
 thx to Christian Kunkel to report this

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/Manifest   |  4 +++-
 media-video/vdr/files/vdr-2.4.6_clang.patch| 20 
 .../vdr/{vdr-2.4.6.ebuild => vdr-2.4.6-r1.ebuild}  | 22 +-
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 43de58b6f2e..7611c3c1c5a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,10 +2,12 @@ DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 
BLAKE2B 81b68ebe0ef4588c
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B 
f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175
 SHA512 
d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
 DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B 
426139bd890e50e491d006445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de
 SHA512 
f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
+DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B 
ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33
 SHA512 
3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
 DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B 
d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9
 SHA512 
99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
 DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 
6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3
 SHA512 
b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f
 SHA512 
9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
 DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 
339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216
 SHA512 
f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
 DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 
52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd
 SHA512 
bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
-DIST vdr-2.4.6_ttxtsubs.patch.bz2 14964 BLAKE2B 
b07e26077fe5af02df00b3580031615390ba6b3ea1c5a6e9c91f5e6d1964da7114e0ad939a9e4de640a97f5a887c45f6c8b5793a4da9341c7c238993a997c87c
 SHA512 
cd60496b4a8a2dbed209dcf6645c0a6886091c5d5fca791a5ff3ec9fdf7f6c3f2c9a99976636aa985257b9baef10439e75f844f58f3f0a25d5ebcd361ec552ae
+DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 
142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f
 SHA512 
d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
+DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B 
e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882
 SHA512 
14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/

2021-02-15 Thread Jörg Bornkessel

commit: 0dcc953a8ef7cc3dac909c34e3ad7ec6daa11603
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Feb 15 17:01:54 2021 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Mon Feb 15 18:23:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcc953a

media-video/vdr: remove unused patch

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19479
Signed-off-by: Joerg Bornkessel  gentoo.org>

 .../vdr/files/vdr-2.4.6_remove_plugins.patch   | 24 --
 1 file changed, 24 deletions(-)

diff --git a/media-video/vdr/files/vdr-2.4.6_remove_plugins.patch 
b/media-video/vdr/files/vdr-2.4.6_remove_plugins.patch
deleted file mode 100644
index d2571ea687c..000
--- a/media-video/vdr/files/vdr-2.4.6_remove_plugins.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-we do not install any plugins from core vdr
-
-Signed-off-by: Joerg Bornkessel  2021/Feb/11
-diff -Naur vdr-2.4.6.orig/Makefile vdr-2.4.6/Makefile
 vdr-2.4.6.orig/Makefile2020-06-27 11:13:04.0 +0200
-+++ vdr-2.4.6/Makefile 2020-08-08 18:16:02.519719542 +0200
-@@ -136,7 +136,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -282,7 +282,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-conf install-doc install-plugins 
install-i18n install-includes
-+install: install-pc install-bin install-conf install-doc install-i18n 
install-includes
- 
- # VDR binary:
-

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2021-02-11 Thread Jörg Bornkessel

commit: 3f50eab87a6bef5bc45fc1754f35db7b769bcdba
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Thu Feb 11 16:55:00 2021 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Thu Feb 11 17:20:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f50eab8

media-video/vdr: version bump

temp droped use-flag permashift, pinplugin
as we do not have a addopted patch from plugins upstream yet

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/Manifest   |   2 +
 media-video/vdr/files/vdr-2.4.6_gentoo.patch   |  66 +++
 .../vdr/files/vdr-2.4.6_makefile-variables.patch   |  40 
 .../vdr/files/vdr-2.4.6_remove_plugins.patch   |  24 +++
 media-video/vdr/vdr-2.4.6.ebuild   | 202 +
 5 files changed, 334 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 715cb3e5d65..43de58b6f2e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -6,4 +6,6 @@ DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B 
d5c3da713cd82ed8c3baccd1336d2834
 DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 
6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3
 SHA512 
b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f
 SHA512 
9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
 DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 
339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216
 SHA512 
f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
+DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 
52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd
 SHA512 
bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
+DIST vdr-2.4.6_ttxtsubs.patch.bz2 14964 BLAKE2B 
b07e26077fe5af02df00b3580031615390ba6b3ea1c5a6e9c91f5e6d1964da7114e0ad939a9e4de640a97f5a887c45f6c8b5793a4da9341c7c238993a997c87c
 SHA512 
cd60496b4a8a2dbed209dcf6645c0a6886091c5d5fca791a5ff3ec9fdf7f6c3f2c9a99976636aa985257b9baef10439e75f844f58f3f0a25d5ebcd361ec552ae
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/files/vdr-2.4.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.4.6_gentoo.patch
new file mode 100644
index 000..6ecd2ccfd43
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.6_gentoo.patch
@@ -0,0 +1,66 @@
+this patch will disable some handling in the core Makefile
+as we use for Linux FHS a different handling in gentoo
+demoplugins from core vdr install disabled
+support from Linguas variable
+
+Signed-off-by: Joerg Bornkessel  2021/Feb/11
+diff -Naur vdr-2.4.6.orig/Makefile vdr-2.4.6/Makefile
+--- vdr-2.4.6.orig/Makefile2020-06-27 11:13:04.0 +0200
 vdr-2.4.6/Makefile 2020-08-08 18:16:02.519719542 +0200
+@@ -193,7 +193,7 @@
+ 
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo= $(wildcard $(PODIR)/*.po)
++I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -220,7 +220,7 @@
+ 
+ install-i18n: i18n
+   @mkdir -p $(DESTDIR)$(LOCDIR)
+-  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -294,12 +294,11 @@
+ 
+ install-dirs:
+   @mkdir -p $(DESTDIR)$(VIDEODIR)
+-  @mkdir -p $(DESTDIR)$(CONFDIR)
+   @mkdir -p $(DESTDIR)$(ARGSDIR)
+-  @mkdir -p $(DESTDIR)$(CACHEDIR)
+   @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf: install-dirs
++  @mkdir -p $(DESTDIR)$(CONFDIR)
+   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -307,9 +306,9 @@
+ install-doc:
+   @mkdir -p $(DESTDIR)$(MANDIR)/man1
+   @mkdir -p $(DESTDIR)$(MANDIR)/man5
+-  @gzip -c vdr.1 >

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-06-12 Thread Agostino Sarubbo

commit: 36f6b5203b548046f0b7c516fefb9ee3f13763e0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 12 07:55:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 12 07:55:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f6b520

media-video/vdr: x86 stable wrt bug #727740

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/vdr/vdr-2.2.0-r6.ebuild | 2 +-
 media-video/vdr/vdr-2.4.1-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild 
b/media-video/vdr/vdr-2.2.0-r6.ebuild
index 1a4590a2e2c..7d6d36b78e9 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild 
b/media-video/vdr/vdr-2.4.1-r3.ebuild
index 41550d62c91..2d62740dffe 100644
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin permashift systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-06-12 Thread Agostino Sarubbo

commit: b0600f6da40162eb16380c6e92e65e0a7d8cf0e8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 12 07:49:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 12 07:49:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0600f6d

media-video/vdr: amd64 stable wrt bug #727740

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/vdr/vdr-2.2.0-r6.ebuild | 2 +-
 media-video/vdr/vdr-2.4.1-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild 
b/media-video/vdr/vdr-2.2.0-r6.ebuild
index fc7a7754d30..1a4590a2e2c 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild 
b/media-video/vdr/vdr-2.4.1-r3.ebuild
index 288169d7293..41550d62c91 100644
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin permashift systemd ttxtsubs verbose"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-03-06 Thread Jörg Bornkessel

commit: 78de03dc358755693e6e1f8144872d5c877868de
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Fri Mar  6 22:43:32 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Fri Mar  6 22:44:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78de03dc

media-video/vdr: use-flag permashift,support for acct/guid handling

for the next gentoo-vdr-scripts version
with acct/{user,group} handling
we have to change the old homedir
/var/vdr to /var/lib/vdr.
this affects also the VIDEODIR
first improvement in this version.

Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/Manifest|   1 +
 media-video/vdr/vdr-2.4.1-r3.ebuild | 206 
 2 files changed, 207 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 645fd58bd16..715cb3e5d65 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,7 @@
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B 
f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175
 SHA512 
d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
+DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B 
426139bd890e50e491d006445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de
 SHA512 
f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
 DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B 
d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9
 SHA512 
99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
 DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 
6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3
 SHA512 
b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f
 SHA512 
9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759

diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild 
b/media-video/vdr/vdr-2.4.1-r3.ebuild
new file mode 100644
index 000..288169d7293
--- /dev/null
+++ b/media-video/vdr/vdr-2.4.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
+   mainmenuhooks? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
+   menuorg? ( 
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
 )
+   naludump? ( 
http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
+   pinplugin? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
+   ttxtsubs? ( 
http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )
+   permashift? ( 
https://raw.githubusercontent.com/eikesauer/Permashift/master/vdr-2.4-patch-for-permashift.diff
 )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin permashift systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+   virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   media-tv/gentoo-vdr-scripts
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? (

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-03-04 Thread Jörg Bornkessel

commit: 427040360a2881e5eb1f30326740cb973aa7c3a9
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Wed Mar  4 20:01:55 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Wed Mar  4 20:01:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42704036

media-video/vdr: drop old buggy version

Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/vdr-2.4.1-r1.ebuild | 202 
 1 file changed, 202 deletions(-)

diff --git a/media-video/vdr/vdr-2.4.1-r1.ebuild 
b/media-video/vdr/vdr-2.4.1-r1.ebuild
deleted file mode 100644
index 8cff2947749..000
--- a/media-video/vdr/vdr-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
-   mainmenuhooks? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
-   menuorg? ( 
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
 )
-   naludump? ( 
http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-   pinplugin? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
-   ttxtsubs? ( 
http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-   virtual/jpeg:*
-   sys-libs/libcap
-   >=media-libs/fontconfig-2.4.2
-   >=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   media-tv/gentoo-vdr-scripts
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
-}
-
-src_configure() {
-   # support languages, written from right to left
-   export "BIDI=$(usex bidi 1 0)"
-   # systemd notification support
-   export "SDNOTIFY=$(usex systemd 1 0)"
-   # with/without keyboard
-   export "USE_KBD=$(usex keyboard 1 0)"
-   # detailed compile output for debug
-   export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-   # apply maintenance-patches
-   ebegin "Changing paths for gentoo"
-
-   local DVBDIR=/usr/include
-   local i
-   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-   [[ -d ${i} ]] || continue
-   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-   einfo "Found DVB header files in ${i}"
-   DVBDIR=${i}
-   break
-   fi
-   done
-
-   # checking for s2api headers
-   local api_version
-   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
-   api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / 
{print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-   if [[ ${api_version:-0} -lt 5*3 ]]; then
-   eerror "DVB header files do not contain s2api support or too 
old for ${P}"
-   eerror "You cannot compile VDR against old dvb-header"
-   die "DVB headers too old"
-   fi
-
-   cat > Make.config <<-EOT || die "cannot write to Make.config"
-   #
-   # Generated by ebuild ${PF}
-   #
-   PREFIX  = /usr
-   DVBDIR  = ${DVBDIR}
-   PLUGINLIBDIR= ${PLUGIN_LIBDIR}
-   CONFDIR = ${CONF_DIR}
-   ARGSDIR = \$(CONFDIR)/conf.d
-   VIDEODIR= /var/vdr/video
-   LOCDIR  = \$(PREFIX)/share/locale
-   INCDIR  = \$(PREFIX)/include
-
-   DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
-   INCLUDES+= -I\$(DVBDIR)
-
-   # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-03-03 Thread Matt Turner

commit: 0fc9761f2802864a309dc1832980866fed91b6c3
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Mar  3 21:15:59 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Mar  3 21:16:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc9761f

Revert "media-video/vdr: old buggy version removed"

This reverts commit 254ca62f09e08d60eac5cc4b91994fbc947efe92.

This is the only stable version of media-video/vdr.

Signed-off-by: Matt Turner  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 301 
 1 file changed, 301 insertions(+)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
new file mode 100644
index 000..472f17daa0a
--- /dev/null
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -0,0 +1,301 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
+   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+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"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+   mirror://gentoo/${EXT_P}.patch.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
+
+COMMON_DEPEND="
+   virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   >=media-tv/gentoo-vdr-scripts-2.7
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+enable_patch() {
+   local arg ARG_UPPER
+   for arg; do
+   ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
+   echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 
Make.config"
+
+   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
+   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
+   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
+   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+   done
+}
+
+extensions_add_make_conf()
+{
+   # copy all ifdef for extensions-patch to Make.config
+   sed -e '1,/need to touch the following:/d' \
+   -e '/need to touch the following/,/^$/d' \
+   Make.config.template >> Make.config || die "cannot write to 
Make.config"
+}
+
+extensions_all_defines() {
+   # extract all possible settings for extensions-patch
+   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+   Make.config.template \
+   | sort \
+   | tr '[:upper:]' '[:lower:]' || die "error in function 
extensions_all_defines"
+}
+
+lang_po() {
+   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+}
+
+src_configure() {
+   # support languages, written from right to left
+   export "BIDI=$(usex bidi 1 0)"
+   # systemd notification support
+   export "SDNOTIFY=$(usex systemd 1 0)"
+   # with/without keyboard
+   export "USE_KBD=$(usex keyboard 1 0)"
+}
+
+src_prepare() {
+   # apply maintenance-patches
+   ebegin "Changing paths for gentoo"
+
+   local DVBDIR="/usr/include"
+   local i
+   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+   [[ -d ${i} ]] || continue
+   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+   einfo "Found DVB header files in ${i}"
+   DVBDIR="${i}"
+   break
+   fi
+   done
+
+   # checking for s2api headers
+   local api_version
+   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-03-03 Thread Jörg Bornkessel

commit: 254ca62f09e08d60eac5cc4b91994fbc947efe92
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Tue Mar  3 19:34:48 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Tue Mar  3 19:34:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=254ca62f

media-video/vdr: old buggy version removed

Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 301 
 1 file changed, 301 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
deleted file mode 100644
index 472f17daa0a..000
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
-   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-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"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-   mirror://gentoo/${EXT_P}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
-
-COMMON_DEPEND="
-   virtual/jpeg:*
-   sys-libs/libcap
-   >=media-libs/fontconfig-2.4.2
-   >=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   >=media-tv/gentoo-vdr-scripts-2.7
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-enable_patch() {
-   local arg ARG_UPPER
-   for arg; do
-   ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
-   echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 
Make.config"
-
-   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
-   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
-   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
-   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-   done
-}
-
-extensions_add_make_conf()
-{
-   # copy all ifdef for extensions-patch to Make.config
-   sed -e '1,/need to touch the following:/d' \
-   -e '/need to touch the following/,/^$/d' \
-   Make.config.template >> Make.config || die "cannot write to 
Make.config"
-}
-
-extensions_all_defines() {
-   # extract all possible settings for extensions-patch
-   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-   Make.config.template \
-   | sort \
-   | tr '[:upper:]' '[:lower:]' || die "error in function 
extensions_all_defines"
-}
-
-lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
-}
-
-src_configure() {
-   # support languages, written from right to left
-   export "BIDI=$(usex bidi 1 0)"
-   # systemd notification support
-   export "SDNOTIFY=$(usex systemd 1 0)"
-   # with/without keyboard
-   export "USE_KBD=$(usex keyboard 1 0)"
-}
-
-src_prepare() {
-   # apply maintenance-patches
-   ebegin "Changing paths for gentoo"
-
-   local DVBDIR="/usr/include"
-   local i
-   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-   [[ -d ${i} ]] || continue
-   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-   einfo "Found DVB header files in ${i}"
-   DVBDIR="${i}"
-   break
-   fi
-   done
-
-   # checking for s2api headers
-   local api_version
-   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
-   api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / 
{print $3}'

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2020-03-02 Thread Jörg Bornkessel

commit: 1a7812a5edfdb1f6a9676fc035fe91dc1032
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Mon Mar  2 20:05:15 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Mon Mar  2 20:05:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a78

media-video/vdr: segfault in ttxtsub patch uses fixed

reported by several users
in IRC #gentoo-vdr
vdr-portal.de

Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 .../vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch|  49 +
 media-video/vdr/vdr-2.4.1-r2.ebuild| 198 +
 2 files changed, 247 insertions(+)

diff --git a/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch 
b/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch
new file mode 100644
index 000..deba0197961
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch
@@ -0,0 +1,49 @@
+fixing segfault, reported on IRC #gentoo-vdr & vdr-portal.de
+https://www.vdr-portal.de/forum/index.php?thread/132017-videotextuntertitel-f%C3%BCr-vdr-2-4-0/=1306478#post1306478
+
+Signed-Off-By: Joerg Bornkessel  ( 2020 Mar 02 )
+diff -Naur vdr-2.4.1.orig/channels.c vdr-2.4.1/channels.c
+--- vdr-2.4.1.orig/channels.c  2020-03-02 19:52:51.052496538 +0100
 vdr-2.4.1/channels.c   2020-03-02 19:54:05.096496538 +0100
+@@ -429,7 +429,7 @@
+   return Modified;
+ }
+ 
+-void cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int 
numberOfPages)
++bool cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int 
numberOfPages)
+ {
+   int mod = CHANNELMOD_NONE;
+   LOCK_CHANNELS_WRITE;
+@@ -447,7 +447,7 @@
+   totalTtxtSubtitlePages++;
+   }
+   modification |= mod;
+-  Channels->SetModified();
++  return true;
+ }
+ 
+ void cChannel::SetSeen(void)
+diff -Naur vdr-2.4.1.orig/channels.h vdr-2.4.1/channels.h
+--- vdr-2.4.1.orig/channels.h  2020-03-02 19:52:51.052496538 +0100
 vdr-2.4.1/channels.h   2020-03-02 19:54:31.745496538 +0100
+@@ -212,7 +212,7 @@
+   bool SetName(const char *Name, const char *ShortName, const char *Provider);
+   bool SetPortalName(const char *PortalName);
+   bool SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char 
ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], 
int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+-  void SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int 
numberOfPages);
++  bool SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int 
numberOfPages);
+   bool SetCaIds(const int *CaIds); // list must be zero-terminated
+   bool SetCaDescriptors(int Level);
+   bool SetLinkChannels(cLinkChannels *LinkChannels);
+diff -Naur vdr-2.4.1.orig/pat.c vdr-2.4.1/pat.c
+--- vdr-2.4.1.orig/pat.c   2020-03-02 19:52:51.053496538 +0100
 vdr-2.4.1/pat.c2020-03-02 19:55:40.819496538 +0100
+@@ -649,7 +649,7 @@
+   if (manualPageNumber)
+  TeletextSubtitlePages[NumTPages++] = 
tTeletextSubtitlePage(manualPageNumber);
+   }
+-   Channel->SetTeletextSubtitlePages(TeletextSubtitlePages, 
NumTPages);
++   ChannelsModified |= 
Channel->SetTeletextSubtitlePages(TeletextSubtitlePages, NumTPages);
+ChannelsModified |= Channel->SetCaIds(CaDescriptors->CaIds());
+ChannelsModified |= 
Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, 
AncillaryPageIds);
+}

diff --git a/media-video/vdr/vdr-2.4.1-r2.ebuild 
b/media-video/vdr/vdr-2.4.1-r2.ebuild
new file mode 100644
index 000..53df602b471
--- /dev/null
+++ b/media-video/vdr/vdr-2.4.1-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
+   mainmenuhooks? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
+   menuorg? ( 
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
 )
+   naludump? ( 
http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
+   pinplugin? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
+   ttxtsubs? ( 
http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+   virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2020-02-24 Thread Jörg Bornkessel

commit: 0ea9c7cd02a332ab43041695be0e778bc0887ef7
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Mon Feb 24 12:16:30 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Mon Feb 24 12:17:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea9c7cd

media-video/vdr: glibc-2.31 compilefix for vdr-2.2.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/files/vdr-2.2.0_glibc-2.31.patch |  19 ++
 media-video/vdr/vdr-2.2.0-r6.ebuild  | 302 +++
 2 files changed, 321 insertions(+)

diff --git a/media-video/vdr/files/vdr-2.2.0_glibc-2.31.patch 
b/media-video/vdr/files/vdr-2.2.0_glibc-2.31.patch
new file mode 100644
index 000..9c23c9f25be
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_glibc-2.31.patch
@@ -0,0 +1,19 @@
+Replace obsolete stime() function with clock_settime()
+bug 708802
+
+Suggested-by: Manuel Reimer 
+Signed-off-by: Joerg Bornkessel  ( 2020 Feb 24 )
+diff -Naur vdr-2.2.0.orig/eit.c vdr-2.2.0/eit.c
+--- vdr-2.2.0.orig/eit.c   2020-02-24 13:05:49.451790460 +0100
 vdr-2.2.0/eit.c2020-02-24 13:07:00.719790460 +0100
+@@ -343,7 +343,9 @@
+   if (abs(diff) > MAX_TIME_DIFF) {
+  mutex.Lock();
+  if (abs(diff) > MAX_ADJ_DIFF) {
+-if (stime() == 0)
++timespec ts = {};
++ts.tv_sec = dvbtim;
++if (clock_settime(CLOCK_REALTIME, ) == 0)
+isyslog("system time changed from %s (%ld) to %s (%ld)", 
*TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
+ else
+esyslog("ERROR while setting system time: %m");

diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild 
b/media-video/vdr/vdr-2.2.0-r6.ebuild
new file mode 100644
index 000..fc7a7754d30
--- /dev/null
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -0,0 +1,302 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
+   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+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"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+   mirror://gentoo/${EXT_P}.patch.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
+
+COMMON_DEPEND="
+   virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   >=media-tv/gentoo-vdr-scripts-2.7
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+enable_patch() {
+   local arg ARG_UPPER
+   for arg; do
+   ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
+   echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 
Make.config"
+
+   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
+   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
+   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
+   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+   done
+}
+
+extensions_add_make_conf()
+{
+   # copy all ifdef for extensions-patch to Make.config
+   sed -e '1,/need to touch the following:/d' \
+   -e '/need to touch the following/,/^$/d' \
+   Make.config.template >> Make.config || die "cannot write to 
Make.config"
+}
+
+extensions_all_defines() {
+   # extract all possible settings for extensions-patch
+   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+   Make.config.template \
+   | sort \
+   | tr '[:upper:]' '[:lower:]' || die "error in function 
extensions_all_defines"
+}
+
+lang_po() {
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-02-16 Thread David Seifert

commit: 9d11c28c8d1a2e84594382c1f812c0414d4a8ac4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Feb 16 20:24:02 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Feb 16 20:24:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d11c28c

media-video/vdr: [QA] inherit eutils.eclass directly

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 2 +-
 media-video/vdr/vdr-2.4.1-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
index 38a44d4e818..472f17daa0a 100644
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin

diff --git a/media-video/vdr/vdr-2.4.1-r1.ebuild 
b/media-video/vdr/vdr-2.4.1-r1.ebuild
index dffe1a8bd52..8cff2947749 100644
--- a/media-video/vdr/vdr-2.4.1-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
 HOMEPAGE="http://www.tvdr.de/;

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-02-11 Thread Jörg Bornkessel

commit: e7c2235119568d65d3ee364aada3e2c65dcf9bc7
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Tue Feb 11 19:56:30 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Tue Feb 11 19:57:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c22351

media-video/vdr: cleanup old, broken by glibc-2.31

Closes: https://bugs.gentoo.org/708802
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/vdr-2.4.1.ebuild | 201 ---
 1 file changed, 201 deletions(-)

diff --git a/media-video/vdr/vdr-2.4.1.ebuild b/media-video/vdr/vdr-2.4.1.ebuild
deleted file mode 100644
index d2f923913af..000
--- a/media-video/vdr/vdr-2.4.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
-   mainmenuhooks? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
-   menuorg? ( 
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
 )
-   naludump? ( 
http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-   pinplugin? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
-   ttxtsubs? ( 
http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-   virtual/jpeg:*
-   sys-libs/libcap
-   >=media-libs/fontconfig-2.4.2
-   >=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   media-tv/gentoo-vdr-scripts
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
-}
-
-src_configure() {
-   # support languages, written from right to left
-   export "BIDI=$(usex bidi 1 0)"
-   # systemd notification support
-   export "SDNOTIFY=$(usex systemd 1 0)"
-   # with/without keyboard
-   export "USE_KBD=$(usex keyboard 1 0)"
-   # detailed compile output for debug
-   export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-   # apply maintenance-patches
-   ebegin "Changing paths for gentoo"
-
-   local DVBDIR=/usr/include
-   local i
-   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-   [[ -d ${i} ]] || continue
-   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-   einfo "Found DVB header files in ${i}"
-   DVBDIR=${i}
-   break
-   fi
-   done
-
-   # checking for s2api headers
-   local api_version
-   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
-   api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / 
{print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-   if [[ ${api_version:-0} -lt 5*3 ]]; then
-   eerror "DVB header files do not contain s2api support or too 
old for ${P}"
-   eerror "You cannot compile VDR against old dvb-header"
-   die "DVB headers too old"
-   fi
-
-   cat > Make.config <<-EOT || die "cannot write to Make.config"
-   #
-   # Generated by ebuild ${PF}
-   #
-   PREFIX  = /usr
-   DVBDIR  = ${DVBDIR}
-   PLUGINLIBDIR= ${PLUGIN_LIBDIR}
-   CONFDIR = ${CONF_DIR}
-   ARGSDIR = \$(CONFDIR)/conf.d
-   VIDEODIR= /var/vdr/video
-   LOCDIR  = \$(PREFIX)/share/locale
-   INCDIR  = \$(PREFIX)/include
-
-   DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
-   INCLUDES+= -I\$(DVBDIR)
-
-   # >=vdr-1.7.36-r1; parameter only

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2020-02-10 Thread Jörg Bornkessel

commit: 9c0907498c287998bfb87e750264b114ecd22585
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Mon Feb 10 20:45:30 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Mon Feb 10 20:45:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c090749

media-video/vdr: compile fix for glibc-2.31

Replace obsolete stime() function with clock_settime()

Suggested-by: Manuel Reimer  gmx.de>
Bug: https://bugs.gentoo.org/708802
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch |  20 +++
 media-video/vdr/vdr-2.4.1-r1.ebuild  | 202 +++
 2 files changed, 222 insertions(+)

diff --git a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch 
b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
new file mode 100644
index 000..0db8c5064ac
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
@@ -0,0 +1,20 @@
+Replace obsolete stime() function with clock_settime()
+bug 708802
+
+
+Suggested-by: Manuel Reimer 
+Signed-off-by: Joerg Bornkessel  ( 2020 Feb 10 )
+diff -Naur vdr-2.4.1.orig/eit.c vdr-2.4.1/eit.c
+--- vdr-2.4.1.orig/eit.c   2020-02-10 21:25:03.594761113 +0100
 vdr-2.4.1/eit.c2020-02-10 21:26:32.443761113 +0100
+@@ -391,7 +391,9 @@
+   if (abs(diff) > MAX_TIME_DIFF) {
+  mutex.Lock();
+  if (abs(diff) > MAX_ADJ_DIFF) {
+-if (stime() == 0)
++timespec ts = {};
++ts.tv_sec = dvbtim;
++if (clock_settime(CLOCK_REALTIME, ) == 0)
+isyslog("system time changed from %s (%ld) to %s (%ld)", 
*TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
+ else
+esyslog("ERROR while setting system time: %m");

diff --git a/media-video/vdr/vdr-2.4.1-r1.ebuild 
b/media-video/vdr/vdr-2.4.1-r1.ebuild
new file mode 100644
index 000..dffe1a8bd52
--- /dev/null
+++ b/media-video/vdr/vdr-2.4.1-r1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
+   mainmenuhooks? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
+   menuorg? ( 
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
 )
+   naludump? ( 
http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
+   pinplugin? ( 
http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
+   ttxtsubs? ( 
http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump 
pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+   virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   media-tv/gentoo-vdr-scripts
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+REQUIRED_USE="pinplugin? ( !mainmenuhooks )"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+lang_po() {
+   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+}
+
+src_configure() {
+   # support languages, written from right to left
+   export "BIDI=$(usex bidi 1 0)"
+   # systemd notification support
+   export "SDNOTIFY=$(usex systemd 1 0)"
+   # with/without keyboard
+   export "USE_KBD=$(usex keyboard 1 0)"
+   # detailed compile output for debug
+   export "VERBOSE=$(usex verbose 1 0)"
+}
+
+src_prepare() {
+   # apply maintenance-patches
+   ebegin "Changing paths for gentoo"
+
+   local DVBDIR=/usr/include
+   local i
+   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+   [[ -d ${i} ]] || continue
+   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+   einfo "Found DVB header files in ${i}"
+   DVBDIR=${i}
+   break
+   fi
+   done
+
+   # checking for s2api headers
+   local api_version
+   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}'

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2020-01-12 Thread Jörg Bornkessel

commit: b11e7abd59c26e2034986c92ccb048249c286928
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jan 12 17:18:06 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun Jan 12 17:55:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11e7abd

media-video/vdr: wrong license, fixed

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
index 41e547cb830..38a44d4e818 100644
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.tvdr.de/;
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
mirror://gentoo/${EXT_P}.patch.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2019-12-25 Thread Jörg Bornkessel

commit: 2b8297d91439c9eebacef0ed85eaa45908b29464
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Wed Dec 25 18:25:29 2019 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Wed Dec 25 18:25:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8297d9

media-video/vdr: version bump to vdr-2.4.1

this version is a major update to
vdr-2.4.1

Signed-off-by: Martin Dummer  gmx.net>
Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/Manifest   |   6 +
 media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch  |   2 +
 media-video/vdr/files/vdr-2.4.1_gentoo.patch   |  66 +++
 .../vdr/files/vdr-2.4.1_makefile-variables.patch   |  40 
 media-video/vdr/files/vdr-2.4_remove_plugins.patch |  25 +++
 media-video/vdr/metadata.xml   |   2 +
 media-video/vdr/vdr-2.4.1.ebuild   | 201 +
 7 files changed, 342 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index dac0f69a4e8..645fd58bd16 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,2 +1,8 @@
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
+DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B 
f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175
 SHA512 
d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
+DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B 
d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9
 SHA512 
99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
+DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 
6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3
 SHA512 
b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
+DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 
2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f
 SHA512 
9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
+DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 
339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216
 SHA512 
f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
+DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
 SHA512 
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0

diff --git a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch 
b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
index b67c94d7c57..8ae498a28fd 100644
--- a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
+++ b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
@@ -1,5 +1,7 @@
 https://bugs.gentoo.org/667934
 
+Signed-off-by: Martin Dummer 
+Reviewed-by: Joerg Bornkessel 
 --- a/tools.c
 +++ b/tools.c
 @@ -1221,15 +1221,15 @@

diff --git a/media-video/vdr/files/vdr-2.4.1_gentoo.patch 
b/media-video/vdr/files/vdr-2.4.1_gentoo.patch
new file mode 100644
index 000..71aca7f5f96
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_gentoo.patch
@@ -0,0 +1,66 @@
+this patch will disable some handling in the core Makefile
+as we use for Linux FHS a different handling in gentoo
+demoplugins from core vdr install disabled
+support from Linguas variable
+
+Signed-off-by: Martin Dummer 
+Reviewed-by: Joerg Bornkessel 
+--- a/Makefile
 b/Makefile
+@@ -182,7 +182,7 @@
+ 
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo= $(wildcard $(PODIR)/*.po)
++I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo,

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-12-22 Thread Jörg Bornkessel

commit: 85b4503d6813bb7e789e6e12263812ae1db90e2b
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Dec 22 18:09:40 2019 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun Dec 22 18:09:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b4503d

media-video/vdr: cleanup old

Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/metadata.xml|   5 +-
 media-video/vdr/vdr-2.2.0-r4.ebuild | 301 
 2 files changed, 4 insertions(+), 302 deletions(-)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index d0e7ffcbce8..acf02374158 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   hd_bru...@gentoo.org
+   Joerg Bornkessel
+   

martin.dum...@gmx.net
Martin Dummer
@@ -18,7 +22,6 @@
fribidi support, for languages, written from 
right to left
support for vdr-graphtft plugin up from 
version 0.1.7
Install HTML documentation
-   enable keyboard support as remote device
enable keyboard support as remote 
device
Allows to replace main menu entries 
by some special plugins (like epgsearch, extrecmenu, ...)
Enables support for the 
media-plugins/vdr-menuorg

diff --git a/media-video/vdr/vdr-2.2.0-r4.ebuild 
b/media-video/vdr/vdr-2.2.0-r4.ebuild
deleted file mode 100644
index 41a6e54da79..000
--- a/media-video/vdr/vdr-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
-   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-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"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-   mirror://gentoo/${EXT_P}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
-
-COMMON_DEPEND="
-   virtual/jpeg:*
-   sys-libs/libcap
-   >=media-libs/fontconfig-2.4.2
-   >=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   >=media-tv/gentoo-vdr-scripts-2.7
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-enable_patch() {
-   local arg ARG_UPPER
-   for arg; do
-   ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
-   echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 
Make.config"
-
-   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
-   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
-   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
-   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-   done
-}
-
-extensions_add_make_conf()
-{
-   # copy all ifdef for extensions-patch to Make.config
-   sed -e '1,/need to touch the following:/d' \
-   -e '/need to touch the following/,/^$/d' \
-   Make.config.template >> Make.config || die "cannot write to 
Make.config"
-}
-
-extensions_all_defines() {
-   # extract all possible settings for extensions-patch
-   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-   Make.config.template \
-   | sort \
-   | tr '[:upper:]' '[:lower:]' || die "error in function 
extensions_all_defines"
-}
-
-lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
-}
-
-src_configure() {
-   # support languages, written from right to left
-

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-12-15 Thread Agostino Sarubbo

commit: f27d5dfc74b339492e51b81ecb9955692333f172
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 16 07:48:50 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 16 07:48:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27d5dfc

media-video/vdr: x86 stable wrt bug #702992

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
index d2c083c0fd5..41e547cb830 100644
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-12-15 Thread Agostino Sarubbo

commit: 557d1ebe28331c301afbbf42741adfce70c2a89f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 16 07:45:58 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 16 07:45:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557d1ebe

media-video/vdr: amd64 stable wrt bug #702992

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/vdr/vdr-2.2.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
index 740d4182bd8..d2c083c0fd5 100644
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-12-15 Thread Joerg Bornkessel

commit: 942e52300c8e525ae888c320524771517c3f585e
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Dec 15 12:58:41 2019 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Dec 15 12:59:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942e5230

media-video/vdr: moved use flag

moved use flag kbd to keyboard
requested by wrt bug 685828

Bug: https://bugs.gentoo.org/685828
Package-Manager: Portage-2.3.81, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-video/vdr/metadata.xml|   1 +
 media-video/vdr/vdr-2.2.0-r5.ebuild | 301 
 2 files changed, 302 insertions(+)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 84dcc17c309..d0e7ffcbce8 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -19,6 +19,7 @@
support for vdr-graphtft plugin up from 
version 0.1.7
Install HTML documentation
enable keyboard support as remote device
+   enable keyboard support as remote 
device
Allows to replace main menu entries 
by some special plugins (like epgsearch, extrecmenu, ...)
Enables support for the 
media-plugins/vdr-menuorg
adds support for menu hotkeys of 
double digits

diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild 
b/media-video/vdr/vdr-2.2.0-r5.ebuild
new file mode 100644
index 000..740d4182bd8
--- /dev/null
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -0,0 +1,301 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
+   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+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"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+   mirror://gentoo/${EXT_P}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
+
+COMMON_DEPEND="
+   virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   >=media-tv/gentoo-vdr-scripts-2.7
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+enable_patch() {
+   local arg ARG_UPPER
+   for arg; do
+   ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
+   echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 
Make.config"
+
+   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
+   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot 
write to defines.tmp"
+   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE 
|| die "cannot write to defines.tmp"
+   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+   done
+}
+
+extensions_add_make_conf()
+{
+   # copy all ifdef for extensions-patch to Make.config
+   sed -e '1,/need to touch the following:/d' \
+   -e '/need to touch the following/,/^$/d' \
+   Make.config.template >> Make.config || die "cannot write to 
Make.config"
+}
+
+extensions_all_defines() {
+   # extract all possible settings for extensions-patch
+   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+   Make.config.template \
+   | sort \
+   | tr '[:upper:]' '[:lower:]' || die "error in function 
extensions_all_defines"
+}
+
+lang_po() {
+   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+}
+
+src_configure() {
+   # support languages, written from right to left
+   export "BIDI=$(usex bidi 1 0)"
+   # systemd notification support
+   export "SDNOTIFY=$(usex systemd 1 0)"
+   # with/without keyboard
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2019-12-02 Thread Joonas Niilola

commit: 0ad257c1fa1579b49a5e299307267a9bcf69ec73
Author: Martin Dummer  gmx  net>
AuthorDate: Fri Nov  8 19:59:12 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  2 15:19:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad257c1

media-video/vdr: remove old ebuilds, fix QA issue

QA issue: USE flag 'permashift_v1' uses reserved underscore character
remove old ebuilds with USE flag 'permashift_v1':
vdr-2.0.6-r1
vdr-2.2.0-r3

Closes: https://bugs.gentoo.org/695066
Closes: https://bugs.gentoo.org/700366
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Martin Dummer  gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/13773
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/vdr/Manifest |   2 -
 media-video/vdr/files/vdr-2.0.6_gentoo.patch |  68 --
 media-video/vdr/metadata.xml |   9 -
 media-video/vdr/vdr-2.0.6-r1.ebuild  | 277 
 media-video/vdr/vdr-2.2.0-r3.ebuild  | 303 ---
 5 files changed, 659 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index e9b20f623a1..dac0f69a4e8 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,4 +1,2 @@
-DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
deleted file mode 100644
index 1641fc8e2ee..000
--- a/media-video/vdr/files/vdr-2.0.6_gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
 vdr-2.0.6.orig/Makefile2014-09-22 22:17:23.0 +0200
-+++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.0 +0200
-@@ -109,7 +109,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -162,7 +162,7 @@
- 
- PODIR = po
- LOCALEDIR = locale
--I18Npo= $(wildcard $(PODIR)/*.po)
-+I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -185,7 +185,7 @@
- 
- install-i18n: i18n
-   @mkdir -p $(DESTDIR)$(LOCDIR)
--  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -247,7 +247,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -259,11 +259,12 @@
- 
- install-dirs:
-   @mkdir -p $(DESTDIR)$(VIDEODIR)
--  @mkdir -p $(DESTDIR)$(CONFDIR)
--  @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
-   @mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -290,8 +291,11 @@
- # Includes:
- 
- install-includes: include-dir
--  @mkdir -p $(DESTDIR)$(INCDIR)
--  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-11-26 Thread Agostino Sarubbo

commit: ba26ea9822bfff98dcb6625e4344f28ec4c0a2ff
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 26 12:27:07 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 26 12:27:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba26ea98

media-video/vdr: amd64 stable wrt bug #700732

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/vdr/vdr-2.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r4.ebuild 
b/media-video/vdr/vdr-2.2.0-r4.ebuild
index 654630b52ca..41a6e54da79 100644
--- a/media-video/vdr/vdr-2.2.0-r4.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r4.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-11-26 Thread Thomas Deutschmann

commit: 8a082af162887fe8362fae2cfd0d24150cc260f3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 26 10:17:08 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 26 10:17:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a082af1

media-video/vdr: x86 stable (bug #700732)

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/vdr/vdr-2.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r4.ebuild 
b/media-video/vdr/vdr-2.2.0-r4.ebuild
index 27229bab9fa..654630b52ca 100644
--- a/media-video/vdr/vdr-2.2.0-r4.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r4.ebuild
@@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2019-11-16 Thread David Seifert

commit: 2f472c1f91d21444530ed18c29a26db3fccc40a8
Author: Martin Dummer  gmx  net>
AuthorDate: Sun Nov 17 01:33:46 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 17 01:33:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f472c1f

media-video/vdr: fix multiple QA issues

* QA issue: USE flag 'permashift_v1' uses reserved underscore
  character, rename USE flag 'permashift_v1' to 'permashift'
* QA issue: UnnecessarySlashStrip in DESTDIR="${D%/}"
* QA issue: makefile installs pre-compressed manpages

Bug: https://bugs.gentoo.org/695066
Closes: https://github.com/gentoo/gentoo/pull/13588
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Martin Dummer  gmx.net>
Signed-off-by: David Seifert  gentoo.org>

 media-video/vdr/files/vdr-2.2.0_gentoo.patch   | 35 +++-
 media-video/vdr/metadata.xml   | 12 -
 media-video/vdr/vdr-2.2.0-r3.ebuild|  4 +-
 .../{vdr-2.2.0-r3.ebuild => vdr-2.2.0-r4.ebuild}   | 62 +++---
 4 files changed, 63 insertions(+), 50 deletions(-)

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 37ffd3c7b2c..70066f5b0c8 100644
--- a/media-video/vdr/files/vdr-2.2.0_gentoo.patch
+++ b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
@@ -1,7 +1,6 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
 vdr-2.1.7.orig/Makefile2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
+--- a/Makefile
 b/Makefile
+@@ -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)
  
@@ -10,7 +9,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  
  # Implicit rules:
  
-@@ -170,7 +170,7 @@
+@@ -179,7 +179,7 @@
  
  PODIR = po
  LOCALEDIR = locale
@@ -19,7 +18,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
  I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
  I18Npot   = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
+@@ -202,7 +202,7 @@
  
  install-i18n: i18n
@mkdir -p $(DESTDIR)$(LOCDIR)
@@ -28,7 +27,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  
  # The 'include' directory (for plugins):
  
-@@ -255,7 +255,7 @@
+@@ -264,7 +264,7 @@
  
  # Install the files (note that 'install-pc' must be first!):
  
@@ -37,16 +36,13 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  
  # VDR binary:
  
-@@ -267,12 +267,13 @@
+@@ -276,12 +276,10 @@
  
  install-dirs:
@mkdir -p $(DESTDIR)$(VIDEODIR)
 -  @mkdir -p $(DESTDIR)$(CONFDIR)
 -  @mkdir -p $(DESTDIR)$(ARGSDIR)
 -  @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
@mkdir -p $(DESTDIR)$(RESDIR)
  
  install-conf:
@@ -54,14 +50,25 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
@cp -pn *.conf $(DESTDIR)$(CONFDIR)
  
  # Documentation:
-@@ -299,8 +300,11 @@
+@@ -289,9 +287,9 @@
+ install-doc:
+   @mkdir -p $(DESTDIR)$(MANDIR)/man1
+   @mkdir -p $(DESTDIR)$(MANDIR)/man5
+-  @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+-  @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
+-  @gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
++  @cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
++  @cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
++  @cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
+ 
+ # Plugins:
+ 
+@@ -308,8 +306,9 @@
  # Includes:
  
  install-includes: include-dir
 -  @mkdir -p $(DESTDIR)$(INCDIR)
 -  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
 +  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
 +  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
 +  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 8ebb4b08a51..246bd87c200 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -1,6 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   martin.dum...@gmx.net
+   Martin Dummer
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

v...@gentoo.org
Gentoo VDR Project
@@ -19,8 +27,8 @@
Enables support for the 
media-plugins/vdr-menuorg
adds support for menu hotkeys of 
double digits
Removes NALU fill data from h.264-Streams 
of TS files
-   permanent timeshift by recording live 
TV on

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2019-07-31 Thread Andreas Sturmlechner

commit: 85b3527f9c3bddee3f2f3c0589ca1f994b28f2b9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 31 14:33:24 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 31 14:36:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b3527f

media-video/vdr: Restore 2.0.6-r1...

media-plugins/vdr-pvr350 requires >=media-video/vdr-2[yaepg]...

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vdr/Manifest |   2 +
 media-video/vdr/files/vdr-2.0.6_gentoo.patch |  68 +++
 media-video/vdr/metadata.xml |   9 +
 media-video/vdr/vdr-2.0.6-r1.ebuild  | 277 +++
 4 files changed, 356 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index dac0f69a4e8..e9b20f623a1 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,2 +1,4 @@
+DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
+DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
new file mode 100644
index 000..1641fc8e2ee
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
@@ -0,0 +1,68 @@
+diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
+--- vdr-2.0.6.orig/Makefile2014-09-22 22:17:23.0 +0200
 vdr-2.0.6/Makefile 2014-09-24 15:22:43.0 +0200
+@@ -109,7 +109,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -162,7 +162,7 @@
+ 
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo= $(wildcard $(PODIR)/*.po)
++I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -185,7 +185,7 @@
+ 
+ install-i18n: i18n
+   @mkdir -p $(DESTDIR)$(LOCDIR)
+-  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -247,7 +247,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -259,11 +259,12 @@
+ 
+ install-dirs:
+   @mkdir -p $(DESTDIR)$(VIDEODIR)
+-  @mkdir -p $(DESTDIR)$(CONFDIR)
+-  @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+   @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++  @mkdir -p $(DESTDIR)$(CONFDIR)
+   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -290,8 +291,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-  @mkdir -p $(DESTDIR)$(INCDIR)
+-  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index f9813be524f..8ebb4b08a51 100644
---

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2019-07-31 Thread Andreas Sturmlechner

commit: 32a83fbc6d69bdc5ed76260355d6a5be2806f2cb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 31 13:33:16 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 31 13:50:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a83fbc

media-video/vdr: Drop 2.0.6-r1 and 2.2.0-r1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vdr/Manifest |   2 -
 media-video/vdr/files/vdr-2.0.6_gentoo.patch |  68 --
 media-video/vdr/metadata.xml |   9 -
 media-video/vdr/vdr-2.0.6-r1.ebuild  | 277 -
 media-video/vdr/vdr-2.2.0-r1.ebuild  | 299 ---
 5 files changed, 655 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index e9b20f623a1..dac0f69a4e8 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,4 +1,2 @@
-DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
deleted file mode 100644
index 1641fc8e2ee..000
--- a/media-video/vdr/files/vdr-2.0.6_gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
 vdr-2.0.6.orig/Makefile2014-09-22 22:17:23.0 +0200
-+++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.0 +0200
-@@ -109,7 +109,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -162,7 +162,7 @@
- 
- PODIR = po
- LOCALEDIR = locale
--I18Npo= $(wildcard $(PODIR)/*.po)
-+I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -185,7 +185,7 @@
- 
- install-i18n: i18n
-   @mkdir -p $(DESTDIR)$(LOCDIR)
--  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -247,7 +247,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -259,11 +259,12 @@
- 
- install-dirs:
-   @mkdir -p $(DESTDIR)$(VIDEODIR)
--  @mkdir -p $(DESTDIR)$(CONFDIR)
--  @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
-   @mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -290,8 +291,11 @@
- # Includes:
- 
- install-includes: include-dir
--  @mkdir -p $(DESTDIR)$(INCDIR)
--  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 

diff --git a/media-video/vdr/metadata.xml

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-07-26 Thread Agostino Sarubbo

commit: 4d7f6000cec7f0e4a5f3a70433f608d753093f66
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 26 09:17:28 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 26 09:17:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7f6000

media-video/vdr: x86 stable wrt bug #638348

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 media-video/vdr/vdr-2.2.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild 
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index b02ec64af72..8dad304a1d8 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.tvdr.de/;
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2019-07-26 Thread Agostino Sarubbo

commit: bb88de8a2d6b0f3ef678ad69013a9f448b8178f1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 26 08:37:55 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 26 08:37:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb88de8a

media-video/vdr: amd64 stable wrt bug #638348

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-video/vdr/vdr-2.2.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild 
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index 0b6e8222559..b02ec64af72 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.tvdr.de/;
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2019-04-11 Thread David Seifert

commit: f5fc0aa4c9cd0708692451bfb3b2e92ef2cbd4aa
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 11 22:39:10 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 11 22:39:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fc0aa4

media-video/vdr: Fix building with media-libs/jpeg

Closes: https://bugs.gentoo.org/667934
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch | 34 +++
 media-video/vdr/vdr-2.2.0-r3.ebuild   |  3 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch 
b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
new file mode 100644
index 000..b67c94d7c57
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/667934
+
+--- a/tools.c
 b/tools.c
+@@ -1221,15 +1221,15 @@
+ }
+  else {
+ esyslog("ERROR: out of memory");
+-return false;
++return FALSE;
+ }
+  if (jcd->mem) {
+ cinfo->dest->next_output_byte = jcd->mem + Used;
+ cinfo->dest->free_in_buffer = jcd->size - Used;
+-return true;
++return TRUE;
+ }
+  }
+-  return false;
++  return FALSE;
+ }
+ 
+ static void JpegCompressTermDestination(j_compress_ptr cinfo)
+@@ -1274,8 +1274,8 @@
+   cinfo.in_color_space = JCS_RGB;
+ 
+   jpeg_set_defaults();
+-  jpeg_set_quality(, Quality, true);
+-  jpeg_start_compress(, true);
++  jpeg_set_quality(, Quality, TRUE);
++  jpeg_start_compress(, TRUE);
+ 
+   int rs = Width * 3;
+   JSAMPROW rp[Height];

diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild 
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index ff3911ffe09..0b6e8222559 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -220,6 +220,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}_gentoo.patch"
eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
eapply "${FILESDIR}/${P}_glibc-2.24.patch"
+   eapply "${FILESDIR}/${P}-jpeg-9c.patch"
 
# fix some makefile issues
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/

2019-03-01 Thread Andreas Sturmlechner

commit: 5465558d397dd3a375655ec04d0280eee4e9bca2
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Mar  1 17:42:14 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  2 00:02:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5465558d

media-video/vdr: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch | 76 -
 1 file changed, 76 deletions(-)

diff --git a/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch 
b/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch
deleted file mode 100644
index 8bdae36ae51..000
--- a/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Support L10N Variable in make.conf to select only the Language will be 
installed
-as it set in make.conf L10N
-(befor it was LINGUAS)
-correct some install path for libsi
-correct install in the right order
-signed-of-by: Joerg Bornkessel  (2018/Jan/21)
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
 vdr-2.1.7.orig/Makefile2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -170,7 +170,7 @@
- 
- PODIR = po
- LOCALEDIR = locale
--I18Npo= $(wildcard $(PODIR)/*.po)
-+I18Npo= $(foreach dir,$(L10N),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
- 
- install-i18n: i18n
-   @mkdir -p $(DESTDIR)$(LOCDIR)
--  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+  @(cd $(LOCALEDIR); for l10n in $(L10N); do [ "$$l10n" = "en" ] && 
continue; cp -r --parents $$l10n* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -255,7 +255,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -267,12 +267,13 @@
- 
- install-dirs:
-   @mkdir -p $(DESTDIR)$(VIDEODIR)
--  @mkdir -p $(DESTDIR)$(CONFDIR)
--  @mkdir -p $(DESTDIR)$(ARGSDIR)
--  @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
-   @mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -299,8 +300,11 @@
- # Includes:
- 
- install-includes: include-dir
--  @mkdir -p $(DESTDIR)$(INCDIR)
--  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
-

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2018-09-29 Thread Michał Górny

commit: 5ed752824e9b885f4645eab68186ffe18aa0e93d
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Sep 29 10:55:01 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep 29 10:55:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed75282

media-video/vdr: Remove obsolete pkgref to vdr-rotor

Signed-off-by: Michał Górny  gentoo.org>

 media-video/vdr/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 62b1c32b1a8..8ebb4b08a51 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -23,7 +23,7 @@
permanent timeshift by recording 
live TV on RAM, need plugin =mediaplugins/vdr-permashift-1
Support for 
media-plugins/vdr-pin
rreset resume of EOF
-   Enable support for plugin 
media-plugins/vdr-rotor for dish-positioner.
+   Enable support for plugin vdr-rotor for 
dish-positioner.
support for 
media-plugins/vdr-ttxtsubs
replacement for the liemikuutio 
patch, adds some nice must haves features
Replace original icon set in 
menu

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2018-09-14 Thread Joerg Bornkessel

commit: 224855e3ca65e9784495d49167a40051f622a88a
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Fri Sep 14 19:18:03 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Fri Sep 14 19:19:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224855e3

media-video/vdr: cleanup old

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-video/vdr/Manifest   |   1 -
 .../vdr/files/vdr-2.0.7_systemd_argsdir.patch  | 438 -
 .../files/vdr-2.0.7_systemd_argsdir_vanilla.patch  | 438 -
 media-video/vdr/vdr-2.0.7.ebuild   | 288 --
 4 files changed, 1165 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 671820be372..e9b20f623a1 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,5 +1,4 @@
 DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
-DIST vdr-2.0.7.tar.bz2 841511 BLAKE2B 
bde06dd038ea2ebfa8768742c02bc7046448ade29032a90130f721af1c4c5d2301ff52065a04c51b31f14250d8ae252d796d93e3012ea1057f2359b1ef9c327c
 SHA512 
cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch 
b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
deleted file mode 100644
index de9f4b90163..000
--- a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
+++ /dev/null
@@ -1,438 +0,0 @@
-diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY
 vdr-2.0.7.orig/HISTORY 2015-01-23 09:16:13.73562 +0100
-+++ vdr-2.0.7/HISTORY  2015-01-23 09:17:29.038614491 +0100
-@@ -7916,6 +7916,16 @@
- - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, 
sdt.h and
-   the functional modification to cFont::CreateFont().
- 
-+2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 
and 2.1.7
-+
-+- Added support for systemd (thanks to Christopher Reimer). To activate this 
you
-+  need to add "SDNOTIFY=1" to the 'make' call.
-+
-+2015-01-18: Version 2.0.6 + backport of reading command line arguments from 
files, from version 2.1$
-+
-+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d 
(thanks
-+  to Lars Hanisch). See vdr.1 and vdr.5 for details.
-+
- 2015-01-20: Version 2.0.7
- 
- - Fixed a possible division by zero in frame rate detection.
-diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template
 vdr-2.0.7.orig/Make.config.template2015-01-23 09:16:13.73662 
+0100
-+++ vdr-2.0.7/Make.config.template 2015-01-23 09:16:34.199618503 +0100
-@@ -38,6 +38,7 @@
- 
- #VIDEODIR  = /srv/vdr/video
- #CONFDIR   = /var/lib/vdr
-+#ARGSDIR   = /etc/vdr/conf.d
- #CACHEDIR  = /var/cache/vdr
- 
- # Overrides for preset/legacy configurations:
-diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile
 vdr-2.0.7.orig/Makefile2015-01-23 09:16:13.724620001 +0100
-+++ vdr-2.0.7/Makefile 2015-01-23 09:17:58.588612330 +0100
-@@ -31,6 +31,7 @@
- DESTDIR   ?=
- VIDEODIR  ?= /srv/vdr/video
- CONFDIR   ?= /var/lib/vdr
-+ARGSDIR   ?= /etc/vdr/conf.d
- CACHEDIR  ?= /var/cache/vdr
- 
- PREFIX?= /usr/local
-@@ -66,7 +67,7 @@
- 
- SILIB= $(LSIDIR)/libsi.a
- 
--OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o 
dvbdevice.o dvbci.o\
-+OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o 
dvbdevice.o dvbci.o\
-dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o 
font.o i18n.o interface.o keys.o\
-lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o 
plugin.o\
-receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o 
sections.o

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2018-09-14 Thread Joerg Bornkessel

commit: 44bf609f6fa77b6bd2415da430d1ccf0934796c6
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Fri Sep 14 19:10:36 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Fri Sep 14 19:10:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bf609f

media-video/vdr: moved gcc7extpng patch to the right line bug 666240

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-video/vdr/vdr-2.2.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild 
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index 1da9aad71f8..ff3911ffe09 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -213,13 +213,13 @@ src_prepare() {
ebegin "Make depend"
emake .dependencies >/dev/null
eend $? "make depend failed"
+
+   eapply "${FILESDIR}/${P}_gcc7extpng.patch"
fi
 
eapply "${FILESDIR}/${P}_gentoo.patch"
-   #gcc-7.2, this will fix only the core vdr, not the extpatch
eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
eapply "${FILESDIR}/${P}_glibc-2.24.patch"
-   eapply "${FILESDIR}/${P}_gcc7extpng.patch"
 
# fix some makefile issues
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2018-09-03 Thread Thomas Deutschmann

commit: 0dcdf482cd292d53a4cb213c9d76e74dd310385e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Sep  3 14:38:40 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Sep  3 14:39:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcdf482

Revert "media-video/vdr: cleanup old"

This reverts commit 99d096c75cc5a13e96a8a3438df6fd93412ce06a.

media-video/vdr-2* still required by media-plugins/vdr-pvr350.

 media-video/vdr/Manifest   |   3 +
 media-video/vdr/files/vdr-2.0.6_gentoo.patch   |  68 
 .../vdr/files/vdr-2.0.7_systemd_argsdir.patch  | 438 +
 .../files/vdr-2.0.7_systemd_argsdir_vanilla.patch  | 438 +
 media-video/vdr/metadata.xml   |   9 +
 media-video/vdr/vdr-2.0.6-r1.ebuild| 277 +
 media-video/vdr/vdr-2.0.7.ebuild   | 288 ++
 7 files changed, 1521 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index dac0f69a4e8..671820be372 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,2 +1,5 @@
+DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
+DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
+DIST vdr-2.0.7.tar.bz2 841511 BLAKE2B 
bde06dd038ea2ebfa8768742c02bc7046448ade29032a90130f721af1c4c5d2301ff52065a04c51b31f14250d8ae252d796d93e3012ea1057f2359b1ef9c327c
 SHA512 
cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
new file mode 100644
index 000..1641fc8e2ee
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
@@ -0,0 +1,68 @@
+diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
+--- vdr-2.0.6.orig/Makefile2014-09-22 22:17:23.0 +0200
 vdr-2.0.6/Makefile 2014-09-24 15:22:43.0 +0200
+@@ -109,7 +109,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -162,7 +162,7 @@
+ 
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo= $(wildcard $(PODIR)/*.po)
++I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -185,7 +185,7 @@
+ 
+ install-i18n: i18n
+   @mkdir -p $(DESTDIR)$(LOCDIR)
+-  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -247,7 +247,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -259,11 +259,12 @@
+ 
+ install-dirs:
+   @mkdir -p $(DESTDIR)$(VIDEODIR)
+-  @mkdir -p $(DESTDIR)$(CONFDIR)
+-  @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+   @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++  @mkdir -p $(DESTDIR)$(CONFDIR)
+   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -290,8 +291,11 @@
+ # Includes:
+ 
+ install-includes:

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2018-09-02 Thread Joerg Bornkessel

commit: 99d096c75cc5a13e96a8a3438df6fd93412ce06a
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Sep  2 21:32:11 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Sep  2 21:32:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d096c7

media-video/vdr: cleanup old

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-video/vdr/Manifest   |   3 -
 media-video/vdr/files/vdr-2.0.6_gentoo.patch   |  68 
 .../vdr/files/vdr-2.0.7_systemd_argsdir.patch  | 438 -
 .../files/vdr-2.0.7_systemd_argsdir_vanilla.patch  | 438 -
 media-video/vdr/metadata.xml   |   9 -
 media-video/vdr/vdr-2.0.6-r1.ebuild| 277 -
 media-video/vdr/vdr-2.0.7.ebuild   | 288 --
 7 files changed, 1521 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 671820be372..dac0f69a4e8 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,5 +1,2 @@
-DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
-DIST vdr-2.0.7.tar.bz2 841511 BLAKE2B 
bde06dd038ea2ebfa8768742c02bc7046448ade29032a90130f721af1c4c5d2301ff52065a04c51b31f14250d8ae252d796d93e3012ea1057f2359b1ef9c327c
 SHA512 
cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
deleted file mode 100644
index 1641fc8e2ee..000
--- a/media-video/vdr/files/vdr-2.0.6_gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
 vdr-2.0.6.orig/Makefile2014-09-22 22:17:23.0 +0200
-+++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.0 +0200
-@@ -109,7 +109,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -162,7 +162,7 @@
- 
- PODIR = po
- LOCALEDIR = locale
--I18Npo= $(wildcard $(PODIR)/*.po)
-+I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -185,7 +185,7 @@
- 
- install-i18n: i18n
-   @mkdir -p $(DESTDIR)$(LOCDIR)
--  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -247,7 +247,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -259,11 +259,12 @@
- 
- install-dirs:
-   @mkdir -p $(DESTDIR)$(VIDEODIR)
--  @mkdir -p $(DESTDIR)$(CONFDIR)
--  @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
-   @mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -290,8 +291,11 @@
- # Includes:
- 
- install-includes: include-dir
--  @mkdir -p $(DESTDIR)$(INCDIR)
--  @cp -pLR include/vdr include/libsi

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2018-08-29 Thread Joerg Bornkessel

commit: c20e014a0a9927935e6e0c5e2533b35504148f59
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Wed Aug 29 10:17:03 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Wed Aug 29 10:17:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20e014a

media-video/vdr: gcc7 compile issius fixed in extpng

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch | 16 
 media-video/vdr/vdr-2.2.0-r3.ebuild  |  1 +
 2 files changed, 17 insertions(+)

diff --git a/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch 
b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch
new file mode 100644
index 000..e00453c2a72
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch
@@ -0,0 +1,16 @@
+fix compile issius gcc7: ISO C++ forbids comparison between pointer and integer
+https://www.linuxtv.org/pipermail/vdr/2017-March/029230.html
+
+Signed-of by: Joerg Bornkessel  (29 Aug 2018)
+diff -Naur vdr-2.2.0.orig/osdbase.c vdr-2.2.0/osdbase.c
+--- vdr-2.2.0.orig/osdbase.c   2018-08-29 11:59:49.522326559 +0200
 vdr-2.2.0/osdbase.c2018-08-29 11:59:13.861326559 +0200
+@@ -525,7 +525,7 @@
+ #ifdef USE_MENUSELECTION
+   i = 0;
+   item_nr = 0;
+-  if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') {
++  if (s && (s = skipspace(s)) != NULL && '0' <= s[i] && s[i] <= '9') {
+  do {
+ item_nr = item_nr * 10 + (s[i] - '0');
+ }

diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild 
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index dbb8e986c4a..1da9aad71f8 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -219,6 +219,7 @@ src_prepare() {
#gcc-7.2, this will fix only the core vdr, not the extpatch
eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
eapply "${FILESDIR}/${P}_glibc-2.24.patch"
+   eapply "${FILESDIR}/${P}_gcc7extpng.patch"
 
# fix some makefile issues
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2018-08-27 Thread Joerg Bornkessel

commit: ddda7c9abad6a161baaf65520b6ca6b4fad7b325
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Mon Aug 27 13:30:59 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Mon Aug 27 13:31:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddda7c9a

media-video/vdr: glibc-2.24 deprecated warning fixed

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch | 35 
 media-video/vdr/vdr-2.2.0-r3.ebuild  |  1 +
 2 files changed, 36 insertions(+)

diff --git a/media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch 
b/media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch
new file mode 100644
index 000..98cc13b0c3b
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch
@@ -0,0 +1,35 @@
+patch will fix readdir_r() is deprecated as of glibc-2.24
+https://www.vdr-portal.de/forum/index.php?thread/130752-handle-deprecated-functions-readdir-r-auto-ptr/=1293833#post1293833
+
+Signed-of by: Joerg Bornkessel  (27 Aug 2018)
+diff -Naur vdr-2.2.0.orig/tools.c vdr-2.2.0/tools.c
+--- vdr-2.2.0.orig/tools.c 2018-08-27 12:59:28.571326559 +0200
 vdr-2.2.0/tools.c  2018-08-27 13:03:11.222326559 +0200
+@@ -1466,7 +1466,11 @@
+ struct dirent *cReadDir::Next(void)
+ {
+   if (directory) {
++#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
+  while (readdir_r(directory, , ) == 0 && result) {
++#else
++ while ((result = readdir(directory)) != NULL) {
++#endif
+if (strcmp(result->d_name, ".") && strcmp(result->d_name, ".."))
+   return result;
+}
+diff -Naur vdr-2.2.0.orig/tools.h vdr-2.2.0/tools.h
+--- vdr-2.2.0.orig/tools.h 2018-08-27 12:59:28.641326559 +0200
 vdr-2.2.0/tools.h  2018-08-27 13:01:44.022326559 +0200
+@@ -369,10 +369,12 @@
+ private:
+   DIR *directory;
+   struct dirent *result;
++#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
+   union { // according to "The GNU C Library Reference Manual"
+ struct dirent d;
+ char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];
+ } u;
++#endif
+ public:
+   cReadDir(const char *Directory);
+   ~cReadDir();

diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild 
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index 2b4a137a165..dbb8e986c4a 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -218,6 +218,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}_gentoo.patch"
#gcc-7.2, this will fix only the core vdr, not the extpatch
eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
+   eapply "${FILESDIR}/${P}_glibc-2.24.patch"
 
# fix some makefile issues
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/, media-video/vdr/

2018-07-15 Thread Joerg Bornkessel

commit: 83a12b950d27baf88c9de51e33dbd1f8ea67
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jul 15 15:05:47 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Jul 15 15:05:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a1

media-video/vdr: fix gcc-7.2 issue, wrt bug 638348; cleanup

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch|  73 --
 .../vdr/files/vdr-2.2.0_unsignedtosigned.patch | 112 +
 .../{vdr-2.2.0-r2.ebuild => vdr-2.2.0-r3.ebuild}   |  24 +++--
 3 files changed, 125 insertions(+), 84 deletions(-)

diff --git a/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch
deleted file mode 100644
index 516bb7b7254..000
--- a/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-disabled plugin install from vdr source, we dont support this way
-patch to support LINGUAS variable
-fixed install on multicore cpu, creating CONFDIR on later time
-install libsi includes in own dir
-Signed-of-by: Joerg Bornkessel  20/Jan/2015
-diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
 vdr-2.0.6.orig/Makefile2014-09-22 22:17:23.0 +0200
-+++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.0 +0200
-@@ -109,7 +109,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -162,7 +162,7 @@
- 
- PODIR = po
- LOCALEDIR = locale
--I18Npo= $(wildcard $(PODIR)/*.po)
-+I18Npo= $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -185,7 +185,7 @@
- 
- install-i18n: i18n
-   @mkdir -p $(DESTDIR)$(LOCDIR)
--  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+  @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -247,7 +247,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -259,11 +259,12 @@
- 
- install-dirs:
-   @mkdir -p $(DESTDIR)$(VIDEODIR)
--  @mkdir -p $(DESTDIR)$(CONFDIR)
--  @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
-   @mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+  @mkdir -p $(DESTDIR)$(CONFDIR)
-   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -290,8 +291,11 @@
- # Includes:
- 
- install-includes: include-dir
--  @mkdir -p $(DESTDIR)$(INCDIR)
--  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 

diff --git a/media-video/vdr/files/vdr-2.2.0_unsignedtosigned.patch 
b/media-video/vdr/files/vdr-2.2.0_unsignedtosigned.patch
new file mode 100644
index 000..dd04abe1e2e
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_unsignedtosigned.patch
@@ -0,0 +1,112 @@
+compile fix for gcc-7.2
+this will only attache the core vdr, not the extpatch-ng
+https://www.linuxtv.org/pipermail/vdr/2017-March/029229.html
+
+Signed-of by: Joerg Bornkessel  (2018/07/15)
+diff -Naur vdr-2.2.0.orig/diseqc.c vdr-2.2.0/diseqc.c
+--- vdr-2.2.0.orig/diseqc.c2018-07-15 15:59:17.0 +0200
 vdr-2.2.0/diseqc.c 2018-07-15 16:04:00.0 +0200
+@@ -253,10 +253,10 @@
+   return result;
+ }
+ 
+-uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t 
*Codes) const
++int cDiseqc::SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t 
*Codes) const
+ {
+   if ((Codes[0] & 0xF0) == 0x70 ) { // EN50607 aka JESS
+- uint t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
++ int t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
+  if (t < 2048 && Scr->Channel() >= 0 && Scr->Channel() < 32) {
+ Codes[1] = t >> 8 | Scr->Channel() << 3;
+ Codes[2] = t;
+@@ -266,7 +266,7 @@
+ }
+  }
+   else { // EN50494 aka Unicable
+- uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 
4 - 350; // '+ 2' together with '/ 4'

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2018-05-01 Thread Michał Górny

commit: 6651b1bf9761acfd0062b23e20dd2c486413350b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May  1 08:15:07 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May  1 09:26:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6651b1bf

media-video/vdr: Fix PkgMetadataXmlInvalidPkgRef

 media-video/vdr/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 21e13471ead..62b1c32b1a8 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -10,7 +10,7 @@
fribidi support, for languages, written from 
right to left
remove duplicate EPG entries
controls video-dir choice on 
recording
-   support for 
media-plugins/vdr-graphtftplugin up from version 0.1.7
+   support for vdr-graphtft plugin up from 
version 0.1.7
Install HTML documentation
Enables automatic jumping over cut marks 
while watching a recording
skip seconds in played 
records

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/

2018-01-21 Thread Joerg Bornkessel

commit: dd27e9b5f899b63e3babb0b39304e463d8789b17
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jan 21 17:53:54 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Jan 21 17:53:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd27e9b5

media-video/vdr: fixed LINGUAS to L10N handling

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch |  76 ++
 media-video/vdr/vdr-2.2.0-r2.ebuild | 298 
 2 files changed, 374 insertions(+)

diff --git a/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch 
b/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch
new file mode 100644
index 000..8bdae36ae51
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch
@@ -0,0 +1,76 @@
+Support L10N Variable in make.conf to select only the Language will be 
installed
+as it set in make.conf L10N
+(befor it was LINGUAS)
+correct some install path for libsi
+correct install in the right order
+signed-of-by: Joerg Bornkessel  (2018/Jan/21)
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile2015-01-18 12:37:45.506034673 +0100
 vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -170,7 +170,7 @@
+ 
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo= $(wildcard $(PODIR)/*.po)
++I18Npo= $(foreach dir,$(L10N),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+ 
+ install-i18n: i18n
+   @mkdir -p $(DESTDIR)$(LOCDIR)
+-  cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++  @(cd $(LOCALEDIR); for l10n in $(L10N); do [ "$$l10n" = "en" ] && 
continue; cp -r --parents $$l10n* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -255,7 +255,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -267,12 +267,13 @@
+ 
+ install-dirs:
+   @mkdir -p $(DESTDIR)$(VIDEODIR)
+-  @mkdir -p $(DESTDIR)$(CONFDIR)
+-  @mkdir -p $(DESTDIR)$(ARGSDIR)
+-  @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(ARGSDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+   @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++  @mkdir -p $(DESTDIR)$(CONFDIR)
+   @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-  @mkdir -p $(DESTDIR)$(INCDIR)
+-  @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++  @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++  @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++  @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 

diff --git a/media-video/vdr/vdr-2.2.0-r2.ebuild 
b/media-video/vdr/vdr-2.2.0-r2.ebuild
new file mode 100644
index 000..6062fc62c64
--- /dev/null
+++ b/media-video/vdr/vdr-2.2.0-r2.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
+
+IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+   https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2017-06-11 Thread Joerg Bornkessel

commit: f9c5a7bbc515e5df54b638034994c020ccde749d
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jun 11 14:53:17 2017 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Jun 11 14:53:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c5a7bb

media-video/vdr: cleanup; stable amd64, x86 wrt bug 620850

Package-Manager: portage-2.3.6

 media-video/vdr/vdr-2.2.0-r1.ebuild |   4 +-
 media-video/vdr/vdr-2.2.0.ebuild| 291 
 2 files changed, 2 insertions(+), 293 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0-r1.ebuild 
b/media-video/vdr/vdr-2.2.0-r1.ebuild
index 982fedb28ab..ce73df6b100 100644
--- a/media-video/vdr/vdr-2.2.0-r1.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.tvdr.de/;
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 

diff --git a/media-video/vdr/vdr-2.2.0.ebuild b/media-video/vdr/vdr-2.2.0.ebuild
deleted file mode 100644
index aaa6d706274..000
--- a/media-video/vdr/vdr-2.2.0.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
-   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
-
-IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
-HOMEPAGE="http://www.tvdr.de/;
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-   https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg:*
-   sys-libs/libcap
-   >=media-libs/fontconfig-2.4.2
-   >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
-   >=virtual/linuxtv-dvb-headers-5.3
-   sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-   dev-lang/perl
-   >=media-tv/gentoo-vdr-scripts-2.7
-   media-fonts/corefonts
-   bidi? ( dev-libs/fribidi )
-   systemd? ( sys-apps/systemd )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
-   use debug && append-flags -g
-
-   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-   tc-export CC CXX AR
-}
-
-add_cap() {
-   local arg
-   for arg; do
-   CAPS="${CAPS}\n${arg}=1"
-   done
-}
-
-enable_patch() {
-   local arg ARG_UPPER
-   for arg; do
-   ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-   echo "${ARG_UPPER} = 1" >> Make.config
-
-   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
-   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-   done
-}
-
-extensions_add_make_conf()
-{
-   # copy all ifdef for extensions-patch to Make.config
-   sed -e '1,/need to touch the following:/d' \
-   -e '/need to touch the following/,/^$/d' \
-   Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-   # extract all possible settings for extensions-patch
-   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-   Make.config.template \
-   | sort \
-   | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
-}
-
-src_configure() {
-   # support languages, written from right to left
-   export "BIDI=$(usex bidi 1 0)"
-   # systemd notification support
-   export "SDNOTIFY=$(usex systemd 1 0)"
-   # with/without keyboard
-   export "USE_KBD=$(usex kbd 1 0)"
-}
-
-src_prepare() {
-   # apply maintainace-patches
-   ebegin "Changing paths for gentoo"
-
-   local DVBDIR=/usr/include
-   local i
-   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-   [[ -d ${i}

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2016-06-24 Thread Joerg Bornkessel

commit: f4358780337bd4cc569edaa3875a3f05b7c8de56
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Fri Jun 24 10:41:52 2016 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Fri Jun 24 10:41:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4358780

media-video/vdr: fixed systemd compile, wrt bug 586070

Package-Manager: portage-2.3.0_rc1

 media-video/vdr/vdr-2.2.0-r1.ebuild | 300 
 1 file changed, 300 insertions(+)

diff --git a/media-video/vdr/vdr-2.2.0-r1.ebuild 
b/media-video/vdr/vdr-2.2.0-r1.ebuild
new file mode 100644
index 000..988fd29
--- /dev/null
+++ b/media-video/vdr/vdr-2.2.0-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+#inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+   mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
+
+IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/;
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+   https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="virtual/jpeg:*
+   sys-libs/libcap
+   >=media-libs/fontconfig-2.4.2
+   >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+   >=virtual/linuxtv-dvb-headers-5.3
+   sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/perl
+   >=media-tv/gentoo-vdr-scripts-2.7
+   media-fonts/corefonts
+   bidi? ( dev-libs/fribidi )
+   systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+   use debug && append-flags -g
+
+   PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+   tc-export CC CXX AR
+}
+
+add_cap() {
+   local arg
+   for arg; do
+   CAPS="${CAPS}\n${arg}=1"
+   done
+}
+
+enable_patch() {
+   local arg ARG_UPPER
+   for arg; do
+   ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+   echo "${ARG_UPPER} = 1" >> Make.config
+
+   # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
+   echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+   cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+   export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+   done
+}
+
+extensions_add_make_conf()
+{
+   # copy all ifdef for extensions-patch to Make.config
+   sed -e '1,/need to touch the following:/d' \
+   -e '/need to touch the following/,/^$/d' \
+   Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+   # extract all possible settings for extensions-patch
+   sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+   Make.config.template \
+   | sort \
+   | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+   LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+}
+
+src_configure() {
+   # support languages, written from right to left
+   export "BIDI=$(usex bidi 1 0)"
+   # systemd notification support
+   export "SDNOTIFY=$(usex systemd 1 0)"
+   # with/without keyboard
+   export "USE_KBD=$(usex kbd 1 0)"
+}
+
+src_prepare() {
+   # apply maintainace-patches
+   ebegin "Changing paths for gentoo"
+
+   local DVBDIR=/usr/include
+   local i
+   for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+   [[ -d ${i} ]] || continue
+   if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+   einfo "Found DVB header files in ${i}"
+   DVBDIR=${i}
+   break
+   fi
+   done
+
+   # checking for s2api headers
+   local api_version
+   api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
+   api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / 
{print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+   if [[ ${api_version:-0} -lt 5*3 ]]; then
+   eerror "DVB header files do not contain s2api support or too 
old for ${P}"
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2016-06-19 Thread Joerg Bornkessel

commit: cba1e330ff192f909f41b1e147156dfbf6f1be1b
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jun 19 12:24:20 2016 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Jun 19 12:24:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba1e330

media-video/vdr: keyword ~arm64, wrt bug 586364; thx to T.Reufer for testing

Package-Manager: portage-2.3.0_rc1

 media-video/vdr/vdr-2.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/vdr/vdr-2.2.0.ebuild b/media-video/vdr/vdr-2.2.0.ebuild
index d29280e..00db36d 100644
--- a/media-video/vdr/vdr-2.2.0.ebuild
+++ b/media-video/vdr/vdr-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.tvdr.de/;
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2;
 
-KEYWORDS="~arm amd64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2016-04-23 Thread Michał Górny

commit: 59e5f2143d593d3ec506f239c979f0ae93948563
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Apr 23 12:15:34 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 23 12:26:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e5f214

media-video/vdr: Remove cross-ref to removed vdr-yaepg package

 media-video/vdr/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 5ffb9c5..21e1347 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -27,6 +27,6 @@
support for 
media-plugins/vdr-ttxtsubs
replacement for the liemikuutio 
patch, adds some nice must haves features
Replace original icon set in 
menu
-   Enables support for the 
media-plugins/vdr-yaepg
+   Enables support for the vdr-yaepg 
plugin

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2016-04-19 Thread Ian Stakenvicius

commit: 98a3191c43138737a231434313e8108b064121a0
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Tue Apr 19 21:05:22 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Tue Apr 19 21:05:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a3191c

fix most  references in metadata.xml

Package-Manager: portage-2.2.26

 media-video/vdr/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index bcc5b18..5ffb9c5 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -10,7 +10,7 @@
fribidi support, for languages, written from 
right to left
remove duplicate EPG entries
controls video-dir choice on 
recording
-   support for 
media-plugins/vdr-grapftftplugin up from vdr-graphtft-0.1.7
+   support for 
media-plugins/vdr-graphtftplugin up from version 0.1.7
Install HTML documentation
Enables automatic jumping over cut marks 
while watching a recording
skip seconds in played 
records
@@ -19,12 +19,12 @@
Enables support for the 
media-plugins/vdr-menuorg
adds support for menu hotkeys of 
double digits
Removes NALU fill data from h.264-Streams 
of TS files
-   permanent timeshift by recording live 
TV on hard disk, need plugin media-plugins/vdr-vdr-permashift
+   permanent timeshift by recording live 
TV on hard disk, need plugin media-plugins/vdr-permashift
permanent timeshift by recording 
live TV on RAM, need plugin =mediaplugins/vdr-permashift-1
Support for 
media-plugins/vdr-pin
rreset resume of EOF
Enable support for plugin 
media-plugins/vdr-rotor for dish-positioner.
-   support for 
media-pugins/vdr-ttxtsubs
+   support for 
media-plugins/vdr-ttxtsubs
replacement for the liemikuutio 
patch, adds some nice must haves features
Replace original icon set in 
menu
Enables support for the 
media-plugins/vdr-yaepg

[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/

2016-02-22 Thread Patrick Lauer

commit: 61d592c5233f63361dcbcbd7e5f07e71e28a712f
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Feb 22 10:05:01 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Mon Feb 22 10:13:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d592c5

media-video/vdr: Fix typo in metadata.xml

Package-Manager: portage-2.2.27

 media-video/vdr/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index e79626c..bcc5b18 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -7,7 +7,7 @@


Use alternate channel on 
record
-   fribid support, for languages, written from 
right to left
+   fribidi support, for languages, written from 
right to left
remove duplicate EPG entries
controls video-dir choice on 
recording
support for 
media-plugins/vdr-grapftftplugin up from vdr-graphtft-0.1.7

80 matches

Mail list logo