diff --git a/packages/accessibility/atk/meta b/packages/accessibility/atk/meta index dfca2ba542..862dab9da2 100644 --- a/packages/accessibility/atk/meta +++ b/packages/accessibility/atk/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="atk" -PKG_VERSION="1.32.0" +PKG_VERSION="1.33.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://library.gnome.org/devel/atk/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/1.32/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/1.33/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="glib" PKG_BUILD_DEPENDS="toolchain glib" PKG_PRIORITY="optional" diff --git a/packages/audio/flac/build b/packages/audio/flac/build index ad500a5913..e55feb969f 100755 --- a/packages/audio/flac/build +++ b/packages/audio/flac/build @@ -37,8 +37,9 @@ do_autoreconf -I m4 --disable-cpplibs \ --disable-xmms-plugin \ --disable-oggtest \ - --with-ogg=$SYSROOT_PREFIX/usr + --with-ogg="$SYSROOT_PREFIX/usr" \ + --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \ + --with-gnu-ld make - $MAKEINSTALL diff --git a/packages/audio/flac/meta b/packages/audio/flac/meta index 2b97932e9a..54e314c088 100644 --- a/packages/audio/flac/meta +++ b/packages/audio/flac/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://flac.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/flac/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libogg" -PKG_BUILD_DEPENDS="toolchain libogg libiconv" +PKG_DEPENDS="libiconv libogg" +PKG_BUILD_DEPENDS="toolchain libiconv libogg" PKG_PRIORITY="optional" PKG_SECTION="audio" PKG_SHORTDESC="flac: An Free Lossless Audio Codec" diff --git a/packages/audio/libcdio/build b/packages/audio/libcdio/build index 6989b23078..9a68be33ca 100755 --- a/packages/audio/libcdio/build +++ b/packages/audio/libcdio/build @@ -44,6 +44,7 @@ cd $PKG_BUILD --with-iso-info \ --with-iso-read \ --without-versioned-libs \ + --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \ make -C lib make -C include diff --git a/packages/audio/libcdio/meta b/packages/audio/libcdio/meta index a2484750e5..aba84e89d9 100644 --- a/packages/audio/libcdio/meta +++ b/packages/audio/libcdio/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libcdio/" PKG_URL="http://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="libiconv" +PKG_BUILD_DEPENDS="toolchain libiconv" PKG_PRIORITY="optional" PKG_SECTION="audio" PKG_SHORTDESC="libcdio: A CD-ROM reading and control library" diff --git a/packages/audio/wavpack/meta b/packages/audio/wavpack/meta index d3d20d821e..a58e67d894 100644 --- a/packages/audio/wavpack/meta +++ b/packages/audio/wavpack/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.wavpack.com" PKG_URL="http://www.wavpack.com/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="libiconv" +PKG_BUILD_DEPENDS="toolchain libiconv" PKG_PRIORITY="optional" PKG_SECTION="audio" PKG_SHORTDESC="wavpack: a completely open audio compression format" diff --git a/packages/debug/w_scan/meta b/packages/debug/w_scan/meta index 7752db7900..d0ad52d592 100644 --- a/packages/debug/w_scan/meta +++ b/packages/debug/w_scan/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="w_scan" -PKG_VERSION="20101204" +PKG_VERSION="20110206" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/devel/glib-host/meta b/packages/devel/glib-host/meta index e5437223d0..31820ec6f8 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 dbus-host gtk-doc" +PKG_BUILD_DEPENDS="toolchain gtk-doc" 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 7aed537024..091fa186ea 100755 --- a/packages/devel/glib/build +++ b/packages/devel/glib/build @@ -52,6 +52,7 @@ glib_cv_stack_grows='no' \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \ + --with-libiconv=gnu \ --enable-Bsymbolic \ --disable-rebuilds \ --disable-gtk-doc \ @@ -60,10 +61,8 @@ make $MAKEINSTALL -#mkdir -p $SYSROOT_PREFIX/usr/include/glib-2.0 -# cp glib/glibconfig.h $SYSROOT_PREFIX/usr/include/glib-2.0 mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig cp g*-2.0.pc $SYSROOT_PREFIX/usr/lib/pkgconfig mkdir -p $SYSROOT_PREFIX/usr/share/aclocal - cp ../m4macros/glib-gettext.m4 $SYSROOT_PREFIX/usr/share/aclocal \ No newline at end of file + cp ../m4macros/glib-gettext.m4 $SYSROOT_PREFIX/usr/share/aclocal diff --git a/packages/devel/glib/install b/packages/devel/glib/install index fb9121a3c8..d3934933ec 100755 --- a/packages/devel/glib/install +++ b/packages/devel/glib/install @@ -38,4 +38,3 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/.build-target/gio/.libs/libgio*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgio*.so*T - cp $PKG_BUILD/.build-target/glib/libcharset/charset.alias $INSTALL/usr/lib diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index 6cb1b80dae..3791dc2a4e 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -19,14 +19,14 @@ ################################################################################ PKG_NAME="glib" -PKG_VERSION="2.27.5" +PKG_VERSION="2.28.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.27/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib dbus" -PKG_BUILD_DEPENDS="toolchain zlib dbus gtk-doc glib-host" +PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="zlib libiconv" +PKG_BUILD_DEPENDS="toolchain zlib libiconv gtk-doc glib-host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib: C support library" diff --git a/packages/devel/libiconv/build b/packages/devel/libiconv/build index a1cbda78f4..d3687974c7 100755 --- a/packages/devel/libiconv/build +++ b/packages/devel/libiconv/build @@ -23,5 +23,18 @@ . config/options $1 cd $PKG_BUILD - mkdir -p $SYSROOT_PREFIX/usr/share/aclocal - cp srcm4/*.m4 $SYSROOT_PREFIX/usr/share/aclocal +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + --enable-shared \ + --disable-nls \ + --disable-extra-encodings \ + --with-gnu-ld + +make +$MAKEINSTALL + +mkdir -p $SYSROOT_PREFIX/usr/share/aclocal + cp srcm4/*.m4 $SYSROOT_PREFIX/usr/share/aclocal diff --git a/packages/linux-firmware/iwlwifi-1000-ucode/install b/packages/devel/libiconv/install similarity index 83% rename from packages/linux-firmware/iwlwifi-1000-ucode/install rename to packages/devel/libiconv/install index 9898ca8275..c9d86e5226 100755 --- a/packages/linux-firmware/iwlwifi-1000-ucode/install +++ b/packages/devel/libiconv/install @@ -20,7 +20,9 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +. config/options -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libcharset/lib/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/charset.alias $INSTALL/usr/lib diff --git a/packages/linux-firmware/iwlwifi-5000-ucode/install b/packages/linux-firmware/b43-fw/install similarity index 92% rename from packages/linux-firmware/iwlwifi-5000-ucode/install rename to packages/linux-firmware/b43-fw/install index 9898ca8275..c67120119c 100755 --- a/packages/linux-firmware/iwlwifi-5000-ucode/install +++ b/packages/linux-firmware/b43-fw/install @@ -22,5 +22,5 @@ . config/options $1 -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware +mkdir -p $INSTALL/lib/firmware/b43 + cp -P $PKG_BUILD/* $INSTALL/lib/firmware/b43 diff --git a/packages/graphics/jasper/unpack b/packages/linux-firmware/b43-fw/meta old mode 100755 new mode 100644 similarity index 71% rename from packages/graphics/jasper/unpack rename to packages/linux-firmware/b43-fw/meta index cc065309f4..f1003ef6fa --- a/packages/graphics/jasper/unpack +++ b/packages/linux-firmware/b43-fw/meta @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) @@ -20,7 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +PKG_NAME="b43-fw" +PKG_VERSION="20110211" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="Free-to-use" +PKG_SITE="http://www.broadcom.com" +PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="linux-firmware" +PKG_SHORTDESC="b43-fw: Broadcom B43 Firmware" +PKG_LONGDESC="b43-fw: Broadcom B43 Firmware" +PKG_IS_ADDON="no" -cp $SCRIPTS/configtools/config.guess $BUILD/$1*/acaux -cp $SCRIPTS/configtools/config.sub $BUILD/$1*/acaux +PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/install b/packages/linux-firmware/install index c648fc18e2..9986bfd617 100755 --- a/packages/linux-firmware/install +++ b/packages/linux-firmware/install @@ -22,20 +22,16 @@ . config/options -for firmware in $FIRMWARE; do +if [ "$FIRMWARE" = "external" ]; then + mkdir -p $INSTALL/lib/firmware + cp -R $PKG_BUILD/* $INSTALL/lib/firmware +fi +for firmware in $ADDITIONAL_FIRMWARE; do + [ $firmware = b43 ] && $SCRIPTS/install b43-fw [ $firmware = ipw2100 ] && $SCRIPTS/install ipw2100-fw [ $firmware = ipw2200 ] && $SCRIPTS/install ipw2200-fw - [ $firmware = iwl1000 ] && $SCRIPTS/install iwlwifi-1000-ucode - [ $firmware = iwl3945 ] && $SCRIPTS/install iwlwifi-3945-ucode - [ $firmware = iwl4965 ] && $SCRIPTS/install iwlwifi-4965-ucode - [ $firmware = iwl5000 ] && $SCRIPTS/install iwlwifi-5000-ucode - [ $firmware = iwl5150 ] && $SCRIPTS/install iwlwifi-5150-ucode - [ $firmware = iwl6000 ] && $SCRIPTS/install iwlwifi-6000-ucode - [ $firmware = iwl6050 ] && $SCRIPTS/install iwlwifi-6050-ucode - [ $firmware = dvb-firmware ] && $SCRIPTS/install linuxtv-dvb-firmware - done exit 0 diff --git a/packages/linux-firmware/iwlwifi-1000-ucode/meta b/packages/linux-firmware/iwlwifi-1000-ucode/meta deleted file mode 100644 index deec45c492..0000000000 --- a/packages/linux-firmware/iwlwifi-1000-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-1000-ucode" -PKG_VERSION="128.50.3.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-1000-ucode: Intel PRO/Wireless 1000 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 1000 Network Connection mini PCI adapter. This project (iwl1000) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/iwlwifi-3945-ucode/install b/packages/linux-firmware/iwlwifi-3945-ucode/install deleted file mode 100755 index 9898ca8275..0000000000 --- a/packages/linux-firmware/iwlwifi-3945-ucode/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 - -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-3945-ucode/meta b/packages/linux-firmware/iwlwifi-3945-ucode/meta deleted file mode 100644 index 3185bc22c2..0000000000 --- a/packages/linux-firmware/iwlwifi-3945-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-3945-ucode" -PKG_VERSION="15.32.2.9" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-3945-ucode: Intel PRO/Wireless 3945 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 3945 Network Connection mini PCI adapter. This project (iwl3945) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/iwlwifi-4965-ucode/install b/packages/linux-firmware/iwlwifi-4965-ucode/install deleted file mode 100755 index 9898ca8275..0000000000 --- a/packages/linux-firmware/iwlwifi-4965-ucode/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 - -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-4965-ucode/meta b/packages/linux-firmware/iwlwifi-4965-ucode/meta deleted file mode 100644 index c017e441c5..0000000000 --- a/packages/linux-firmware/iwlwifi-4965-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-4965-ucode" -PKG_VERSION="228.61.2.24" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-4965-ucode: Intel PRO/Wireless 4965 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 4965 Network Connection mini PCI adapter. This project (iwl4965) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/iwlwifi-5000-ucode/meta b/packages/linux-firmware/iwlwifi-5000-ucode/meta deleted file mode 100644 index 4b0e5840c6..0000000000 --- a/packages/linux-firmware/iwlwifi-5000-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-5000-ucode" -PKG_VERSION="8.24.2.12" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-5000-ucode: Intel PRO/Wireless 5000 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 5000 Network Connection mini PCI adapter. This project (iwl5000) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/iwlwifi-5150-ucode/install b/packages/linux-firmware/iwlwifi-5150-ucode/install deleted file mode 100755 index 9898ca8275..0000000000 --- a/packages/linux-firmware/iwlwifi-5150-ucode/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 - -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-5150-ucode/meta b/packages/linux-firmware/iwlwifi-5150-ucode/meta deleted file mode 100644 index 740e86a584..0000000000 --- a/packages/linux-firmware/iwlwifi-5150-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-5150-ucode" -PKG_VERSION="8.24.2.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-5150-ucode: Intel PRO/Wireless 5150 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 5150 Network Connection mini PCI adapter. This project (iwl5150) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/iwlwifi-6000-ucode/install b/packages/linux-firmware/iwlwifi-6000-ucode/install deleted file mode 100755 index 9898ca8275..0000000000 --- a/packages/linux-firmware/iwlwifi-6000-ucode/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 - -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-6000-ucode/meta b/packages/linux-firmware/iwlwifi-6000-ucode/meta deleted file mode 100644 index c2b2f4f861..0000000000 --- a/packages/linux-firmware/iwlwifi-6000-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-6000-ucode" -PKG_VERSION="9.193.4.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-6000-ucode: Intel PRO/Wireless 6000 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 6000 Network Connection mini PCI adapter. This project (iwl6000) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/iwlwifi-6050-ucode/install b/packages/linux-firmware/iwlwifi-6050-ucode/install deleted file mode 100755 index 9898ca8275..0000000000 --- a/packages/linux-firmware/iwlwifi-6050-ucode/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 - -mkdir -p $INSTALL/lib/firmware - cp -PR $PKG_BUILD/* $INSTALL/lib/firmware diff --git a/packages/linux-firmware/iwlwifi-6050-ucode/meta b/packages/linux-firmware/iwlwifi-6050-ucode/meta deleted file mode 100644 index b87a087e13..0000000000 --- a/packages/linux-firmware/iwlwifi-6050-ucode/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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="iwlwifi-6050-ucode" -PKG_VERSION="9.201.4.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="Free-to-use" -PKG_SITE="http://www.intellinuxwireless.org" -#PKG_URL="http://www.intellinuxwireless.org/iwlwifi/downloads/$PKG_NAME-$PKG_VERSION.tgz" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="linux-firmware" -PKG_SHORTDESC="iwlwifi-6050-ucode: Intel PRO/Wireless 6050 Driver for Linux" -PKG_LONGDESC="This project was created by Intel to enable support for the Intel PRO/Wireless 6050 Network Connection mini PCI adapter. This project (iwl6050) is intended to be a community effort as much as is possible given some working constraints (mainly, no HW documentation is available)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-firmware/linuxtv-dvb-firmware/meta b/packages/linux-firmware/linuxtv-dvb-firmware/meta index 07aeb8ddcd..5e0187c73b 100644 --- a/packages/linux-firmware/linuxtv-dvb-firmware/meta +++ b/packages/linux-firmware/linuxtv-dvb-firmware/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linuxtv-dvb-firmware" -PKG_VERSION="20110120" +PKG_VERSION="20110212" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Free-to-use" diff --git a/packages/linux-firmware/meta b/packages/linux-firmware/meta index 449630a1cb..d739d50aed 100644 --- a/packages/linux-firmware/meta +++ b/packages/linux-firmware/meta @@ -19,18 +19,18 @@ ################################################################################ PKG_NAME="linux-firmware" -PKG_VERSION="" +PKG_VERSION="20110212" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.openelec.tv" -PKG_URL="" +PKG_SITE="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree" +PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="linux-firmware" -PKG_SHORTDESC="linux-firmware: Meta package to install firmware drivers" -PKG_LONGDESC="linux-firmware is a Meta package to install firmware drivers" +PKG_SHORTDESC="linux-firmware: various free firmware drivers" +PKG_LONGDESC="linux-firmware is a package to install various free firmware drivers" PKG_IS_ADDON="no" PKG_AUTORECONF="no" diff --git a/packages/linux/install b/packages/linux/install index 9c439d49da..1934f31b17 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -37,10 +37,12 @@ for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v mo rm -f $i done -# copy kernel firmwares (if present) -mkdir -p $INSTALL/lib/firmware - [ -d $PKG_BUILD/modules/lib/firmware ] && \ - cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true +if [ "$FIRMWARE" = "internal" ]; then + # copy kernel firmwares (if present and requested) + mkdir -p $INSTALL/lib/firmware + [ -d $PKG_BUILD/modules/lib/firmware ] && \ + cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true +fi mkdir -p $INSTALL/etc cp $PKG_DIR/config/modules $INSTALL/etc diff --git a/packages/multimedia/hts-tvheadend/build b/packages/multimedia/hts-tvheadend/build index c942bb2ddd..3e52301e7f 100755 --- a/packages/multimedia/hts-tvheadend/build +++ b/packages/multimedia/hts-tvheadend/build @@ -22,6 +22,8 @@ . config/options $1 +export LDFLAGS="$LDFLAGS -liconv" + cd $PKG_BUILD ./configure --prefix=/usr \ --arch=$TARGET_ARCH \ diff --git a/packages/multimedia/hts-tvheadend/meta b/packages/multimedia/hts-tvheadend/meta index 8b76a3f329..fa17261fc2 100644 --- a/packages/multimedia/hts-tvheadend/meta +++ b/packages/multimedia/hts-tvheadend/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz" -PKG_DEPENDS="avahi" -PKG_BUILD_DEPENDS="toolchain avahi" +PKG_DEPENDS="libiconv avahi" +PKG_BUILD_DEPENDS="toolchain libiconv avahi" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources." diff --git a/packages/network/samba/build b/packages/network/samba/build index bee748948f..4faab101be 100755 --- a/packages/network/samba/build +++ b/packages/network/samba/build @@ -43,38 +43,65 @@ sh autogen.sh --with-privatedir=/var/run \ --enable-shared \ --disable-static \ - --enable-shared-libs \ --enable-debug \ + --disable-krb5developer \ + --disable-picky-developer \ + --enable-largefile \ + --disable-socket-wrapper \ + --disable-nss-wrapper \ --disable-swat \ --disable-cups \ --disable-iprint \ - --with-fhs \ --enable-pie \ - --with-pthreads \ - --with-sqlite3 \ --enable-relro \ + --enable-shared-libs \ + --enable-external-libtalloc \ + --disable-external-libtdb \ + --disable-fam \ --disable-dnssd \ $SMB_AVAHI \ - --without-pam \ - --without-ads \ + --disable-pthreadpool \ + --enable-gnutls \ + --disable-netapi \ + --disable-dmalloc \ + --with-fhs \ --with-libtalloc \ --without-libtdb \ --without-libnetapi \ - --with-cifsmount \ - --with-cifsumount \ - --without-ldap \ - --without-acl-support \ - --with-winbind \ - --with-dnsupdate \ - --without-automount \ - --with-included-popt \ --with-libsmbclient \ --with-libsmbsharemodes \ + --without-libaddns \ + --without-afs \ + --without-fake-kaserver \ + --without-vfs-afsacl \ + --without-dce-dfs \ + --without-ldap \ + --without-ads \ + --with-dnsupdate \ + --without-automount \ + --with-cifsmount \ + --without-cifsumount \ + --without-cifsupcall \ + --without-pam \ + --without-pam_smbpass \ + --without-nisplus-home \ + --with-syslog \ --without-quotas \ --without-sys-quotas \ - --with-syslog \ --without-utmp \ + --without-cluster-support \ + --without-acl-support \ + --without-aio-support \ --with-sendfile-support \ + --without-wbclient \ + --with-winbind \ + --with-static-modules=charset_CP437,charset_CP850 \ + --with-included-popt \ + --with-included-iniparser \ + --with-libiconv=$SYSROOT_PREFIX/usr \ + --with-sqlite3 \ + --with-pthreads \ + --without-setproctitle \ make bin/libsmbclient.so make bin/mount.cifs diff --git a/packages/network/samba/meta b/packages/network/samba/meta index 209499cf1c..bb8bb4822d 100644 --- a/packages/network/samba/meta +++ b/packages/network/samba/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.samba.org" PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="sqlite talloc connman" -PKG_BUILD_DEPENDS="toolchain sqlite talloc" +PKG_DEPENDS="libiconv sqlite talloc connman" +PKG_BUILD_DEPENDS="toolchain libiconv sqlite talloc" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client" diff --git a/packages/network/transmission/build b/packages/network/transmission/build index 6f0673a0b7..30a9e2a65b 100755 --- a/packages/network/transmission/build +++ b/packages/network/transmission/build @@ -25,6 +25,8 @@ # transmission (svn 11666) fails to build with LTO support strip_lto +export LDFLAGS="$LDFLAGS -liconv" + cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ @@ -42,6 +44,7 @@ cd $PKG_BUILD --disable-nls \ --disable-cli \ --disable-mac \ + --enable-lightweight \ --enable-daemon \ --with-gnu-ld \ diff --git a/packages/network/transmission/meta b/packages/network/transmission/meta index e55142a377..900893addd 100644 --- a/packages/network/transmission/meta +++ b/packages/network/transmission/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.transmissionbt.com/" PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib openssl curl libevent connman" -PKG_BUILD_DEPENDS="toolchain zlib openssl curl libevent" +PKG_DEPENDS="zlib libiconv openssl curl libevent connman" +PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client" diff --git a/packages/other/enca/build b/packages/other/enca/build index faab814928..844b2aa275 100755 --- a/packages/other/enca/build +++ b/packages/other/enca/build @@ -22,6 +22,8 @@ . config/options $1 +export LDFLAGS="$LDFLAGS -liconv" + cd $PKG_BUILD ac_cv_file__dev_random=yes \ ac_cv_file__dev_urandom=no \ @@ -36,6 +38,11 @@ CPPFLAGS="-I$SYSROOT_PREFIX/usr/include" \ --datadir=/usr/share \ --enable-shared \ --disable-static \ + --disable-external \ + --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \ + --without-librecode \ + --disable-rpath \ + --with-gnu-ld make CC="$HOST_CC" \ CPPFLAGS="$HOST_CPPFLAGS" \ diff --git a/packages/other/enca/meta b/packages/other/enca/meta index 50af26e9ce..d0a338b6fd 100644 --- a/packages/other/enca/meta +++ b/packages/other/enca/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://freshmeat.net/projects/enca/" PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" +PKG_DEPENDS="libiconv" PKG_BUILD_DEPENDS="toolchain libiconv" PKG_PRIORITY="optional" PKG_SECTION="other" diff --git a/packages/security/openssl/meta b/packages/security/openssl/meta index 0d439e602f..9f043be333 100644 --- a/packages/security/openssl/meta +++ b/packages/security/openssl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="openssl" -PKG_VERSION="1.0.0c" +PKG_VERSION="1.0.0d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/sysutils/LVM2/meta b/packages/sysutils/LVM2/meta index 4e700a02e1..f4335c8dc9 100644 --- a/packages/sysutils/LVM2/meta +++ b/packages/sysutils/LVM2/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="LVM2" -PKG_VERSION="2.02.79" +PKG_VERSION="2.02.84" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="" diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index aa6ee5e03a..d25f72f0bf 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Tue Feb 1 00:10:08 2011 +# Busybox version: 1.18.3 +# Wed Feb 9 14:13:22 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_WTMP=y -CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_UTMP is not set CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set diff --git a/packages/sysutils/busybox/init.d/35_wakeup b/packages/sysutils/busybox/init.d/35_wakeup index 8ad0440b36..123d54706c 100644 --- a/packages/sysutils/busybox/init.d/35_wakeup +++ b/packages/sysutils/busybox/init.d/35_wakeup @@ -26,7 +26,7 @@ if [ -f /proc/acpi/wakeup ]; then progress "enable WakeUp devices" - for device in `cat /proc/acpi/wakeup | grep "^US[B,0-9]" | grep "*disabled" | cut -f1 -d " "`; do + for device in `cat /proc/acpi/wakeup | grep "^U[H,S][B,C,0-9]" | grep "*disabled" | cut -f1 -d " "`; do echo -n $device > /proc/acpi/wakeup done fi diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build index ad181c1c46..bb258f5c8d 100755 --- a/packages/sysutils/dbus/build +++ b/packages/sysutils/dbus/build @@ -48,7 +48,7 @@ mkdir -p .build-target && cd .build-target --enable-dnotify \ --enable-inotify \ --with-xml=expat \ - --with-x \ + --without-x \ --with-dbus-user=dbus \ make diff --git a/packages/sysutils/dbus/install b/packages/sysutils/dbus/install index 58776a48c7..7a74f086ff 100755 --- a/packages/sysutils/dbus/install +++ b/packages/sysutils/dbus/install @@ -31,11 +31,8 @@ mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin - cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin - - if [ "$DEVTOOLS" = yes ]; then - cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin - fi + cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin +# cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta index 2cdeaf030d..3ba92a7a79 100644 --- a/packages/sysutils/dbus/meta +++ b/packages/sysutils/dbus/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://dbus.freedesktop.org" PKG_URL="http://dbus.freedesktop.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="expat libX11" -PKG_BUILD_DEPENDS="toolchain expat libX11" +PKG_DEPENDS="expat" +PKG_BUILD_DEPENDS="toolchain expat" PKG_PRIORITY="required" PKG_SECTION="system" PKG_SHORTDESC="dbus: simple interprocess messaging system" diff --git a/packages/sysutils/fuse/build b/packages/sysutils/fuse/build index eeea4ed814..f887ffa1a5 100755 --- a/packages/sysutils/fuse/build +++ b/packages/sysutils/fuse/build @@ -25,13 +25,22 @@ # fuse fails to build with GOLD linker strip_gold +export LDFLAGS="$LDFLAGS -liconv" + cd $PKG_BUILD +am_cv_func_iconv=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --enable-shared \ --disable-static \ + --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \ + --enable-lib \ + --enable-util \ + --disable-example \ + --disable-mtab \ + --disable-rpath \ + --with-gnu-ld \ make - $MAKEINSTALL diff --git a/packages/sysutils/fuse/meta b/packages/sysutils/fuse/meta index cb7f2eb252..6f3fde5842 100644 --- a/packages/sysutils/fuse/meta +++ b/packages/sysutils/fuse/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://sourceforge.net/projects/fuse/" PKG_URL="$SOURCEFORGE_SRC/fuse/fuse-2.X/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" +PKG_DEPENDS="libiconv" PKG_BUILD_DEPENDS="toolchain libiconv" PKG_PRIORITY="optional" PKG_SECTION="system" diff --git a/packages/sysutils/lm_sensors/build b/packages/sysutils/lm_sensors/build index b2e144512b..f8ddd7c931 100755 --- a/packages/sysutils/lm_sensors/build +++ b/packages/sysutils/lm_sensors/build @@ -23,4 +23,9 @@ . config/options $1 cd $PKG_BUILD - make PREFIX=/usr CC=$TARGET_CC CFLAGS="$TARGET_CFLAGS" CPPFLAGS="$TARGET_CPPFLAGS" AR="$TARGET_AR" + make PREFIX=/usr \ + CC="$TARGET_CC" \ + AR="$TARGET_AR" \ + CFLAGS="$TARGET_CFLAGS" \ + CPPFLAGS="$TARGET_CPPFLAGS" \ + LIBICONV="-liconv" \ diff --git a/packages/sysutils/lm_sensors/meta b/packages/sysutils/lm_sensors/meta index 1a406dee3f..464146a1fe 100644 --- a/packages/sysutils/lm_sensors/meta +++ b/packages/sysutils/lm_sensors/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://secure.netroedge.com/~lm78/" PKG_URL="http://dl.lm-sensors.org/lm-sensors/releases/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="libiconv" +PKG_BUILD_DEPENDS="toolchain libiconv" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="lm_sensors: Hardware monitoring via the SMBus" diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta index bc833e5d79..1e40cda026 100644 --- a/packages/sysutils/udev/meta +++ b/packages/sysutils/udev/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="udev" -PKG_VERSION="165" +PKG_VERSION="166" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/udev/patches/udev-165-remove_keymap_and_acl-0.1.patch b/packages/sysutils/udev/patches/udev-166-remove_keymap_and_acl-0.1.patch similarity index 92% rename from packages/sysutils/udev/patches/udev-165-remove_keymap_and_acl-0.1.patch rename to packages/sysutils/udev/patches/udev-166-remove_keymap_and_acl-0.1.patch index 39c2fe711e..be09a81f65 100644 --- a/packages/sysutils/udev/patches/udev-165-remove_keymap_and_acl-0.1.patch +++ b/packages/sysutils/udev/patches/udev-166-remove_keymap_and_acl-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur udev-165/configure.ac udev-165.patch/configure.ac ---- udev-165/configure.ac 2010-12-15 08:58:46.000000000 +0100 -+++ udev-165.patch/configure.ac 2010-12-17 16:34:16.539808917 +0100 +diff -Naur udev-166/configure.ac udev-166.patch/configure.ac +--- udev-166/configure.ac 2010-12-16 13:37:25.000000000 +0100 ++++ udev-166.patch/configure.ac 2011-02-12 15:33:22.359406798 +0100 @@ -86,9 +86,6 @@ AC_SUBST([GLIB_CFLAGS]) AC_SUBST([GLIB_LIBS]) @@ -11,10 +11,10 @@ diff -Naur udev-165/configure.ac udev-165.patch/configure.ac PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12) AC_SUBST(LIBUSB_CFLAGS) AC_SUBST(LIBUSB_LIBS) -diff -Naur udev-165/Makefile.am udev-165.patch/Makefile.am ---- udev-165/Makefile.am 2010-12-15 09:00:08.000000000 +0100 -+++ udev-165.patch/Makefile.am 2010-12-17 16:33:51.280663440 +0100 -@@ -464,21 +464,6 @@ +diff -Naur udev-166/Makefile.am udev-166.patch/Makefile.am +--- udev-166/Makefile.am 2011-02-09 22:12:14.000000000 +0100 ++++ udev-166.patch/Makefile.am 2011-02-12 15:34:06.794544227 +0100 +@@ -477,21 +477,6 @@ libexec_PROGRAMS += extras/hid2hci/hid2hci # ------------------------------------------------------------------------------ @@ -36,10 +36,12 @@ diff -Naur udev-165/Makefile.am udev-165.patch/Makefile.am # usb-db - read USB vendor/device string database # ------------------------------------------------------------------------------ extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c -@@ -526,108 +511,6 @@ - libexec_PROGRAMS += extras/mtd_probe/mtd_probe - +@@ -537,110 +522,6 @@ + dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules + libexec_PROGRAMS += extras/mtd_probe/mtd_probe +- +- -# ------------------------------------------------------------------------------ -# keymap - map custom hardware's multimedia keys -# ------------------------------------------------------------------------------ @@ -66,6 +68,7 @@ diff -Naur udev-165/Makefile.am udev-165.patch/Makefile.am -dist_udevkeymap_DATA = \ - extras/keymap/keymaps/acer \ - extras/keymap/keymaps/acer-aspire_5720 \ +- extras/keymap/keymaps/acer-aspire_8930 \ - extras/keymap/keymaps/acer-aspire_5920g \ - extras/keymap/keymaps/acer-aspire_6920 \ - extras/keymap/keymaps/acer-travelmate_c300 \ @@ -141,7 +144,6 @@ diff -Naur udev-165/Makefile.am udev-165.patch/Makefile.am -keymaps-distcheck-hook: extras/keymap/keys.txt - $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^ -DISTCHECK_HOOKS += keymaps-distcheck-hook -- + endif # ENABLE_EXTRAS - # ------------------------------------------------------------------------------ diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build index 236b64cc01..a608be4f31 100755 --- a/packages/sysutils/util-linux/build +++ b/packages/sysutils/util-linux/build @@ -76,6 +76,14 @@ gt_cv_func_gnugettext1_libintl=no \ --without-selinux \ --without-audit -make +make -C mount mount +make -C mount umount +make -C mount swapon +make -C misc-utils blkid +make -C sys-utils fstrim +make -C shlibs/uuid +make -C shlibs/blkid -$MAKEINSTALL +# libuuid must be installed before libblkid!!! + $MAKEINSTALL -C shlibs/uuid + $MAKEINSTALL -C shlibs/blkid diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build index b4c21b4baa..3fa619dad4 100755 --- a/packages/textproc/libxml2/build +++ b/packages/textproc/libxml2/build @@ -32,6 +32,7 @@ cd .build-target --sysconfdir=/etc \ --disable-static \ --enable-shared \ + --with-iconv \ --disable-ipv6 \ --without-python \ --with-zlib diff --git a/packages/textproc/libxml2/meta b/packages/textproc/libxml2/meta index 753b8282e9..ffdd395cc3 100644 --- a/packages/textproc/libxml2/meta +++ b/packages/textproc/libxml2/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="libiconv" +PKG_BUILD_DEPENDS="toolchain libiconv" PKG_PRIORITY="optional" PKG_SECTION="textproc" PKG_SHORTDESC="libxml: XML parser library for Gnome" diff --git a/packages/textproc/xerces-c/build b/packages/textproc/xerces-c/build index 35c28524f0..21970f407e 100755 --- a/packages/textproc/xerces-c/build +++ b/packages/textproc/xerces-c/build @@ -25,6 +25,8 @@ # xerces_c fails to build with LTO support strip_lto +export LDFLAGS="$LDFLAGS -liconv" + cd $PKG_BUILD ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ @@ -44,7 +46,8 @@ cd $PKG_BUILD --enable-msgloader-inmemory \ --disable-msgloader-icu \ --enable-msgloader-iconv \ + --disable-rpath \ + --with-gnu-ld make - $MAKEINSTALL diff --git a/packages/textproc/xerces-c/meta b/packages/textproc/xerces-c/meta index e4e9e8dac7..ddc3f4f3f9 100644 --- a/packages/textproc/xerces-c/meta +++ b/packages/textproc/xerces-c/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="APL" PKG_SITE="http://xml.apache.org/xerces-c/" PKG_URL="http://mirror.switch.ch/mirror/apache/dist/xerces/c/3/sources/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="curl" -PKG_BUILD_DEPENDS="toolchain curl" +PKG_DEPENDS="libiconv curl" +PKG_BUILD_DEPENDS="toolchain libiconv curl" PKG_PRIORITY="optional" PKG_SECTION="textproc" PKG_SHORTDESC="xerces-c: A C++ XML parser" diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build index bd7dd593ed..62f4dabea4 100755 --- a/packages/toolchain/devel/eglibc/build +++ b/packages/toolchain/devel/eglibc/build @@ -38,8 +38,7 @@ if [ "$DEBUG" = yes ]; then DEBUG_CONFIG="--enable-debug" else DEBUG_CONFIG="--disable-debug" - DEBUG_OPTIONS="OPTION_EGLIBC_BACKTRACE = n - OPTION_EGLIBC_MEMUSAGE = n" + DEBUG_OPTIONS=" OPTION_EGLIBC_MEMUSAGE = n" fi NSS_CONF_DIR=`ls -d $ROOT/$BUILD/eglibc*/nss` @@ -50,6 +49,50 @@ autoconf mkdir -p objdir-$1 && cd objdir-$1 +# OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = $NSS_CONF_DIR/fixed-nsswitch.conf +# OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = $NSS_CONF_DIR/fixed-nsswitch.functions + +cat >option-groups.config <config.cache <options-groups.conf <configparms <