* [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/
@ 2019-03-02 0:04 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-03-02 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 5465558d397dd3a375655ec04d0280eee4e9bca2
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar 1 17:42:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 00:02:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5465558d
media-video/vdr: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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..00000000000
--- 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 <hd_brummy@gentoo.org> (2018/Jan/21)
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile 2015-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:
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/
@ 2021-02-15 18:23 Jörg Bornkessel
0 siblings, 0 replies; 3+ messages in thread
From: Jörg Bornkessel @ 2021-02-15 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 0dcc953a8ef7cc3dac909c34e3ad7ec6daa11603
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 15 17:01:54 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 18:23:01 2021 +0000
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 <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19479
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> 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..00000000000
--- 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 <hd_brummy@gentoo.org> 2021/Feb/11
-diff -Naur vdr-2.4.6.orig/Makefile vdr-2.4.6/Makefile
---- vdr-2.4.6.orig/Makefile 2020-06-27 11:13:04.000000000 +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:
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/
@ 2021-09-20 20:11 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-09-20 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 34adca8ab939de7cd6ac16f4862f1bd097382071
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 20 17:12:30 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 20:10:13 2021 +0000
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 <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..00000000000
--- 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 <martin.dummer@gmx.net>
-Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org>
---- 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..00000000000
--- 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 <manuel.reimer@gmx.de>
-Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 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.c 2020-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(&dvbtim) == 0)
-+ timespec ts = {};
-+ ts.tv_sec = dvbtim;
-+ if (clock_settime(CLOCK_REALTIME, &ts) == 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..00000000000
--- 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 <hd_brummy@gentoo.org> ( 22 Dec 2019 )
---- a/Makefile
-+++ b/Makefile
-@@ -54,7 +54,7 @@
-
- # Output control
-
--ifdef VERBOSE
-+ifeq ($(VERBOSE),1)
- Q =
- else
- Q = @
-@@ -89,7 +89,7 @@
- ifdef HDRDIR
- HDRDIR := -I$(HDRDIR)
- endif
--ifndef NO_KBD
-+ifeq ($(USE_KBD),1)
- DEFINES += -DREMOTE_KBD
- endif
- ifdef REMOTE
-@@ -98,12 +98,12 @@
- ifdef VDR_USER
- DEFINES += -DVDR_USER=\"$(VDR_USER)\"
- endif
--ifdef BIDI
-+ifeq ($(BIDI),1)
- INCLUDES += $(shell pkg-config --cflags fribidi)
- DEFINES += -DBIDI
- LIBS += $(shell pkg-config --libs fribidi)
- endif
--ifdef SDNOTIFY
-+ifeq ($(SDNOTIFY),1)
- INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd)
- DEFINES += -DSDNOTIFY
- LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd)
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
deleted file mode 100644
index deba0197961..00000000000
--- a/media-video/vdr/files/vdr-2.4.1_ttxtsubs_segfault.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/&postID=1306478#post1306478
-
-Signed-Off-By: Joerg Bornkessel <hd_brummy@gentoo.org> ( 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.c 2020-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);
- }
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-20 20:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-15 18:23 [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/files/ Jörg Bornkessel
-- strict thread matches above, loose matches on Subject: below --
2021-09-20 20:11 Conrad Kostecki
2019-03-02 0:04 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox