[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/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/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/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/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/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/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/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/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/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'