From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- 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 ++++++++ 4 files changed, 133 insertions(+) create mode 100644 media-video/vdr/files/vdr-2.4.1_gentoo.patch create mode 100644 media-video/vdr/files/vdr-2.4.1_makefile-variables.patch create mode 100644 media-video/vdr/files/vdr-2.4_remove_plugins.patch (limited to 'media-video/vdr/files') 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 b67c94d7c579..8ae498a28fd8 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 000000000000..71aca7f5f96b --- /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, $(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_makefile-variables.patch b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch new file mode 100644 index 000000000000..30cd39528f9b --- /dev/null +++ b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch @@ -0,0 +1,40 @@ +we change some variables in the Makefile +for a better handling in gentoo ebuild + +Signed-off-by: Joerg Bornkessel ( 22 Dec 2019 ) +diff -Naur vdr-2.4.1.orig/Makefile vdr-2.4.1/Makefile +--- vdr-2.4.1.orig/Makefile 2019-12-22 00:51:31.000000000 +0100 ++++ vdr-2.4.1/Makefile 2019-12-22 00:53:34.000000000 +0100 +@@ -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_remove_plugins.patch b/media-video/vdr/files/vdr-2.4_remove_plugins.patch new file mode 100644 index 000000000000..56997968d60f --- /dev/null +++ b/media-video/vdr/files/vdr-2.4_remove_plugins.patch @@ -0,0 +1,25 @@ +we do not install any plugins from core vdr + +Signed-off-by: Martin Dummer +Reviewed-by: Joerg Bornkessel +diff -Naur vdr-2.4.0.orig/Makefile vdr-2.4.0/Makefile +--- vdr-2.4.0.orig/Makefile 2017-05-29 10:48:42.000000000 +0200 ++++ vdr-2.4.0/Makefile 2019-03-14 12:08:56.857495048 +0100 +@@ -125,7 +125,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: + +@@ -271,7 +271,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: + -- cgit v1.2.3