Merge branch 'master' into openelec-addons

Conflicts: packages/addons/service/multimedia/hts-tvheadend/changelog.txt
2025-08-01 15:07:49 +00:00 · 2011-10-18 00:07:04 +02:00 · 2011-10-18 00:07:04 +02:00 · 8077a65f11
commit 8077a65f11
parent 2eecb31fda 3e62365197
30 changed files with 79 additions and 26 deletions
--- a/packages/3rdparty/download/CouchPotato/meta
+++ b/packages/3rdparty/download/CouchPotato/meta
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="CouchPotato"
-PKG_VERSION="6cd66ae"
+PKG_VERSION="4eec8e0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/3rdparty/download/Headphones/meta
+++ b/packages/3rdparty/download/Headphones/meta
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="Headphones"
-PKG_VERSION="ee3326e"
+PKG_VERSION="e9a1e55"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/3rdparty/download/SABnzbd/meta
+++ b/packages/3rdparty/download/SABnzbd/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="SABnzbd"
-PKG_VERSION="0.6.7"
+PKG_VERSION="0.6.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.10-001_remove_default_settings-0.3.patch
+++ b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.10-001_remove_default_settings-0.3.patch
--- a/packages/3rdparty/download/SickBeard/meta
+++ b/packages/3rdparty/download/SickBeard/meta
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="SickBeard"
-PKG_VERSION="e0e8f0e"
+PKG_VERSION="9f64728"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-001-remove_logo_update-header_and_donate_button-0.1.patch
+++ b/packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-001-remove_logo_update-header_and_donate_button-0.1.patch
--- a/packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-002-remove_default_settings-0.3.patch
+++ b/packages/3rdparty/download/SickBeard/patches/SickBeard-9f64728-002-remove_default_settings-0.3.patch
--- a/packages/addons/debugging/tools/evtest/addon
+++ b/packages/addons/debugging/tools/evtest/addon
@ -27,6 +27,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp $PKG_BUILD/evtest-capture $ADDON_BUILD/$PKG_ADDON_ID/bin/evtest-capture.bin

 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
--- a/packages/addons/debugging/tools/evtest/changelog.txt
+++ b/packages/addons/debugging/tools/evtest/changelog.txt
@ -1,3 +1,7 @@
+1.0.0
+- update to evtest-1.29
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - change icon

--- a/packages/addons/debugging/tools/evtest/meta
+++ b/packages/addons/debugging/tools/evtest/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="evtest"
-PKG_VERSION="1.27"
-PKG_REV="3"
+PKG_VERSION="1.29"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ b/packages/addons/debugging/tools/htop/changelog.txt
@ -1,3 +1,6 @@
+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.4
 - change icon

--- a/packages/addons/debugging/tools/htop/meta
+++ b/packages/addons/debugging/tools/htop/meta
@ -20,7 +20,7 @@

 PKG_NAME="htop"
 PKG_VERSION="0.9"
-PKG_REV="4"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
--- a/packages/addons/multimedia/libav/changelog.txt
+++ b/packages/addons/multimedia/libav/changelog.txt
@ -1,3 +1,7 @@
+1.0.0
+- update to libav-0.7.2
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - update to libav-0.7 (final)

--- a/packages/addons/multimedia/libav/meta
+++ b/packages/addons/multimedia/libav/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="libav"
-PKG_VERSION="0.7"
-PKG_REV="3"
+PKG_VERSION="0.7.2"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libav.org"
--- a/packages/addons/multimedia/makemkv/changelog.txt
+++ b/packages/addons/multimedia/makemkv/changelog.txt
@ -1,3 +1,6 @@
+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - update to makemkv-1.6.15

--- a/packages/addons/multimedia/makemkv/meta
+++ b/packages/addons/multimedia/makemkv/meta
@ -20,7 +20,7 @@

 PKG_NAME="makemkv"
 PKG_VERSION="1.6.15"
-PKG_REV="3"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
--- a/packages/addons/networking/backup/rsync/changelog.txt
+++ b/packages/addons/networking/backup/rsync/changelog.txt
@ -1,3 +1,7 @@
+1.0.0
+- update to rsync-3.0.9
+- prepare for OpenELEC-1.0 release
+
 0.99.3
 - change icon

--- a/packages/addons/networking/backup/rsync/meta
+++ b/packages/addons/networking/backup/rsync/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="rsync"
-PKG_VERSION="3.0.8"
-PKG_REV="3"
+PKG_VERSION="3.0.9"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
@ -1,3 +1,11 @@
+1.0.0
+- update to unrar-4.0.7
+- update to CouchPotato-4eec8e0
+- update to Headphones-e9a1e55
+- update to SickBeard-9f64728
+- update to SABnzbd-0.6.10
+- prepare for OpenELEC-1.0 release
+
 0.99.4
 - add Headphones-ee3326e

--- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
+++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="SABnzbd-Suite"
-PKG_VERSION="0.99"
-PKG_REV="4"
+PKG_VERSION="1.0"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"
--- a/packages/addons/service/downloadmanager/transmission/changelog.txt
+++ b/packages/addons/service/downloadmanager/transmission/changelog.txt
@ -1,3 +1,7 @@
+1.0.0
+- update to transmission-2.41
+- prepare for OpenELEC-1.0 release
+
 0.99.8
 - update to transmission-2.33
 - add libevent to addon
--- a/packages/addons/service/downloadmanager/transmission/meta
+++ b/packages/addons/service/downloadmanager/transmission/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="transmission"
-PKG_VERSION="2.33"
-PKG_REV="8"
+PKG_VERSION="2.41"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@ -1,9 +1,13 @@
-1.00.0
+
+1.0.1
 - add XMLTV tv_file_grab support
 - add XMLTV configuration support
 - add teletext support patch
 - add fix memory leak patch

+1.0.0
+- prepare for OpenELEC-1.0 release
+
 0.99.8
 - add suspend/wakeup script

--- a/packages/addons/shell/texteditor/nano/changelog.txt
+++ b/packages/addons/shell/texteditor/nano/changelog.txt
@ -1,3 +1,7 @@
+1.0.0
+- update to nano-2.3.1
+- prepare for OpenELEC-1.0 release
+
 0.99.4
 - change icon

--- a/packages/addons/shell/texteditor/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@ -19,8 +19,8 @@
 ################################################################################

 PKG_NAME="nano"
-PKG_VERSION="2.3.0"
-PKG_REV="4"
+PKG_VERSION="2.3.1"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
--- a/packages/compress/unrar/meta
+++ b/packages/compress/unrar/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="unrar"
-PKG_VERSION="4.0.4"
+PKG_VERSION="4.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="free"
--- a/packages/linux-firmware/wlan-firmware/meta
+++ b/packages/linux-firmware/wlan-firmware/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.6"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
--- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-457-fix_connection_check-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-457-fix_connection_check-0.1.patch
@ -0,0 +1,15 @@
+diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/FileCurl.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileCurl.cpp
+--- xbmc-10.1-Dharma/xbmc/FileSystem/FileCurl.cpp	2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileCurl.cpp	2011-10-17 19:21:04.180783870 +0200
+@@ -803,9 +803,9 @@
+ // Detect whether we are "online" or not! Very simple and dirty!
+ bool CFileCurl::IsInternet(bool checkDNS /* = true */)
+ {
+-  CStdString strURL = "http://www.google.com";
+  CStdString strURL = "http://www.openelec.tv";
+   if (!checkDNS)
+-    strURL = "http://74.125.19.103"; // www.google.com ip
+    strURL = "http://212.101.13.10"; // www.openelec.tv ip
+ 
+   bool found = Exists(strURL);
+   Close();
--- a/packages/sysutils/lcdproc/config/LCDd.conf
+++ b/packages/sysutils/lcdproc/config/LCDd.conf
@ -577,7 +577,7 @@ Protocol=0

 # Set the exit behavior [legal: 0=leave shutdown message, 1=show the big clock,
 # 2=blank device; default: 1]
-#OnExit=2
+OnExit=2

 # Select the output device to use [default: /dev/lcd0]
 Device=/dev/lcd0
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -145,7 +145,7 @@
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
-  ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+  ADDITIONAL_DRIVERS="asix-ax887xx AF9035 bcm_sta"

 # build with network support (yes / no)
  NETWORK="yes"