Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

Conflicts: packages/network/cifs-utils/build packages/network/cifs-utils/meta
2025-07-29 13:46:49 +00:00 · 2011-10-03 01:59:02 +02:00 · 2011-10-03 01:59:02 +02:00 · 04f496de2e
commit 04f496de2e
parent 1633178404 5be222f15c
18 changed files with 196 additions and 79 deletions
--- 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"
--- 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"
--- 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' \
--- 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"
--- a/packages/devel/libffi-host/build
+++ 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
--- a/packages/devel/libffi-host/meta
+++ 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"
--- 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

--- 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
--- 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"
--- 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

--- 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."
--- a/packages/other/fribidi/build
+++ b/packages/other/fribidi/build
@ -22,15 +22,20 @@

 . config/options $1

+CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080"
+
 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

--- a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch
+++ b/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch
@ -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
--- 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"
--- 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
@ -0,0 +1,30 @@
+From ff23a9c6e229cd8a2c4226fdc281ab5853d6da35 Mon Sep 17 00:00:00 2001
+From: Christian Seiler <christian@iwakd.de>
+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 <martin.pitt@ubuntu.com>
+---
+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
--- 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
--- 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 \
--- 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"