frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Making sure that plugins include the VDR header files from the actual VDR source directory when doing "make plugins"

This commit is contained in:
Klaus Schmidinger 2012-12-27 09:59:29 +01:00
parent 4545c9e93e
commit 3649145acb
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2814,6 +2814,8 @@ Christopher Reimer <reimer.christopher@freenet.de>
mechanism
for suggesting to give the plugin Makefiles a separate 'install' target
for making plugin Makefiles use DESTDIR and the 'install' program
for suggesting to make sure that plugins include the VDR header files from the actual
VDR source directory when doing "make plugins"
Stefan Huskamp <coca_cola1@gmx.de>
for suggesting to make entering characters via the number keys

5
HISTORY
View File

@ -7459,3 +7459,8 @@ Video Disk Recorder Revision History
- Fixed cIndexFile::GetNextIFrame() to properly handle the case where the very last frame
is an I-frame (which normally shouldn't occur).
- Fixed replaying ongoing recordings from other VDR instances.
2012-12-27: Version 1.7.35
- Making sure that plugins include the VDR header files from the actual VDR source
directory when doing "make plugins" (suggested by Christoper Reimer).

8
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 2.36 2012/12/23 11:28:13 kls Exp $
# $Id: Makefile 2.37 2012/12/26 10:55:01 kls Exp $
.DELETE_ON_ERROR:
@ -196,7 +196,11 @@ plugins: include-dir vdr.pc
if [ "$(LIBDIR)" == "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" == "$(CWD)/locale" ]; then\
target=install;\
fi;\
$(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) $$target || failed="$$failed $$i";\
includes=;\
if [ "$(INCDIR)" != "$(CWD)/include" ]; then\
includes="INCLUDES=-I$(CWD)/include";\
fi;\
$(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) $$includes $$target || failed="$$failed $$i";\
done;\
if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi

10
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 2.58 2012/12/11 09:59:16 kls Exp $
* $Id: config.h 2.59 2012/12/27 09:56:56 kls Exp $
*/
#ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number:
#define VDRVERSION "1.7.34"
#define VDRVERSNUM 10734 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.7.35"
#define VDRVERSNUM 10735 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
#define APIVERSION "1.7.34"
#define APIVERSNUM 10734 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "1.7.35"
#define APIVERSNUM 10735 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to