From f21fdb66b660295f8c17169b823e56d8a7367812 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 14 Dec 2011 05:13:47 +0100
Subject: [PATCH] htop: update to htop-1.0, prepare for OpenELEC-2.0 release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/debugging/tools/htop/build         |  8 ++++++++
 packages/addons/debugging/tools/htop/changelog.txt |  4 ++++
 packages/addons/debugging/tools/htop/meta          |  4 ++--
 .../htop/patches/htop-0.9-crosscompiling-0.1.patch | 14 --------------
 4 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch

diff --git a/packages/addons/debugging/tools/htop/build b/packages/addons/debugging/tools/htop/build
index 477d01ea61..1d8b6ddf02 100755
--- a/packages/addons/debugging/tools/htop/build
+++ b/packages/addons/debugging/tools/htop/build
@@ -25,6 +25,8 @@
 # htop fails to build with GOLD linker
   strip_gold
 
+LDFLAGS="$LDFLAGS -ltinfo"
+
 cd $PKG_BUILD
 ac_cv_func_malloc_0_nonnull=yes \
 ac_cv_func_realloc_0_nonnull=yes \
@@ -33,6 +35,12 @@ ac_cv_func_realloc_0_nonnull=yes \
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
+            --enable-cgroup \
+            --disable-vserver \
+            --disable-taskstats \
+            --disable-unicode \
+            --disable-native-affinity \
+            --disable-hwloc \
             --with-gnu-ld
 
 make
diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
index cd6a808791..6b32f8c58a 100644
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ b/packages/addons/debugging/tools/htop/changelog.txt
@@ -1,3 +1,7 @@
+2.0.0
+- prepare for OpenELEC-2.0 release
+- update to htop-1.0
+
 1.90.1
 - depends on xbmc.python API 2.0
 
diff --git a/packages/addons/debugging/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
index bebbb3151c..88a6be6a93 100644
--- a/packages/addons/debugging/tools/htop/meta
+++ b/packages/addons/debugging/tools/htop/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="htop"
-PKG_VERSION="0.9"
-PKG_REV="1"
+PKG_VERSION="1.0"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"
diff --git a/packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch b/packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
deleted file mode 100644
index 0ad948a769..0000000000
--- a/packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur htop-0.9.orig/configure.ac htop-0.9/configure.ac
---- htop-0.9.orig/configure.ac  2010-11-23 16:56:32.000000000 +0100
-+++ htop-0.9/configure.ac       2010-12-26 12:23:34.433062696 +0100
-@@ -101,9 +101,6 @@
- 
- 
- 
--AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
--AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
--
- AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes")
- PLPA_INCLUDED
- PLPA_INIT([plpa-1.3.2], [plpa_happy=yes], [plpa_happy=no])
-