From 53aa7c02694d7381d65429db7f9186f7aa6edf79 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 08:51:49 +0200 Subject: [PATCH 01/32] dvb-firmware: update to dvb-firmware-0.0.8 Signed-off-by: Stephan Raue --- packages/linux-firmware/dvb-firmware/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/dvb-firmware/meta b/packages/linux-firmware/dvb-firmware/meta index d54b74f32f..44f79476fe 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.7" +PKG_VERSION="0.0.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Free-to-use" From 41a382d02c3f63d69f4312736a9f1f90e13250e4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 09:26:32 +0200 Subject: [PATCH 02/32] dvb-firmware: update to dvb-firmware-0.0.9 Signed-off-by: Stephan Raue --- packages/linux-firmware/dvb-firmware/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/dvb-firmware/meta b/packages/linux-firmware/dvb-firmware/meta index 44f79476fe..9e241719ed 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.8" +PKG_VERSION="0.0.9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Free-to-use" From 5926358cccbe6d00767d88bf55211cd6cafec60e Mon Sep 17 00:00:00 2001 From: Gujs Date: Sun, 19 Jun 2011 12:25:34 +0200 Subject: [PATCH 03/32] zlib-hots: add zlib-host package --- packages/compress/zlib-host/build | 38 +++++++++++++++++++++++++++++++ packages/compress/zlib-host/meta | 36 +++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100755 packages/compress/zlib-host/build create mode 100644 packages/compress/zlib-host/meta diff --git a/packages/compress/zlib-host/build b/packages/compress/zlib-host/build new file mode 100755 index 0000000000..92a22fcaa4 --- /dev/null +++ b/packages/compress/zlib-host/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 + +$SCRIPTS/unpack zlib + +setup_toolchain host + +cd $BUILD/zlib-* + +mkdir -p .build-host +cp * .build-host -R +cd .build-host + +./configure --prefix=$ROOT/$TOOLCHAIN +make clean +make +make install diff --git a/packages/compress/zlib-host/meta b/packages/compress/zlib-host/meta new file mode 100644 index 0000000000..78f25ba240 --- /dev/null +++ b/packages/compress/zlib-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="zlib" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.zlib.net" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="compress" +PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library" +PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 1e5ab5b46d7b7452ef9bdb560ee8104f3ee24e14 Mon Sep 17 00:00:00 2001 From: Gujs Date: Sun, 19 Jun 2011 12:27:01 +0200 Subject: [PATCH 04/32] Python: add zlib-host to build dependencies (fixes building openelec on Ubuntu 11.04) --- packages/lang/Python/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lang/Python/meta b/packages/lang/Python/meta index 7f1d816b90..5d3e0101f6 100644 --- a/packages/lang/Python/meta +++ b/packages/lang/Python/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="zlib openssl libffi file" -PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib openssl libffi" +PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib-host zlib openssl libffi" PKG_PRIORITY="optional" PKG_SECTION="lang" PKG_SHORTDESC="python: The Python programming language" From fcf1a7a048efb6a54bcd0b30b36b6f63a3979849 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 13:51:49 +0200 Subject: [PATCH 05/32] zlib: build with cmake Signed-off-by: Stephan Raue --- packages/compress/zlib/build | 11 +++++++++-- packages/compress/zlib/install | 2 +- packages/initramfs/compress/zlib-initramfs/install | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index b29656bb95..4b44b2b650 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -23,8 +23,15 @@ . config/options $1 cd $PKG_BUILD -./configure --prefix=/usr --shared + +# needed for building with cmake + rm -rf zconf.h + +mkdir -p .build-target && cd .build-target + +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + .. make - $MAKEINSTALL diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index afe2733c0a..e281394a2b 100755 --- a/packages/compress/zlib/install +++ b/packages/compress/zlib/install @@ -23,4 +23,4 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib + cp -R $PKG_BUILD/.build-target/*.so* $INSTALL/usr/lib diff --git a/packages/initramfs/compress/zlib-initramfs/install b/packages/initramfs/compress/zlib-initramfs/install index 6c59423c48..a6b4c723e0 100755 --- a/packages/initramfs/compress/zlib-initramfs/install +++ b/packages/initramfs/compress/zlib-initramfs/install @@ -25,4 +25,4 @@ ZLIB_DIR="$BUILD/zlib-*" mkdir -p $INSTALL/lib - cp -R $ZLIB_DIR/*.so* $INSTALL/lib + cp -R $ZLIB_DIR/.build-target/*.so* $INSTALL/lib From c23de3e98d8e7503ae2b39dd142d1d2fbe8aee6c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 13:52:09 +0200 Subject: [PATCH 06/32] zlib-host: build with cmake Signed-off-by: Stephan Raue --- packages/compress/zlib-host/build | 13 ++++++++----- packages/compress/zlib-host/meta | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/compress/zlib-host/build b/packages/compress/zlib-host/build index 92a22fcaa4..bb37eaa29e 100755 --- a/packages/compress/zlib-host/build +++ b/packages/compress/zlib-host/build @@ -28,11 +28,14 @@ setup_toolchain host cd $BUILD/zlib-* -mkdir -p .build-host -cp * .build-host -R -cd .build-host +# needed for building with cmake + rm -rf zconf.h + +mkdir -p .build-host && cd .build-host + +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ + -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \ + .. -./configure --prefix=$ROOT/$TOOLCHAIN -make clean make make install diff --git a/packages/compress/zlib-host/meta b/packages/compress/zlib-host/meta index 78f25ba240..7b974cf8e0 100644 --- a/packages/compress/zlib-host/meta +++ b/packages/compress/zlib-host/meta @@ -18,7 +18,7 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="zlib" +PKG_NAME="zlib-host" PKG_VERSION="" PKG_REV="1" PKG_ARCH="any" From 7a83f68cb0db82a845be37f89fed52d771ce5e26 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 15:37:45 +0200 Subject: [PATCH 07/32] glib-host: depends on zlib-host Signed-off-by: Stephan Raue --- packages/devel/glib-host/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/glib-host/meta b/packages/devel/glib-host/meta index 31820ec6f8..49a260279e 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" +PKG_BUILD_DEPENDS="toolchain gtk-doc zlib-host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib-host: C support library" From 7e73212d164b2dfb4b30337d85b3373e80b7ffe8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 15:39:30 +0200 Subject: [PATCH 08/32] checkdeps: we dont need to install zlib devel package anymore Signed-off-by: Stephan Raue --- scripts/checkdeps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 9ed5c8b0bd..26fa0245f2 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -35,8 +35,8 @@ case $1 in build) deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt" deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext" - files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h" - files_pkg="glibc-static libc6-dev zlib1g-dev libncurses5-dev" + files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/ncurses.h" + files_pkg="glibc-static libc6-dev libncurses5-dev" ;; qemu) if [ ! `which qemu` ]; then From a515edaacecd8b8e276935598e8d2f48f200f8dc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 15:49:35 +0200 Subject: [PATCH 09/32] libxml2-host: depends on zlib-host Signed-off-by: Stephan Raue --- packages/textproc/libxml2-host/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/textproc/libxml2-host/meta b/packages/textproc/libxml2-host/meta index 12a1880934..e98d4e804c 100644 --- a/packages/textproc/libxml2-host/meta +++ b/packages/textproc/libxml2-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain Python" +PKG_BUILD_DEPENDS="toolchain zlib-host Python" PKG_PRIORITY="optional" PKG_SECTION="textproc" PKG_SHORTDESC="libxml: XML parser library for Gnome" From 4ee1cdfccbe00d67106bb4033c9960c55fa8a29d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 16:24:48 +0200 Subject: [PATCH 10/32] Python: check toolchain libdir and includedir for libs and headers Signed-off-by: Stephan Raue --- packages/lang/Python/build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 90f0ce60cd..132c747de8 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -39,8 +39,12 @@ LDFLAGS="$LDFLAGS -lexpat" \ --with-threads \ --enable-unicode=ucs4 \ -make -make install +make PYTHON_MODULES_INCLUDE=$ROOT/$TOOLCHAIN/include \ + PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib" + +make PYTHON_MODULES_INCLUDE=$ROOT/$TOOLCHAIN/include \ + PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib" \ + install # symlink python binary to python2 (needed for Mesa) ln -sf python $ROOT/$TOOLCHAIN/bin/python2 From 966297681f2ff6c9180f68e7360f1b8e707669ce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 20:51:36 +0200 Subject: [PATCH 11/32] oscam: update to oscam-5386, various cleanups and changes Signed-off-by: Stephan Raue --- packages/addons/service/softcam/oscam/addon | 2 +- packages/addons/service/softcam/oscam/build | 8 +++++++- .../addons/service/softcam/oscam/changelog.txt | 3 +++ packages/addons/service/softcam/oscam/meta | 9 ++++----- .../softcam/oscam/source/bin/oscam.service | 15 ++++++++------- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon index 23e6843c7b..9b81749b4f 100755 --- a/packages/addons/service/softcam/oscam/addon +++ b/packages/addons/service/softcam/oscam/addon @@ -24,7 +24,7 @@ . config/options $1 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf diff --git a/packages/addons/service/softcam/oscam/build b/packages/addons/service/softcam/oscam/build index f7b25c375c..e4cc4fb8cd 100755 --- a/packages/addons/service/softcam/oscam/build +++ b/packages/addons/service/softcam/oscam/build @@ -24,5 +24,11 @@ . config/options $1 cd $PKG_BUILD -cmake -DWEBIF=1 +mkdir -p build && cd build + +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWEBIF=1 \ + .. + make diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt index 5c9a1ea79d..2f6f7ce593 100644 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ b/packages/addons/service/softcam/oscam/changelog.txt @@ -1,2 +1,5 @@ +0.99.2 +- update to oscam-5386 + 0.99.1 - initial version oscam-5377 diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index d21bde4621..962a7cd1f3 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,15 +20,14 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="5377" +PKG_VERSION="5386" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en" -#PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_URL="http://gujs.openelec.tv/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS="libiconv avahi openssl" -PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl" +PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_DEPENDS="openssl" +PKG_BUILD_DEPENDS="toolchain openssl" PKG_PRIORITY="optional" PKG_SECTION="service/softcam" PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul." diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.service b/packages/addons/service/softcam/oscam/source/bin/oscam.service index a3aac8992e..cd5a2466cb 100755 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.service +++ b/packages/addons/service/softcam/oscam/source/bin/oscam.service @@ -21,7 +21,7 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -#Check if process is already running +# Check if process is already running if [ ! $(pidof oscam) ]; then ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam" @@ -64,10 +64,11 @@ if [ ! $(pidof oscam) ]; then touch $ADDON_CONF_TIERS touch $ADDON_CONF_USER -#Restart process if it terminates. - (while true; do - oscam $OSCAM_ARG > /dev/null 2>&1 - sleep 1 - done)& +# Restart process if it terminates. + ( + while true; do + oscam $OSCAM_ARG > /dev/null 2>&1 + usleep 250000 + done + )& fi - From 648be8e8712aec5797274b2fd7c5259ae1b6c21f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 22:45:58 +0200 Subject: [PATCH 12/32] samba: update to samba-3.5.9 Signed-off-by: Stephan Raue --- packages/network/samba/meta | 2 +- ...compile-0.1.patch => samba-3.5.9-010_crosscompile-0.1.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/network/samba/patches/{samba-3.5.8-010_crosscompile-0.1.patch => samba-3.5.9-010_crosscompile-0.1.patch} (100%) diff --git a/packages/network/samba/meta b/packages/network/samba/meta index 7186b06586..825716893b 100644 --- a/packages/network/samba/meta +++ b/packages/network/samba/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="samba" -PKG_VERSION="3.5.8" +PKG_VERSION="3.5.9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/samba/patches/samba-3.5.8-010_crosscompile-0.1.patch b/packages/network/samba/patches/samba-3.5.9-010_crosscompile-0.1.patch similarity index 100% rename from packages/network/samba/patches/samba-3.5.8-010_crosscompile-0.1.patch rename to packages/network/samba/patches/samba-3.5.9-010_crosscompile-0.1.patch From ce9b548b9336f0e985615e669fe6850e3baf8dc4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 22:46:24 +0200 Subject: [PATCH 13/32] libass: update to libass-0.9.12 Signed-off-by: Stephan Raue --- packages/multimedia/libass/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/multimedia/libass/meta b/packages/multimedia/libass/meta index a7dbb6a0b1..caaf3fb78b 100644 --- a/packages/multimedia/libass/meta +++ b/packages/multimedia/libass/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="libass" -PKG_VERSION="0.9.11" +PKG_VERSION="0.9.12" 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.bz2" +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_PRIORITY="optional" From 640f5d378a03607b6fbe93f91b48ec660f5710a6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 00:27:18 +0200 Subject: [PATCH 14/32] libass: forcing build with enca support Signed-off-by: Stephan Raue --- packages/multimedia/libass/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/multimedia/libass/build b/packages/multimedia/libass/build index 012809e2e1..6873acc548 100755 --- a/packages/multimedia/libass/build +++ b/packages/multimedia/libass/build @@ -31,7 +31,8 @@ cd $PKG_BUILD --datadir=/usr/share \ --enable-shared \ --disable-static \ + --enable-enca \ make -$MAKEINSTALL \ No newline at end of file +$MAKEINSTALL From 03f647f0ff3dc52653b122b64fe94a9428396597 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:39:12 +0200 Subject: [PATCH 15/32] usbutils: update to usbutils-003 Signed-off-by: Stephan Raue --- packages/sysutils/usbutils/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/usbutils/meta b/packages/sysutils/usbutils/meta index 10e9f27f64..de3bdbc12d 100644 --- a/packages/sysutils/usbutils/meta +++ b/packages/sysutils/usbutils/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="usbutils" -PKG_VERSION="0.91" +PKG_VERSION="003" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From c2f9f0f1b2e077e56237db95c65a148f24f7a575 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:40:20 +0200 Subject: [PATCH 16/32] atk: update to atk-2.0.1 Signed-off-by: Stephan Raue --- packages/accessibility/atk/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/accessibility/atk/meta b/packages/accessibility/atk/meta index 7aec38fe1f..2279e42093 100644 --- a/packages/accessibility/atk/meta +++ b/packages/accessibility/atk/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="atk" -PKG_VERSION="2.0.0" +PKG_VERSION="2.0.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From f599ecf9615e2b0c109a3be39c57f72e42f5cdff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:41:01 +0200 Subject: [PATCH 17/32] libimobiledevice: update to libimobiledevice-1.1.1 Signed-off-by: Stephan Raue --- packages/devel/libimobiledevice/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/libimobiledevice/meta b/packages/devel/libimobiledevice/meta index 3592bbf317..83577ef91e 100644 --- a/packages/devel/libimobiledevice/meta +++ b/packages/devel/libimobiledevice/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libimobiledevice" -PKG_VERSION="1.0.4" +PKG_VERSION="1.1.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 018385dc2f33ad7382f5daed8d700ac9e141c908 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:41:32 +0200 Subject: [PATCH 18/32] pango: update to pango-1.29.3 Signed-off-by: Stephan Raue --- packages/x11/toolkits/pango/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/toolkits/pango/meta b/packages/x11/toolkits/pango/meta index a1f490947e..e43c81e510 100644 --- a/packages/x11/toolkits/pango/meta +++ b/packages/x11/toolkits/pango/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="pango" -PKG_VERSION="1.28.4" +PKG_VERSION="1.29.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.pango.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.28/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.29/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="glib cairo freetype fontconfig libX11 libXft" PKG_BUILD_DEPENDS="toolchain glib cairo freetype fontconfig libX11 libXft" PKG_PRIORITY="optional" From 879737ced59fbd9f3dc22b48cac67f1634508d95 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:42:02 +0200 Subject: [PATCH 19/32] gtk-doc: update to gtk-doc-1.17 Signed-off-by: Stephan Raue --- packages/x11/toolkits/gtk-doc/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/toolkits/gtk-doc/meta b/packages/x11/toolkits/gtk-doc/meta index 31b752523e..496471d3bf 100644 --- a/packages/x11/toolkits/gtk-doc/meta +++ b/packages/x11/toolkits/gtk-doc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gtk-doc" -PKG_VERSION="1.15" +PKG_VERSION="1.17" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 1a632ceb54bdd84b2ff5425c256f1842c48f4938 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:48:39 +0200 Subject: [PATCH 20/32] tiff: update to 4.0.0beta7 Signed-off-by: Stephan Raue --- packages/graphics/tiff/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/tiff/meta b/packages/graphics/tiff/meta index 4ce60611a3..ef07867505 100644 --- a/packages/graphics/tiff/meta +++ b/packages/graphics/tiff/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="tiff" -PKG_VERSION="4.0.0beta6" +PKG_VERSION="4.0.0beta7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 90334a2d3efdd284cf27694b19aca413c0e1674f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:49:03 +0200 Subject: [PATCH 21/32] cifs-utils: update to cifs-utils-5.0 Signed-off-by: Stephan Raue --- packages/network/cifs-utils/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/cifs-utils/meta b/packages/network/cifs-utils/meta index 5df114a051..43847599a0 100644 --- a/packages/network/cifs-utils/meta +++ b/packages/network/cifs-utils/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="cifs-utils" -PKG_VERSION="4.8.1" +PKG_VERSION="5.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From e135ebd401b9b9cf90f9e278aa0c6534757fcc6a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:49:25 +0200 Subject: [PATCH 22/32] ethtool: update to ethtool-2.6.39 Signed-off-by: Stephan Raue --- packages/network/ethtool/meta | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/network/ethtool/meta b/packages/network/ethtool/meta index 3c3975a527..5aab5d1686 100644 --- a/packages/network/ethtool/meta +++ b/packages/network/ethtool/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="ethtool" -PKG_VERSION="2.6.36" +PKG_VERSION="2.6.39" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://sourceforge.net/projects/gkernel/" -PKG_URL="$SOURCEFORGE_SRC/gkernel/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/" +PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" From baba03175090a16c0fc7feb84ff83962bad71764 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:51:34 +0200 Subject: [PATCH 23/32] libssh: update to libssh-0.5.0 Signed-off-by: Stephan Raue --- packages/network/libssh/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/libssh/meta b/packages/network/libssh/meta index f657837a02..da304252f4 100644 --- a/packages/network/libssh/meta +++ b/packages/network/libssh/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="libssh" -PKG_VERSION="0.4.8" +PKG_VERSION="0.5.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OpenSource" PKG_SITE="http://www.libssh.org/" -PKG_URL="http://www.libssh.org/files/0.4/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.libssh.org/files/0.5/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="zlib libgcrypt" PKG_BUILD_DEPENDS="toolchain zlib libgcrypt" PKG_PRIORITY="optional" From 04504ae4375bcd9b402f5b83ebf4bf2a396277db Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:52:06 +0200 Subject: [PATCH 24/32] pygobject: update to pygobject-2.28.6 Signed-off-by: Stephan Raue --- packages/python/devel/pygobject/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/devel/pygobject/meta b/packages/python/devel/pygobject/meta index 4a260a22a4..361e9f9af1 100644 --- a/packages/python/devel/pygobject/meta +++ b/packages/python/devel/pygobject/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="pygobject" -PKG_VERSION="2.28.4" +PKG_VERSION="2.28.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" From 700c5073147219c5b838a17daff63f618d788e94 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:52:38 +0200 Subject: [PATCH 25/32] simplejson: update to simplejson-2.1.6 Signed-off-by: Stephan Raue --- packages/python/system/simplejson/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/system/simplejson/meta b/packages/python/system/simplejson/meta index 9ae87c3e87..504725169f 100644 --- a/packages/python/system/simplejson/meta +++ b/packages/python/system/simplejson/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="simplejson" -PKG_VERSION="2.1.3" +PKG_VERSION="2.1.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 7216f81d7294929d48b9537b56a342422f16baed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:53:06 +0200 Subject: [PATCH 26/32] ccache: update to ccache-3.1.5 Signed-off-by: Stephan Raue --- packages/toolchain/devel/ccache/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/devel/ccache/meta b/packages/toolchain/devel/ccache/meta index 359d21c28b..075430609d 100644 --- a/packages/toolchain/devel/ccache/meta +++ b/packages/toolchain/devel/ccache/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ccache" -PKG_VERSION="3.1.4" +PKG_VERSION="3.1.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From bd655efa184a9e9b98d89e9b4dfdcea2c66dda8d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:55:15 +0200 Subject: [PATCH 27/32] xf86-video-fglrx: update to xf86-video-fglrx-11.6 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-fglrx/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index e69ff80a5a..a0dfa2ecd7 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-fglrx" -PKG_VERSION="11.5" +PKG_VERSION="11.6" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" From c70cb89f5116ba519ef8f30c6285b6f6da8686dd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:55:40 +0200 Subject: [PATCH 28/32] gtk+: update to gtk+-2.24.5 Signed-off-by: Stephan Raue --- packages/x11/toolkits/gtk+/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/toolkits/gtk+/meta b/packages/x11/toolkits/gtk+/meta index 8be9131980..1116bdc3b8 100644 --- a/packages/x11/toolkits/gtk+/meta +++ b/packages/x11/toolkits/gtk+/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gtk+" -PKG_VERSION="2.24.4" +PKG_VERSION="2.24.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 1fff11cce952cd0ae6f87c61dabc0fd5423bbad4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:56:18 +0200 Subject: [PATCH 29/32] scripts/extract: add support to extract tar.xz files Signed-off-by: Stephan Raue --- scripts/extract | 3 +++ scripts/unpack | 3 +++ 2 files changed, 6 insertions(+) diff --git a/scripts/extract b/scripts/extract index 97a3cf40b2..cb6f678f1b 100755 --- a/scripts/extract +++ b/scripts/extract @@ -51,6 +51,9 @@ for i in $PKG_URL; do *.tar.gz | *.tgz) tar xzf $f -C $3 ;; + *.tar.xz | *.txz) + tar xJf $f -C $3 + ;; *.7z) mkdir -p $3/$1 7z x -o$3/$1 $f diff --git a/scripts/unpack b/scripts/unpack index a3e9d3455b..e4a18879f1 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -58,7 +58,10 @@ rm -rf $BUILD/$1[-_]git* if [ -n "$PKG_URL" ]; then $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD + $SCRIPTS/extract $1 "$1*.tbz" $BUILD $SCRIPTS/extract $1 "$1*.tar.gz" $BUILD + $SCRIPTS/extract $1 "$1*.tar.xz" $BUILD + $SCRIPTS/extract $1 "$1*.txz" $BUILD $SCRIPTS/extract $1 "$1*.tgz" $BUILD $SCRIPTS/extract $1 "$1*.7z" $BUILD fi From 7a781038f19d8b77c367fa381c12a29b1cd2eb70 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 Jun 2011 21:56:58 +0200 Subject: [PATCH 30/32] strace: update to strace-4.6 Signed-off-by: Stephan Raue --- packages/debug/strace/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/debug/strace/meta b/packages/debug/strace/meta index 622cd9ae36..468bdeea2c 100644 --- a/packages/debug/strace/meta +++ b/packages/debug/strace/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="strace" -PKG_VERSION="4.5.20" +PKG_VERSION="4.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://sourceforge.net/projects/strace/" -PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" From f0ba273193fdfe07568763fbb11a0442f6314c77 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 21 Jun 2011 09:17:59 +0200 Subject: [PATCH 31/32] libssh: fix install script Signed-off-by: Stephan Raue --- packages/network/libssh/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/libssh/install b/packages/network/libssh/install index e7a0e6081b..0e103a602c 100755 --- a/packages/network/libssh/install +++ b/packages/network/libssh/install @@ -23,4 +23,4 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/build/src/*.so* $INSTALL/usr/lib From dcf182aa67891764d25519393c77e63d09462614 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 21 Jun 2011 10:48:52 +0200 Subject: [PATCH 32/32] Python: use /usr/lib and /usr/include too to look for libs for building hostpython Signed-off-by: Stephan Raue --- packages/lang/Python/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 132c747de8..bd93bba952 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -39,11 +39,11 @@ LDFLAGS="$LDFLAGS -lexpat" \ --with-threads \ --enable-unicode=ucs4 \ -make PYTHON_MODULES_INCLUDE=$ROOT/$TOOLCHAIN/include \ - PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib" +make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \ + PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" -make PYTHON_MODULES_INCLUDE=$ROOT/$TOOLCHAIN/include \ - PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib" \ +make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \ + PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \ install # symlink python binary to python2 (needed for Mesa)