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 building VDR with systemd >= 230

Browse Source
This commit is contained in:
Klaus Schmidinger 2016-12-22 13:20:16 +01:00
parent 26252c37cd
commit 5c8d366975
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

@ -2063,6 +2063,7 @@ Ville Skytt
for reporting a possible NULL pointer dereference in cCiSession::SendData() for reporting a possible NULL pointer dereference in cCiSession::SendData()
for reporting a superfluous assignment in cPipe::Open() for reporting a superfluous assignment in cPipe::Open()
for avoiding unnecessary pkg-config warnings in plugin Makefiles for avoiding unnecessary pkg-config warnings in plugin Makefiles
for fixing building VDR with systemd >= 230
Steffen Beyer <cpunk@reactor.de> Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next for fixing setting the colored button help after deleting a recording in case the next

1
HISTORY
View File

@ -8865,3 +8865,4 @@ Video Disk Recorder Revision History
- Added cFont::Width(void) to get the default character width and allow stretched - Added cFont::Width(void) to get the default character width and allow stretched
font drawing in high level OSDs (thanks to Thomas Reufer). font drawing in high level OSDs (thanks to Thomas Reufer).
- Fixed regenerating the index of audio recordings (thanks to Thomas Reufer). - Fixed regenerating the index of audio recordings (thanks to Thomas Reufer).
- Fixed building VDR with systemd >= 230 (thanks to Ville Skyttä).

6
Makefile
View File

@ -4,7 +4,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: Makefile 3.6 2015/02/09 12:28:24 kls Exp $ # $Id: Makefile 4.1 2016/12/22 13:18:32 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -95,9 +95,9 @@ DEFINES += -DBIDI
LIBS += $(shell pkg-config --libs fribidi) LIBS += $(shell pkg-config --libs fribidi)
endif endif
ifdef SDNOTIFY ifdef SDNOTIFY
INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd)
DEFINES += -DSDNOTIFY DEFINES += -DSDNOTIFY
LIBS += $(shell pkg-config --libs libsystemd-daemon) LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd)
endif endif
LIRC_DEVICE ?= /var/run/lirc/lircd LIRC_DEVICE ?= /var/run/lirc/lircd