From 8ae28c8171af52a1470cc3b3d1de744202b3fa05 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 17:43:56 +0200 Subject: [PATCH 01/12] autoupdate: rework autoupdate script to match better our versions scheme Signed-off-by: Stephan Raue --- .../autoupdate/scripts/autoupdate.release | 78 +++++++++++-------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release index 42b40b0221..40744df76e 100755 --- a/packages/tools/autoupdate/scripts/autoupdate.release +++ b/packages/tools/autoupdate/scripts/autoupdate.release @@ -84,54 +84,66 @@ if [ ! -f /var/lock/update.lock ]; then NEW_MINOR="`echo "$NEW_VERSION" | cut -d "." -f2`" NEW_PATCH="`echo "$NEW_VERSION" | cut -d "." -f3`" - if [ "$THIS_MAJOR" -lt "$NEW_MAJOR" -o \ - "$THIS_MINOR" -lt "$NEW_MINOR" -o \ - "$THIS_PATCH" -lt "$NEW_PATCH" ]; then + if [ "$THIS_PATCH" -lt "$NEW_PATCH" -a \ + "$THIS_MINOR" -eq "$NEW_MINOR" -a \ + "$THIS_MAJOR" -eq "$NEW_MAJOR" ] || \ + [ "$THIS_MINOR" -lt "$NEW_MINOR" -a \ + "$THIS_MAJOR" -eq "$NEW_MAJOR" -a \ + "$NEW_MINOR" -lt 90 ] || \ + [ "$THIS_MINOR" -ge 90 -a \ + "$NEW_MINOR" -lt 90 -a \ + $(( $THIS_MAJOR + 1 )) -eq "$NEW_MAJOR" ]; then + AUTOUPDATE="$AUTOUPDATE" + elif [ "$THIS_MAJOR" -lt "$NEW_MAJOR" -a \ + "$NEW_MINOR" -lt 90 ]; then + AUTOUPDATE="manually" + else + AUTOUPDATE="no" + fi - if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then + if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then - # show a message if a new version is avaible - send_message "New update avaible: $NEW_VERSION - please update manually" + # show a message if a new version is avaible + send_message "New update avaible: $NEW_VERSION - please update manually" - elif [ "$AUTOUPDATE" = "auto" ]; then + elif [ "$AUTOUPDATE" = "auto" ]; then - # show a message if a new version is avaible - send_message "New update avaible: $NEW_VERSION - downloading and extracting the new version..." + # show a message if a new version is avaible + send_message "New update avaible: $NEW_VERSION - downloading and extracting the new version..." - # locking autoupdate - touch /var/lock/update.lock + # locking autoupdate + touch /var/lock/update.lock - # downloading the new version - rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - download "$UPDATEURL/$NEW_IMAGE.tar.bz2" + # downloading the new version + rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 + download "$UPDATEURL/$NEW_IMAGE.tar.bz2" - # extract the image - rm -rf $TMP_DIR/$NEW_IMAGE - tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR + # extract the image + rm -rf $TMP_DIR/$NEW_IMAGE + tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR - # move KERNEL and SYSTEM to an temporary file - mkdir -p /storage/.update + # move KERNEL and SYSTEM to an temporary file + mkdir -p /storage/.update - [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \ - mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp + [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \ + mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp - [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \ - mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp + [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \ + mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp sync - # move KERNEL and SYSTEM to the right place - mv /storage/.update/KERNEL.tmp /storage/.update/KERNEL - mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM + # move KERNEL and SYSTEM to the right place + mv /storage/.update/KERNEL.tmp /storage/.update/KERNEL + mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM - # cleanup tmp files - rm -rf $TMP_DIR/$NEW_IMAGE - rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 - rm -rf /storage/.update/*.tmp + # cleanup tmp files + rm -rf $TMP_DIR/$NEW_IMAGE + rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2 + rm -rf /storage/.update/*.tmp - # we are ready (hopefully) - send_message "Update $NEW_VERSION - downloaded and extracted - please reboot to install" + # we are ready (hopefully) + send_message "Update $NEW_VERSION - downloaded and extracted - please reboot to install" - fi fi fi fi From 69f0c79774302e2551abe2fb2c4eedc6d9166577 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:19:57 +0200 Subject: [PATCH 02/12] libffi: update to libffi-3.0.10 Signed-off-by: Stephan Raue --- packages/devel/libffi/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/libffi/meta b/packages/devel/libffi/meta index b51a15160b..097ccefe1f 100644 --- a/packages/devel/libffi/meta +++ b/packages/devel/libffi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libffi" -PKG_VERSION="3.0.9" +PKG_VERSION="3.0.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 50d7940454b58d4759e59385eeba7d587fdb98c4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:20:40 +0200 Subject: [PATCH 03/12] libffi: split in libffi-host and libffi-target Signed-off-by: Stephan Raue --- packages/devel/libffi-host/build | 44 ++++++++++++++++++++++++++++++++ packages/devel/libffi-host/meta | 36 ++++++++++++++++++++++++++ packages/devel/libffi/build | 19 +++++++++----- packages/devel/libffi/install | 2 +- 4 files changed, 93 insertions(+), 8 deletions(-) create mode 100755 packages/devel/libffi-host/build create mode 100644 packages/devel/libffi-host/meta diff --git a/packages/devel/libffi-host/build b/packages/devel/libffi-host/build new file mode 100755 index 0000000000..6cc66d174c --- /dev/null +++ b/packages/devel/libffi-host/build @@ -0,0 +1,44 @@ +#!/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 + +$SCRIPTS/unpack libffi + +setup_toolchain host + +cd $BUILD/libffi-* +mkdir -p .build-host && cd .build-host +../configure --host=$HOST_NAME \ + --build=$HOST_NAME \ + --prefix=$ROOT/$TOOLCHAIN \ + --sysconfdir=/etc \ + --disable-static \ + --enable-shared \ + --disable-debug \ + --enable-structs \ + --enable-raw-api \ + --disable-purify-safety \ + --with-gnu-ld + +make +make install diff --git a/packages/devel/libffi-host/meta b/packages/devel/libffi-host/meta new file mode 100644 index 0000000000..cad9095434 --- /dev/null +++ b/packages/devel/libffi-host/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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="libffi-host" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://sourceware.org/$PKG_NAME/" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="devel" +PKG_SHORTDESC="Foreign Function Interface Library" +PKG_LONGDESC="The libffi library provides a portable, high level programming interface to various calling conventions. This allows a programmer to call any function specified by a call interface description at run-time." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/devel/libffi/build b/packages/devel/libffi/build index f7165b19be..08f3b805ef 100755 --- a/packages/devel/libffi/build +++ b/packages/devel/libffi/build @@ -23,13 +23,18 @@ . config/options $1 cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - --disable-debug \ +mkdir -p .build-target && cd .build-target +../configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + --enable-shared \ + --disable-debug \ + --enable-structs \ + --enable-raw-api \ + --disable-purify-safety \ + --with-gnu-ld make diff --git a/packages/devel/libffi/install b/packages/devel/libffi/install index 0895911777..a710883507 100755 --- a/packages/devel/libffi/install +++ b/packages/devel/libffi/install @@ -23,4 +23,4 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/.build-target/.libs/*.so* $INSTALL/usr/lib From 0bbdefd0a8609e07b929040c3e2630629b5410e5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:21:44 +0200 Subject: [PATCH 04/12] glib: update to glib-2.30.0 Signed-off-by: Stephan Raue --- packages/devel/glib-host/meta | 2 +- packages/devel/glib/build | 1 + packages/devel/glib/meta | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/devel/glib-host/meta b/packages/devel/glib-host/meta index 49a260279e..59f1a0f1c4 100644 --- a/packages/devel/glib-host/meta +++ b/packages/devel/glib-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain gtk-doc zlib-host" +PKG_BUILD_DEPENDS="toolchain libffi-host zlib-host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib-host: C support library" diff --git a/packages/devel/glib/build b/packages/devel/glib/build index 3f407e3bf9..c9e443afc3 100755 --- a/packages/devel/glib/build +++ b/packages/devel/glib/build @@ -33,6 +33,7 @@ ac_cv_func_mmap_fixed_mapped='yes' \ ac_cv_func_posix_getpwuid_r='yes' \ ac_cv_func_posix_getgrgid_r='yes' \ ac_cv_func_printf_unix98='yes' \ +ac_cv_func_qsort_r='no' \ ac_cv_func_snprintf_c99='yes' \ ac_cv_func_vsnprintf_c99='yes' \ glib_cv_stack_grows='no' \ diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index c069832ebb..317666404e 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="glib" -PKG_VERSION="2.28.8" +PKG_VERSION="2.30.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib libiconv pcre" -PKG_BUILD_DEPENDS="toolchain zlib libiconv pcre gtk-doc glib-host" +PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.30/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="zlib libiconv libffi pcre" +PKG_BUILD_DEPENDS="toolchain zlib libiconv libffi pcre glib-host gtk-doc" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib: C support library" From f874462cc1fc1033c816c537939cf4a661f9dcd8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:23:04 +0200 Subject: [PATCH 05/12] cifs-utils: update to cifs-utils-5.1 Signed-off-by: Stephan Raue --- packages/network/cifs-utils/build | 1 + packages/network/cifs-utils/meta | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/network/cifs-utils/build b/packages/network/cifs-utils/build index ff05151ad8..04c8625c4d 100755 --- a/packages/network/cifs-utils/build +++ b/packages/network/cifs-utils/build @@ -34,6 +34,7 @@ ac_cv_func_realloc_0_nonnull=yes \ --disable-cifsupcall \ --disable-cifscreds \ --disable-cifsidmap \ + --disable-cifsacl \ --with-libcap-ng \ --with-libcap \ diff --git a/packages/network/cifs-utils/meta b/packages/network/cifs-utils/meta index 949b5a8e71..86ef4f4988 100644 --- a/packages/network/cifs-utils/meta +++ b/packages/network/cifs-utils/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="cifs-utils" -PKG_VERSION="5.0" +PKG_VERSION="5.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From a29e0baf2063375b3474a362f8ec13030db28cbd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:24:00 +0200 Subject: [PATCH 06/12] fribidi: build with charset support, rework configure options Signed-off-by: Stephan Raue --- packages/other/fribidi/build | 9 +++++--- .../patches/fribidi-0.19.2-chunk_size.patch | 22 ------------------- 2 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch diff --git a/packages/other/fribidi/build b/packages/other/fribidi/build index c7f6b7a915..a87845fd48 100755 --- a/packages/other/fribidi/build +++ b/packages/other/fribidi/build @@ -26,11 +26,14 @@ cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ - --disable-debug \ - --enable-malloc \ - --with-glib=no \ --enable-shared \ --disable-static \ + --disable-debug \ + --disable-deprecated \ + --disable-malloc \ + --enable-charsets \ + --with-gnu-ld \ + --without-glib make diff --git a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch b/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch deleted file mode 100644 index e7256dabf5..0000000000 --- a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch +++ /dev/null @@ -1,22 +0,0 @@ -Define FRIBIDI_CHUNK_SIZE only if using allocation pools - -diff -Nur fribidi2-cvs-20061020.orig/lib/common.h fribidi2-cvs-20061020/lib/common.h ---- fribidi2-cvs-20061020.orig/lib/common.h Tue Jan 31 05:23:12 2006 -+++ fribidi2-cvs-20061020/lib/common.h Sat Oct 21 16:42:41 2006 -@@ -131,6 +131,8 @@ - - /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being - * allocated for data structure pools. */ -+#if USE_SIMPLE_MALLOC+0 -+#else - #ifndef FRIBIDI_CHUNK_SIZE - # if HAVE_ASM_PAGE_H - # ifndef __FRIBIDI_DOC -@@ -145,6 +147,7 @@ - # error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes. - # endif /* FRIBIDI_CHUNK_SIZE < 256 */ - #endif /* FRIBIDI_CHUNK_SIZE */ -+#endif /* USE_SIMPLE_MALLOC */ - - /* FRIBIDI_BEGIN_STMT should be used at the beginning of your macro - * definitions that are to behave like simple statements. Use From 05bdb0b3fb2da813dac9924653cef35c12505bb4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:24:42 +0200 Subject: [PATCH 07/12] libass: update to libass-0.10.0 Signed-off-by: Stephan Raue --- packages/multimedia/libass/build | 5 +++++ packages/multimedia/libass/meta | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/multimedia/libass/build b/packages/multimedia/libass/build index 6873acc548..00aff9dbdc 100755 --- a/packages/multimedia/libass/build +++ b/packages/multimedia/libass/build @@ -31,7 +31,12 @@ cd $PKG_BUILD --datadir=/usr/share \ --enable-shared \ --disable-static \ + --disable-test \ --enable-enca \ + --enable-fontconfig \ + --disable-harfbuzz \ + --disable-silent-rules \ + --with-gnu-ld \ make diff --git a/packages/multimedia/libass/meta b/packages/multimedia/libass/meta index ab7816f3ba..c024162ba6 100644 --- a/packages/multimedia/libass/meta +++ b/packages/multimedia/libass/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="libass" -PKG_VERSION="0.9.13" +PKG_VERSION="0.10.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://code.google.com/p/libass/" PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="freetype fontconfig enca" -PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca" +PKG_DEPENDS="freetype fontconfig enca fribidi" +PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca fribidi" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libass: a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format." From c4590ac09372f1861af747700044023678c4c1c2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:30:21 +0200 Subject: [PATCH 08/12] dbus-glib: update to dbus-glib-0.98 Signed-off-by: Stephan Raue --- packages/devel/dbus-glib/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/dbus-glib/meta b/packages/devel/dbus-glib/meta index 31870a294e..132fa100b3 100644 --- a/packages/devel/dbus-glib/meta +++ b/packages/devel/dbus-glib/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="dbus-glib" -PKG_VERSION="0.96" +PKG_VERSION="0.98" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 2688b5e8bff81d246adb888d2f166bfa8312e639 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:34:34 +0200 Subject: [PATCH 09/12] xkeyboard-config: update to xkeyboard-config-2.4 Signed-off-by: Stephan Raue --- packages/x11/data/xkeyboard-config/build | 1 + packages/x11/data/xkeyboard-config/meta | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build index 9580eb8bd3..9d496a1ab3 100755 --- a/packages/x11/data/xkeyboard-config/build +++ b/packages/x11/data/xkeyboard-config/build @@ -28,6 +28,7 @@ XKBCOMP="/usr/bin/xkbcomp" \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ + --without-xsltproc \ --enable-compat-rules \ --with-xkb-base=$XORG_PATH_XKB \ --without-xkb-rules-symlink \ diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/meta index 3cfee36011..3401e6e55d 100644 --- a/packages/x11/data/xkeyboard-config/meta +++ b/packages/x11/data/xkeyboard-config/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xkeyboard-config" -PKG_VERSION="2.3" +PKG_VERSION="2.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 7b37ac72bf8cb1605336c97e2b43339d36ecdcf6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 2 Oct 2011 20:38:59 +0200 Subject: [PATCH 10/12] fribidi: set chunk size to 4080 Signed-off-by: Stephan Raue --- packages/other/fribidi/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/other/fribidi/build b/packages/other/fribidi/build index a87845fd48..3227d7242f 100755 --- a/packages/other/fribidi/build +++ b/packages/other/fribidi/build @@ -22,6 +22,8 @@ . config/options $1 +CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080" + cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ From b17282e66a14f264734278e7acbf496333550568 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 3 Oct 2011 01:33:49 +0200 Subject: [PATCH 11/12] upower: update to upower-0.9.13 Signed-off-by: Stephan Raue --- packages/sysutils/upower/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta index 76f55343a7..11f7a97cd8 100644 --- a/packages/sysutils/upower/meta +++ b/packages/sysutils/upower/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="upower" -PKG_VERSION="0.9.12" +PKG_VERSION="0.9.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -33,4 +33,4 @@ PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in PKG_LONGDESC="Upower is a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management and replace the current monolithic Linux HAL. Upower includes the ability to enumerate system devices and send notifications when hardware is added or removed from the computer system." PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" +PKG_AUTORECONF="no" From 66021fbbfffdfa308d3c23b6e153e7633ed56f14 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 3 Oct 2011 01:34:12 +0200 Subject: [PATCH 12/12] upower: add upstream patches Signed-off-by: Stephan Raue --- ...end_supports_sleep_state_return_code.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/sysutils/upower/patches/upower-0.9.13-Fix_linux-up_backend_supports_sleep_state_return_code.patch diff --git a/packages/sysutils/upower/patches/upower-0.9.13-Fix_linux-up_backend_supports_sleep_state_return_code.patch b/packages/sysutils/upower/patches/upower-0.9.13-Fix_linux-up_backend_supports_sleep_state_return_code.patch new file mode 100644 index 0000000000..c52c591302 --- /dev/null +++ b/packages/sysutils/upower/patches/upower-0.9.13-Fix_linux-up_backend_supports_sleep_state_return_code.patch @@ -0,0 +1,30 @@ +From ff23a9c6e229cd8a2c4226fdc281ab5853d6da35 Mon Sep 17 00:00:00 2001 +From: Christian Seiler +Date: Thu, 22 Sep 2011 15:34:45 +0000 +Subject: Fix linux up_backend_supports_sleep_state() return code. + +Under Linux, regardless of the exit code of /usr/bin/pm-is-supported, it will +always set CanSuspend and CanHibernate to true due to a logic error in +up_backend_supports_sleep_state in src/linux/up-backend.c: The 'ret' variable +is re-used for the return code without being re-initialized to false after the +call to g_spawn_command_line_sync. + +Signed-off-by: Martin Pitt +--- +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index 14435be..d126b5b 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -361,8 +361,8 @@ up_backend_supports_sleep_state (const gchar *state) + g_error_free (error); + goto out; + } +- if (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS)) +- ret = TRUE; ++ ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS)); ++ + out: + g_free (command); + return ret; +-- +cgit v0.9.0.2-2-gbebe