From e7d7a78a67ed8639d699d6bb66b53e0511072d9a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 14 Feb 2013 16:55:05 +0100
Subject: [PATCH] xbmc-addon-settings: create pyo files, add patch to use pyo
 files

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../mediacenter/xbmc-addon-settings/build     | 32 +++++++++++++++++++
 .../service.openelec.settings-pyo.patch       | 12 +++++++
 .../mediacenter/xbmc-addon-settings/unpack    |  7 ++++
 3 files changed, 51 insertions(+)
 create mode 100755 packages/mediacenter/xbmc-addon-settings/build
 create mode 100644 packages/mediacenter/xbmc-addon-settings/patches.upstream/service.openelec.settings-pyo.patch

diff --git a/packages/mediacenter/xbmc-addon-settings/build b/packages/mediacenter/xbmc-addon-settings/build
new file mode 100755
index 0000000000..6c76578d6d
--- /dev/null
+++ b/packages/mediacenter/xbmc-addon-settings/build
@@ -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
+
+cd $PKG_BUILD
+  rm -rf `find . -name "*.pyo"`
+
+  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./service.openelec.settings/resources/lib/ -f
+  rm -rf `find ./service.openelec.settings/resources/lib/ -name "*.py"`
+
+  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./service.openelec.settings/oe.py -f
+  rm -rf ./service.openelec.settings/oe.py
diff --git a/packages/mediacenter/xbmc-addon-settings/patches.upstream/service.openelec.settings-pyo.patch b/packages/mediacenter/xbmc-addon-settings/patches.upstream/service.openelec.settings-pyo.patch
new file mode 100644
index 0000000000..e97cf5d14c
--- /dev/null
+++ b/packages/mediacenter/xbmc-addon-settings/patches.upstream/service.openelec.settings-pyo.patch
@@ -0,0 +1,12 @@
+diff -Naur a/service.openelec.settings/oe.py b/service.openelec.settings/oe.py
+--- a/service.openelec.settings/oe.py	2013-02-12 16:37:57.000000000 +0100
++++ b/service.openelec.settings/oe.py	2013-02-14 16:22:25.902628266 +0100
+@@ -542,7 +542,7 @@
+     dictModules = {}
+       
+     for strFilename in sorted(os.listdir(__cwd__+"/resources/lib/modules")):
+-      if not strFilename.startswith("__") and strFilename.endswith(".py"):
++      if not strFilename.startswith("__") and strFilename.endswith(".pyo"):
+ 
+         strModule, strExtension = strFilename.split(".")
+         try:
diff --git a/packages/mediacenter/xbmc-addon-settings/unpack b/packages/mediacenter/xbmc-addon-settings/unpack
index 09ae905c23..6c5b6426b7 100755
--- a/packages/mediacenter/xbmc-addon-settings/unpack
+++ b/packages/mediacenter/xbmc-addon-settings/unpack
@@ -27,3 +27,10 @@ ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
 
 mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
   unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
+
+echo "### Applying upstream patches ###"
+
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
+done