xbmc-addon-xvdr: add Frodo upstream patches, thanks to 'Gimli'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-09-12 22:29:43 +02:00
parent 5c9a817a55
commit 8859217920
2 changed files with 142 additions and 0 deletions

View File

@ -0,0 +1,110 @@
diff -Naur xbmc-addon-xvdr-75445e7/addons/library.xbmc.addon/libXBMC_addon.h xbmc-addon-xvdr-75445e7.patch/addons/library.xbmc.addon/libXBMC_addon.h
--- xbmc-addon-xvdr-75445e7/addons/library.xbmc.addon/libXBMC_addon.h 2012-07-09 11:18:28.000000000 +0200
+++ xbmc-addon-xvdr-75445e7.patch/addons/library.xbmc.addon/libXBMC_addon.h 2012-09-12 21:42:39.624671013 +0200
@@ -14,9 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
+ * along with XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
*
*/
@@ -29,37 +28,34 @@
#ifdef _WIN32 // windows
#include "dlfcn-win32.h"
#define ADDON_DLL "\\library.xbmc.addon\\libXBMC_addon" ADDON_HELPER_EXT
-#define ADDON_HELPER_PLATFORM "win32"
#define ADDON_HELPER_EXT ".dll"
#else
#if defined(__APPLE__) // osx
-#define ADDON_HELPER_PLATFORM "osx"
#if defined(__POWERPC__)
-#define ADDON_HELPER_ARCH "powerpc"
+#define ADDON_HELPER_ARCH "powerpc-osx"
#elif defined(__arm__)
-#define ADDON_HELPER_ARCH "arm"
+#define ADDON_HELPER_ARCH "arm-osx"
#else
-#define ADDON_HELPER_ARCH "x86"
+#define ADDON_HELPER_ARCH "x86-osx"
#endif
#else // linux
-#define ADDON_HELPER_PLATFORM "linux"
#if defined(__x86_64__)
-#define ADDON_HELPER_ARCH "x86_64"
+#define ADDON_HELPER_ARCH "x86_64-linux"
#elif defined(_POWERPC)
-#define ADDON_HELPER_ARCH "powerpc"
+#define ADDON_HELPER_ARCH "powerpc-linux"
#elif defined(_POWERPC64)
-#define ADDON_HELPER_ARCH "powerpc64"
+#define ADDON_HELPER_ARCH "powerpc64-linux"
#elif defined(_ARMEL)
#define ADDON_HELPER_ARCH "arm"
#elif defined(_MIPSEL)
-#define ADDON_HELPER_ARCH "mipsel"
+#define ADDON_HELPER_ARCH "mipsel-linux"
#else
-#define ADDON_HELPER_ARCH "i486"
+#define ADDON_HELPER_ARCH "i486-linux"
#endif
#endif
#include <dlfcn.h> // linux+osx
#define ADDON_HELPER_EXT ".so"
-#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
#endif
#ifdef LOG_DEBUG
diff -Naur xbmc-addon-xvdr-75445e7/addons/library.xbmc.gui/libXBMC_gui.h xbmc-addon-xvdr-75445e7.patch/addons/library.xbmc.gui/libXBMC_gui.h
--- xbmc-addon-xvdr-75445e7/addons/library.xbmc.gui/libXBMC_gui.h 2012-07-09 11:18:28.000000000 +0200
+++ xbmc-addon-xvdr-75445e7.patch/addons/library.xbmc.gui/libXBMC_gui.h 2012-09-12 21:32:18.664121278 +0200
@@ -14,9 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
+ * along with XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
*
*/
@@ -32,7 +31,7 @@
#ifdef _WIN32
#define GUI_HELPER_DLL "\\library.xbmc.gui\\libXBMC_gui" ADDON_HELPER_EXT
#else
-#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
#endif
#define ADDON_ACTION_PREVIOUS_MENU 10
diff -Naur xbmc-addon-xvdr-75445e7/addons/library.xbmc.pvr/libXBMC_pvr.h xbmc-addon-xvdr-75445e7.patch/addons/library.xbmc.pvr/libXBMC_pvr.h
--- xbmc-addon-xvdr-75445e7/addons/library.xbmc.pvr/libXBMC_pvr.h 2012-07-09 11:18:28.000000000 +0200
+++ xbmc-addon-xvdr-75445e7.patch/addons/library.xbmc.pvr/libXBMC_pvr.h 2012-09-12 21:32:18.664121278 +0200
@@ -14,9 +14,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
+ * along with XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
*
*/
@@ -31,7 +30,7 @@
#ifdef _WIN32
#define PVR_HELPER_DLL "\\library.xbmc.pvr\\libXBMC_pvr" ADDON_HELPER_EXT
#else
-#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
#endif
#define DVD_TIME_BASE 1000000

View File

@ -0,0 +1,32 @@
#!/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 [ "$MEDIACENTER" = "xbmc-frodo" ]; then
echo "### Applying Frodo based patches ###"
for patch in `ls $PKG_DIR/patches.frodo/*.patch`; do
cat $patch | patch -d \
`echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
done
fi