From e7abe57121440910205b90742114635cf2a01e11 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 9 Sep 2013 04:18:59 +0200
Subject: [PATCH] xbmc-pvr-addons: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc-pvr-addons/build    |  41 -----
 packages/mediacenter/xbmc-pvr-addons/install  |  32 ----
 .../xbmc-pvr-addons/{meta => package.mk}      |   7 +-
 .../patches/xbmc-pvr-addons-buildfix.patch    | 147 ++++++++++++++++++
 4 files changed, 153 insertions(+), 74 deletions(-)
 delete mode 100755 packages/mediacenter/xbmc-pvr-addons/build
 delete mode 100755 packages/mediacenter/xbmc-pvr-addons/install
 rename packages/mediacenter/xbmc-pvr-addons/{meta => package.mk} (89%)
 create mode 100644 packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch

diff --git a/packages/mediacenter/xbmc-pvr-addons/build b/packages/mediacenter/xbmc-pvr-addons/build
deleted file mode 100755
index afa47dbec4..0000000000
--- a/packages/mediacenter/xbmc-pvr-addons/build
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-if [ "$MYSQL_SUPPORT" = yes ]; then
-  PVRADDONS_MYSQL="--enable-mysql"
-else
-  PVRADDONS_MYSQL="--disable-mysql"
-fi
-
-cd $PKG_BUILD
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr/share/xbmc \
-            --disable-static \
-            --enable-addons-with-dependencies \
-            $PVRADDONS_MYSQL \
-            --enable-shared
-
-make
diff --git a/packages/mediacenter/xbmc-pvr-addons/install b/packages/mediacenter/xbmc-pvr-addons/install
deleted file mode 100755
index 0432be7535..0000000000
--- a/packages/mediacenter/xbmc-pvr-addons/install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-for addon in `find $PKG_BUILD/addons/ -name *.pvr`;do
-  ADDON=$(basename $(dirname $addon))
-  mkdir -p $INSTALL/usr/share/xbmc/addons/$ADDON
-    cp -PRf $PKG_BUILD/addons/$ADDON/addon/* $INSTALL/usr/share/xbmc/addons/$ADDON
-
-  mkdir -p $INSTALL/usr/lib/xbmc/addons/$ADDON
-    cp -Pf $PKG_BUILD/addons/$ADDON/*.pvr $INSTALL/usr/lib/xbmc/addons/$ADDON
-done
diff --git a/packages/mediacenter/xbmc-pvr-addons/meta b/packages/mediacenter/xbmc-pvr-addons/package.mk
similarity index 89%
rename from packages/mediacenter/xbmc-pvr-addons/meta
rename to packages/mediacenter/xbmc-pvr-addons/package.mk
index e3dbb93e2d..8cb5f5b5b4 100644
--- a/packages/mediacenter/xbmc-pvr-addons/meta
+++ b/packages/mediacenter/xbmc-pvr-addons/package.mk
@@ -29,7 +29,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="curl"
-PKG_BUILD_DEPENDS="toolchain curl"
+PKG_BUILD_DEPENDS_TARGET="toolchain curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="Various PVR addons for XBMC" 
@@ -40,4 +40,9 @@ PKG_AUTORECONF="yes"
 if [ "$MYSQL_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS mysql"
   PKG_DEPENDS="$PKG_DEPENDS mysql"
+  PVRADDONS_MYSQL="--enable-mysql"
+else
+  PVRADDONS_MYSQL="--disable-mysql"
 fi
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-addons-with-dependencies $PVRADDONS_MYSQL"
diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch b/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch
new file mode 100644
index 0000000000..3fbc6daea6
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch
@@ -0,0 +1,147 @@
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.argustv/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.argustv/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.argustv/Makefile.am	2013-09-09 03:48:49.756563520 +0200
+@@ -10,11 +10,11 @@
+ LIBNAME         = libargustv-addon
+ lib_LTLIBRARIES = libargustv-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/jsoncpp/libjsoncpp.la
++LIBS            = @abs_top_builddir@/lib/jsoncpp/libjsoncpp.la
+ 
+ include ../Makefile.include.am
+ 
+-INCLUDES+=-Isrc -Isrc/lib/filesystem -I@abs_top_srcdir@/lib/jsoncpp/include
++INCLUDES+=-I$(srcdir)/src -I$(srcdir)/src/lib/filesystem -I@abs_top_srcdir@/lib/jsoncpp/include
+ 
+ libargustv_addon_la_SOURCES = src/activerecording.cpp \
+                                    src/channel.cpp \
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.demo/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.demo/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.demo/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.demo/Makefile.am	2013-09-09 03:34:14.482815303 +0200
+@@ -10,7 +10,7 @@
+ LIBNAME         = libpvrdemo-addon
+ lib_LTLIBRARIES = libpvrdemo-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS            = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
+ 
+ include ../Makefile.include.am
+ 
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.hts/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.hts/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.hts/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.hts/Makefile.am	2013-09-09 03:39:48.924418632 +0200
+@@ -10,7 +10,7 @@
+ LIBNAME         = libtvheadend-addon
+ lib_LTLIBRARIES = libtvheadend-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/libhts/libhts.la -ldl
++LIBS            = @abs_top_builddir@/lib/libhts/libhts.la -ldl
+ 
+ include ../Makefile.include.am
+ 
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mediaportal.tvserver/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mediaportal.tvserver/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mediaportal.tvserver/Makefile.am	2013-09-09 03:45:22.546295558 +0200
+@@ -10,11 +10,11 @@
+ LIBNAME         = libmediaportal-addon
+ lib_LTLIBRARIES = libmediaportal-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS            = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
+ 
+ include ../Makefile.include.am
+ 
+-INCLUDES+=-Isrc
++INCLUDES+=-I$(srcdir)/src
+ 
+ libmediaportal_addon_la_SOURCES = src/Cards.cpp \
+                                   src/channels.cpp \
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mythtv.cmyth/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.mythtv.cmyth/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.mythtv.cmyth/Makefile.am	2013-09-09 03:41:06.664969675 +0200
+@@ -10,7 +10,7 @@
+ LIBNAME         = libmythtvcmyth-addon
+ lib_LTLIBRARIES = libmythtvcmyth-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/cmyth/libcmyth.la
++LIBS            = @abs_top_builddir@/lib/cmyth/libcmyth.la
+ 
+ AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include
+ 
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.nextpvr/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.nextpvr/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.nextpvr/Makefile.am	2013-09-09 03:49:09.311590467 +0200
+@@ -10,11 +10,11 @@
+ LIBNAME         = libnextpvr-addon
+ lib_LTLIBRARIES = libnextpvr-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS            = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
+ 
+ include ../Makefile.include.am
+ 
+-INCLUDES+=-Isrc
++INCLUDES+=-I$(srcdir)/src
+ 
+ libnextpvr_addon_la_SOURCES = src/client.cpp \
+                                   src/pvrclient-nextpvr.cpp \
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.njoy/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.njoy/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.njoy/Makefile.am	2013-09-09 03:36:15.792970520 +0200
+@@ -10,7 +10,7 @@
+ LIBNAME         = libpvrnjoy-addon
+ lib_LTLIBRARIES = libpvrnjoy-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS            = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
+ 
+ include ../Makefile.include.am
+ 
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.vuplus/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/addons/pvr.vuplus/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/addons/pvr.vuplus/Makefile.am	2013-09-09 03:35:22.527902278 +0200
+@@ -10,7 +10,7 @@
+ LIBNAME         = libvuplus-addon
+ lib_LTLIBRARIES = libvuplus-addon.la
+ 
+-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
++LIBS            = @abs_top_builddir@/lib/tinyxml/libtinyxml.la
+ 
+ include ../Makefile.include.am
+ 
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/libcmyth/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/libcmyth/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/libcmyth/Makefile.am	2013-09-09 03:02:37.362378511 +0200
+@@ -25,7 +25,7 @@
+                      channel.c \
+                      storagegroup.c
+ 
+-INCLUDES=-I../include/ $(MYSQL_INCLUDES)
++INCLUDES=-I$(srcdir)/../include/ $(MYSQL_INCLUDES)
+ 
+ $(LIB): libcmyth.la
+ 	cp -f .libs/libcmyth.a .
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/librefmem/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/lib/cmyth/librefmem/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/lib/cmyth/librefmem/Makefile.am	2013-09-09 02:58:20.664045817 +0200
+@@ -3,7 +3,7 @@
+ librefmem_la_SOURCES = alloc.c \
+                       debug_refmem.c
+ 
+-INCLUDES=-I../include/ -I../libcmyth/
++INCLUDES=-I$(srcdir)/../include/ -I$(srcdir)/../libcmyth/
+ 
+ $(LIB): librefmem.la
+ 	cp -f .libs/librefmem.a .
+diff -Naur xbmc-pvr-addons-frodo-910d7e7/lib/jsoncpp/Makefile.am xbmc-pvr-addons-frodo-910d7e7.patch/lib/jsoncpp/Makefile.am
+--- xbmc-pvr-addons-frodo-910d7e7/lib/jsoncpp/Makefile.am	2013-09-09 01:56:00.000000000 +0200
++++ xbmc-pvr-addons-frodo-910d7e7.patch/lib/jsoncpp/Makefile.am	2013-09-09 02:53:57.575708599 +0200
+@@ -4,7 +4,7 @@
+                         src/lib_json/json_value.cpp \
+                         src/lib_json/json_writer.cpp
+ 
+-INCLUDES=-Iinclude/
++INCLUDES=-I$(srcdir)/include/
+ 
+ $(LIB): libjsoncpp.la
+ 	cp -f .libs/libjsoncpp.a .