[vdr-plugin-mp3] 02/02: Added vdr 2.1.x compatibility patch from Lars Hanisch (yaVDR)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-mp3.

commit 89fe04579364d3dda5651b199c6e762f2d08868a
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 1 19:49:20 2015 +0100

    Added vdr 2.1.x compatibility patch from Lars Hanisch (yaVDR)
    
    * Added vdr 2.1.x compatibility patch from Lars Hanisch (yaVDR)
    * Build-depend on vdr-dev (>= 2.2.0)
    * Standards-Version: 3.9.6
---
 debian/changelog                      |  8 ++++++++
 debian/control                        |  4 ++--
 debian/patches/series                 |  2 +-
 debian/patches/vdr-2.1.x-compat.patch | 28 ++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f40827..2f2d28f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vdr-plugin-mp3 (0.10.2-21) unstable; urgency=medium
+
+  * Added vdr 2.1.x compatibility patch from Lars Hanisch (yaVDR)
+  * Build-depend on vdr-dev (>= 2.2.0)
+  * Standards-Version: 3.9.6
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 01 Mar 2015 19:48:32 +0100
+
 vdr-plugin-mp3 (0.10.2-20) unstable; urgency=medium
 
   * Build-depend on vdr-dev (>= 2.0.6)
diff --git a/debian/control b/debian/control
index fe37ca0..d90c0bc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: video
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 9), vdr-dev (>= 2.0.6), pkg-config, libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), vdr-dev (>= 2.2.0), pkg-config, libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
+Standards-Version: 3.9.6
 Homepage: http://www.muempf.de/
 Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-mp3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-mp3.git
diff --git a/debian/patches/series b/debian/patches/series
index 730685c..3181b61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 10_debian-fhs-defaults.patch
 20_Makefile-fix.patch
-flags.patch
+vdr-2.1.x-compat.patch
diff --git a/debian/patches/vdr-2.1.x-compat.patch b/debian/patches/vdr-2.1.x-compat.patch
new file mode 100644
index 0000000..7d49107
--- /dev/null
+++ b/debian/patches/vdr-2.1.x-compat.patch
@@ -0,0 +1,28 @@
+--- a/decoder.c
++++ b/decoder.c
+@@ -632,7 +632,11 @@
+ 
+ char *cInfoCache::CacheFile(void)
+ {
++#if APIVERSNUM > 20101
++  return AddPath(cachedir?cachedir:cVideoDirectory::Name(),CACHEFILENAME);
++#else
+   return AddPath(cachedir?cachedir:VideoDirectory,CACHEFILENAME);
++#endif
+ }
+ 
+ void cInfoCache::Save(bool force)
+--- a/player-mplayer.c
++++ b/player-mplayer.c
+@@ -185,7 +185,11 @@
+     if(MPlayerSetup.ResumeMode==1 || 
+        (access(s,W_OK) && (errno==EACCES || errno==EROFS))) {
+       global=true;
++#if APIVERSNUM > 20101
++      resfile=AddPath(globalResumeDir?globalResumeDir:cVideoDirectory::Name(),GLOBAL_RESUME_FILE);
++#else
+       resfile=AddPath(globalResumeDir?globalResumeDir:VideoDirectory,GLOBAL_RESUME_FILE);
++#endif
+       d(printf("resume: using global file\n"))
+       }
+     else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-mp3.git