From 357c00e39a12ac725bfe2f428995bce82a0fc274 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Feb 2013 23:12:43 +0100 Subject: [PATCH 1/9] bcm2835-bootloader: install and use start_x.elf and fixup_x.dat per default Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/install | 6 ++---- packages/tools/bcm2835-bootloader/scripts/update.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/tools/bcm2835-bootloader/install b/packages/tools/bcm2835-bootloader/install index 83ee16b9eb..7e95187b99 100755 --- a/packages/tools/bcm2835-bootloader/install +++ b/packages/tools/bcm2835-bootloader/install @@ -25,10 +25,8 @@ mkdir -p $INSTALL/usr/share/bootloader cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader - cp $PKG_BUILD/fixup.dat $INSTALL/usr/share/bootloader - cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader - cp $PKG_BUILD/start.elf $INSTALL/usr/share/bootloader - cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader + cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader/fixup.dat + cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader/start.elf cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index dab5d0e29f..67603a2644 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -30,12 +30,12 @@ cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT - cp $SYSTEM_ROOT/usr/share/bootloader/fixup_x.dat $BOOT_ROOT cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT - cp $SYSTEM_ROOT/usr/share/bootloader/start_x.elf $BOOT_ROOT # cleanup not more needed files rm -rf $BOOT_ROOT/loader.bin + rm -rf $BOOT_ROOT/fixup_x.dat + rm -rf $BOOT_ROOT/start_x.elf # some config.txt magic if [ ! -f $BOOT_ROOT/config.txt ]; then From b031e4833f48bf25ea302540bee483e7c5b7f935 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 18 Feb 2013 11:31:04 +0200 Subject: [PATCH 2/9] vdr-plugin-dvbapi: force softcsa. this fixes #1905 --- .../vdr-plugin-dvbapi-cd93752-force-softcsa.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch new file mode 100644 index 0000000000..cfa1cc9f54 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-force-softcsa.patch @@ -0,0 +1,13 @@ +diff --git a/device-tmpl.cpp b/device-tmpl.cpp +index 158324b..4d9f862 100644 +--- a/device-tmpl.cpp ++++ b/device-tmpl.cpp +@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca + fd_dvr = -1; + + int n = Adapter; +- softcsa = (fd_ca < 0); ++ softcsa = true; + if (softcsa) + { + if (HasDecoder()) From 810088e698d520e2290590f52f9996e9f5ecd2db Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 17:48:11 +0100 Subject: [PATCH 3/9] projects/RPi/options: revert part of acdd4c8 Signed-off-by: Stephan Raue --- projects/RPi/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/RPi/options b/projects/RPi/options index f53c67d1a2..6cce14c377 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -309,7 +309,7 @@ SENSOR_SUPPORT="yes" # build with swap support (yes / no) - SWAP_SUPPORT="yes" + SWAP_SUPPORT="no" # swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB ) SWAPFILESIZE="131072" From e57553ae7d8dfb395da454333da55ceadd0651fa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 17:55:59 +0100 Subject: [PATCH 4/9] libcec: install cec-client on release builds too Signed-off-by: Stephan Raue --- packages/devel/libcec/install | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/devel/libcec/install b/packages/devel/libcec/install index 85c8c9ca42..d8eec0e6e8 100755 --- a/packages/devel/libcec/install +++ b/packages/devel/libcec/install @@ -25,7 +25,5 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib -if [ "$DEVTOOLS" = yes ]; then - mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin -fi +mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin From ec582089bca152518ed816a2c67d85654e2fe456 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 18 Feb 2013 20:04:50 +0200 Subject: [PATCH 5/9] vdr-addon: bump to 3.0.4 --- .../addons/service/multimedia/vdr-addon/changelog.txt | 8 ++++++++ packages/addons/service/multimedia/vdr-addon/meta | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 9196f35f8a..82ba64f4bb 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,11 @@ +3.0.4 +- update to vdr-1.1.33 +- update to vdr-plugin-dvbapi-cd93752 +- update to vdr-plugin-streamdev-f58086a +- update to vdr-epgsearch-0fc4817 +- remove text2skin plugin +- remove xinelib plugin + 3.0.3 - update to vdr-sc-620 - update to vdr-plugin-xvdr-c43033c diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 368c9637ce..ec477698d9 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -21,7 +21,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="3.0" -PKG_REV="3" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" From 36be00b3072fdd92874f04c22f6d843ca530f68b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 21:02:50 +0100 Subject: [PATCH 6/9] xbmc: fix connection check patch Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-457-fix_connection_check-0.1.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc/patches/xbmc-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-457-fix_connection_check-0.1.patch index f7c4f4a98f..e2ff800e71 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-457-fix_connection_check-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-457-fix_connection_check-0.1.patch @@ -6,10 +6,10 @@ diff -Naur a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp bool CFileCurl::IsInternet(bool checkDNS /* = true */) { - CStdString strURL = "http://www.google.com"; -+ CStdString strURL = "http://openelec.tv"; ++ CStdString strURL = "http://releases.openelec.tv"; if (!checkDNS) - strURL = "http://74.125.19.103"; // www.google.com ip -+ strURL = "http://212.101.13.10"; // openelec.tv ip ++ strURL = "http://212.101.13.11"; // openelec.tv ip bool found = Exists(strURL); Close(); From 306dd41b5b788368d223c8d16af20df1a65190b0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 22:30:45 +0100 Subject: [PATCH 7/9] pycrypto: install pyo files only Signed-off-by: Stephan Raue --- packages/python/security/pycrypto/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/python/security/pycrypto/build b/packages/python/security/pycrypto/build index 45619ac4db..d1b237aec1 100755 --- a/packages/python/security/pycrypto/build +++ b/packages/python/security/pycrypto/build @@ -38,3 +38,5 @@ ac_cv_func_malloc_0_nonnull=yes \ python setup.py build --cross-compile python setup.py install --root=./.install --prefix=/usr + +find ./.install -name "*.py" -exec rm -rf "{}" ";" From 036082503d1fbb2b311270203a38b6ab850f3147 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 22:31:13 +0100 Subject: [PATCH 8/9] pygobject: install pyo files only Signed-off-by: Stephan Raue --- packages/python/devel/pygobject/build | 7 +++++++ packages/python/devel/pygobject/install | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/python/devel/pygobject/build b/packages/python/devel/pygobject/build index 3bd9f1a62a..5cfd5057e0 100755 --- a/packages/python/devel/pygobject/build +++ b/packages/python/devel/pygobject/build @@ -23,6 +23,7 @@ . config/options $1 PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`" +PYTHON_HOST_LIBDIR="`ls -d $ROOT/$TOOLCHAIN/lib/python*`" cd $PKG_BUILD ./configure --host=$TARGET_NAME \ @@ -37,3 +38,9 @@ cd $PKG_BUILD make $MAKEINSTALL + +python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./pygtk.py -f +python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./dsextras.py -f +python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./gobject -f +python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./glib -f +python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./gio -f diff --git a/packages/python/devel/pygobject/install b/packages/python/devel/pygobject/install index 911c053948..c8c3b87cde 100755 --- a/packages/python/devel/pygobject/install +++ b/packages/python/devel/pygobject/install @@ -28,21 +28,21 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/glib/.libs/libpyglib*.so* $INSTALL/usr/lib mkdir -p $PYTHON_LIB_DIR/site-packages - cp $PKG_BUILD/pygtk.py $PYTHON_LIB_DIR/site-packages + cp $PKG_BUILD/pygtk.pyo $PYTHON_LIB_DIR/site-packages echo "gtk-2.0" > $PYTHON_LIB_DIR/site-packages/pygtk.pth mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0 - cp $PKG_BUILD/dsextras.py $PYTHON_LIB_DIR/site-packages/gtk-2.0 + cp $PKG_BUILD/dsextras.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0 mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject cp $PKG_BUILD/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject - cp $PKG_BUILD/gobject/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject + cp $PKG_BUILD/gobject/*.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib cp $PKG_BUILD/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib - cp $PKG_BUILD/glib/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib + cp $PKG_BUILD/glib/*.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio cp $PKG_BUILD/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio cp $PKG_BUILD/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio - cp $PKG_BUILD/gio/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio + cp $PKG_BUILD/gio/*.pyo $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio From 924acef40ed52dc03916d596c26b26da00f6c881 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Feb 2013 22:31:27 +0100 Subject: [PATCH 9/9] dbus-python: install pyo files only Signed-off-by: Stephan Raue --- packages/python/system/dbus-python/build | 3 +++ packages/python/system/dbus-python/install | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/python/system/dbus-python/build b/packages/python/system/dbus-python/build index 19d02ebb69..cfea282897 100755 --- a/packages/python/system/dbus-python/build +++ b/packages/python/system/dbus-python/build @@ -23,6 +23,7 @@ . config/options $1 PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`" +PYTHON_HOST_LIBDIR="`ls -d $ROOT/$TOOLCHAIN/lib/python*`" cd $PKG_BUILD ./configure --host=$TARGET_NAME \ @@ -35,3 +36,5 @@ cd $PKG_BUILD make CFLAGS="$TARGET_CFLAGS" $MAKEINSTALL + +python -Wi -t -B $PYTHON_HOST_LIBDIR/compileall.py ./dbus -f diff --git a/packages/python/system/dbus-python/install b/packages/python/system/dbus-python/install index 83e38a40fe..cbcea221fd 100755 --- a/packages/python/system/dbus-python/install +++ b/packages/python/system/dbus-python/install @@ -29,7 +29,7 @@ mkdir -p $PYTHON_LIB_DIR/site-packages cp -P $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages mkdir -p $PYTHON_LIB_DIR/site-packages/dbus - cp $PKG_BUILD/dbus/*.py* $PYTHON_LIB_DIR/site-packages/dbus + cp $PKG_BUILD/dbus/*.pyo $PYTHON_LIB_DIR/site-packages/dbus mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop - cp $PKG_BUILD/dbus/mainloop/*.py* $PYTHON_LIB_DIR/site-packages/dbus/mainloop + cp $PKG_BUILD/dbus/mainloop/*.pyo $PYTHON_LIB_DIR/site-packages/dbus/mainloop