frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling $(PKG_CONFIG) in newplugin

Browse Source
This commit is contained in:
Klaus Schmidinger 2021-01-02 14:32:20 +01:00
parent 3f3e47d280
commit be9eff0fad
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2773,6 +2773,7 @@ Winfried K
for adding initialization of cDvbFrontend::frontendInfo for adding initialization of cDvbFrontend::frontendInfo
for improving handling missing VDRPluginDestroyer() for improving handling missing VDRPluginDestroyer()
for fixing a compiler warning for fixing a compiler warning
for fixing handling $(PKG_CONFIG) in newplugin
Hans-Werner Hilse <hilse@web.de> Hans-Werner Hilse <hilse@web.de>
for adding the command line option --userdump to enable core dumps in case VDR for adding the command line option --userdump to enable core dumps in case VDR

3
HISTORY
View File

@ -9569,7 +9569,7 @@ Video Disk Recorder Revision History
- Events in the past are no longer marked as having a timer in the Schedules - Events in the past are no longer marked as having a timer in the Schedules
menu. menu.
2021-01-01: 2021-01-02:
- Fixed strreplace() to handle NULL strings (reported by Jürgen Schneider). - Fixed strreplace() to handle NULL strings (reported by Jürgen Schneider).
- Somewhere down the road the 'x' bit of Doxyfile.filter got lost, so the - Somewhere down the road the 'x' bit of Doxyfile.filter got lost, so the
@ -9577,3 +9577,4 @@ Video Disk Recorder Revision History
- Using strgetlast() in more places. - Using strgetlast() in more places.
- Fixed a crash in the SVDRP command CLRE in case a non-existing channel number is - Fixed a crash in the SVDRP command CLRE in case a non-existing channel number is
given (reported by Manuel Reimer). given (reported by Manuel Reimer).
- Fixed handling $(PKG_CONFIG) in newplugin (thanks to Winfried Köhler).

4
newplugin
View File

@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: newplugin 4.4 2020/06/22 15:08:46 kls Exp $ # $Id: newplugin 5.1 2021/01/02 14:32:20 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@ -76,7 +76,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
# Use package data if installed...otherwise assume we're under the VDR source directory: # Use package data if installed...otherwise assume we're under the VDR source directory:
PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config
PKGCFG = \$(if \$(VDRDIR),\$(shell $(PKG_CONFIG) --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell PKG_CONFIG_PATH="\$\$PKG_CONFIG_PATH:../../.." $(PKG_CONFIG) --variable=\$(1) vdr)) PKGCFG = \$(if \$(VDRDIR),\$(shell \$(PKG_CONFIG) --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell PKG_CONFIG_PATH="\$\$PKG_CONFIG_PATH:../../.." \$(PKG_CONFIG) --variable=\$(1) vdr))
LIBDIR = \$(call PKGCFG,libdir) LIBDIR = \$(call PKGCFG,libdir)
LOCDIR = \$(call PKGCFG,locdir) LOCDIR = \$(call PKGCFG,locdir)
PLGCFG = \$(call PKGCFG,plgcfg) PLGCFG = \$(call PKGCFG,plgcfg)