diff options
| author |   Sam James <sam@gentoo.org> | 2021-06-18 23:03:15 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2021-06-18 23:03:15 +0200 |
| commit | 71c086aa8af8388c12611de8857b0929f7a041f1 (patch) | |
| tree | 24e5800ef2d0cc00a01d9b5427d864d2070656a9 /media-plugins/vdr-extrecmenu | |
| parent | media-plugins/vdr-duplicates: respect PKG_CONFIG, tidy patch (diff) | |
| download | gentoo-71c086aa8af8388c12611de8857b0929f7a041f1.tar.gz gentoo-71c086aa8af8388c12611de8857b0929f7a041f1.tar.bz2 gentoo-71c086aa8af8388c12611de8857b0929f7a041f1.zip | |
media-plugins/vdr-extrecmenu: respect PKG_CONFIG, tidy patches
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-plugins/vdr-extrecmenu')
3 files changed, 5 insertions, 6 deletions
diff --git a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch index 723610e8c58e..77da7a5563c9 100644 --- a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch +++ b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch @@ -1,5 +1,5 @@ ---- dvdarchive-2.3-beta.sh 2009-10-06 16:23:20.000000000 +0200 -+++ dvdarchive-2.3-beta.sh 2009-10-06 17:32:43.000000000 +0200 +--- a/dvdarchive-2.3-beta.sh ++++ b/dvdarchive-2.3-beta.sh @@ -118,6 +118,10 @@ DEBUGLOG="/tmp/dvdarchive.sh-debug.log" diff --git a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk index b08519610a69..ae68843778f9 100644 --- a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk +++ b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk @@ -15,7 +15,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The directory environment: # Use package data if installed...otherwise assume we're under the VDR source directory: -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) +PKGCFG = $(if $(VDRDIR),$(shell ${PKG_CONFIG} --variable=$(1) $(VDRDIR)/vdr.pc),$(shell ${PKG_CONFIG} --variable=$(1) vdr || ${PKG_CONFIG} --variable=$(1) ../../../vdr.pc)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch index 91df23911a42..8427982eede8 100644 --- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch +++ b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch @@ -2,9 +2,8 @@ C++11 requires a space between literal and identifier https://bugs.gentoo.org/740282 Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> -diff -Naur vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c ---- vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c 2021-03-21 17:25:40.260078140 +0100 -+++ vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c 2021-03-21 17:26:15.560078140 +0100 +--- a/mymenueditrecording.c ++++ b/mymenueditrecording.c @@ -626,7 +626,7 @@ { //This has been taken from remotetimers-0.1.5, written by Frank Schmirler <vdrdev@schmirler.de> |