diff --git a/CHANGELOG b/CHANGELOG index e69de29bb2..af11166dcb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -0,0 +1,7 @@ +OpenELEC - 1.0.1 (21.10.2011) +- dont start wpa_supplicant in debugmode, this fixes non working wlan connections +- update DVB firmwares + +OpenELEC - 1.0.0 (20.10.2011) +- initial version + diff --git a/VERSION b/VERSION index d64531f130..7dea76edb3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -devel +1.0.1 diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/addon b/packages/addons/multimedia/xbmc-addon-xvdr/addon new file mode 100755 index 0000000000..740fcc9230 --- /dev/null +++ b/packages/addons/multimedia/xbmc-addon-xvdr/addon @@ -0,0 +1,29 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID + cp -PR $PKG_BUILD/addons/pvr.vdr.xvdr/resources $ADDON_BUILD/$PKG_ADDON_ID + cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $ADDON_BUILD/$PKG_ADDON_ID + cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $ADDON_BUILD/$PKG_ADDON_ID + cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $ADDON_BUILD/$PKG_ADDON_ID diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/build b/packages/addons/multimedia/xbmc-addon-xvdr/build new file mode 100755 index 0000000000..794b360977 --- /dev/null +++ b/packages/addons/multimedia/xbmc-addon-xvdr/build @@ -0,0 +1,38 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD + +# some fixes for autoreconf + touch NEWS AUTHORS ChangeLog + do_autoreconf + +CXXFLAGS="-DZLIB_INTERNAL=1" \ +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --disable-static \ + --enable-shared + +make diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt b/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt new file mode 100644 index 0000000000..c9271f76dd --- /dev/null +++ b/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt @@ -0,0 +1,2 @@ +1.0.0 +- initial import of xbmc-addon-xvdr-9822a8a diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png b/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png new file mode 100644 index 0000000000..f8f83ae27d Binary files /dev/null and b/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png differ diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/install b/packages/addons/multimedia/xbmc-addon-xvdr/install new file mode 100755 index 0000000000..81b096dc4b --- /dev/null +++ b/packages/addons/multimedia/xbmc-addon-xvdr/install @@ -0,0 +1,29 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr + cp -PRf $PKG_BUILD/addons/pvr.vdr.xvdr/resources $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr + cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr +# cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr + cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/meta b/packages/addons/multimedia/xbmc-addon-xvdr/meta new file mode 100644 index 0000000000..9b3d814d96 --- /dev/null +++ b/packages/addons/multimedia/xbmc-addon-xvdr/meta @@ -0,0 +1,37 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="xbmc-addon-xvdr" +PKG_VERSION="9822a8a" +PKG_REV="0" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="https://github.com/pipelka/xbmc-addon-xvdr" +PKG_URL="http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/xbmc-addon-xvdr-$PKG_VERSION.tar.gz" +PKG_DEPENDS="zlib" +PKG_BUILD_DEPENDS="toolchain zlib" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia/pvr" +PKG_SHORTDESC="XVDR addon for XBMC" +PKG_LONGDESC="This addon allows XBMC PVR to connect to the VDR server." +PKG_IS_ADDON="yes" +PKG_ADDON_TYPE="xbmc.python.script" + +PKG_AUTORECONF="no" diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py b/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py new file mode 100644 index 0000000000..2085a1f96d --- /dev/null +++ b/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py @@ -0,0 +1,23 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +import os +import sys +import xbmcaddon diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt index 59409030eb..644d301c42 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt @@ -1,3 +1,6 @@ +1.0.2 +- add (CH) GA Weissenstein default muxes + 1.0.1 - add XMLTV tv_file_grab support - add XMLTV configuration support diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta index 869e5f621f..1499c51199 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/meta +++ b/packages/addons/service/multimedia/hts-tvheadend/meta @@ -20,7 +20,7 @@ PKG_NAME="hts-tvheadend" PKG_VERSION="c88a646" -PKG_REV="0" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" diff --git a/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-090-add_CH-GA-Weissenstein_muxes-0.1.patch b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-090-add_CH-GA-Weissenstein_muxes-0.1.patch new file mode 100644 index 0000000000..e8c6050515 --- /dev/null +++ b/packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-c88a646-090-add_CH-GA-Weissenstein_muxes-0.1.patch @@ -0,0 +1,55 @@ +diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h +--- hts-tvheadend-c88a646/src/linuxtv_muxes.h 2011-09-26 20:18:12.000000000 +0200 ++++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h 2011-10-18 13:40:37.768853992 +0200 +@@ -12001,6 +12001,39 @@ + { .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5}, + }; + ++static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = { ++ { .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3}, ++ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++ { .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5}, ++}; ++ + static const struct mux muxes_DVBC_ch_Rega_Sense[] = { + { .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3}, + { .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3}, +@@ -12881,6 +12914,11 @@ + + static const struct network networks_DVBC_ch[] = { + { ++ .name = "GA-Weissenstein", ++ .muxes = muxes_DVBC_ch_GA_Weissenstein, ++ .nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux), ++ }, ++ { + .name = "Rega-Sense", + .muxes = muxes_DVBC_ch_Rega_Sense, + .nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux), diff --git a/packages/linux-firmware/dvb-firmware/meta b/packages/linux-firmware/dvb-firmware/meta index 462bac423b..36cbafba0b 100644 --- a/packages/linux-firmware/dvb-firmware/meta +++ b/packages/linux-firmware/dvb-firmware/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="dvb-firmware" -PKG_VERSION="0.0.13" +PKG_VERSION="0.0.15" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Free-to-use" diff --git a/packages/linux/meta b/packages/linux/meta index 73dbdaac36..59238d414b 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.1-rc9" +PKG_VERSION="3.1-rc10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.1-rc9-000_crosscompile.patch b/packages/linux/patches/linux-3.1-rc10-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-000_crosscompile.patch rename to packages/linux/patches/linux-3.1-rc10-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.1-rc9-003-no_dev_console.patch b/packages/linux/patches/linux-3.1-rc10-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-003-no_dev_console.patch rename to packages/linux/patches/linux-3.1-rc10-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.1-rc9-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.1-rc10-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.1-rc10-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.1-rc9-006_enable_utf8.patch b/packages/linux/patches/linux-3.1-rc10-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-006_enable_utf8.patch rename to packages/linux/patches/linux-3.1-rc10-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.1-rc9-007_die_floppy_die.patch b/packages/linux/patches/linux-3.1-rc10-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.1-rc10-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.1-rc9-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.1-rc10-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.1-rc10-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.1-rc9-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-3.1-rc10-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-3.1-rc10-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-3.1-rc9-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.1-rc10-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-053-ati_remote-0.1.patch b/packages/linux/patches/linux-3.1-rc10-053-ati_remote-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-053-ati_remote-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-053-ati_remote-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-3.1-rc10-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.1-rc10-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch rename to packages/linux/patches/linux-3.1-rc10-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch diff --git a/packages/linux/patches/linux-3.1-rc9-058-add_rtl2832u_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.1-rc10-058-add_rtl2832u_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-058-add_rtl2832u_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-058-add_rtl2832u_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch b/packages/linux/patches/linux-3.1-rc10-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-060-fix_dib0700_buffer_access-0.1.patch b/packages/linux/patches/linux-3.1-rc10-060-fix_dib0700_buffer_access-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-060-fix_dib0700_buffer_access-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-060-fix_dib0700_buffer_access-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.1-rc10-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.1-rc10-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.1-rc10-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.1-rc9-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.1-rc10-716_mm-zero_swappiness.patch similarity index 100% rename from packages/linux/patches/linux-3.1-rc9-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-3.1-rc10-716_mm-zero_swappiness.patch diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 66dcf2910d..c50c56068e 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -36,6 +36,16 @@ fi # hack: make addon-bins executable chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 +# hack to support user installed fonts + SUBFONTS="/storage/.xbmc/userdata/fonts" + if [ -d "$SUBFONTS" ]; then + files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l) + if [ "$files" = "0" ]; then + cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/ + fi + mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/ + fi + # starting autostart script (will be removed later again, dont use it!!!) AUTOSTART="/storage/.config/autostart.sh" if [ -f $AUTOSTART ]; then diff --git a/packages/mediacenter/xbmc/sleep.d/63_reload_skin b/packages/mediacenter/xbmc/sleep.d/99_reload_skin similarity index 95% rename from packages/mediacenter/xbmc/sleep.d/63_reload_skin rename to packages/mediacenter/xbmc/sleep.d/99_reload_skin index c0c2068b28..fd0a13ed3c 100755 --- a/packages/mediacenter/xbmc/sleep.d/63_reload_skin +++ b/packages/mediacenter/xbmc/sleep.d/99_reload_skin @@ -24,7 +24,7 @@ case "$1" in thaw|resume) - xbmc-send --host=127.0.0.1 -a "ReloadSkin()" + xbmc-send --host=127.0.0.1 -a "ReloadSkin()" & ;; *) exit $NA ;; diff --git a/packages/network/afpfs-ng/install b/packages/network/afpfs-ng/install index 55d15a74d9..04cc3e8b2d 100755 --- a/packages/network/afpfs-ng/install +++ b/packages/network/afpfs-ng/install @@ -23,7 +23,7 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/fuse/afpfs $INSTALL/usr/bin diff --git a/packages/network/bluez/install b/packages/network/bluez/install index 121eb88ac7..a63afb0b5c 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -34,17 +34,17 @@ mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/lib/udev - cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev - chmod +x $INSTALL/lib/udev/bluetooth_serial +# not needed: cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev +# not needed: chmod +x $INSTALL/lib/udev/bluetooth_serial cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev mkdir -p $INSTALL/lib/udev/rules.d cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d +# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d +# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/usr/lib - cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/alsa cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-01-enable_logging-0.1.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-01-enable_logging-0.1.patch deleted file mode 100644 index 9ec07248b0..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-01-enable_logging-0.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 17:43:39.000000000 +0200 -+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2011-04-08 19:04:10.740611827 +0200 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=/sbin/wpa_supplicant -u -+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log - User=root -diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2010-09-07 17:43:39.000000000 +0200 -+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2011-04-08 19:04:18.365451110 +0200 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=/sbin/wpa_supplicant -u -+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log - User=root diff --git a/packages/python/devel/pygobject/build b/packages/python/devel/pygobject/build index 821982ea90..29a4e3e852 100755 --- a/packages/python/devel/pygobject/build +++ b/packages/python/devel/pygobject/build @@ -37,5 +37,3 @@ cd $PKG_BUILD make $MAKEINSTALL - -python -Wi -t $PYTHON_LIBDIR/compileall.py . diff --git a/packages/python/devel/pygobject/install b/packages/python/devel/pygobject/install index 767be3121a..fd8f73325f 100755 --- a/packages/python/devel/pygobject/install +++ b/packages/python/devel/pygobject/install @@ -29,25 +29,20 @@ mkdir -p $INSTALL/usr/lib mkdir -p $PYTHON_LIB_DIR/site-packages cp $PKG_BUILD/pygtk.py $PYTHON_LIB_DIR/site-packages - cp $PKG_BUILD/pygtk.pyc $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.pyc $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/*.pyc $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/*.pyc $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/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio diff --git a/packages/python/system/dbus-python/build b/packages/python/system/dbus-python/build index ba4cc262d5..d12d63cf09 100755 --- a/packages/python/system/dbus-python/build +++ b/packages/python/system/dbus-python/build @@ -35,5 +35,3 @@ cd $PKG_BUILD make $MAKEINSTALL - -python -Wi -t $PYTHON_LIBDIR/compileall.py . diff --git a/packages/python/system/dbus-python/install b/packages/python/system/dbus-python/install index c1b34eff67..ea1bbf248a 100755 --- a/packages/python/system/dbus-python/install +++ b/packages/python/system/dbus-python/install @@ -27,10 +27,10 @@ PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*` mkdir -p $PYTHON_LIB_DIR/site-packages cp -P $PKG_BUILD/_dbus_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages cp -P $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages - cp $PKG_BUILD/*.pyc $PYTHON_LIB_DIR/site-packages + cp $PKG_BUILD/*.py $PYTHON_LIB_DIR/site-packages mkdir -p $PYTHON_LIB_DIR/site-packages/dbus - cp $PKG_BUILD/dbus/*.pyc $PYTHON_LIB_DIR/site-packages/dbus + cp $PKG_BUILD/dbus/*.py $PYTHON_LIB_DIR/site-packages/dbus mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop - cp $PKG_BUILD/dbus/mainloop/*.pyc $PYTHON_LIB_DIR/site-packages/dbus/mainloop + cp $PKG_BUILD/dbus/mainloop/*.py $PYTHON_LIB_DIR/site-packages/dbus/mainloop diff --git a/packages/sysutils/busybox/profile.d/systemid.conf b/packages/sysutils/busybox/profile.d/systemid.conf new file mode 100644 index 0000000000..d358798797 --- /dev/null +++ b/packages/sysutils/busybox/profile.d/systemid.conf @@ -0,0 +1,38 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ +# Attempts to generate a unique system ID based on one local MAC address +# SystemID SHOULD be the same between upgrades/reinstalls +# MAC is hashed so that it cant be reversed making it anonymous +# Used to help with global usage statistics +################################################################################ + +SYSTEMID="00000000000000000000000000000000" + +if [ -e "/sys/class/net/eth0/address" ]; then + MAC_ADRESS=`cat /sys/class/net/eth0/address` +elif [ -e "/sys/class/net/wlan0/address" ]; then + MAC_ADRESS=`cat /sys/class/net/wlan0/address` +fi + +if [ -n "$MAC_ADRESS" ]; then + SYSTEMID=`/bin/echo $MAC_ADRESS | /usr/bin/md5sum | /usr/bin/cut -f1 -d" "` +fi + +export SYSTEMID diff --git a/packages/sysutils/pm-utils/config.d/module b/packages/sysutils/pm-utils/config.d/module index cccef5656a..60c2cb2a09 100644 --- a/packages/sysutils/pm-utils/config.d/module +++ b/packages/sysutils/pm-utils/config.d/module @@ -1 +1 @@ -SUSPEND_MODULES="xhci-hcd jme anysee" +SUSPEND_MODULES="xhci-hcd jme anysee rtl8192se" diff --git a/packages/tools/autoupdate/scripts/autoupdate.devel b/packages/tools/autoupdate/scripts/autoupdate.devel index 4642419fa2..e6a67dd39c 100755 --- a/packages/tools/autoupdate/scripts/autoupdate.devel +++ b/packages/tools/autoupdate/scripts/autoupdate.devel @@ -43,7 +43,9 @@ fi download () { case "$DL_METHOD" in wget) - wget -c $1 -P $TMP_DIR > /dev/null 2>&1 + wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \ + -c ${1}?sysid=$SYSTEMID \ + -O $2 > /dev/null 2>&1 ;; scp) scp $SCP_ARG "$1" $TMP_DIR @@ -69,7 +71,7 @@ if [ ! -f /var/lock/update.lock ]; then # get infofile with the latest released version rm -rf $TMP_DIR/latest - download "$UPDATEURL/latest" + download "$UPDATEURL/latest" "$TMP_DIR/latest" NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`" NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`" @@ -79,7 +81,7 @@ if [ ! -f /var/lock/update.lock ]; then # compare installed version with latest released version THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`" - if [ -Z $NEW_VERSION ]; then + if [ -z $NEW_VERSION ]; then NEW_VERSION="$THIS_VERSION" fi @@ -100,7 +102,7 @@ if [ ! -f /var/lock/update.lock ]; then # downloading the new version rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - download "$UPDATEURL/$NEW_IMAGE.tar.bz2" + download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2" # extract the image rm -rf $TMP_DIR/$NEW_IMAGE diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release index 40744df76e..1011c63f9a 100755 --- a/packages/tools/autoupdate/scripts/autoupdate.release +++ b/packages/tools/autoupdate/scripts/autoupdate.release @@ -43,7 +43,9 @@ fi download () { case "$DL_METHOD" in wget) - wget -c $1 -P $TMP_DIR > /dev/null 2>&1 + wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \ + -c ${1}?sysid=$SYSTEMID \ + -O $2 > /dev/null 2>&1 ;; scp) scp $SCP_ARG "$1" $TMP_DIR @@ -72,7 +74,7 @@ if [ ! -f /var/lock/update.lock ]; then # get infofile with the latest released version rm -rf $TMP_DIR/latest - download "$UPDATEURL/latest" + download "$UPDATEURL/latest" "$TMP_DIR/latest" NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`" NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`" @@ -116,7 +118,7 @@ if [ ! -f /var/lock/update.lock ]; then # downloading the new version rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - download "$UPDATEURL/$NEW_IMAGE.tar.bz2" + download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2" # extract the image rm -rf $TMP_DIR/$NEW_IMAGE diff --git a/scripts/create_addon b/scripts/create_addon index 9d64210415..c183c017da 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -53,7 +53,8 @@ if [ -f $PKG_DIR/addon ]; then $PKG_DIR/addon $@ >&$VERBOSE_OUT mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID + if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then + cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ -e "s|@PKG_NAME@|$PKG_NAME|g" \ -e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \ @@ -63,12 +64,12 @@ if [ -f $PKG_DIR/addon ]; then -e "s|@OS_VERSION@|$OS_VERSION|g" \ -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \ -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml + fi if [ -f $PKG_DIR/source/default.py ]; then cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID else - echo "*** ERROR: you need at least $PKG_DIR/source/default.py so your addon can work ***" - exit 1 + echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***" fi if [ -f $PKG_DIR/icon/icon.png ]; then