Merge branch 'master' into openelec-pvr

Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/xbmc-2884715-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-341-xbmc-PR468-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-342-revert_ffmpeg_00d1e96bf4fc0467744f840fbc85d1a65cbb6f08.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2884715-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-341-xbmc-PR468-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-4c32cde-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-341-xbmc-PR468-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-6922560-464-add_eject_keymapping_for_lirc-0.1.patch

CHANGELOG

@@ -4,7 +4,7 @@ Changelog OpenELEC-1.0 to OpenELEC-2.0
 
 Package updates:
   - update XBMC to XBMC-11.0 (Eden)
-  - update eglibc to eglibc-2.14
+  - update eglibc to eglibc-2.14.1
   - update Python to Python-2.7.2
   - update gcc to gcc-4.6.2
   - update openssl to openssl-1.0.0e

config/functions

@@ -15,6 +15,7 @@ setup_toolchain() {
     export NM=$TARGET_NM
     export RANLIB=$TARGET_RANLIB
     export OBJCOPY=$TARGET_OBJCOPY
+    export OBJDUMP=$TARGET_OBJDUMP
     export STRIP=$TARGET_STRIP
     export CPPFLAGS="$TARGET_CPPFLAGS"
     export CFLAGS="$TARGET_CFLAGS"
@@ -117,39 +118,39 @@ add_group() {
 do_autoreconf() {
   export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoconf ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autoconf" ]; then
     export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/automake ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/automake" ]; then
     export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autopoint ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autopoint" ]; then
     export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/libtoolize" ]; then
     export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/intltoolize" ]; then
     export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/aclocal ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/aclocal" ]; then
     export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoheader ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autoheader" ]; then
     export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/libtool ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/libtool" ]; then
     export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
   fi
 
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf -a -e $INTLTOOLIZE ]; then
+  if [ -e "$ROOT/$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
     mkdir -p $ACLOCAL_DIR
     export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
     $AUTORECONF $@
@@ -174,3 +175,17 @@ strip_gold() {
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
 }
 
+fix_module_depends() {
+  # modify .modinfo section in kernel module to depends on other required modules
+  local MODULE="$1"
+  local DEPENDS="$2"
+  cp ${MODULE} ${MODULE}_orig
+  $OBJDUMP -s -j .modinfo ${MODULE}_orig | awk 'BEGIN{v=0;} /Contents/ {v=1; next;} {if (v==1) print $0;}' >new.modinfo1
+  cat new.modinfo1 | cut -c7-41 | awk '{printf($0);}' | sed 's/ //g;s/../\\\x&/g;' >new.modinfo2
+  /bin/echo -ne `cat new.modinfo2` >new.modinfo3
+  cat new.modinfo3 | tr '\000' '\n' | awk '/^depends=/ {next;} {print $0;}' | tr '\n' '\000' >new.modinfo4
+  /bin/echo -ne "depends=$DEPENDS\0" >>new.modinfo4
+  $OBJCOPY --remove-section=.modinfo --add-section=.modinfo=new.modinfo4 --set-section-flags .modinfo=contents,alloc,load,readonly,data ${MODULE}_orig ${MODULE}
+  rm new.modinfo*
+}
+

config/path

@@ -82,6 +82,7 @@ TARGET_AR=${TARGET_PREFIX}ar
 TARGET_NM=${TARGET_PREFIX}nm
 TARGET_RANLIB=${TARGET_PREFIX}ranlib
 TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
+TARGET_OBJDUMP=${TARGET_PREFIX}objdump
 TARGET_STRIP=${TARGET_PREFIX}strip
 
 . config/optimize

packages/addons/debugging/tools/evtest/addon

@@ -29,4 +29,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/libiconv-[0-9]*/lib/.libs/libiconv.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/libxml2-[0-9]*/.build-target/.libs/libxml2.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/zlib-[0-9]*/.build-target/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/zlib-[0-9]*/libz.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,3 +1,6 @@
+1.90.1
+- update to makemkv-1.6.16
+
 1.90.0
 - prepare for OpenELEC-1.90 release
 

packages/addons/multimedia/makemkv/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="1.6.15"
-PKG_REV="0"
+PKG_VERSION="1.6.16"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,3 +1,6 @@
+1.90.1
+- rebuild for OpenSSL upgrade
+
 1.90.0
 - prepare for OpenELEC-1.90 release
 

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="SABnzbd-Suite"
 PKG_VERSION="1.90"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/downloadmanager/transmission/build

@@ -25,7 +25,7 @@
 # transmission (svn 11666) fails to build with LTO support
   strip_lto
 
-export LDFLAGS="$LDFLAGS -liconv"
+export LIBS="-liconv"
 
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
@@ -35,12 +35,8 @@ cd $PKG_BUILD
             --localstatedir=/var \
             --disable-static \
             --enable-shared \
+            --disable-utp \
             --enable-largefile \
-            --disable-gtk \
-            --disable-libnotify \
-            --disable-libappindicator \
-            --disable-libcanberra \
-            --disable-gconf2 \
             --disable-nls \
             --disable-cli \
             --disable-mac \

packages/addons/service/downloadmanager/transmission/changelog.txt

@@ -1,3 +1,6 @@
+1.90.1
+- update to transmission-2.42
+
 1.90.0
 - prepare for OpenELEC-1.90 release
 

packages/addons/service/downloadmanager/transmission/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.41"
-PKG_REV="0"
+PKG_VERSION="2.42"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"

packages/addons/service/downloadmanager/transmission/patches/transmission-2.42-utp.patch

@@ -0,0 +1,14 @@
+--- a/third-party/libutp/utypes.h.orig	Wed Sep 28 19:46:15 2011
++++ b/third-party/libutp/utypes.h	Wed Sep 28 19:47:06 2011
+@@ -36,7 +36,11 @@ typedef const char * cstr;
+ typedef char * str;
+ 
+ #ifndef __cplusplus
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
+ typedef uint8 bool;
++#endif
+ #endif
+ 
+ #endif //__UTYPES_H__

packages/addons/service/multimedia/hts-tvheadend/changelog.txt

@@ -1,3 +1,6 @@
+1.90.1
+- update to hts-tvheadend-fdc743f
+
 1.90.0
 - add (CH) GA Weissenstein default muxes
 - prepare for OpenELEC-1.90 release

packages/addons/service/multimedia/hts-tvheadend/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="hts-tvheadend"
-PKG_VERSION="c88a646"
-PKG_REV="0"
+PKG_VERSION="fdc743f"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

packages/audio/alsa-plugins/install

@@ -24,6 +24,10 @@
 
 mkdir -p $INSTALL/usr/lib/alsa
   cp -P $PKG_BUILD/*/.libs/*.so $INSTALL/usr/lib/alsa
+  if [ -f $INSTALL/usr/lib/alsa/libasound_module_rate_speexrate.so ]; then
+    ln -sf libasound_module_rate_speexrate.so $INSTALL/usr/lib/alsa/libasound_module_rate_speexrate_best.so
+    ln -sf libasound_module_rate_speexrate.so $INSTALL/usr/lib/alsa/libasound_module_rate_speexrate_medium.so
+  fi
 
 mkdir -p $INSTALL/usr/share/alsa/pcm
   cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm

packages/audio/alsa-utils/install

@@ -25,13 +25,14 @@
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/amixer/amixer $INSTALL/usr/bin
   cp $PKG_BUILD/aplay/aplay $INSTALL/usr/bin
-  cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/bin
   cp $PKG_BUILD/speaker-test/speaker-test $INSTALL/usr/bin
 
+mkdir -p $INSTALL/usr/lib/udev
+  cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/lib/udev
+
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/alsactl/alsactl $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/share/alsa/init
   cp $PKG_BUILD/alsactl/init/* $INSTALL/usr/share/alsa/init
   rm -rf $INSTALL/usr/share/alsa/init/Makefile*
-

packages/audio/alsa-utils/udev.d/40-alsa.rules

@@ -18,16 +18,5 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-# Give the audio group ownership of sound devices
-SUBSYSTEM=="sound",       GROUP="audio"
-SUBSYSTEM=="snd",         GROUP="audio"
-
-# ALSA Devices
 # When a sound device is detected, restore the volume settings
-KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="/usr/bin/soundconfig"
-KERNEL=="hw[CD0-9]*",      NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*",   NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",    NAME="snd/%k"
-KERNEL=="timer",           NAME="snd/%k"
-KERNEL=="seq",             NAME="snd/%k"
-KERNEL=="mixer0",          SYMLINK+="mixer"
+  KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="soundconfig"

packages/audio/alsa/meta

@@ -34,3 +34,9 @@ PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Li
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS alsa-plugins"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS alsa-plugins"
+fi
+

packages/audio/libsamplerate/build

@@ -32,7 +32,7 @@ cd $PKG_BUILD
             --disable-static \
             --datadir=/usr/share \
             --disable-fftw \
-            --disable-sndfile \
+            --enable-sndfile \
 
 make
 

packages/audio/libsamplerate/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="libsamplerate"
-PKG_VERSION="0.1.7"
+PKG_VERSION="0.1.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mega-nerd.com/SRC/"
 PKG_URL="http://www.mega-nerd.com/SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS="libsndfile"
+PKG_BUILD_DEPENDS="toolchain libsndfile"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="libsamplerate: A Sample Rate Converter library for audio"

packages/audio/libsndfile/build

@@ -29,9 +29,9 @@ cd $PKG_BUILD
             --disable-static \
             --enable-shared \
             --disable-silent-rules \
-            --disable-sqlite \
+            --enable-sqlite \
             --enable-alsa \
-            --disable-external-libs \
+            --enable-external-libs \
             --disable-experimental \
             --disable-test-coverage \
             --enable-largefile \

packages/audio/libsndfile/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mega-nerd.com/libsndfile/"
 PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="alsa-lib"
-PKG_BUILD_DEPENDS="toolchain alsa-lib"
+PKG_DEPENDS="alsa-lib sqlite flac libvorbis libogg"
+PKG_BUILD_DEPENDS="toolchain alsa-lib sqlite flac libvorbis libogg"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"

packages/audio/pulseaudio/build

@@ -44,7 +44,7 @@ cd $PKG_BUILD
             --disable-nls \
             --enable-largefile \
             --disable-rpath \
-            --enable-x11 \
+            --disable-x11 \
             --enable-samplerate \
             --disable-oss-output \
             --disable-oss-wrapper \
@@ -70,26 +70,20 @@ cd $PKG_BUILD
             --disable-orc \
             --disable-manpages \
             --disable-per-user-esound-socket \
-              --enable-legacy-runtime-dir \
-              --enable-legacy-database-entry-format \
+            --disable-legacy-runtime-dir \
+            --disable-legacy-database-entry-format \
             --with-system-user=root \
             --with-system-group=root \
             --with-access-group=root \
             --with-module-dir="/usr/lib/pulse" \
 
-#            --with-system-user=pulse \
-#            --with-system-group=pulse \
-#            --with-access-group=pulse-access \
-
-#            --with-system-user=root \
-#            --with-system-group=root \
-#            --with-access-group=root \
-
 make
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
   cp -P src/.libs/libpulse.so* $SYSROOT_PREFIX/usr/lib
   cp -P src/.libs/libpulse-simple.so* $SYSROOT_PREFIX/usr/lib
+  cp -P src/.libs/libpulsecommon-*.so* $SYSROOT_PREFIX/usr/lib
+  cp -P src/.libs/libpulsecore-*.so $SYSROOT_PREFIX/usr/lib
 
 mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
   cp libpulse.pc $SYSROOT_PREFIX/usr/lib/pkgconfig

packages/audio/pulseaudio/config/default.pa

@@ -41,9 +41,10 @@ load-module module-augment-properties
 ### Load audio drivers statically
 ### (it's probably better to not load these drivers manually, but instead
 ### use module-udev-detect -- see below -- for doing this automatically)
-load-module module-alsa-sink device=hw:1,7
+#load-module module-alsa-sink device=hw:1,7
 #load-module module-alsa-sink
 #load-module module-alsa-source device=hw:1,0
+load-module module-alsa-source device=hw:1,7
 #load-module module-null-sink
 #load-module module-pipe-sink
 

packages/audio/pulseaudio/init.d/91_PulseAudio

@@ -23,10 +23,6 @@
 # runlevels: openelec, textmode
 
 progress "starting PulseAudio daemon"
-  pulseaudio --system \
-             --daemonize \
+  pulseaudio --system --daemonize \
              --log-target=file:/var/log/pulseaudio.log \
              --log-level=debug >/dev/null 2>&1
-
-#             --disallow-exit \
-#             --disallow-module-loading \

packages/audio/pulseaudio/install

@@ -20,11 +20,11 @@ mkdir -p $INSTALL/etc/pulse
   cp $PKG_BUILD/src/client.conf $INSTALL/etc/pulse
   cp $PKG_BUILD/src/daemon.conf $INSTALL/etc/pulse
 #  cp $PKG_BUILD/src/default.pa $INSTALL/etc/pulse
-  cp $PKG_DIR/config/default.pa $INSTALL/etc/pulse
+#  cp $PKG_DIR/config/default.pa $INSTALL/etc/pulse
   cp $PKG_BUILD/src/system.pa $INSTALL/etc/pulse
 
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules $INSTALL/lib/udev/rules.d
+mkdir -p $INSTALL/usr/lib/udev/rules.d
+  cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules $INSTALL/usr/lib/udev/rules.d
 
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/src/.libs/pacat $INSTALL/usr/bin
@@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin
   ln -sf pactl $INSTALL/usr/bin/parec
   ln -sf pactl $INSTALL/usr/bin/parecord
   cp $PKG_BUILD/src/.libs/pasuspender $INSTALL/usr/bin
-  cp $PKG_BUILD/src/.libs/pax11publish $INSTALL/usr/bin
+#  cp $PKG_BUILD/src/.libs/pax11publish $INSTALL/usr/bin
   cp $PKG_BUILD/src/.libs/pulseaudio $INSTALL/usr/bin
 #  cp $PKG_BUILD/src/start-pulseaudio-x11 $INSTALL/usr/bin
 

packages/audio/pulseaudio/meta

@@ -24,8 +24,8 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
-PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl alsa-plugins"
+PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
 PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/pulseaudio/patches/pulseaudio-1.1-0001-alsa-support-fixed-latency-range-in-alsa-modules.patch

@@ -0,0 +1,218 @@
+From 7a387fed36ed5bc0b925269fb76b5e8e3a738a5f Mon Sep 17 00:00:00 2001
+From: "Lars R. Damerow" <lars@pixar.com>
+Date: Thu, 3 Nov 2011 21:14:45 +0100
+Subject: [PATCH 1/3] alsa: support fixed latency range in alsa modules
+
+This adds a boolean module parameter to disable automatic dynamic
+latency readjustments on underruns, but leaves automatic dynamic
+watermark readjustments untouched.
+---
+ src/modules/alsa/alsa-sink.c          |   23 +++++++++++++++++++----
+ src/modules/alsa/alsa-source.c        |   22 ++++++++++++++++++----
+ src/modules/alsa/module-alsa-sink.c   |    4 +++-
+ src/modules/alsa/module-alsa-source.c |    4 +++-
+ src/pulsecore/protocol-native.c       |    4 ++++
+ 5 files changed, 47 insertions(+), 10 deletions(-)
+
+diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
+index 7b31b1b..1386196 100644
+--- a/src/modules/alsa/alsa-sink.c
++++ b/src/modules/alsa/alsa-sink.c
+@@ -134,7 +134,7 @@ struct userdata {
+     char *device_name;  /* name of the PCM device */
+     char *control_device; /* name of the control device */
+ 
+-    pa_bool_t use_mmap:1, use_tsched:1, deferred_volume:1;
++    pa_bool_t use_mmap:1, use_tsched:1, deferred_volume:1, fixed_latency_range:1;
+ 
+     pa_bool_t first, after_rewind;
+ 
+@@ -331,7 +331,12 @@ static void increase_watermark(struct userdata *u) {
+         return;
+     }
+ 
+-    /* Hmm, we cannot increase the watermark any further, hence let's raise the latency */
++    /* Hmm, we cannot increase the watermark any further, hence let's
++       raise the latency, unless doing so was disabled in
++       configuration */
++    if (u->fixed_latency_range)
++        return;
++
+     old_min_latency = u->sink->thread_info.min_latency;
+     new_min_latency = PA_MIN(old_min_latency * 2, old_min_latency + TSCHED_WATERMARK_INC_STEP_USEC);
+     new_min_latency = PA_MIN(new_min_latency, u->sink->thread_info.max_latency);
+@@ -1969,7 +1974,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
+     uint32_t nfrags, frag_size, buffer_size, tsched_size, tsched_watermark, rewind_safeguard;
+     snd_pcm_uframes_t period_frames, buffer_frames, tsched_frames;
+     size_t frame_size;
+-    pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d, ignore_dB = FALSE, namereg_fail = FALSE, deferred_volume = FALSE, set_formats = FALSE;
++    pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d, ignore_dB = FALSE, namereg_fail = FALSE, deferred_volume = FALSE, set_formats = FALSE, fixed_latency_range = FALSE;
+     pa_sink_new_data data;
+     pa_alsa_profile_set *profile_set = NULL;
+ 
+@@ -2039,6 +2044,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
+         goto fail;
+     }
+ 
++    if (pa_modargs_get_value_boolean(ma, "fixed_latency_range", &fixed_latency_range) < 0) {
++        pa_log("Failed to parse fixed_latency_range argument.");
++        goto fail;
++    }
++
+     use_tsched = pa_alsa_may_tsched(use_tsched);
+ 
+     u = pa_xnew0(struct userdata, 1);
+@@ -2047,6 +2057,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
+     u->use_mmap = use_mmap;
+     u->use_tsched = use_tsched;
+     u->deferred_volume = deferred_volume;
++    u->fixed_latency_range = fixed_latency_range;
+     u->first = TRUE;
+     u->rewind_safeguard = rewind_safeguard;
+     u->rtpoll = pa_rtpoll_new();
+@@ -2143,9 +2154,13 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
+     if (u->use_mmap)
+         pa_log_info("Successfully enabled mmap() mode.");
+ 
+-    if (u->use_tsched)
++    if (u->use_tsched) {
+         pa_log_info("Successfully enabled timer-based scheduling mode.");
+ 
++        if (u->fixed_latency_range)
++            pa_log_info("Disabling latency range changes on underrun");
++    }
++
+     if (is_iec958(u) || is_hdmi(u))
+         set_formats = TRUE;
+ 
+diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
+index 7a51572..255a61d 100644
+--- a/src/modules/alsa/alsa-source.c
++++ b/src/modules/alsa/alsa-source.c
+@@ -121,7 +121,7 @@ struct userdata {
+     char *device_name;  /* name of the PCM device */
+     char *control_device; /* name of the control device */
+ 
+-    pa_bool_t use_mmap:1, use_tsched:1, deferred_volume:1;
++    pa_bool_t use_mmap:1, use_tsched:1, deferred_volume:1, fixed_latency_range:1;
+ 
+     pa_bool_t first;
+ 
+@@ -306,7 +306,12 @@ static void increase_watermark(struct userdata *u) {
+         return;
+     }
+ 
+-    /* Hmm, we cannot increase the watermark any further, hence let's raise the latency */
++    /* Hmm, we cannot increase the watermark any further, hence let's
++     raise the latency unless doing so was disabled in
++     configuration */
++    if (u->fixed_latency_range)
++        return;
++
+     old_min_latency = u->source->thread_info.min_latency;
+     new_min_latency = PA_MIN(old_min_latency * 2, old_min_latency + TSCHED_WATERMARK_INC_STEP_USEC);
+     new_min_latency = PA_MIN(new_min_latency, u->source->thread_info.max_latency);
+@@ -1710,7 +1715,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
+     uint32_t nfrags, frag_size, buffer_size, tsched_size, tsched_watermark;
+     snd_pcm_uframes_t period_frames, buffer_frames, tsched_frames;
+     size_t frame_size;
+-    pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d, ignore_dB = FALSE, namereg_fail = FALSE, deferred_volume = FALSE;
++    pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d, ignore_dB = FALSE, namereg_fail = FALSE, deferred_volume = FALSE, fixed_latency_range = FALSE;
+     pa_source_new_data data;
+     pa_alsa_profile_set *profile_set = NULL;
+ 
+@@ -1774,6 +1779,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
+         goto fail;
+     }
+ 
++    if (pa_modargs_get_value_boolean(ma, "fixed_latency_range", &fixed_latency_range) < 0) {
++        pa_log("Failed to parse fixed_latency_range argument.");
++        goto fail;
++    }
++
+     use_tsched = pa_alsa_may_tsched(use_tsched);
+ 
+     u = pa_xnew0(struct userdata, 1);
+@@ -1782,6 +1792,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
+     u->use_mmap = use_mmap;
+     u->use_tsched = use_tsched;
+     u->deferred_volume = deferred_volume;
++    u->fixed_latency_range = fixed_latency_range;
+     u->first = TRUE;
+     u->rtpoll = pa_rtpoll_new();
+     pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+@@ -1877,8 +1888,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
+     if (u->use_mmap)
+         pa_log_info("Successfully enabled mmap() mode.");
+ 
+-    if (u->use_tsched)
++    if (u->use_tsched) {
+         pa_log_info("Successfully enabled timer-based scheduling mode.");
++        if (u->fixed_latency_range)
++            pa_log_info("Disabling latency range changes on overrun");
++    }
+ 
+     /* ALSA might tweak the sample spec, so recalculate the frame size */
+     frame_size = pa_frame_size(&ss);
+diff --git a/src/modules/alsa/module-alsa-sink.c b/src/modules/alsa/module-alsa-sink.c
+index 019ccf0..927f075 100644
+--- a/src/modules/alsa/module-alsa-sink.c
++++ b/src/modules/alsa/module-alsa-sink.c
+@@ -59,7 +59,8 @@ PA_MODULE_USAGE(
+         "rewind_safeguard=<number of bytes that cannot be rewound> "
+         "deferred_volume=<Synchronize software and hardware volume changes to avoid momentary jumps?> "
+         "deferred_volume_safety_margin=<usec adjustment depending on volume direction> "
+-        "deferred_volume_extra_delay=<usec adjustment to HW volume changes>");
++        "deferred_volume_extra_delay=<usec adjustment to HW volume changes> "
++        "fixed_latency_range=<disable latency range changes on underrun?>");
+ 
+ static const char* const valid_modargs[] = {
+     "name",
+@@ -85,6 +86,7 @@ static const char* const valid_modargs[] = {
+     "deferred_volume",
+     "deferred_volume_safety_margin",
+     "deferred_volume_extra_delay",
++    "fixed_latency_range",
+     NULL
+ };
+ 
+diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
+index 2d2c8b6..efb2d0c 100644
+--- a/src/modules/alsa/module-alsa-source.c
++++ b/src/modules/alsa/module-alsa-source.c
+@@ -67,7 +67,8 @@ PA_MODULE_USAGE(
+         "control=<name of mixer control>"
+         "deferred_volume=<Synchronize software and hardware volume changes to avoid momentary jumps?> "
+         "deferred_volume_safety_margin=<usec adjustment depending on volume direction> "
+-        "deferred_volume_extra_delay=<usec adjustment to HW volume changes>");
++        "deferred_volume_extra_delay=<usec adjustment to HW volume changes> "
++        "fixed_latency_range=<disable latency range changes on overrun?>");
+ 
+ static const char* const valid_modargs[] = {
+     "name",
+@@ -92,6 +93,7 @@ static const char* const valid_modargs[] = {
+     "deferred_volume",
+     "deferred_volume_safety_margin",
+     "deferred_volume_extra_delay",
++    "fixed_latency_range",
+     NULL
+ };
+ 
+diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
+index 0ee4ead..d6bff11 100644
+--- a/src/pulsecore/protocol-native.c
++++ b/src/pulsecore/protocol-native.c
+@@ -1008,6 +1008,10 @@ static void fix_playback_buffer_attr(playback_stream *s) {
+             tlength_usec -= s->configured_sink_latency;
+     }
+ 
++    pa_log_debug("Requested latency=%0.2f ms, Received latency=%0.2f ms",
++                 (double) sink_usec / PA_USEC_PER_MSEC,
++                 (double) s->configured_sink_latency / PA_USEC_PER_MSEC);
++
+     /* FIXME: This is actually larger than necessary, since not all of
+      * the sink latency is actually rewritable. */
+     if (tlength_usec < s->configured_sink_latency + 2*minreq_usec)
+-- 
+1.7.6.4
+

packages/audio/pulseaudio/patches/pulseaudio-1.1-0002-alsa-fixed-latency-range-handling-for-udev-detect.patch

@@ -0,0 +1,78 @@
+From c07c4b353dffe17607fee89e294181bb4e2da40d Mon Sep 17 00:00:00 2001
+From: "Lars R. Damerow" <lars@pixar.com>
+Date: Thu, 3 Nov 2011 21:29:03 +0100
+Subject: [PATCH 2/3] alsa: fixed latency range handling for udev-detect
+
+---
+ src/modules/module-udev-detect.c |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
+index c5312a8..1192194 100644
+--- a/src/modules/module-udev-detect.c
++++ b/src/modules/module-udev-detect.c
+@@ -45,6 +45,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION);
+ PA_MODULE_LOAD_ONCE(TRUE);
+ PA_MODULE_USAGE(
+         "tsched=<enable system timer based scheduling mode?> "
++        "fixed_latency_range=<disable latency range changes on underrun?> "
+         "ignore_dB=<ignore dB information from the device?> "
+         "deferred_volume=<syncronize sw and hw volume changes in IO-thread?>");
+ 
+@@ -62,6 +63,7 @@ struct userdata {
+     pa_hashmap *devices;
+ 
+     pa_bool_t use_tsched:1;
++    pa_bool_t fixed_latency_range:1;
+     pa_bool_t ignore_dB:1;
+     pa_bool_t deferred_volume:1;
+ 
+@@ -75,6 +77,7 @@ struct userdata {
+ 
+ static const char* const valid_modargs[] = {
+     "tsched",
++    "fixed_latency_range",
+     "ignore_dB",
+     "deferred_volume",
+     NULL
+@@ -388,6 +391,7 @@ static void card_changed(struct userdata *u, struct udev_device *dev) {
+                                 "card_name=\"%s\" "
+                                 "namereg_fail=false "
+                                 "tsched=%s "
++                                "fixed_latency_range=%s "
+                                 "ignore_dB=%s "
+                                 "deferred_volume=%s "
+                                 "card_properties=\"module-udev-detect.discovered=1\"",
+@@ -395,6 +399,7 @@ static void card_changed(struct userdata *u, struct udev_device *dev) {
+                                 n,
+                                 d->card_name,
+                                 pa_yes_no(u->use_tsched),
++                                pa_yes_no(u->fixed_latency_range),
+                                 pa_yes_no(u->ignore_dB),
+                                 pa_yes_no(u->deferred_volume));
+     pa_xfree(n);
+@@ -665,7 +670,7 @@ int pa__init(pa_module *m) {
+     struct udev_enumerate *enumerate = NULL;
+     struct udev_list_entry *item = NULL, *first = NULL;
+     int fd;
+-    pa_bool_t use_tsched = TRUE, ignore_dB = FALSE, deferred_volume = m->core->deferred_volume;
++    pa_bool_t use_tsched = TRUE, fixed_latency_range = FALSE, ignore_dB = FALSE, deferred_volume = m->core->deferred_volume;
+ 
+ 
+     pa_assert(m);
+@@ -686,6 +691,12 @@ int pa__init(pa_module *m) {
+     }
+     u->use_tsched = use_tsched;
+ 
++    if (pa_modargs_get_value_boolean(ma, "fixed_latency_range", &fixed_latency_range) < 0) {
++        pa_log("Failed to parse fixed_latency_range= argument.");
++        goto fail;
++    }
++    u->fixed_latency_range = fixed_latency_range;
++
+     if (pa_modargs_get_value_boolean(ma, "ignore_dB", &ignore_dB) < 0) {
+         pa_log("Failed to parse ignore_dB= argument.");
+         goto fail;
+-- 
+1.7.6.4
+

packages/audio/pulseaudio/patches/pulseaudio-1.1-0003-alsa-fixed_latency_range-modarg-for-module-alsa-card.patch

@@ -0,0 +1,32 @@
+From 1e6eda8eda615ec1275a1f208e5f3c9b41238f10 Mon Sep 17 00:00:00 2001
+From: "Lars R. Damerow" <lars@pixar.com>
+Date: Thu, 3 Nov 2011 21:31:48 +0100
+Subject: [PATCH 3/3] alsa: fixed_latency_range modarg for module-alsa-card
+
+---
+ src/modules/alsa/module-alsa-card.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
+index 5bf6480..344563f 100644
+--- a/src/modules/alsa/module-alsa-card.c
++++ b/src/modules/alsa/module-alsa-card.c
+@@ -64,6 +64,7 @@ PA_MODULE_USAGE(
+         "tsched_buffer_size=<buffer size when using timer based scheduling> "
+         "tsched_buffer_watermark=<lower fill watermark> "
+         "profile=<profile name> "
++        "fixed_latency_range=<disable latency range changes on underrun?> "
+         "ignore_dB=<ignore dB information from the device?> "
+         "deferred_volume=<Synchronize software and hardware volume changes to avoid momentary jumps?> "
+         "profile_set=<profile set configuration file> ");
+@@ -88,6 +89,7 @@ static const char* const valid_modargs[] = {
+     "tsched",
+     "tsched_buffer_size",
+     "tsched_buffer_watermark",
++    "fixed_latency_range",
+     "profile",
+     "ignore_dB",
+     "deferred_volume",
+-- 
+1.7.6.4
+

packages/compress/zlib-host/build

@@ -28,14 +28,9 @@ setup_toolchain host
 
 cd $BUILD/zlib-*
 
-# needed for building with cmake
-  rm -rf zconf.h
+cd zlib-host
 
-mkdir -p .build-host && cd .build-host
-
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-      -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \
-      ..
+./configure --prefix=$ROOT/$TOOLCHAIN
 
 make
 make install

packages/compress/zlib-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.zlib.net"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="ccache"
 PKG_PRIORITY="optional"
 PKG_SECTION="compress"
 PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"

packages/compress/zlib/build

@@ -24,14 +24,8 @@
 
 cd $PKG_BUILD
 
-# 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 \
-      ..
+./configure --prefix=/usr
 
 make
+
 $MAKEINSTALL

packages/compress/zlib/install

@@ -23,4 +23,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -R $PKG_BUILD/.build-target/*.so* $INSTALL/usr/lib
+  cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib

packages/compress/zlib/unpack

@@ -0,0 +1,28 @@
+#!/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
+
+ZLIB_DIR=`ls -d $PKG_BUILD`
+
+cp -r "$ZLIB_DIR" "$BUILD/zlib-host" || rm -rf "$BUILD/zlib-host"
+mv "$BUILD/zlib-host" "$ZLIB_DIR"

packages/databases/sqlite/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3070800"
+PKG_VERSION="autoconf-3070900"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/devel/attr/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="attr"
-PKG_VERSION="2.4.44"
+PKG_VERSION="2.4.46"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/boost/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.boost.org/"
 PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.45.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS="zlib bzip2"
-PKG_BUILD_DEPENDS="toolchain boost-jam Python zlib bzip2"
+PKG_BUILD_DEPENDS="toolchain boost-jam Python-host zlib bzip2"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="boost: Peer-reviewed STL style libraries for C++"

packages/devel/glib-host/build

@@ -27,10 +27,10 @@ $SCRIPTS/unpack glib
 setup_toolchain host
 export ZLIB_CFLAGS=""
 export ZLIB_LIBS=""
+export LIBFFI_CFLAGS="-I$ROOT/$TOOLCHAIN/include/libffi"
+export LIBFFI_LIBS="-L$ROOT/$TOOLCHAIN/lib -lffi"
 
 cd $BUILD/glib*
-
-do_autoreconf
 mkdir -p .build-host && cd .build-host
 ../configure --host=$HOST_NAME \
              --build=$HOST_NAME \

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 libffi-host zlib-host"
+PKG_BUILD_DEPENDS="ccache libffi-host zlib-host Python-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib-host: C support library"

packages/devel/glib/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.30.0"
+PKG_VERSION="2.31.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.30/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.31/$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_BUILD_DEPENDS="toolchain zlib libiconv libffi pcre glib-host gtk-doc Python-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"

packages/devel/gmp/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
+
+export CFLAGS="$CFLAGS -fPIC"
+export CPPFLAGS="$CPPFLAGS -fexceptions"
+
+cd $PKG_BUILD
+
+mkdir -p .objdir-target && cd .objdir-target
+
+../configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --sysconfdir=/etc \
+             --datadir=/usr/share \
+             --localstatedir=/var \
+             --disable-static \
+             --enable-shared \
+             --disable-mpbsd \
+             --disable-cxx \
+
+make
+$MAKEINSTALL

packages/devel/gmp/install

@@ -23,10 +23,4 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/build/libusbmuxd/libusbmuxd.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/sbin
-  cp -P $PKG_BUILD/build/daemon/usbmuxd $INSTALL/usr/sbin
-
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp -P $PKG_BUILD/build/udev/*.rules $INSTALL/lib/udev/rules.d
+  cp -P $PKG_BUILD/.objdir-target/.libs/libgmp.so* $INSTALL/usr/lib

packages/devel/gmp/meta

@@ -26,11 +26,11 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://gmplib.org/"
 PKG_URL="http://ftp.sunet.se/pub/gnu/gmp/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/math"
+PKG_SECTION="devel"
 PKG_SHORTDESC="gmp: The GNU MP (multiple precision arithmetic) library"
 PKG_LONGDESC="GNU MP is a library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. It has a rich set of functions, and the functions have a regular interface. GNU MP is designed to be as fast as possible, both for small operands and for huge operands. The speed is achieved by using fullwords as the basic arithmetic type, by using fast algorithms, by carefully optimized assembly code for the most common inner loops for a lots of CPUs, and by a general emphasis on speed (instead of simplicity or elegance). The speed of GNU MP is believed to be faster than any other similar library. The advantage for GNU MP increases with the operand sizes for certain operations, since GNU MP in many cases has asymptotically faster algorithms."
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"

packages/devel/gobject-introspection/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="gobject-introspection"
-PKG_VERSION="0.10.0"
+PKG_VERSION="1.31.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://live.gnome.org/GObjectIntrospection"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/0.10/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.31/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/devel/libcec/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="cb91287"
+PKG_VERSION="84c27c4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/libffi-host/build

@@ -27,10 +27,14 @@ $SCRIPTS/unpack libffi
 setup_toolchain host
 
 cd $BUILD/libffi-*
+
+do_autoreconf
+
 mkdir -p .build-host && cd .build-host
 ../configure --host=$HOST_NAME \
              --build=$HOST_NAME \
              --prefix=$ROOT/$TOOLCHAIN \
+             --includedir=$ROOT/$TOOLCHAIN/include \
              --sysconfdir=/etc \
              --disable-static \
              --enable-shared \

packages/devel/libffi-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://sourceware.org/$PKG_NAME/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="ccache autotools"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="Foreign Function Interface Library"

packages/devel/libffi/build

@@ -27,6 +27,7 @@ mkdir -p .build-target && cd .build-target
 ../configure --host=$TARGET_NAME \
              --build=$HOST_NAME \
              --prefix=/usr \
+             --includedir=/usr/include \
              --sysconfdir=/etc \
              --disable-static \
              --enable-shared \

packages/devel/libffi/patches/libffi-3.0.10-includedir.patch

@@ -0,0 +1,22 @@
+diff -Naur libffi-3.0.10/include/Makefile.am libffi-3.0.10.patch/include/Makefile.am
+--- libffi-3.0.10/include/Makefile.am	2011-08-22 20:38:12.000000000 +0200
++++ libffi-3.0.10.patch/include/Makefile.am	2011-11-04 09:26:38.587669344 +0100
+@@ -5,5 +5,5 @@
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/@PACKAGE_NAME@
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff -Naur libffi-3.0.10/libffi.pc.in libffi-3.0.10.patch/libffi.pc.in
+--- libffi-3.0.10/libffi.pc.in	2011-08-22 20:38:12.000000000 +0200
++++ libffi-3.0.10.patch/libffi.pc.in	2011-11-04 09:25:20.218682315 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@/@PACKAGE_NAME@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces

packages/devel/pcre/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.13"
+PKG_VERSION="8.20"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/devel/usbmuxd/patches/usbmuxd-1.0.6-version.tag.patch

@@ -1,22 +0,0 @@
-diff -Naur usbmuxd-1.0.6/Modules/describe.sh usbmuxd-1.0.6.patch/Modules/describe.sh
---- usbmuxd-1.0.6/Modules/describe.sh	2010-09-28 03:32:44.000000000 +0200
-+++ usbmuxd-1.0.6.patch/Modules/describe.sh	2011-01-05 14:28:41.461148284 +0100
-@@ -1,17 +1,8 @@
--#!/bin/bash
-+#!/bin/sh
- 
--# Check for git and a git repo.
--if head=`git rev-parse --verify HEAD 2>/dev/null`; then
--	/bin/echo -n `git describe`
--
--	# Are there uncommitted changes?
--	git update-index --refresh --unmerged > /dev/null
--	git diff-index --quiet HEAD || /bin/echo -n -dirty
--else
- # Check for version tag
- 	if [ -e version.tag ]; then
- 		/bin/echo -n `cat version.tag`
- 	fi
--fi
- 
- echo

packages/graphics/Mesa/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
-PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
+PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"

packages/graphics/mesa/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="http://cgit.freedesktop.org/mesa/mesa/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
-PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
+PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"

packages/initramfs/compress/zlib-initramfs/install

@@ -25,4 +25,4 @@
 ZLIB_DIR="$BUILD/zlib-*"
 
 mkdir -p $INSTALL/lib
-  cp -R $ZLIB_DIR/.build-target/*.so* $INSTALL/lib
+  cp -R $ZLIB_DIR/*.so* $INSTALL/lib

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -101,8 +101,8 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
     if [ "$SPLASH" = "no" ]; then
       break
     else
-      if [ -f "/sbin/ply-image" ]; then
-        /sbin/ply-image "$SPLASHIMAGE" &
+      if [ -f "/bin/ply-image" ]; then
+        /bin/ply-image "$SPLASHIMAGE" &
       fi
     fi
   }
@@ -160,7 +160,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
 
       if [ "$FS_TYPE" = "\"hfs\"" -o "$FS_TYPE" = "\"hfsplus\"" ]; then
         progress "check filesystem $DEVICE [$FS_TYPE]..."
-        /sbin/fsck_hfs -r -y $DEVICE > /dev/null 2>&1
+        /bin/fsck_hfs -r -y $DEVICE > /dev/null 2>&1
       fi
     done
   }

packages/initramfs/sysutils/diskdev_cmds-initramfs/install

@@ -24,7 +24,7 @@
 
 DISKDEV_CMDS_DIR="$BUILD/diskdev_cmds-*"
 
-mkdir -p $INSTALL/sbin
-  cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/sbin
-  ln -sf fsck_hfs $INSTALL/sbin/fsck.hfs
-  ln -sf fsck_hfs $INSTALL/sbin/fsck.hfsplus
+mkdir -p $INSTALL/bin
+  cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/bin
+  ln -sf fsck_hfs $INSTALL/bin/fsck.hfs
+  ln -sf fsck_hfs $INSTALL/bin/fsck.hfsplus

packages/initramfs/sysutils/e2fsprogs-initramfs/install

@@ -27,12 +27,12 @@ E2FSPROGS_DIR="$BUILD/e2fsprogs-*"
 mkdir -p $INSTALL/etc
   cp $E2FSPROGS_DIR/misc/mke2fs.conf $INSTALL/etc
 
-mkdir -p $INSTALL/sbin
-  cp $E2FSPROGS_DIR/e2fsck/e2fsck $INSTALL/sbin
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
+mkdir -p $INSTALL/bin
+  cp $E2FSPROGS_DIR/e2fsck/e2fsck $INSTALL/bin
+    ln -sf e2fsck $INSTALL/bin/fsck.ext2
+    ln -sf e2fsck $INSTALL/bin/fsck.ext3
+    ln -sf e2fsck $INSTALL/bin/fsck.ext4
+    ln -sf e2fsck $INSTALL/bin/fsck.ext4dev
 
 mkdir -p $INSTALL/lib
   cp -P $E2FSPROGS_DIR/lib/e2p/libe2p.so.* $INSTALL/lib

packages/initramfs/sysutils/plymouth-lite/install

@@ -22,8 +22,8 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/sbin
-  cp $PKG_BUILD/ply-image $INSTALL/sbin
+mkdir -p $INSTALL/bin
+  cp $PKG_BUILD/ply-image $INSTALL/bin
 
 mkdir -p $INSTALL/splash
   if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then

packages/lang/Python-host/build

@@ -0,0 +1,67 @@
+#!/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 Python
+
+setup_toolchain host
+
+PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
+
+cd $BUILD/Python-*
+mkdir -p .objdir-host && cd .objdir-host
+
+OPT="$HOST_CFLAGS" \
+LDFLAGS="$LDFLAGS -lexpat" \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
+             --cache-file=config.cache \
+             --enable-shared \
+             --without-cxx-main \
+             --with-threads \
+             --enable-unicode=ucs4 \
+             --with-system-expat \
+
+make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
+     PYTHON_MODULES_LIB="$HOST_LIBDIR" \
+     PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+
+make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
+     PYTHON_MODULES_LIB="$HOST_LIBDIR" \
+     PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+     install
+
+cp Parser/pgen $ROOT/$TOOLCHAIN/bin
+
+# symlink python binary to python2 (needed for Mesa)
+  ln -sf python $ROOT/$TOOLCHAIN/bin/python2
+
+# replace python-config to make sure python uses $SYSROOT_PREFIX
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+  rm -rf $ROOT/$TOOLCHAIN/bin/python*-config
+
+  sed -e "s:%PREFIX%:$SYSROOT_PREFIX/usr:g" -e "s:%CFLAGS%:$TARGET_CFLAGS:g" \
+    $ROOT/$PKG_DIR/scripts/python-config > $ROOT/$TOOLCHAIN/bin/python2.7-config
+  chmod +x $ROOT/$TOOLCHAIN/bin/python2.7-config
+  ln -s python2.7-config $ROOT/$TOOLCHAIN/bin/python-config

packages/lang/Python-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="Python-host"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.python.org/"
+PKG_URL=""
+PKG_DEPENDS="zlib-host expat-host"
+PKG_BUILD_DEPENDS="ccache zlib-host expat-host"
+PKG_PRIORITY="optional"
+PKG_SECTION="lang"
+PKG_SHORTDESC="python: The Python programming language"
+PKG_LONGDESC="Python is an interpreted object-oriented programming language, and is often compared with Tcl, Perl, Java or Scheme."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/lang/Python/build

@@ -24,51 +24,15 @@
 
 PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
 
-cd $PKG_BUILD
-
-mkdir -p .objdir-host && cd .objdir-host
-
-setup_toolchain host
-
-OPT="$HOST_CFLAGS" \
-LDFLAGS="$LDFLAGS -lexpat" \
-../configure --host=$HOST_NAME \
-             --build=$HOST_NAME \
-             --prefix=$ROOT/$TOOLCHAIN \
-             --cache-file=config.cache \
-             --enable-shared \
-             --without-cxx-main \
-             --with-threads \
-             --enable-unicode=ucs4 \
-             --with-system-expat \
-
-make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
-     PYTHON_MODULES_LIB="$HOST_LIBDIR"
-
-make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
-     PYTHON_MODULES_LIB="$HOST_LIBDIR" \
-     install
-
-# symlink python binary to python2 (needed for Mesa)
-  ln -sf python $ROOT/$TOOLCHAIN/bin/python2
-
-cp Parser/pgen ./hostpgen
-cp python ./hostpython
-
-cd ..
-
-mkdir -p .objdir-target && cd .objdir-target
-
-setup_toolchain target
-
 # dont use some optimizations because of problems
 # this fixes problems with expat (maybe)
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
 
   strip_lto
 
-#LDFLAGS="$LDFLAGS -lexpat -lffi" \
-#LDFLAGS="$LDFLAGS -lffi" \
+cd $PKG_BUILD
+mkdir -p .objdir-target && cd .objdir-target
+
 ac_cv_file_dev_ptc=no \
 ac_cv_file_dev_ptmx=yes \
 ac_cv_func_lchflags_works=no \
@@ -96,10 +60,10 @@ OPT="$CFLAGS -fno-strict-aliasing" \
              --with-system-expat \
 
 make  -j1 CC="$TARGET_CC" \
-      HOSTPYTHON=../.objdir-host/hostpython \
-      HOSTPGEN=../.objdir-host/hostpgen \
-      RUNSHARED="LD_LIBRARY_PATH=../.objdir-host:" \
+      HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
+      HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
       BLDSHARED="$CC -shared" \
+      RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/:$LD_LIBRARY_PATH" \
       PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
       CROSS_COMPILE="$TARGET_NAME" \
       CROSS_COMPILE_TARGET="yes" \
@@ -108,10 +72,10 @@ make  -j1 CC="$TARGET_CC" \
 
 make  -j1 CC="$TARGET_CC" \
       DESTDIR=$SYSROOT_PREFIX \
-      HOSTPYTHON=../.objdir-host/hostpython \
-      HOSTPGEN=../.objdir-host/hostpgen \
-      RUNSHARED="LD_LIBRARY_PATH=../.objdir-host:" \
+      HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
+      HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
       BLDSHARED="$CC -shared" \
+      RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/:$LD_LIBRARY_PATH" \
       PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
       CROSS_COMPILE="$TARGET_NAME" \
       CROSS_COMPILE_TARGET="yes" \
@@ -119,11 +83,3 @@ make  -j1 CC="$TARGET_CC" \
       PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
       install
 
-# replace python-config to make sure python uses $SYSROOT_PREFIX
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-  rm -rf $ROOT/$TOOLCHAIN/bin/python*-config
-
-  sed -e "s:%PREFIX%:$SYSROOT_PREFIX/usr:g" -e "s:%CFLAGS%:$TARGET_CFLAGS:g" \
-    $ROOT/$PKG_DIR/scripts/python-config > $ROOT/$TOOLCHAIN/bin/python2.7-config
-  chmod +x $ROOT/$TOOLCHAIN/bin/python2.7-config
-  ln -s python2.7-config $ROOT/$TOOLCHAIN/bin/python-config

packages/lang/Python/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.python.org/"
 PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="zlib openssl libffi file"
-PKG_BUILD_DEPENDS="toolchain expat-host sqlite expat zlib-host zlib openssl libffi"
+PKG_DEPENDS="sqlite expat zlib openssl libffi file"
+PKG_BUILD_DEPENDS="toolchain Python-host sqlite expat zlib openssl libffi"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="python: The Python programming language"

packages/lang/php/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="php"
-PKG_VERSION="5.3.6"
+PKG_VERSION="5.3.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"

packages/linux-drivers/AF9035/install

@@ -29,10 +29,5 @@ mkdir -p $INSTALL/lib/modules/$VER/AF9035
   cp $PKG_BUILD/tua9001.ko $INSTALL/lib/modules/$VER/AF9035
   cp $PKG_BUILD/af9033.ko $INSTALL/lib/modules/$VER/AF9035
 
-mkdir -p $INSTALL/lib/firmware
-  cp $PKG_DIR/firmware/*.fw $INSTALL/lib/firmware
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
+mkdir -p $INSTALL/usr/lib/firmware
+  cp $PKG_DIR/firmware/*.fw $INSTALL/usr/lib/firmware

packages/linux-drivers/AF9035/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.abclinuxu.cz/hardware/pridavne-karty/televizni-karty/dvb-t/usb/aver-tv-volar-hd-a835"
 PKG_URL="http://xgazza.altervista.org/Linux/DVB/Drivers/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="AF9035 driver: Afa Technologies Inc. AF9035A USB Device"

packages/linux-drivers/a867_drv/install

@@ -26,8 +26,3 @@ VER=`ls $BUILD/linux*/modules/lib/modules`
 
 mkdir -p $INSTALL/lib/modules/$VER/a867
 cp $PKG_BUILD/a867.ko $INSTALL/lib/modules/$VER/a867/
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done

packages/linux-drivers/a867_drv/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.avermedia.com/Product/ProductDetail.aspx?Id=516&tab=APDriver"
 PKG_URL="http://www.avermedia.com/avertv/Upload/Download/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="AVerTV Volar HD Nano A867R driver"

packages/linux-drivers/asix-ax887xx/install

@@ -26,8 +26,3 @@ VER=`ls $BUILD/linux*/modules/lib/modules`
 
 mkdir -p $INSTALL/lib/modules/$VER/asix-ax887xx
   cp $PKG_BUILD/asix.ko $INSTALL/lib/modules/$VER/asix-ax887xx
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done

packages/linux-drivers/asix-ax887xx/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.asix.com.tw"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="asix-ax887xx: ASIX AX88772B/772A/760/772/178 Linux USB LANDriver"

packages/linux-drivers/aver_h826d/build

@@ -0,0 +1,29 @@
+#!/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
+
+cd $PKG_BUILD/installer/src
+
+make KERNELDIR=$(kernel_path)
+
+fix_module_depends "h826d.ko" "averusbh826d,videodev"

packages/linux-drivers/aver_h826d/install

@@ -0,0 +1,28 @@
+#!/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
+
+VER=`ls $BUILD/linux*/modules/lib/modules`
+
+mkdir -p $INSTALL/lib/modules/$VER/aver_h826d
+  cp $PKG_BUILD/installer/src/*.ko $INSTALL/lib/modules/$VER/aver_h826d

packages/linux-drivers/aver_h826d/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="aver_h826d"
+PKG_VERSION="0.10"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.avermedia-usa.com/avertv/product/ProductDetail.aspx?Id=431&tab=APDriver"
+[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://www.avermedia-usa.com/AVerTV/Upload/Download/C038A827H826_Installer_x86_0.10-Beta_091126.zip"
+[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://www.avermedia-usa.com/AVerTV/Upload/Download/C038A827H826_Installer_x64_0.10-Beta_091126.zip"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver"
+PKG_SHORTDESC="AVerTV Hybrid Volar MAX H826 driver"
+PKG_LONGDESC="AVerTV Hybrid Volar MAX H826 driver"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/linux-drivers/aver_h826d/patches-manual/aver_h826d-0.10-100-latest_kernel.patch

@@ -0,0 +1,65 @@
+diff -Nr -u0 original/installer/installer.sh modified/installer/installer.sh
+--- original/installer/installer.sh     2009-11-13 11:47:33.000000000 +0100
++++ modified/installer/installer.sh     2011-08-28 20:58:38.000000000 +0200
+@@ -177,13 +176,0 @@
+-	if [[ "$kversion" != "2" || "$kpatchlevel" != "6" ]]; then
+-		dialog --backtitle "$BACKTITLE" \
+-		--title "Kernel version error" \
+-		--msgbox "Installer cannot determine kernel version or the running kernel is not 2.6.x kernel. \n\
+-Installer will abort now.
+-" \
+-		10 $WIDTH
+-		log "generate_kdep_string: wrong kernel version ${kversion}.${kpatchlevel}.${ksublevel}. Abort."
+-        log_from_file $ksrc/Makefile #s016
+-        log_from_file $kobj/Makefile #s016
+-		exit
+-	fi
+-
+diff -Nr -u0 original/installer/src/aver/osdep.c modified/installer/src/aver/osdep.c
+--- original/installer/src/aver/osdep.c 2009-11-13 11:54:56.000000000 +0100
++++ modified/installer/src/aver/osdep.c 2011-08-28 20:19:19.000000000 +0200
+@@ -89 +88,0 @@
+-#include <linux/smp_lock.h>
+@@ -435 +434 @@
+-		init_MUTEX(tmp);
++		sema_init(tmp, 1);
+@@ -439 +438 @@
+-		init_MUTEX_LOCKED(tmp);
++		sema_init(tmp, 0);
+@@ -1069,0 +1069 @@
++static DEFINE_MUTEX(dvbdev_mutex);
+@@ -1072 +1072 @@
+-	lock_kernel();
++	mutex_lock(&dvbdev_mutex);
+@@ -1077 +1077 @@
+-	unlock_kernel();
++	mutex_unlock(&dvbdev_mutex);
+diff -Nr -u0 original/installer/src/aver/osdep_dvb.c modified/installer/src/aver/osdep_dvb.c
+--- original/installer/src/aver/osdep_dvb.c     2009-11-13 11:54:57.000000000 +0100
++++ modified/installer/src/aver/osdep_dvb.c     2011-08-28 20:19:36.000000000 +0200
+@@ -79 +78,0 @@
+-#include <linux/smp_lock.h>
+@@ -233 +232 @@
+-		init_MUTEX(&p->feedlock);
++		sema_init(&p->feedlock, 1);
+diff -Nr -u0 original/installer/src/aver/osdep_th2.c modified/installer/src/aver/osdep_th2.c
+--- original/installer/src/aver/osdep_th2.c     2009-11-13 11:54:57.000000000 +0100
++++ modified/installer/src/aver/osdep_th2.c     2011-08-28 20:20:00.000000000 +0200
+@@ -78 +77,0 @@
+-#include <linux/smp_lock.h>
+@@ -80,0 +80 @@
++#include "osdep.h"
+@@ -90 +90 @@
+-        lock_kernel();
++        SysLockKernel();
+@@ -100 +100 @@
+-        unlock_kernel();
++        SysUnlockKernel();
+diff -Nr -u0 original/installer/src/aver/osdep_v4l2.c modified/installer/src/aver/osdep_v4l2.c
+--- original/installer/src/aver/osdep_v4l2.c    2009-11-13 11:54:58.000000000 +0100
++++ modified/installer/src/aver/osdep_v4l2.c    2011-08-28 20:20:19.000000000 +0200
+@@ -75,0 +76,2 @@
++#define VFL_TYPE_VTX 3
++
+@@ -84 +85,0 @@
+-#include <linux/smp_lock.h>

packages/linux-drivers/aver_h826d/patches-manual/aver_h826d-0.10-100-latest_kernel.patch.txt

@@ -0,0 +1 @@
+http://linuxtv.org/wiki/index.php/AVerMedia_AverTV_Hybrid_Volar_HX_(A827)

packages/linux-drivers/aver_h826d/unpack

@@ -0,0 +1,52 @@
+#!/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
+
+ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+
+mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+
+unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
+
+tail -n +115 $BUILD/${PKG_NAME}-${PKG_VERSION}/H826D_Installer_*/AVERMEDIA-Linux-*-H826D-0.10-beta.sh | bzip2 -d | tar xf - -C $BUILD/${PKG_NAME}-${PKG_VERSION}
+
+# this code is copied from scripts/unpack
+PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
+for i in $PKG_DIR/patches-manual/$PKG_NAME-$PKG_VERSION*.patch ; do
+  if [ -f "$i" ]; then
+    PATCH=`basename $i`
+    PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
+    if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
+      printf "%${INDENT}c SKIP PATCH:   $i\n" >&$SILENT_OUT
+      continue;
+    else
+      printf "%${INDENT}c APPLY PATCH:   $i\n" >&$SILENT_OUT
+      cat $i | patch -p1 -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
+    fi
+  fi
+done
+
+# prebuild objects were hex edited for kernel 3.1
+[ "$TARGET_ARCH" = "x86_64" ] && KVSTR=x64
+[ "$TARGET_ARCH" = "i386" ] && KVSTR=4GREG
+cp -rf $PKG_DIR/kdep_2.6.30/OBJ-$KVSTR/* $BUILD/${PKG_NAME}-${PKG_VERSION}/installer/src

packages/linux-drivers/bcm_sta/install

@@ -25,10 +25,9 @@
 VER=`ls $BUILD/linux*/modules/lib/modules`
 
 mkdir -p $INSTALL/lib/modules/$VER/bcm_sta
-[ "$TARGET_ARCH" = "i386" ] && cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
-[ "$TARGET_ARCH" = "x86_64" ] && cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
+  if [ "$TARGET_ARCH" = "i386" ]; then
+    cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
+  fi
+  if [ "$TARGET_ARCH" = "x86_64" ]; then
+    cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
+  fi

packages/linux-drivers/bcm_sta/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux  busybox-hosttools"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="bcm_sta: Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver"

packages/linux-firmware/dvb-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL/usr
+  cp -PR $PKG_BUILD/.install/* $INSTALL/usr

packages/linux-firmware/misc-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL/usr
+  cp -PR $PKG_BUILD/.install/* $INSTALL/usr

packages/linux-firmware/wlan-firmware/install

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL/usr
+  cp -PR $PKG_BUILD/.install/* $INSTALL/usr

packages/linux/install

@@ -30,15 +30,10 @@ mkdir -p $INSTALL/lib/modules/$VER
   cp -r $PKG_BUILD/modules/* $INSTALL
   rm -f $INSTALL/lib/modules/$VER/modules.*
 
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
-
 # copy kernel firmwares (if present and requested)
-  mkdir -p $INSTALL/lib/firmware
+  mkdir -p $INSTALL/usr/lib/firmware
   [ -d $PKG_BUILD/modules/lib/firmware ] && \
-    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
+    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/usr/lib/firmware || true
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc

packages/mediacenter/xbmc/meta

@@ -48,6 +48,11 @@ PKG_AUTORECONF="no"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"
   PKG_DEPENDS="$PKG_DEPENDS dbus"
 
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
+  PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
+fi
+
 if [ "$CEC_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec"
   PKG_DEPENDS="$PKG_DEPENDS libcec"

packages/mediacenter/xbmc/patches/xbmc-2884715-342-revert_ffmpeg_00d1e96bf4fc0467744f840fbc85d1a65cbb6f08.patch

@@ -1,48 +0,0 @@
-diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/h264.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264.c
---- xbmc-4c32cde/lib/ffmpeg/libavcodec/h264.c	2011-10-28 15:29:40.000000000 +0200
-+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264.c	2011-10-29 15:18:16.716609657 +0200
-@@ -1802,7 +1802,7 @@
-     if(h->sps.frame_mbs_only_flag)
-         s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7);
-     else
--        s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 7);
-+        s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3);
- 
-     if (s->context_initialized
-         && (   s->width != s->avctx->width || s->height != s->avctx->height
-diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/h264_ps.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264_ps.c
---- xbmc-4c32cde/lib/ffmpeg/libavcodec/h264_ps.c	2011-10-28 15:29:39.000000000 +0200
-+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264_ps.c	2011-10-29 15:18:16.718609683 +0200
-@@ -374,7 +374,7 @@
-         if(sps->crop_left || sps->crop_top){
-             av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
-         }
--        if(sps->crop_right >= 8 || sps->crop_bottom >= 8){
-+        if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !sps->frame_mbs_only_flag)){
-             av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
-         }
-     }else{
-diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/mpegvideo.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/mpegvideo.c
---- xbmc-4c32cde/lib/ffmpeg/libavcodec/mpegvideo.c	2011-10-28 15:29:40.000000000 +0200
-+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/mpegvideo.c	2011-10-29 15:18:16.719609696 +0200
-@@ -498,7 +498,7 @@
- 
-     if(s->codec_id == CODEC_ID_MPEG2VIDEO && !s->progressive_sequence)
-         s->mb_height = (s->height + 31) / 32 * 2;
--    else if (s->codec_id != CODEC_ID_H264)
-+    else
-         s->mb_height = (s->height + 15) / 16;
- 
-     if(s->avctx->pix_fmt == PIX_FMT_NONE){
-diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/utils.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/utils.c
---- xbmc-4c32cde/lib/ffmpeg/libavcodec/utils.c	2011-10-28 15:29:41.000000000 +0200
-+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/utils.c	2011-10-29 15:18:16.721609720 +0200
-@@ -145,7 +145,7 @@
-     case PIX_FMT_YUVA420P:
-         w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
-         h_align= 16;
--        if(s->codec_id == CODEC_ID_MPEG2VIDEO || s->codec_id == CODEC_ID_MJPEG || s->codec_id == CODEC_ID_AMV || s->codec_id == CODEC_ID_THP || s->codec_id == CODEC_ID_H264)
-+        if(s->codec_id == CODEC_ID_MPEG2VIDEO || s->codec_id == CODEC_ID_MJPEG || s->codec_id == CODEC_ID_AMV || s->codec_id == CODEC_ID_THP)
-             h_align= 32; // interlaced is rounded up to 2 MBs
-         break;
-     case PIX_FMT_YUV411P:

packages/multimedia/crystalhd/install

@@ -24,19 +24,14 @@
 
 VER=`ls $BUILD/linux*/modules/lib/modules`
 
-mkdir -p $INSTALL/lib/firmware
-  cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/lib/firmware
+mkdir -p $INSTALL/usr/lib/firmware
+  cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/usr/lib/firmware
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/linux_lib/libcrystalhd/*.so* $INSTALL/usr/lib
 
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/driver/linux/*.rules $INSTALL/lib/udev/rules.d
+mkdir -p $INSTALL/usr/lib/udev/rules.d
+  cp $PKG_BUILD/driver/linux/*.rules $INSTALL/usr/lib/udev/rules.d
 
 mkdir -p $INSTALL/lib/modules/$VER/crystalhd
   cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd
-
-$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done

packages/multimedia/crystalhd/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/crystalhd-for-osx/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="linux"
-PKG_BUILD_DEPENDS="toolchain busybox-hosttools linux"
+PKG_BUILD_DEPENDS="toolchain linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="crystalhd: OSX and Linux driver and library support for the Broadcom Crystal HD Video Accelerator."

packages/network/bluez/install

@@ -34,15 +34,15 @@ mkdir -p $INSTALL/etc/bluetooth
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
 
-mkdir -p $INSTALL/lib/udev
-# not needed:  cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev
-# not needed:  chmod +x $INSTALL/lib/udev/bluetooth_serial
-  cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
+mkdir -p $INSTALL/usr/lib/udev
+# not needed:  cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/usr/lib/udev
+# not needed:  chmod +x $INSTALL/usr/lib/udev/bluetooth_serial
+  cp $PKG_BUILD/tools/hid2hci $INSTALL/usr/lib/udev
 
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d
-# todo:        cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
-# not needed:  cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
+mkdir -p $INSTALL/usr/lib/udev/rules.d
+  cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/usr/lib/udev/rules.d
+# todo:        cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/usr/lib/udev/rules.d
+# not needed:  cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/usr/lib/udev/rules.d
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib

packages/network/connman/build

@@ -22,8 +22,10 @@
 
 . config/options $1
 
+export WPASUPPLICANT="/usr/bin/wpa_supplicant"
+
 cd $PKG_BUILD
-ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
+#ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \

packages/network/ethtool/install

@@ -25,5 +25,3 @@
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/ethtool $INSTALL/usr/sbin
 
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d

packages/network/libgssglue/build

@@ -23,17 +23,15 @@
 . config/options $1
 
 cd $PKG_BUILD
-
-# Set the owner of the device node to be usbmuxd
-  sed -i 's/ATTR{idVendor}=="05ac"/OWNER="root", ATTR{idVendor}=="05ac"/' udev/85-usbmuxd.rules.in
-  sed -i 's/-U usbmux/-U root/' udev/85-usbmuxd.rules.in
-
-mkdir -p build && cd build
-
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DLIB_SUFFIX="" \
-      ..
+ac_cv_func_realloc_0_nonnull=yes \
+ac_cv_func_malloc_0_nonnull=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared \
+            --with-gnu-ld
 
 make
 $MAKEINSTALL

packages/network/libgssglue/install

@@ -0,0 +1,26 @@
+#!/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/usr/lib
+  cp $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib

packages/network/libgssglue/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="libgssglue"
+PKG_VERSION="0.3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/"
+PKG_URL="http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="libgssglue: a library which exports a gssapi interface, but doesn't implement any gssapi mechanisms itself"
+PKG_LONGDESC="libgssglue is  a library which exports a gssapi interface, but doesn't implement any gssapi mechanisms itself; instead it calls gssapi routines in other libraries, depending on the mechanism."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/network/libnfs/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/sahlberg/libnfs"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libtirpc"
-PKG_BUILD_DEPENDS="toolchain libtirpc"
+PKG_DEPENDS="rpcbind"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="libnfs: a client library for accessing NFS shares over a network."