[SCM] xbmc-pvr-addons/master: Fix using pkg-config when building vdr-plugin-vnsiserver

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ea6dc8564eafce8849b35e1ac2c332ab6d7f1cc8
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed May 7 18:23:46 2014 +0200

    Fix using pkg-config when building vdr-plugin-vnsiserver
    
    Closes: #745712

diff --git a/debian/patches/02_use_global_cflags.patch b/debian/patches/02_use_global_cflags.patch
index 8583ef4..7db726c 100644
--- a/debian/patches/02_use_global_cflags.patch
+++ b/debian/patches/02_use_global_cflags.patch
@@ -1,8 +1,15 @@
-diff --git a/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile b/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-index ad09fba..db88ebb 100644
 --- a/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
 +++ b/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/Makefile
-@@ -25,8 +25,8 @@ TMPDIR ?= /tmp
+@@ -16,7 +16,7 @@
+ ### 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 = $(shell pkg-config --variable=$(1) vdr)
+ LIBDIR ?= $(call PKGCFG,libdir)
+ LOCDIR = $(call PKGCFG,locdir)
+ PLGCFG = $(call PKGCFG,plgcfg)
+@@ -25,8 +25,8 @@
  
  ### The compiler options:
  
@@ -13,7 +20,7 @@ index ad09fba..db88ebb 100644
  
  ### The version number of VDR's plugin API:
  
-@@ -48,7 +48,7 @@ LIBDIR = $(VDRSRC)/PLUGINS/lib
+@@ -48,7 +48,7 @@
  endif
  
  ifndef NOCONFIG
@@ -22,5 +29,3 @@ index ad09fba..db88ebb 100644
  CXXFLAGS += -fPIC
  else
  -include $(VDRSRC)/Make.global
-diff --git a/debian/patches/02_use_global_cflags.patch b/debian/patches/02_use_global_cflags.patch
-index 5f2696c..e69de29 100644
diff --git a/debian/patches/03_disable_dvbviewer.patch b/debian/patches/03_disable_dvbviewer.patch
index b27d937..690d8e4 100644
--- a/debian/patches/03_disable_dvbviewer.patch
+++ b/debian/patches/03_disable_dvbviewer.patch
@@ -1,8 +1,6 @@
-diff --git a/addons/Makefile.am b/addons/Makefile.am
-index c677998..09e32f3 100644
 --- a/addons/Makefile.am
 +++ b/addons/Makefile.am
-@@ -6,7 +6,6 @@ if ADDON_IPTVSIMPLE
+@@ -6,7 +6,6 @@
  endif
  
  SUBDIRS = pvr.demo \

-- 
xbmc-pvr-addons packaging