diff --git a/CHANGELOG b/CHANGELOG
index e69de29bb2..ac4405bc09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -0,0 +1,16 @@
+OpenELEC (Version 2.0)
+
+Changelog OpenELEC-1.0 to OpenELEC-2.0
+
+Package updates:
+ - update XBMC to XBMC-11.0 (Eden)
+ - update eglibc to eglibc-2.14
+
+Added functions:
+ - PXE netboot support
+ - Airplay support
+ - Airtunes support
+ - CEC support
+
+Removed functions:
+ - remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
diff --git a/config/functions b/config/functions
index 8bf9a821c8..5f5b8339a1 100644
--- a/config/functions
+++ b/config/functions
@@ -115,22 +115,44 @@ add_group() {
}
do_autoreconf() {
- if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf ] &&
- [ -e $ROOT/$TOOLCHAIN/bin/autoconf ] &&
- [ -e $ROOT/$TOOLCHAIN/bin/automake ] &&
- [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ] &&
- [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
- export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
- export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
- export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
- export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
- export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
- export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
- export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
- export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR"
+ export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
- mkdir -p $ACLOCAL_DIR
- autoreconf --force --install -I $ACLOCAL_DIR $@
+ if [ -e $ROOT/$TOOLCHAIN/bin/autoconf ]; then
+ export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/automake ]; then
+ export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/autopoint ]; then
+ export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ]; then
+ export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
+ export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/aclocal ]; then
+ export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/autoheader ]; then
+ export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
+ fi
+
+ if [ -e $ROOT/$TOOLCHAIN/bin/libtool ]; then
+ export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
+ fi
+
+ 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 $@
fi
}
diff --git a/config/optimize b/config/optimize
index ff78ec361e..733e7e5e02 100644
--- a/config/optimize
+++ b/config/optimize
@@ -38,6 +38,7 @@ fi
if [ "$LTO_SUPPORT" = yes ];then
GCC_OPTIM="$GCC_OPTIM -flto"
+ LD_OPTIM="$LD_OPTIM -flto"
fi
if [ "$GOLD_SUPPORT" = yes ];then
@@ -57,7 +58,7 @@ fi
TARGET_CPPFLAGS=
TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
diff --git a/config/options b/config/options
index 18d9a875e0..0a916b75b4 100644
--- a/config/options
+++ b/config/options
@@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects"
OPENELEC_VERSION=`cat VERSION`
if [ "$OPENELEC_VERSION" = "devel" ]; then
- OS_VERSION="0.99"
+ OS_VERSION="1.0"
else
OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`
diff --git a/config/release/create_installstick.bat b/config/release/create_installstick.bat
index d5589d269b..e7f1ef2e51 100644
--- a/config/release/create_installstick.bat
+++ b/config/release/create_installstick.bat
@@ -1,114 +1,169 @@
@ECHO OFF
+TITLE OpenELEC USB Installer
+mode con:cols=67 lines=17
+COLOR 17
+SET DRIVE=
+
+:checkPrivileges
+mkdir "%windir%\OEAdminCheck"
+if '%errorlevel%' == '0' (
+rmdir "%windir%\OEAdminCheck" & goto gotPrivileges
+) else ( goto getPrivileges )
+
+:getPrivileges
CLS
ECHO.
-ECHO OpenELEC.tv USB Installer
+ECHO.
+ECHO OpenELEC.tv USB Installer
ECHO.
ECHO.
-ECHO ******************************************************
-ECHO.
-ECHO This will wipe any data off your chosen drive
-ECHO Please read the instructions and use very carefully...
+ECHO *****************************************************************
+ECHO.
+ECHO Administrator Rights are required for USB Stick creation
+ECHO Invoking UAC for Privilege Escalation
+ECHO.
+ECHO *****************************************************************
ECHO.
-ECHO ******************************************************
ECHO.
ECHO.
-ECHO. Are you running this USB Wizard for the first time
-ECHO. on Windows 7 or Windows Vista? [Y/N]
ECHO.
ECHO.
-SET /P OS= --
-IF "%OS%"=="n" GOTO INSTALL
-IF "%OS%"=="N" GOTO INSTALL
+ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\OEgetPrivileges.vbs"
+ECHO UAC.ShellExecute %0, "", "", "runas", 1 >> "%temp%\OEgetPrivileges.vbs"
+"%temp%\OEgetPrivileges.vbs"
+exit /B
-:NOTES
-CLS
-ECHO.
-ECHO ******************************************************
-ECHO.
-ECHO.
-ECHO Due to UAC in Windows 7 / Windows Vista we need to run
-ECHO syslinux.exe as 'Administrator'
-ECHO.
-ECHO After pressing any key the folder containing syslinux.exe
-ECHO will pop up automatically.
-ECHO.
-ECHO 1. Right click on syslinux.exe
-ECHO 2. Click on 'Properties'
-ECHO 3. Change to the 'Compatibility' tab
-ECHO 4. Check the 'Run this program as an administrator' checkbox
-ECHO.
-ECHO.
-ECHO.
-ECHO ******************************************************
-ECHO.
-ECHO Press any key to open the syslinux directory
-ECHO.
-pause >NUL
-explorer "%CD%\3rdparty\syslinux\win32"
-ECHO When finished changing the administrator rights,
-ECHO please press any key to continue with the installation
-pause >NUL
-GOTO :INSTALL
+:gotPrivileges
+if exist "%temp%\OEgetPrivileges.vbs" ( del "%temp%\OEgetPrivileges.vbs" )
+pushd "%CD%"
+CD /D "%~dp0"
-:INSTALL
+:HashCheck
3rdparty\md5sum\md5sum.exe -c "%CD%\target\SYSTEM.md5"
-IF ERRORLEVEL 1 GOTO BADMD5
+IF ERRORLEVEL 1 GOTO BadMD5
3rdparty\md5sum\md5sum.exe -c "%CD%\target\KERNEL.md5"
-IF ERRORLEVEL 1 GOTO BADMD5
+IF ERRORLEVEL 1 GOTO BadMD5
+
+:InstallOE
CLS
ECHO.
-ECHO OpenELEC.tv USB Installer
+ECHO.
+ECHO OpenELEC.tv USB Installer
ECHO.
ECHO.
-ECHO ******************************************************
-ECHO.
-ECHO This will wipe any data off your chosen drive
-ECHO Please read the instructions and use very carefully...
+ECHO *****************************************************************
ECHO.
-ECHO ******************************************************
+ECHO This WILL wipe ALL data off the selected drive
+ECHO Please use carefully...
+ECHO.
+ECHO *****************************************************************
ECHO.
ECHO.
+
+:SelectDrive
ECHO Enter USB Drive letter
ECHO eg. d:
ECHO.
SET /P DRIVE= --
-if %DRIVE%!==! goto INSTALL
-format %DRIVE% /V:OPENELEC /Q /FS:FAT32
-3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
-ECHO Copying necessary files to %DRIVE%
-copy target\* %DRIVE%
-copy Autorun.inf %DRIVE%
-copy CHANGELOG %DRIVE%
-copy INSTALL %DRIVE%
-copy README %DRIVE%
-copy RELEASE %DRIVE%
-copy openelec.ico %DRIVE%
-FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
-echo DEFAULT linux > %DRIVE%\syslinux.cfg
-echo PROMPT 0 >> %DRIVE%\syslinux.cfg
-echo. >> %DRIVE%\syslinux.cfg
-echo LABEL linux >> %DRIVE%\syslinux.cfg
-echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
-echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
-GOTO END
+IF NOT DEFINED DRIVE goto InvalidDrive
+if %DRIVE%==c: goto InvalidDrive
+if %DRIVE%==C: goto InvalidDrive
-:BADMD5
CLS
ECHO.
ECHO.
-ECHO ***** OpenELEC.tv failed md5 check - Installation will quit *****
+ECHO OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO *****************************************************************
+ECHO.
+ECHO Installing OpenELEC to %DRIVE%
+ECHO Please wait approximately 20 seconds...
+ECHO.
+ECHO *****************************************************************
ECHO.
ECHO.
ECHO.
-ECHO Your original download was probably corrupt.
-ECHO Please visit www.openelec.tv and get another copy
+ECHO.
+ECHO.
+
+ECHO. | >NUL format %DRIVE% /V:OPENELEC /Q /FS:FAT32 /X
+IF ERRORLEVEL 1 goto InvalidDrive
+>NUL 3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
+>NUL copy target\* %DRIVE%
+>NUL copy Autorun.inf %DRIVE%
+>NUL copy CHANGELOG %DRIVE%
+>NUL copy INSTALL %DRIVE%
+>NUL copy README %DRIVE%
+>NUL copy RELEASE %DRIVE%
+>NUL copy openelec.ico %DRIVE%
+FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
+ECHO DEFAULT linux > %DRIVE%\syslinux.cfg
+ECHO PROMPT 0 >> %DRIVE%\syslinux.cfg
+ECHO. >> %DRIVE%\syslinux.cfg
+ECHO LABEL linux >> %DRIVE%\syslinux.cfg
+ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
+ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
+GOTO END
+
+:InvalidDrive
+CLS
+ECHO.
+ECHO.
+ECHO OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO *****************************************************************
+ECHO.
+ECHO Invalid Drive Selected...
+ECHO Please confirm the drive letter of your USB stick
+ECHO.
+ECHO *****************************************************************
+ECHO.
+ECHO.
+GOTO SelectDrive
+
+:BadMD5
+CLS
+ECHO.
+ECHO.
+ECHO OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO *****************************************************************
+ECHO.
+ECHO OpenELEC.tv failed md5 check - Installation will now quit
+ECHO.
+ECHO Your original download is probably corrupt
+ECHO Please visit www.openelec.tv and download another copy
+ECHO.
+ECHO *****************************************************************
+ECHO.
ECHO.
ECHO.
PAUSE
+EXIT
:END
+CLS
+ECHO.
+ECHO.
+ECHO OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO *****************************************************************
+ECHO.
+ECHO The OpenELEC USB Installer has been successfully copied to %DRIVE%
+ECHO Please boot your HTPC off this USB stick
+ECHO.
+ECHO *****************************************************************
+ECHO.
+ECHO.
+ECHO.
+ECHO.
+
SET DRIVE=
-SET OS=
-SET DRIVEUUID=
\ No newline at end of file
+SET DRIVEUUID=
+PAUSE
diff --git a/packages/3rdparty/multimedia/airplayer/meta b/packages/3rdparty/multimedia/airplayer/meta
deleted file mode 100755
index df759be40e..0000000000
--- a/packages/3rdparty/multimedia/airplayer/meta
+++ /dev/null
@@ -1,35 +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="airplayer"
-PKG_VERSION="7776e54"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/PascalW/Airplayer"
-PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="Airplayer: script to make media playing software Airplay-compatible."
-PKG_LONGDESC="Airplayer is a script to make media playing software Airplay-compatible. Airplayer features pluggable backends, making it possible to support different media players."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/multimedia/pybonjour/build_not_used b/packages/3rdparty/multimedia/pybonjour/build_not_used
deleted file mode 100755
index 3d37a7f15b..0000000000
--- a/packages/3rdparty/multimedia/pybonjour/build_not_used
+++ /dev/null
@@ -1,36 +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
-
-export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
-export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-
-cd $PKG_BUILD
-
-python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/bin
diff --git a/packages/3rdparty/multimedia/pybonjour/meta b/packages/3rdparty/multimedia/pybonjour/meta
deleted file mode 100755
index c7f2a666e7..0000000000
--- a/packages/3rdparty/multimedia/pybonjour/meta
+++ /dev/null
@@ -1,35 +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="pybonjour"
-PKG_VERSION="1.1.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://pybonjour.googlecode.com/"
-PKG_URL="http://pybonjour.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="Python"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="pybonjour: A Zeroconf mDNS/DNS-SD responder"
-PKG_LONGDESC="Pybonjour is a framework for Multicast DNS Service Discovery (mDNS/DNS-SD a.k.a. Zeroconf) on Linux. It allows programs to publish and discover services running on a local network with no specific configuration. For example, you can plug into a network and instantly find printers to print to, files to look at, and people to talk to."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch b/packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch
deleted file mode 100755
index a9fc7614ab..0000000000
--- a/packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -uNr shairport_orig/Makefile shairport/Makefile
---- shairport_orig/Makefile 2011-08-09 23:07:40.000000000 +0200
-+++ shairport/Makefile 2011-08-15 20:02:36.000000000 +0200
-@@ -1,5 +1,5 @@
--CFLAGS:=-O2 -Wall $(shell pkg-config --cflags openssl ao)
--LDFLAGS:=-lm -lpthread $(shell pkg-config --libs openssl ao)
-+CFLAGS?=-O2 -Wall $(shell pkg-config --cflags openssl ao)
-+LDFLAGS?=-lm -lpthread $(shell pkg-config --libs openssl ao)
- OBJS=socketlib.o shairport.o alac.o hairtunes.o
- all: hairtunes shairport
-
-diff -uNr shairport_orig/shairport.c shairport/shairport.c
---- shairport_orig/shairport.c 2011-08-09 23:07:40.000000000 +0200
-+++ shairport/shairport.c 2011-08-09 11:37:52.000000000 +0200
-@@ -51,6 +51,9 @@
- #define HEADER_LOG_LEVEL LOG_DEBUG
- #define AVAHI_LOG_LEVEL LOG_DEBUG
-
-+char tAoDeviceName[56] = "";
-+char tAoDriver[56] = "";
-+
- int main(int argc, char **argv)
- {
- char tHWID[HWID_SIZE] = {0,51,52,53,54,55};
-@@ -129,6 +132,14 @@
- {
- kCurrentLogLevel = LOG_DEBUG_VV;
- }
-+ else if(!strncmp(arg, "--ao_driver=", 12))
-+ {
-+ strncpy(tAoDriver, arg+12, 55);
-+ }
-+ else if(!strncmp(arg, "--ao_devicename=", 16))
-+ {
-+ strncpy(tAoDeviceName, arg+16, 55);
-+ }
- else if(!strcmp(arg, "-h") || !strcmp(arg, "--help"))
- {
- slog(LOG_INFO, "ShairPort version 0.05 C port - Airport Express emulator\n");
-@@ -140,6 +151,8 @@
- slog(LOG_INFO, " -d Daemon mode\n");
- slog(LOG_INFO, " -q, --quiet Supresses all output.\n");
- slog(LOG_INFO, " -v,-v2,-v3,-vv Various debugging levels\n");
-+ slog(LOG_INFO, " --ao_driver=driver Sets the ao driver (optional)\n");
-+ slog(LOG_INFO, " --ao_devicename=devicename Sets the ao device name (optional)\n");
- slog(LOG_INFO, "\n");
- return 0;
- }
-@@ -731,8 +744,6 @@
- slog(LOG_DEBUG_V, "Got %d for CPort and %d for TPort\n", tControlport, tTimingport);
- char *tRtp = NULL;
- char *tPipe = NULL;
-- char *tAoDriver = NULL;
-- char *tAoDeviceName = NULL;
- char *tAoDeviceId = NULL;
-
- // *************************************************
-@@ -758,7 +769,7 @@
- }
- cleanupBuffers(pConn);
- hairtunes_init(tKeys->aeskey, tKeys->aesiv, tKeys->fmt, tControlport, tTimingport,
-- tDataport, tRtp, tPipe, tAoDriver, tAoDeviceName, tAoDeviceId);
-+ tDataport, tRtp, tPipe, tAoDriver[0]!='\0'?tAoDriver:NULL, tAoDeviceName[0]!='\0'?tAoDeviceName:NULL, tAoDeviceId);
-
- // Quit when finished.
- slog(LOG_DEBUG, "Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");
diff --git a/packages/3rdparty/multimedia/simplejson-ap/build b/packages/3rdparty/multimedia/simplejson-ap/build
deleted file mode 100755
index 3d37a7f15b..0000000000
--- a/packages/3rdparty/multimedia/simplejson-ap/build
+++ /dev/null
@@ -1,36 +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
-
-export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
-export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-
-cd $PKG_BUILD
-
-python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/bin
diff --git a/packages/3rdparty/multimedia/tornado-ap/build b/packages/3rdparty/web/pycurl/build
similarity index 88%
rename from packages/3rdparty/multimedia/tornado-ap/build
rename to packages/3rdparty/web/pycurl/build
index 3d37a7f15b..a443bc7610 100755
--- a/packages/3rdparty/multimedia/tornado-ap/build
+++ b/packages/3rdparty/web/pycurl/build
@@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
cd $PKG_BUILD
python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
+python setup.py install -O0 --no-compile --prefix /usr --root .install
rm -rf .install/usr/bin
diff --git a/packages/network/cifs-utils/install b/packages/3rdparty/web/pycurl/install
similarity index 94%
rename from packages/network/cifs-utils/install
rename to packages/3rdparty/web/pycurl/install
index 2cfcc0c72a..a9c8b9924b 100755
--- a/packages/network/cifs-utils/install
+++ b/packages/3rdparty/web/pycurl/install
@@ -22,5 +22,4 @@
. config/options $1
-mkdir -p $INSTALL/sbin
- cp $PKG_BUILD/mount.cifs $INSTALL/sbin
+cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/network/netstatus/meta b/packages/3rdparty/web/pycurl/meta
similarity index 65%
rename from packages/network/netstatus/meta
rename to packages/3rdparty/web/pycurl/meta
index 15c657a8c9..2f193ebdfd 100644
--- a/packages/network/netstatus/meta
+++ b/packages/3rdparty/web/pycurl/meta
@@ -1,7 +1,6 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2010-2011 Roman Weber (roman@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
@@ -19,19 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="netstatus"
-PKG_VERSION="1"
+PKG_NAME="pycurl"
+PKG_VERSION="7.19.0"
PKG_REV="1"
PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://wiki.meego.com/D-Bus/Overview#D-Bus_GLib"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="dbus glib dbus-glib"
-PKG_BUILD_DEPENDS="toolchain dbus glib dbus-glib"
+PKG_LICENSE="GPL-2"
+PKG_SITE="http://pycurl.sourceforge.net/"
+PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python distribute curl"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross curl"
PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="netstatus: asmall utility to know if we are online or not"
-PKG_LONGDESC="netstatus is a small utility to know if we are online or not"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="pycurl: a Python interface to libcurl"
+PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch
new file mode 100644
index 0000000000..7e20b15c2f
--- /dev/null
+++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch
@@ -0,0 +1,24 @@
+--- a/src/pycurl.c
++++ a/src/pycurl.c
+@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self)
+ }
+ }
+
++ Py_INCREF(Py_None);
+ return Py_None;
+ }
+
+--- a/tests/test_internals.py
++++ a/tests/test_internals.py
+@@ -245,6 +245,11 @@ if 1 and gc:
+ if opts.verbose >= 1:
+ print "Tracked objects:", len(gc.get_objects())
+
++if 1:
++ # Ensure that the refcounting error in "reset" is fixed:
++ for i in xrange(100000):
++ c = Curl()
++ c.reset()
+
+ # /***********************************************************************
+ # // done
diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch
new file mode 100644
index 0000000000..06ac2c1f1e
--- /dev/null
+++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch
@@ -0,0 +1,12 @@
+--- pycurl/setup.py~ 2008-04-22 17:00:45.000000000 +0300
++++ pycurl/setup.py 2008-07-03 21:53:36.000000000 +0300
+@@ -97,8 +97,7 @@
+ else:
+ extra_compile_args.append(e)
+ libs = split_quoted(
+- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++ os.popen("'%s' --libs" % CURL_CONFIG).read())
+ for e in libs:
+ if e[:2] == "-l":
+ libraries.append(e[2:])
diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch
new file mode 100644
index 0000000000..8ceba310a2
--- /dev/null
+++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch
@@ -0,0 +1,14 @@
+diff -Naur pycurl-7.19.0/setup.py pycurl-7.19.0.patch/setup.py
+--- pycurl-7.19.0/setup.py 2008-09-09 19:40:34.000000000 +0200
++++ pycurl-7.19.0.patch/setup.py 2011-09-29 02:07:22.584412664 +0200
+@@ -11,8 +11,8 @@
+
+ import glob, os, re, sys, string
+ import distutils
+-from distutils.core import setup
+-from distutils.extension import Extension
++from setuptools import setup
++from setuptools import Extension
+ from distutils.util import split_quoted
+ from distutils.version import LooseVersion
+
diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt
index 45123e0790..9589c49fe8 100644
--- a/packages/addons/multimedia/makemkv/changelog.txt
+++ b/packages/addons/multimedia/makemkv/changelog.txt
@@ -1,3 +1,6 @@
+0.99.3
+- update to makemkv-1.6.15
+
0.99.2
- change icon
diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta
index 5cf5c2a427..757a900b6a 100644
--- a/packages/addons/multimedia/makemkv/meta
+++ b/packages/addons/multimedia/makemkv/meta
@@ -19,8 +19,8 @@
################################################################################
PKG_NAME="makemkv"
-PKG_VERSION="1.6.10"
-PKG_REV="2"
+PKG_VERSION="1.6.15"
+PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.15-000-crosscompiling-0.1.patch
similarity index 100%
rename from packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.10-000-crosscompiling-0.1.patch
rename to packages/addons/multimedia/makemkv/patches.upstream/makemkv-1.6.15-000-crosscompiling-0.1.patch
diff --git a/packages/3rdparty/multimedia/shairport/build b/packages/addons/service/downloadmanager/pyload/addon
similarity index 76%
rename from packages/3rdparty/multimedia/shairport/build
rename to packages/addons/service/downloadmanager/pyload/addon
index 2e6df72fee..1133121155 100755
--- a/packages/3rdparty/multimedia/shairport/build
+++ b/packages/addons/service/downloadmanager/pyload/addon
@@ -22,15 +22,11 @@
. config/options $1
-cd $PKG_BUILD
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+ cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
-# fix me :(
-LIBAO_DIR=../libao-1.1.0
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
+ cp -R $BUILD/pycurl*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
-# large buffer
-sed -i 's|#define BUFFER_FRAMES 320|#define BUFFER_FRAMES 1024|g' hairtunes.h
-sed -i 's|read = ab_read + 10;|read = ab_read + 50;|g' hairtunes.c
-
-CFLAGS="-O2 -Wall -I$LIBAO_DIR/include" \
-LDFLAGS="-lm -lpthread -L$LIBAO_DIR/src/.libs -lao -lssl" \
-make
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pyload
+ cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/pyload
diff --git a/packages/addons/service/downloadmanager/pyload/changelog.txt b/packages/addons/service/downloadmanager/pyload/changelog.txt
new file mode 100644
index 0000000000..411ed2f4c4
--- /dev/null
+++ b/packages/addons/service/downloadmanager/pyload/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial version pyload-0.4.7
diff --git a/packages/addons/service/downloadmanager/pyload/icon/icon.png b/packages/addons/service/downloadmanager/pyload/icon/icon.png
new file mode 100644
index 0000000000..72a95b740b
Binary files /dev/null and b/packages/addons/service/downloadmanager/pyload/icon/icon.png differ
diff --git a/packages/addons/service/downloadmanager/pyload/meta b/packages/addons/service/downloadmanager/pyload/meta
new file mode 100644
index 0000000000..5ce5cce7b5
--- /dev/null
+++ b/packages/addons/service/downloadmanager/pyload/meta
@@ -0,0 +1,38 @@
+################################################################################
+# 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="pyload"
+PKG_VERSION="0.4.7"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://pyload.org/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="Python"
+PKG_BUILD_DEPENDS="toolchain Python pycurl unrar"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="pyLoad is a fast, lightweight and full featured download manager"
+PKG_LONGDESC="pyLoad is a fast, lightweight and full featured download manager for many One-Click-Hoster, container formats like DLC, video sites or just plain http/ftp links. It aims for low hardware requirements and platform independence to be runnable on all kind of systems (desktop pc, netbook, NAS, router)."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/multimedia/libao/build b/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service
similarity index 69%
rename from packages/3rdparty/multimedia/libao/build
rename to packages/addons/service/downloadmanager/pyload/source/bin/pyload.service
index 98a5a9342e..55d57d5374 100755
--- a/packages/3rdparty/multimedia/libao/build
+++ b/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service
@@ -20,20 +20,13 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-. config/options $1
+# Addon settings
+ ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.pyload"
+ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.pyload"
-cd $PKG_BUILD
+ export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
-./configure --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --prefix=/usr \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --disable-esd \
- --disable-esdtest \
- --disable-pulse \
- --enable-alsa \
- --prefix /storage/.xbmc/addons/service.multimedia.Airplayer-Suite
-
-make
+################################################################################
+# start pyload
+################################################################################
+ python $ADDON_DIR/pyload/pyLoadCore.py -daemon --configdir=$ADDON_HOME
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/default.py b/packages/addons/service/downloadmanager/pyload/source/default.py
old mode 100755
new mode 100644
similarity index 96%
rename from packages/addons/service/multimedia/Airplayer-Suite/source/default.py
rename to packages/addons/service/downloadmanager/pyload/source/default.py
index cca9fa4207..6a017ac4c2
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/default.py
+++ b/packages/addons/service/downloadmanager/pyload/source/default.py
@@ -20,4 +20,4 @@
import xbmc, time, os, subprocess
-os.system("Airplayer-Suite.service")
+os.system("pyload.service")
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/addon b/packages/addons/service/multimedia/Airplayer-Suite/addon
deleted file mode 100755
index 9030a152f5..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/addon
+++ /dev/null
@@ -1,42 +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 $ADDON_BUILD/$PKG_ADDON_ID/bin/
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib/
-
- cp $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
-
- cp $BUILD/pybonjour-1.1.1/pybonjour.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/
- cp -R $BUILD/tornado-ap-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/
- cp -R $BUILD/simplejson-ap-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/
-
- cp -a $BUILD/airplayer-*/airplayer/ $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
- cp $BUILD/libao-*/src/.libs/libao.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib/
- cp $BUILD/libao-*/src/plugins/alsa/.libs/libalsa.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
- cp $BUILD/libao-*/src/plugins/oss/.libs/liboss.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
-
- cp $BUILD/shairport-*/shairport $ADDON_BUILD/$PKG_ADDON_ID/bin/
- cp $BUILD/shairport-*/hairtunes $ADDON_BUILD/$PKG_ADDON_ID/bin/
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/changelog.txt b/packages/addons/service/multimedia/Airplayer-Suite/changelog.txt
deleted file mode 100755
index 4bace83caf..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/changelog.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-0.99.5
-- initial version airplayer-7776e54 and shairport-346db95
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/config/settings.xml b/packages/addons/service/multimedia/Airplayer-Suite/config/settings.xml
deleted file mode 100755
index 4e9671b6d6..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/config/settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/icon/icon.png b/packages/addons/service/multimedia/Airplayer-Suite/icon/icon.png
deleted file mode 100755
index a0e56d5f54..0000000000
Binary files a/packages/addons/service/multimedia/Airplayer-Suite/icon/icon.png and /dev/null differ
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/meta b/packages/addons/service/multimedia/Airplayer-Suite/meta
deleted file mode 100755
index e1c51358ad..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/meta
+++ /dev/null
@@ -1,36 +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="Airplayer-Suite"
-PKG_VERSION="Suite"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/PascalW/Airplayer"
-PKG_URL=""
-PKG_DEPENDS="Python"
-PKG_BUILD_DEPENDS="toolchain Python avahi pybonjour tornado-ap simplejson-ap airplayer libao shairport"
-PKG_PRIORITY="optional"
-PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="Airplayer and ShairPort programs"
-PKG_LONGDESC="Airplayer makes make media playing software Airplay-compatible. Airplayer features pluggable backends, making it possible to support different media players. Send video and pictures from your iDevice to your Airplay enabled media player. Audio streaming is currently not supported. On the iDevice side IOS 4.2 or above is required. ShairPort emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods."
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
-PKG_AUTORECONF="no"
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/asound.conf_ultra_stmlabs b/packages/addons/service/multimedia/Airplayer-Suite/source/asound.conf_ultra_stmlabs
deleted file mode 100755
index d687429de0..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/asound.conf_ultra_stmlabs
+++ /dev/null
@@ -1,84 +0,0 @@
- #
- # got from http://stmlabs.com/forum/topic/asoundconf-simultaneous-output#post-896
- # change line pcm "hw:1,7" to suit your box
- #
- #----
- # /etc/asound.conf file designed to expand 2 channels through device 'clone_output'
- # to output 2 channels to multiple devices
- #
- # Use aplay -l to find device numbers
- #
- #----
-
-pcm.!default {
- type plug
- slave.pcm "dmixed_hdmi"
-}
-
- #-----
- # Single channel dmixed. Crossfade works
- #-----
-pcm.hdmiout {
- type plug
- slave.pcm "dmixed_hdmi"
-}
-
-pcm.dmixed_hdmi {
- type dmix
- ipc_key 2024
- slave {
- pcm "hw:1,7" # hdmi
- }
-}
- #-----
- # multiple output portion begin (3 devices) dmix not supported.
- #-----
-
-pcm.clone_output {
- type plug
- slave.pcm "6channel_expander"
-}
-
-pcm.multi_pcm_device {
- type multi;
- slaves.a.pcm "hw:1,7"; # hdmi
- slaves.a.channels 2;
- slaves.b.pcm "hw:0,0"; # analog
- slaves.b.channels 2;
- slaves.c.pcm "hw:0,1"; # spdif
- slaves.c.channels 2;
- bindings.0.slave a;
- bindings.0.channel 0;
- bindings.1.slave a;
- bindings.1.channel 1;
- bindings.2.slave b;
- bindings.2.channel 0;
- bindings.3.slave b;
- bindings.3.channel 1;
- bindings.4.slave c;
- bindings.4.channel 0;
- bindings.5.slave c;
- bindings.5.channel 1;
-}
-
-ctl.multi_pcm_device {
- type hw;
- card 0;
-}
-
- pcm.6channel_expander {
- type route;
- slave.pcm "multi_pcm_device";
- slave.channels 6;
- ttable.0.0 1;
- ttable.1.1 1;
- ttable.0.2 1;
- ttable.1.3 1;
- ttable.0.4 1;
- ttable.1.5 1;
-}
-
-ctl.6channel_expander {
- type hw;
- card 0;
-}
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/bin/Airplayer-Suite.service b/packages/addons/service/multimedia/Airplayer-Suite/source/bin/Airplayer-Suite.service
deleted file mode 100755
index d68edb6311..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/bin/Airplayer-Suite.service
+++ /dev/null
@@ -1,127 +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
-################################################################################
-
-# setup functions
-read_xbmcconfig() {
- grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,,,"
-}
-
- ADDON_ID="Airplayer-Suite"
- ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.$ADDON_ID"
- ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.$ADDON_ID"
-
- AIRPLAYERSUITE_SETTINGS_XML="$ADDON_HOME/settings.xml"
- AIRPLAYERSUITE_SETTINGS_CONF="/var/config/$ADDON_ID.conf"
- XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
-
- # create default config
- mkdir -p $ADDON_HOME
- if [ ! -f "$AIRPLAYERSUITE_SETTINGS_XML" ]; then
- cp $ADDON_DIR/settings-default.xml $AIRPLAYERSUITE_SETTINGS_XML
- fi
-
- # convert xml file to bash variables and use them
- if [ -f "$AIRPLAYERSUITE_SETTINGS_XML" ]; then
- mkdir -p /var/config/
- awk -F\" '{print $2"=\""$4"\""}' "$AIRPLAYERSUITE_SETTINGS_XML" | sed '/^=/d' > $AIRPLAYERSUITE_SETTINGS_CONF
- . $AIRPLAYERSUITE_SETTINGS_CONF
- # replace spaces with underscore
- SHAIRPORT_NAME=${SHAIRPORT_NAME// /_}
- AIRPLAYER_NAME=${AIRPLAYER_NAME// /_}
- else
- LOG_FILES="true"
- SHAIRPORT_DEVICENAME="default"
- SHAIRPORT_DRIVER="alsa"
- SHAIRPORT_NAME="ShairPort"
- AIRPLAYER_NAME="Airplayer"
- fi
-
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
- export PYTHONPATH="$ADDON_DIR/pylib"
-
- if [ "$LOG_FILES" = "true" ]; then
- LOG_FILE_SHAIRPORT="$ADDON_HOME/shairport.log"
- LOG_FILE_AIRPLAYER="$ADDON_HOME/airplayer.log"
- PID_FILE_AIRPLAYER="$ADDON_HOME/airplayer.pid"
-
- ADDON_ARG_SHAIRPORT="-v --apname=$SHAIRPORT_NAME --ao_driver=$SHAIRPORT_DRIVER --ao_devicename=$SHAIRPORT_DEVICENAME"
- ADDON_ARG_AIRPLAYER="-d -p $PID_FILE_AIRPLAYER -l $LOG_FILE_AIRPLAYER"
- else
- LOG_FILE_SHAIRPORT="/dev/null"
- LOG_FILE_AIRPLAYER="/dev/null"
- PID_FILE_AIRPLAYER="$ADDON_HOME/airplayer.pid"
-
- ADDON_ARG_SHAIRPORT="--apname=$SHAIRPORT_NAME --ao_driver=$SHAIRPORT_DRIVER --ao_devicename=$SHAIRPORT_DEVICENAME"
- ADDON_ARG_AIRPLAYER="-d -p $PID_FILE_AIRPLAYER -l $LOG_FILE_AIRPLAYER"
- fi
-
- AIRPLAYER_SETTINGS_TMP="/tmp/airplayer_settings.py"
- AIRPLAYER_SETTINGS_ORIG="$ADDON_DIR/bin/airplayer/settings.py"
-
- # first copy to tmp
- cp "$AIRPLAYER_SETTINGS_ORIG" "$AIRPLAYER_SETTINGS_TMP"
-
- # read xbmc settings
- XBMC_PORT=`read_xbmcconfig webserverport`
- XBMC_USER=`read_xbmcconfig webserverusername`
- XBMC_PWD=`read_xbmcconfig webserverpassword`
-
- # modify with real values
- sed -i "s|MEDIA_BACKEND_PORT = .*|MEDIA_BACKEND_PORT = $XBMC_PORT|g" $AIRPLAYER_SETTINGS_TMP
-
- if [ -n "XBMC_USER" ]; then
- sed -i "s|MEDIA_BACKEND_USERNAME = .*|MEDIA_BACKEND_USERNAME = '$XBMC_USER'|g" $AIRPLAYER_SETTINGS_TMP
- else
- sed -i "s|MEDIA_BACKEND_USERNAME = .*|MEDIA_BACKEND_USERNAME = None|g" $AIRPLAYER_SETTINGS_TMP
- fi
- if [ -n "XBMC_PWD" ]; then
- sed -i "s|MEDIA_BACKEND_PASSWORD = .*|MEDIA_BACKEND_PASSWORD = '$XBMC_PWD'|g" $AIRPLAYER_SETTINGS_TMP
- else
- sed -i "s|MEDIA_BACKEND_PASSWORD = .*|MEDIA_BACKEND_PASSWORD = None|g" $AIRPLAYER_SETTINGS_TMP
- fi
- if [ -n "AIRPLAYER_NAME" ]; then
- sed -i "s|AIRPLAY_HOSTNAME = .*|AIRPLAY_HOSTNAME = '$AIRPLAYER_NAME'|g" $AIRPLAYER_SETTINGS_TMP
- else
- sed -i "s|AIRPLAY_HOSTNAME = .*|AIRPLAY_HOSTNAME = None|g" $AIRPLAYER_SETTINGS_TMP
- fi
-
- # if different copy it back
- if [ "`md5sum "$AIRPLAYER_SETTINGS_TMP" | cut -d ' ' -f 1`" != "`md5sum "$AIRPLAYER_SETTINGS_ORIG" | cut -d ' ' -f 1`" ]; then
- cp "$AIRPLAYER_SETTINGS_TMP" "$AIRPLAYER_SETTINGS_ORIG"
- fi
-
- rm "$AIRPLAYER_SETTINGS_TMP"
-
- # restart avahi daemon because sometimes doesn't start correctly at boot time
- avahi-daemon -k
- /bin/sh /etc/init.d/53_avahi
-
- # run shairport
- if [ ! $(pidof shairport) ]; then
- $ADDON_DIR/bin/shairport $ADDON_ARG_SHAIRPORT >$LOG_FILE_SHAIRPORT 2>&1 &
- fi
-
- # run airplayer
- ps -ef | grep airplayer.py | grep -v grep >/dev/null 2>&1
- if [ "$?" != "0" ]; then
- python $ADDON_DIR/bin/airplayer/airplayer.py $ADDON_ARG_AIRPLAYER
- fi
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/Airplayer-Suite/source/resources/language/English/strings.xml
deleted file mode 100755
index 966e7e8537..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/language/English/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- Airplayer and ShairPort
- Identification
- Airplayer name
- ShairPort name
- ShairPort sound output
- ao driver
- ao device name
- Log files
- Log file
- Enabled
-
diff --git a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/settings.xml b/packages/addons/service/multimedia/Airplayer-Suite/source/resources/settings.xml
deleted file mode 100755
index 100421536b..0000000000
--- a/packages/addons/service/multimedia/Airplayer-Suite/source/resources/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index 44d2d5045a..5487c925c2 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,9 @@
+0.99.8
+- add suspend/wakeup script
+
+0.99.7
+- update to hts-tvheadend-c88a646
+
0.99.6
- update to hts-tvheadend-9d775da
diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
index c932722df1..a2e0000e5b 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -19,8 +19,8 @@
################################################################################
PKG_NAME="hts-tvheadend"
-PKG_VERSION="9d775da"
-PKG_REV="6"
+PKG_VERSION="c88a646"
+PKG_REV="8"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/mediacenter/xbmc/init.d/91_setup-addons b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
old mode 100644
new mode 100755
similarity index 68%
rename from packages/mediacenter/xbmc/init.d/91_setup-addons
rename to packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
index 9f22b212cd..61ac1e3654
--- a/packages/mediacenter/xbmc/init.d/91_setup-addons
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
@@ -1,3 +1,5 @@
+#!/bin/sh
+
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@@ -18,27 +20,30 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-#
-# setup XBMC addons
-#
-# runlevels: openelec, textmode
+. /etc/profile
-case $RUNLEVEL in
- boot)
- progress "setup XBMC addons"
+LOCKDIR="/var/lock/"
+LOCKFILE="tvheadend"
- # hack: add addons to $PATH
- for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
- PATH="$PATH:$i"
- done
- export PATH
-
- # hack: make addon-bins executable
- chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
+case "$1" in
+ hibernate|suspend)
+ if [ $(pidof tvheadend) ];then
+ progress "Shutting down HTS TVHeadend for suspending..."
+ mkdir -p "$LOCKDIR"
+ touch "$LOCKDIR/$LOCKFILE"
+ killall tvheadend
+ fi
;;
- poweroff|reboot)
+ thaw|resume)
+ if [ -f "$LOCKDIR/$LOCKFILE" ];then
+ progress "Restarting HTS TVHeadend for wakeup..."
+ tvheadend.service
+ rm -rf "$LOCKDIR/$LOCKFILE"
+ fi
+ ;;
+
+ *) exit $NA
;;
esac
-
diff --git a/packages/audio/alsa-lib/meta b/packages/audio/alsa-lib/meta
index 64c4264c3e..e97f0bbba3 100644
--- a/packages/audio/alsa-lib/meta
+++ b/packages/audio/alsa-lib/meta
@@ -24,7 +24,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
-PKG_URL="http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.alsa-project.org/pub/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
diff --git a/packages/audio/alsa-plugins/build b/packages/audio/alsa-plugins/build
index 21a1c57afb..451928f8da 100755
--- a/packages/audio/alsa-plugins/build
+++ b/packages/audio/alsa-plugins/build
@@ -22,6 +22,12 @@
. config/options $1
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+ ALSA_PULSEAUDIO="--enable-pulseaudio"
+else
+ ALSA_PULSEAUDIO="--disable-pulseaudio"
+fi
+
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
@@ -33,9 +39,9 @@ cd $PKG_BUILD
--disable-static \
--enable-shared \
--disable-jack \
- --disable-samplerate \
+ --enable-samplerate \
--disable-avcodec \
- --disable-pulseaudio \
+ $ALSA_PULSEAUDIO \
--with-speex=lib \
$MAKE
diff --git a/packages/audio/alsa-plugins/config/samplerate.conf b/packages/audio/alsa-plugins/config/samplerate.conf
new file mode 100644
index 0000000000..8bf7b9a21f
--- /dev/null
+++ b/packages/audio/alsa-plugins/config/samplerate.conf
@@ -0,0 +1,11 @@
+# samplerate plugin configuration
+# $Id: samplerate.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
+
+pcm.my_rate {
+ type rate
+ slave.pcm "hw"
+ converter "samplerate"
+ hint {
+ description "External rate converter"
+ }
+}
diff --git a/packages/audio/alsa-plugins/config/speex.conf b/packages/audio/alsa-plugins/config/speex.conf
new file mode 100644
index 0000000000..c4f23e3b4f
--- /dev/null
+++ b/packages/audio/alsa-plugins/config/speex.conf
@@ -0,0 +1,11 @@
+# samplerate plugin configuration
+# $Id$
+
+pcm.my_rate {
+ type rate
+ slave.pcm "hw"
+ converter "speexrate"
+ hint {
+ description "Rate Converter Plugin Using Speex Resampler"
+ }
+}
diff --git a/packages/audio/alsa-plugins/config/upmix.conf b/packages/audio/alsa-plugins/config/upmix.conf
new file mode 100644
index 0000000000..e15055e1ea
--- /dev/null
+++ b/packages/audio/alsa-plugins/config/upmix.conf
@@ -0,0 +1,10 @@
+# upmix plugin configuration
+# $Id: upmix.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
+
+pcm.upmix51 {
+ type upmix
+ slave.pcm "surround51"
+ hint {
+ description "Upmixer channel expander"
+ }
+}
diff --git a/packages/audio/alsa-plugins/config/vdownmix.conf b/packages/audio/alsa-plugins/config/vdownmix.conf
new file mode 100644
index 0000000000..95786b8a66
--- /dev/null
+++ b/packages/audio/alsa-plugins/config/vdownmix.conf
@@ -0,0 +1,18 @@
+# vdownmix plugin configuration
+# $Id$
+
+pcm.!surround51 {
+ type vdownmix
+ slave.pcm "default"
+ hint {
+ description "Downmixer to stereo from surround51"
+ }
+}
+
+pcm.!surround40 {
+ type vdownmix
+ slave.pcm "default"
+ hint {
+ description "Downmixer to stereo from surround40"
+ }
+}
diff --git a/packages/audio/alsa-plugins/install b/packages/audio/alsa-plugins/install
index f401e3de7b..626ab795a1 100755
--- a/packages/audio/alsa-plugins/install
+++ b/packages/audio/alsa-plugins/install
@@ -24,3 +24,6 @@
mkdir -p $INSTALL/usr/lib/alsa
cp -P $PKG_BUILD/*/.libs/*.so $INSTALL/usr/lib/alsa
+
+mkdir -p $INSTALL/usr/share/alsa/pcm
+ cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm
diff --git a/packages/audio/alsa-plugins/meta b/packages/audio/alsa-plugins/meta
index a52f351db4..5a7add224c 100644
--- a/packages/audio/alsa-plugins/meta
+++ b/packages/audio/alsa-plugins/meta
@@ -19,14 +19,14 @@
################################################################################
PKG_NAME="alsa-plugins"
-PKG_VERSION="1.0.23"
+PKG_VERSION="1.0.24"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="alsa-lib speex"
-PKG_BUILD_DEPENDS="toolchain alsa-lib speex"
+PKG_DEPENDS="alsa-lib speex libsamplerate"
+PKG_BUILD_DEPENDS="toolchain alsa-lib speex libsamplerate"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="alsa-plugins: Advanced Linux Sound Architecture Plugins"
@@ -34,3 +34,8 @@ PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Li
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
+
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+ PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
+fi
diff --git a/packages/audio/alsa-utils/meta b/packages/audio/alsa-utils/meta
index b81c1f125b..421f1ba063 100644
--- a/packages/audio/alsa-utils/meta
+++ b/packages/audio/alsa-utils/meta
@@ -24,7 +24,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
-PKG_URL="http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.alsa-project.org/pub/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="alsa-lib"
PKG_BUILD_DEPENDS="toolchain alsa-lib"
PKG_PRIORITY="optional"
diff --git a/packages/audio/alsa-utils/scripts/soundconfig b/packages/audio/alsa-utils/scripts/soundconfig
index 4c3c9fa3f6..2355bdb7b0 100755
--- a/packages/audio/alsa-utils/scripts/soundconfig
+++ b/packages/audio/alsa-utils/scripts/soundconfig
@@ -128,7 +128,11 @@ else
mixer 0 'Master Front' 100%
# Shuttle XS35GT needs this too
- mixer 0 Master,0 100%
+ mixer 0 'Master',0 100% on
+
+# and this for various Fusion devices like Zotac ZBOX
+ mixer 1 'Master',0 100% on
+
fi
diff --git a/packages/audio/libmad/build b/packages/audio/libmad/build
index 8f4bbf759c..6d5246b01e 100755
--- a/packages/audio/libmad/build
+++ b/packages/audio/libmad/build
@@ -24,6 +24,10 @@
cd $PKG_BUILD
+if [ $TARGET_ARCH == "x86_64" ] ; then
+ MAD_OPTIONS="--enable-accuracy --enable-fpm=64bit"
+fi
+
# some fixes for autoreconf
touch NEWS AUTHORS ChangeLog
do_autoreconf
@@ -32,7 +36,8 @@ cd $PKG_BUILD
--build=$HOST_NAME \
--prefix=/usr \
--disable-static \
- --enable-shared
+ --enable-shared \
+ $MAD_OPTIONS
make
diff --git a/packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch b/packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch
new file mode 100644
index 0000000000..61b4b13bd7
--- /dev/null
+++ b/packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch
@@ -0,0 +1,12 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac 2007-07-01 12:58:13.000000000 -0600
++++ libmad-0.15.1b/configure.ac 2007-07-01 12:59:13.000000000 -0600
+@@ -105,7 +105,7 @@
+ shift
+ ;;
+ -O2)
+- optimize="-O"
++ optimize="-O2"
+ shift
+ ;;
+ -fomit-frame-pointer)
diff --git a/packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch b/packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch
new file mode 100644
index 0000000000..2ec44e3445
--- /dev/null
+++ b/packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch
@@ -0,0 +1,146 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac 2007-06-30 20:22:31.000000000 -0600
++++ libmad-0.15.1b/configure.ac 2007-06-30 20:25:31.000000000 -0600
+@@ -122,74 +122,74 @@
+ esac
+ done
+
+-if test "$GCC" = yes
+-then
+- if test -z "$arch"
+- then
+- case "$host" in
+- i386-*) ;;
+- i?86-*) arch="-march=i486" ;;
+- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
+- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
+- powerpc-*) ;;
+- mips*-agenda-*) arch="-mcpu=vr4100" ;;
+- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+- esac
+- fi
+-
+- case "$optimize" in
+- -O|"-O "*)
+- optimize="-O"
+- optimize="$optimize -fforce-mem"
+- optimize="$optimize -fforce-addr"
+- : #x optimize="$optimize -finline-functions"
+- : #- optimize="$optimize -fstrength-reduce"
+- optimize="$optimize -fthread-jumps"
+- optimize="$optimize -fcse-follow-jumps"
+- optimize="$optimize -fcse-skip-blocks"
+- : #x optimize="$optimize -frerun-cse-after-loop"
+- : #x optimize="$optimize -frerun-loop-opt"
+- : #x optimize="$optimize -fgcse"
+- optimize="$optimize -fexpensive-optimizations"
+- optimize="$optimize -fregmove"
+- : #* optimize="$optimize -fdelayed-branch"
+- : #x optimize="$optimize -fschedule-insns"
+- optimize="$optimize -fschedule-insns2"
+- : #? optimize="$optimize -ffunction-sections"
+- : #? optimize="$optimize -fcaller-saves"
+- : #> optimize="$optimize -funroll-loops"
+- : #> optimize="$optimize -funroll-all-loops"
+- : #x optimize="$optimize -fmove-all-movables"
+- : #x optimize="$optimize -freduce-all-givs"
+- : #? optimize="$optimize -fstrict-aliasing"
+- : #* optimize="$optimize -fstructure-noalias"
+-
+- case "$host" in
+- arm*-*)
+- optimize="$optimize -fstrength-reduce"
+- ;;
+- mips*-*)
+- optimize="$optimize -fstrength-reduce"
+- optimize="$optimize -finline-functions"
+- ;;
+- i?86-*)
+- optimize="$optimize -fstrength-reduce"
+- ;;
+- powerpc-apple-*)
+- # this triggers an internal compiler error with gcc2
+- : #optimize="$optimize -fstrength-reduce"
+-
+- # this is really only beneficial with gcc3
+- : #optimize="$optimize -finline-functions"
+- ;;
+- *)
+- # this sometimes provokes bugs in gcc 2.95.2
+- : #optimize="$optimize -fstrength-reduce"
+- ;;
+- esac
+- ;;
+- esac
+-fi
++#if test "$GCC" = yes
++#then
++# if test -z "$arch"
++# then
++# case "$host" in
++# i386-*) ;;
++# i?86-*) arch="-march=i486" ;;
++# arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
++# armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
++# powerpc-*) ;;
++# mips*-agenda-*) arch="-mcpu=vr4100" ;;
++# mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
++# esac
++# fi
++#
++# case "$optimize" in
++# -O|"-O "*)
++# optimize="-O"
++# optimize="$optimize -fforce-mem"
++# optimize="$optimize -fforce-addr"
++# : #x optimize="$optimize -finline-functions"
++# : #- optimize="$optimize -fstrength-reduce"
++# optimize="$optimize -fthread-jumps"
++# optimize="$optimize -fcse-follow-jumps"
++# optimize="$optimize -fcse-skip-blocks"
++# : #x optimize="$optimize -frerun-cse-after-loop"
++# : #x optimize="$optimize -frerun-loop-opt"
++# : #x optimize="$optimize -fgcse"
++# optimize="$optimize -fexpensive-optimizations"
++# optimize="$optimize -fregmove"
++# : #* optimize="$optimize -fdelayed-branch"
++# : #x optimize="$optimize -fschedule-insns"
++# optimize="$optimize -fschedule-insns2"
++# : #? optimize="$optimize -ffunction-sections"
++# : #? optimize="$optimize -fcaller-saves"
++# : #> optimize="$optimize -funroll-loops"
++# : #> optimize="$optimize -funroll-all-loops"
++# : #x optimize="$optimize -fmove-all-movables"
++# : #x optimize="$optimize -freduce-all-givs"
++# : #? optimize="$optimize -fstrict-aliasing"
++# : #* optimize="$optimize -fstructure-noalias"
++#
++# case "$host" in
++# arm*-*)
++# optimize="$optimize -fstrength-reduce"
++# ;;
++# mips*-*)
++# optimize="$optimize -fstrength-reduce"
++# optimize="$optimize -finline-functions"
++# ;;
++# i?86-*)
++# optimize="$optimize -fstrength-reduce"
++# ;;
++# powerpc-apple-*)
++# # this triggers an internal compiler error with gcc2
++# : #optimize="$optimize -fstrength-reduce"
++#
++# # this is really only beneficial with gcc3
++# : #optimize="$optimize -finline-functions"
++# ;;
++# *)
++# # this sometimes provokes bugs in gcc 2.95.2
++# : #optimize="$optimize -fstrength-reduce"
++# ;;
++# esac
++# ;;
++# esac
++#fi
+
+ case "$host" in
+ mips*-agenda-*)
diff --git a/packages/audio/libsndfile/build b/packages/audio/libsndfile/build
index c16241fa6f..3589a7ddda 100755
--- a/packages/audio/libsndfile/build
+++ b/packages/audio/libsndfile/build
@@ -28,9 +28,14 @@ cd $PKG_BUILD
--prefix=/usr \
--disable-static \
--enable-shared \
+ --disable-silent-rules \
--disable-sqlite \
--enable-alsa \
--disable-external-libs \
+ --disable-experimental \
+ --disable-test-coverage \
+ --enable-largefile \
+ --with-gnu-ld
make -C src
cp sndfile.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
diff --git a/packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch b/packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch
new file mode 100644
index 0000000000..ece79a7d2b
--- /dev/null
+++ b/packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch
@@ -0,0 +1,25 @@
+diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
+--- libsndfile-1.0.25-old/configure.ac 2011-07-13 01:59:57.000000000 -0700
++++ libsndfile-1.0.25-new/configure.ac 2011-07-13 17:04:14.000000000 -0700
+@@ -18,9 +18,6 @@
+ AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ AM_SILENT_RULES([yes])
+
+-dnl Add parameters for aclocal
+-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
+-
+ AC_LANG([C])
+
+ AC_PROG_CC
+diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
+--- libsndfile-1.0.25-old/Makefile.am 2011-07-07 02:47:24.000000000 -0700
++++ libsndfile-1.0.25-new/Makefile.am 2011-07-13 17:04:14.000000000 -0700
+@@ -2,6 +2,8 @@
+
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+
++ACLOCAL_AMFLAGS = -I M4
++
+ if BUILD_OCTAVE_MOD
+ octave_dir = Octave
+ endif
diff --git a/packages/audio/pulseaudio/build b/packages/audio/pulseaudio/build
new file mode 100755
index 0000000000..f26b88e560
--- /dev/null
+++ b/packages/audio/pulseaudio/build
@@ -0,0 +1,99 @@
+#!/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
+
+# pulseaudio fails to build with LTO support
+ strip_lto
+
+if [ "$AVAHI_DAEMON" = yes ]; then
+ PULSEAUDIO_AVAHI="--enable-avahi"
+else
+ PULSEAUDIO_AVAHI="--disable-avahi"
+fi
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+ --build=$HOST_NAME \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-shared \
+ --disable-silent-rules \
+ --disable-nls \
+ --enable-largefile \
+ --disable-rpath \
+ --enable-x11 \
+ --enable-samplerate \
+ --disable-oss-output \
+ --disable-oss-wrapper \
+ --disable-coreaudio-output \
+ --enable-alsa \
+ --disable-solaris \
+ --disable-waveout \
+ --disable-glib2 \
+ --disable-gtk2 \
+ --disable-gconf \
+ $PULSEAUDIO_AVAHI \
+ --disable-jack \
+ --disable-asyncns \
+ --disable-tcpwrap \
+ --disable-lirc \
+ --enable-dbus \
+ --disable-hal \
+ --disable-bluez \
+ --enable-udev \
+ --disable-hal-compat \
+ --enable-ipv6 \
+ --enable-openssl \
+ --disable-orc \
+ --disable-manpages \
+ --disable-per-user-esound-socket \
+ --enable-legacy-runtime-dir \
+ --enable-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
+
+mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
+ cp libpulse.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+ cp libpulse-simple.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+
+make DESTDIR="$SYSROOT_PREFIX" -C src install-pulseincludeHEADERS
+
diff --git a/packages/audio/pulseaudio/config/asound.conf b/packages/audio/pulseaudio/config/asound.conf
new file mode 100644
index 0000000000..9b1d6ea534
--- /dev/null
+++ b/packages/audio/pulseaudio/config/asound.conf
@@ -0,0 +1,13 @@
+#
+# Place your global alsa-lib configuration here...
+#
+
+@hooks [
+ {
+ func load
+ files [
+ "/etc/alsa/pulse-default.conf"
+ ]
+ errors false
+ }
+]
diff --git a/packages/audio/pulseaudio/config/default.pa b/packages/audio/pulseaudio/config/default.pa
new file mode 100644
index 0000000000..431d5e420b
--- /dev/null
+++ b/packages/audio/pulseaudio/config/default.pa
@@ -0,0 +1,153 @@
+#!/usr/bin/pulseaudio -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio 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 Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# This startup script is used only if PulseAudio is started per-user
+# (i.e. not in system mode)
+
+.nofail
+
+### Load something into the sample cache
+#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
+#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
+#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
+#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
+
+.fail
+
+### Automatically restore the volume of streams and devices
+load-module module-device-restore
+load-module module-stream-restore
+load-module module-card-restore
+
+### Automatically augment property information from .desktop files
+### stored in /usr/share/application
+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
+#load-module module-alsa-source device=hw:1,0
+#load-module module-null-sink
+#load-module module-pipe-sink
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-udev-detect.so
+load-module module-udev-detect
+.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
+load-module module-detect
+.endif
+
+### Automatically connect sink and source if JACK server is present
+.ifexists module-jackdbus-detect.so
+load-module module-jackdbus-detect
+.endif
+
+
+### Load several protocols
+.ifexists module-esound-protocol-unix.so
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Network access (may be configured with paprefs, so leave this commented
+### here if you plan to use paprefs)
+#load-module module-esound-protocol-tcp
+#load-module module-native-protocol-tcp
+#load-module module-zeroconf-publish
+
+### Load the RTP receiver module (also configured via paprefs, see above)
+#load-module module-rtp-recv
+
+### Load the RTP sender module (also configured via paprefs, see above)
+#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
+#load-module module-rtp-send source=rtp.monitor
+
+### Load additional modules from GConf settings. This can be configured with the paprefs tool.
+### Please keep in mind that the modules configured by paprefs might conflict with manually
+### loaded modules.
+.ifexists module-gconf.so
+.nofail
+load-module module-gconf
+.fail
+.endif
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Honour intended role device property
+load-module module-intended-roles
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### If autoexit on idle is enabled we want to make sure we only quit
+### when no local session needs us anymore.
+.ifexists module-console-kit.so
+load-module module-console-kit
+.endif
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
+
+### Cork music streams when a phone stream is active
+load-module module-cork-music-on-phone
+
+### Modules to allow autoloading of filters (such as echo cancellation)
+### on demand. module-filter-heuristics tries to determine what filters
+### make sense, and module-filter-apply does the heavy-lifting of
+### loading modules and rerouting streams.
+load-module module-filter-heuristics
+load-module module-filter-apply
+
+### Load DBus protocol
+.ifexists module-dbus-protocol.so
+load-module module-dbus-protocol
+.endif
+
+# X11 modules should not be started from default.pa so that one daemon
+# can be shared by multiple sessions.
+
+### Load X11 bell module
+#load-module module-x11-bell sample=bell-windowing-system
+
+### Register ourselves in the X11 session manager
+load-module module-x11-xsmp
+
+### Publish connection data in the X11 root window
+.ifexists module-x11-publish.so
+.nofail
+load-module module-x11-publish
+.fail
+.endif
+
+### Make some devices default
+#set-default-sink output
+#set-default-source input
diff --git a/packages/audio/pulseaudio/config/pulse-default.conf b/packages/audio/pulseaudio/config/pulse-default.conf
new file mode 100644
index 0000000000..a84bede025
--- /dev/null
+++ b/packages/audio/pulseaudio/config/pulse-default.conf
@@ -0,0 +1,35 @@
+# PulseAudio plugin configuration
+# $Id$
+
+# Let's create a virtual device "pulse" for mixer and PCM
+
+pcm.pulse {
+ type pulse
+ hint {
+ description "PulseAudio Sound Server"
+ }
+}
+
+ctl.pulse {
+ type pulse
+ hint {
+ description "PulseAudio Sound Server"
+ }
+}
+
+# Let's make it the default!
+
+pcm.!default {
+ type pulse
+ hint {
+ description "Default"
+ }
+}
+
+ctl.!default {
+ type pulse
+ hint {
+ description "Default"
+ }
+}
+
diff --git a/packages/audio/pulseaudio/config/system.pa b/packages/audio/pulseaudio/config/system.pa
new file mode 100644
index 0000000000..e389e0582f
--- /dev/null
+++ b/packages/audio/pulseaudio/config/system.pa
@@ -0,0 +1,62 @@
+#!/usr/bin/pulseaudio -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio 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 Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# This startup script is used only if PulseAudio is started in system
+# mode.
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-udev-detect.so
+load-module module-udev-detect
+.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
+load-module module-detect
+.endif
+
+### Load several protocols
+.ifexists module-esound-protocol-unix.so
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Automatically restore the volume of streams and devices
+load-module module-stream-restore
+load-module module-device-restore
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+load-module module-default-device-restore
+
+.ifexists module-dbus-protocol.so
+### If you want to allow TCP connections, set access to "remote" or "local,remote".
+load-module module-dbus-protocol access=local
+.endif
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
diff --git a/packages/x11/xserver/xorg-server/init.d/70_xorg b/packages/audio/pulseaudio/init.d/35_PulseAudio
similarity index 75%
rename from packages/x11/xserver/xorg-server/init.d/70_xorg
rename to packages/audio/pulseaudio/init.d/35_PulseAudio
index 9e61e7ca92..0b4f058936 100644
--- a/packages/x11/xserver/xorg-server/init.d/70_xorg
+++ b/packages/audio/pulseaudio/init.d/35_PulseAudio
@@ -18,17 +18,15 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
+# start PulseAudio daemon
#
-# mounting needed filesystems
-#
-# runlevels: openelec, installer, textmode
+# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- # dont do anything here, we start xorg per udev
- ;;
- poweroff|reboot)
- progress "stopping Xorg"
- killall Xorg
- ;;
-esac
+progress "starting PulseAudio daemon"
+ pulseaudio --system \
+ --daemonize \
+ --log-target=file:/var/log/pulseaudio.log \
+ --log-level=debug >/dev/null 2>&1
+
+# --disallow-exit \
+# --disallow-module-loading \
diff --git a/packages/audio/pulseaudio/install b/packages/audio/pulseaudio/install
new file mode 100755
index 0000000000..6dd8c7a1b8
--- /dev/null
+++ b/packages/audio/pulseaudio/install
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+. config/options $1
+
+# add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh"
+# add_group pulse 498
+# add_group pulse-access 497
+
+mkdir -p $INSTALL/etc/dbus-1/system.d
+ cp $PKG_BUILD/src/daemon/pulseaudio-system.conf $INSTALL/etc/dbus-1/system.d
+ sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
+
+mkdir -p $INSTALL/etc
+ cp $PKG_DIR/config/asound.conf $INSTALL/etc
+
+mkdir -p $INSTALL/etc/alsa
+ cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa
+
+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_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/bin
+ cp $PKG_BUILD/src/.libs/pacat $INSTALL/usr/bin
+ cp $PKG_BUILD/src/.libs/pacmd $INSTALL/usr/bin
+ cp $PKG_BUILD/src/.libs/pactl $INSTALL/usr/bin
+ ln -sf pactl $INSTALL/usr/bin/pamon
+ ln -sf pactl $INSTALL/usr/bin/paplay
+ 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/pulseaudio $INSTALL/usr/bin
+# cp $PKG_BUILD/src/start-pulseaudio-x11 $INSTALL/usr/bin
+
+mkdir -p $INSTALL/usr/lib
+ cp -P $PKG_BUILD/src/.libs/libpulse*.so* $INSTALL/usr/lib
+ rm -rf $INSTALL/usr/lib/libpulse*.so*T
+
+mkdir -p $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libalsa-util.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libavahi-wrap.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libcli.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libprotocol-cli.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libprotocol-esound.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libprotocol-http.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libprotocol-native.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libprotocol-simple.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/libraop.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/librtp.so $INSTALL/usr/lib/pulse
+ cp -P $PKG_BUILD/src/.libs/module-*.so $INSTALL/usr/lib/pulse
+
+mkdir -p $INSTALL/usr/share/pulseaudio/alsa-mixer/paths
+ cp $PKG_BUILD/src/modules/alsa/mixer/paths/* $INSTALL/usr/share/pulseaudio/alsa-mixer/paths
+
+mkdir -p $INSTALL/usr/share/pulseaudio/alsa-mixer/profile-sets
+ cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/*.conf $INSTALL/usr/share/pulseaudio/alsa-mixer/profile-sets
diff --git a/packages/audio/pulseaudio/meta b/packages/audio/pulseaudio/meta
new file mode 100644
index 0000000000..8eb39ae298
--- /dev/null
+++ b/packages/audio/pulseaudio/meta
@@ -0,0 +1,42 @@
+################################################################################
+# 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="pulseaudio"
+PKG_VERSION="1.0"
+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_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"
+PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+if [ "$AVAHI_DAEMON" = yes ]; then
+ PKG_DEPENDS="$PKG_DEPENDS avahi"
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
+fi
+
diff --git a/packages/compress/lzo/meta b/packages/compress/lzo/meta
index eac4d84498..bd943c8987 100644
--- a/packages/compress/lzo/meta
+++ b/packages/compress/lzo/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="lzo"
-PKG_VERSION="2.04"
+PKG_VERSION="2.06"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/compress/lzo/patches/lzo-2.04-acinclude_m4.patch b/packages/compress/lzo/patches/lzo-2.04-acinclude_m4.patch
deleted file mode 100644
index 8f860f4cc0..0000000000
--- a/packages/compress/lzo/patches/lzo-2.04-acinclude_m4.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-The lzo tarball only contains an aclocal.m4, which is the result from
-running aclocal. Unfortunately, it lacks the acinclude.m4 file which
-would allow us to do an autoreconf of the package. Therefore, this
-patch extracts from aclocal.m4 the parts that are specific to this lzo
-package, and put them into an acinclude.m4 so that autoreconf on this
-package will work.
-
-Signed-off-by: Thomas Petazzoni
----
- acinclude.m4 | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 360 insertions(+)
-
-Index: lzo-2.03/acinclude.m4
-===================================================================
---- /dev/null
-+++ lzo-2.03/acinclude.m4
-@@ -0,0 +1,360 @@
-+# /***********************************************************************
-+# // standard ACC macros
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
-+AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
-+])#
-+
-+AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
-+AC_HEADER_TIME
-+AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h])
-+])#
-+
-+AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
-+AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown clock_getcpuclockid clock_getres clock_gettime ctime difftime fstat getenv getpagesize getrusage gettimeofday gmtime isatty localtime longjmp lstat memcmp memcpy memmove memset mkdir mktime mmap mprotect munmap qsort raise rmdir setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
-+])#
-+
-+
-+AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
-+AC_CHECK_SIZEOF(short)
-+AC_CHECK_SIZEOF(int)
-+AC_CHECK_SIZEOF(long)
-+
-+AC_CHECK_SIZEOF(long long)
-+AC_CHECK_SIZEOF(__int16)
-+AC_CHECK_SIZEOF(__int32)
-+AC_CHECK_SIZEOF(__int64)
-+
-+AC_CHECK_SIZEOF(void *)
-+AC_CHECK_SIZEOF(size_t)
-+AC_CHECK_SIZEOF(ptrdiff_t)
-+])#
-+
-+
-+# /***********************************************************************
-+# // Check for ACC_conformance
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_ACC_ACCCHK], [
-+mfx_tmp=$1
-+mfx_save_CPPFLAGS=$CPPFLAGS
-+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
-+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
-+
-+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
-+
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-+[[#define ACC_CONFIG_NO_HEADER 1
-+#include "acc/acc.h"
-+#include "acc/acc_incd.h"
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-+#include "acc/acc_chk.ch"
-+#undef ACCCHK_ASSERT
-+static void test_acc_compile_time_assert(void) {
-+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr)
-+#include "acc/acc_chk.ch"
-+#undef ACCCHK_ASSERT
-+}
-+#undef NDEBUG
-+#include
-+static int test_acc_run_time_assert(int r) {
-+#define ACCCHK_ASSERT(expr) assert(expr);
-+#include "acc/acc_chk.ch"
-+#undef ACCCHK_ASSERT
-+return r;
-+}
-+]], [[
-+test_acc_compile_time_assert();
-+if (test_acc_run_time_assert(1) != 1) return 1;
-+]]
-+)])
-+
-+mfx_tmp=FAILED
-+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+
-+CPPFLAGS=$mfx_save_CPPFLAGS
-+
-+AC_MSG_RESULT([$mfx_tmp])
-+case x$mfx_tmp in
-+ xpassed | xyes) ;;
-+ *)
-+ AC_MSG_NOTICE([])
-+ AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
-+ AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
-+ AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
-+ AC_MSG_NOTICE([Thanks for your support.])
-+ AC_MSG_NOTICE([])
-+ AC_MSG_ERROR([ACC conformance test failed. Stop.])
-+dnl AS_EXIT
-+ ;;
-+esac
-+])# mfx_ACC_ACCCHK
-+
-+
-+# /***********************************************************************
-+# // Check for ACC_conformance
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_MINIACC_ACCCHK], [
-+mfx_tmp=$1
-+mfx_save_CPPFLAGS=$CPPFLAGS
-+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
-+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
-+
-+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
-+
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-+[[#define ACC_CONFIG_NO_HEADER 1
-+#define ACC_WANT_ACC_INCD_H 1
-+#include $2
-+
-+#define ACC_WANT_ACC_CHK_CH 1
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-+#include $2
-+
-+#define ACC_WANT_ACC_CHK_CH 1
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr)
-+static void test_acc_compile_time_assert(void) {
-+#include $2
-+}
-+
-+#undef NDEBUG
-+#include
-+#define ACC_WANT_ACC_CHK_CH 1
-+#undef ACCCHK_ASSERT
-+#define ACCCHK_ASSERT(expr) assert(expr);
-+static int test_acc_run_time_assert(int r) {
-+#include $2
-+return r;
-+}
-+]], [[
-+test_acc_compile_time_assert();
-+if (test_acc_run_time_assert(1) != 1) return 1;
-+]]
-+)])
-+
-+mfx_tmp=FAILED
-+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+
-+CPPFLAGS=$mfx_save_CPPFLAGS
-+
-+AC_MSG_RESULT([$mfx_tmp])
-+case x$mfx_tmp in
-+ xpassed | xyes) ;;
-+ *)
-+ AC_MSG_NOTICE([])
-+ AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
-+ AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
-+ AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
-+ AC_MSG_NOTICE([Thanks for your support.])
-+ AC_MSG_NOTICE([])
-+ AC_MSG_ERROR([ACC conformance test failed. Stop.])
-+dnl AS_EXIT
-+ ;;
-+esac
-+])# mfx_MINIACC_ACCCHK
-+
-+
-+
-+# serial 1
-+
-+AC_DEFUN([mfx_PROG_CPPFLAGS], [
-+AC_MSG_CHECKING([whether the C preprocessor needs special flags])
-+
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-+[[#include
-+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
-+# include "your C preprocessor is broken 1"
-+#elif (0xffffu == 0xfffffffful)
-+# include "your C preprocessor is broken 2"
-+#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX)
-+# include "your C preprocessor is broken 3"
-+#endif
-+]], [[ ]]
-+)])
-+
-+mfx_save_CPPFLAGS=$CPPFLAGS
-+mfx_tmp=ERROR
-+for mfx_arg in "" -no-cpp-precomp
-+do
-+ CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS"
-+ _AC_COMPILE_IFELSE([],
-+[mfx_tmp=$mfx_arg
-+break])
-+done
-+CPPFLAGS=$mfx_save_CPPFLAGS
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+case x$mfx_tmp in
-+ x)
-+ AC_MSG_RESULT([none needed]) ;;
-+ xERROR)
-+ AC_MSG_RESULT([ERROR])
-+ AC_MSG_ERROR([your C preprocessor is broken - for details see config.log])
-+ ;;
-+ *)
-+ AC_MSG_RESULT([$mfx_tmp])
-+ CPPFLAGS="$mfx_tmp $CPPFLAGS"
-+ ;;
-+esac
-+])# mfx_PROG_CPPFLAGS
-+
-+# serial 3
-+
-+AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [
-+AC_CACHE_CHECK([whether limits.h is sane],
-+mfx_cv_header_sane_limits_h,
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include
-+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
-+# if defined(__APPLE__) && defined(__GNUC__)
-+# error "your preprocessor is broken - use compiler option -no-cpp-precomp"
-+# else
-+# include "your preprocessor is broken"
-+# endif
-+#endif
-+#define MFX_0xffff 0xffff
-+#define MFX_0xffffffffL 4294967295ul
-+#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
-+# include "error CHAR_BIT"
-+#endif
-+#if !defined(UCHAR_MAX)
-+# include "error UCHAR_MAX 1"
-+#endif
-+#if !defined(USHRT_MAX)
-+# include "error USHRT_MAX 1"
-+#endif
-+#if !defined(UINT_MAX)
-+# include "error UINT_MAX 1"
-+#endif
-+#if !defined(ULONG_MAX)
-+# include "error ULONG_MAX 1"
-+#endif
-+#if !defined(SHRT_MAX)
-+# include "error SHRT_MAX 1"
-+#endif
-+#if !defined(INT_MAX)
-+# include "error INT_MAX 1"
-+#endif
-+#if !defined(LONG_MAX)
-+# include "error LONG_MAX 1"
-+#endif
-+#if (UCHAR_MAX < 1)
-+# include "error UCHAR_MAX 2"
-+#endif
-+#if (USHRT_MAX < 1)
-+# include "error USHRT_MAX 2"
-+#endif
-+#if (UINT_MAX < 1)
-+# include "error UINT_MAX 2"
-+#endif
-+#if (ULONG_MAX < 1)
-+# include "error ULONG_MAX 2"
-+#endif
-+#if (UCHAR_MAX < 0xff)
-+# include "error UCHAR_MAX 3"
-+#endif
-+#if (USHRT_MAX < MFX_0xffff)
-+# include "error USHRT_MAX 3"
-+#endif
-+#if (UINT_MAX < MFX_0xffff)
-+# include "error UINT_MAX 3"
-+#endif
-+#if (ULONG_MAX < MFX_0xffffffffL)
-+# include "error ULONG_MAX 3"
-+#endif
-+#if (USHRT_MAX > UINT_MAX)
-+# include "error USHRT_MAX vs UINT_MAX"
-+#endif
-+#if (UINT_MAX > ULONG_MAX)
-+# include "error UINT_MAX vs ULONG_MAX"
-+#endif
-+]], [[
-+#if (USHRT_MAX == MFX_0xffff)
-+{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; }
-+#elif (USHRT_MAX >= MFX_0xffff)
-+{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; }
-+#endif
-+#if (UINT_MAX == MFX_0xffff)
-+{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; }
-+#elif (UINT_MAX >= MFX_0xffff)
-+{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; }
-+#endif
-+#if (ULONG_MAX == MFX_0xffff)
-+{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; }
-+#elif (ULONG_MAX >= MFX_0xffff)
-+{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; }
-+#endif
-+#if !defined(_CRAY1) /* CRAY PVP systems */
-+#if (USHRT_MAX == MFX_0xffffffffL)
-+{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; }
-+#elif (USHRT_MAX >= MFX_0xffffffffL)
-+{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; }
-+#endif
-+#endif /* _CRAY1 */
-+#if (UINT_MAX == MFX_0xffffffffL)
-+{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; }
-+#elif (UINT_MAX >= MFX_0xffffffffL)
-+{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; }
-+#endif
-+#if (ULONG_MAX == MFX_0xffffffffL)
-+{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; }
-+#elif (ULONG_MAX >= MFX_0xffffffffL)
-+{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; }
-+#endif
-+]])],
-+[mfx_cv_header_sane_limits_h=yes],
-+[mfx_cv_header_sane_limits_h=no])])
-+])
-+
-+# /***********************************************************************
-+# // standard
-+# ************************************************************************/
-+
-+AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [
-+AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
-+])#
-+
-+
-+# /***********************************************************************
-+# //
-+# ************************************************************************/
-+
-+dnl more types which are not yet covered by ACC
-+
-+AC_DEFUN([mfx_CHECK_SIZEOF], [
-+AC_CHECK_SIZEOF(__int32)
-+AC_CHECK_SIZEOF(intmax_t)
-+AC_CHECK_SIZEOF(uintmax_t)
-+AC_CHECK_SIZEOF(intptr_t)
-+AC_CHECK_SIZEOF(uintptr_t)
-+
-+AC_CHECK_SIZEOF(float)
-+AC_CHECK_SIZEOF(double)
-+AC_CHECK_SIZEOF(long double)
-+
-+AC_CHECK_SIZEOF(dev_t)
-+AC_CHECK_SIZEOF(fpos_t)
-+AC_CHECK_SIZEOF(mode_t)
-+AC_CHECK_SIZEOF(off_t)
-+AC_CHECK_SIZEOF(ssize_t)
-+AC_CHECK_SIZEOF(time_t)
-+])#
-+
-+
-+
-+AC_DEFUN([mfx_CHECK_LIB_WINMM], [
-+if test "X$GCC" = Xyes; then
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+ test "X$LIBS" != "X" && LIBS="$LIBS "
-+ LIBS="${LIBS}-lwinmm" ;;
-+*)
-+ ;;
-+esac
-+fi
-+])#
diff --git a/packages/compress/lzo/patches/lzo-2.04-fix_makefile_am.patch b/packages/compress/lzo/patches/lzo-2.04-fix_makefile_am.patch
deleted file mode 100644
index 9f23e40db1..0000000000
--- a/packages/compress/lzo/patches/lzo-2.04-fix_makefile_am.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile.am is not allowed to override CFLAGS/CPPFLAGS, it must use
-AM_CFLAGS and AM_CPPFLAGS. This is needed in order for autoreconf to
-work on this package.
-
-Signed-off-by: Thomas Petazzoni
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: lzo-2.03/src/Makefile.am
-===================================================================
---- lzo-2.03.orig/src/Makefile.am
-+++ lzo-2.03/src/Makefile.am
-@@ -7,8 +7,8 @@
- SUFFIXES = .S
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
--CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
--CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
-+AM_CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
-+AM_CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
-
- lib_LTLIBRARIES = liblzo2.la
-
diff --git a/packages/databases/mysql/meta b/packages/databases/mysql/meta
index 0dba776050..68ec7e1020 100644
--- a/packages/databases/mysql/meta
+++ b/packages/databases/mysql/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="mysql"
-PKG_VERSION="5.1.58"
+PKG_VERSION="5.1.59"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
diff --git a/packages/databases/mysql/patches/mysql-5.1.58-010_crosscompiling.patch b/packages/databases/mysql/patches/mysql-5.1.59-010_crosscompiling.patch
similarity index 100%
rename from packages/databases/mysql/patches/mysql-5.1.58-010_crosscompiling.patch
rename to packages/databases/mysql/patches/mysql-5.1.59-010_crosscompiling.patch
diff --git a/packages/databases/sqlite/meta b/packages/databases/sqlite/meta
index 59f584093c..077a8a3318 100644
--- a/packages/databases/sqlite/meta
+++ b/packages/databases/sqlite/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3070701"
+PKG_VERSION="autoconf-3070800"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="PublicDomain"
diff --git a/packages/devel/dbus-glib/meta b/packages/devel/dbus-glib/meta
index 28d36e819d..132fa100b3 100644
--- a/packages/devel/dbus-glib/meta
+++ b/packages/devel/dbus-glib/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dbus-glib"
-PKG_VERSION="0.92"
+PKG_VERSION="0.98"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/devel/file/meta b/packages/devel/file/meta
index c4f4896f78..6374af413d 100644
--- a/packages/devel/file/meta
+++ b/packages/devel/file/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="file"
-PKG_VERSION="5.08"
+PKG_VERSION="5.09"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
diff --git a/packages/devel/file/patches/file-5.08-zip.patch b/packages/devel/file/patches/file-5.09-zip.patch
similarity index 100%
rename from packages/devel/file/patches/file-5.08-zip.patch
rename to packages/devel/file/patches/file-5.09-zip.patch
diff --git a/packages/devel/glib-host/meta b/packages/devel/glib-host/meta
index 49a260279e..59f1a0f1c4 100644
--- a/packages/devel/glib-host/meta
+++ b/packages/devel/glib-host/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
PKG_SITE="http://www.gtk.org/"
PKG_URL=""
PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain gtk-doc zlib-host"
+PKG_BUILD_DEPENDS="toolchain libffi-host zlib-host"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="glib-host: C support library"
diff --git a/packages/devel/glib/build b/packages/devel/glib/build
index 3f407e3bf9..c9e443afc3 100755
--- a/packages/devel/glib/build
+++ b/packages/devel/glib/build
@@ -33,6 +33,7 @@ ac_cv_func_mmap_fixed_mapped='yes' \
ac_cv_func_posix_getpwuid_r='yes' \
ac_cv_func_posix_getgrgid_r='yes' \
ac_cv_func_printf_unix98='yes' \
+ac_cv_func_qsort_r='no' \
ac_cv_func_snprintf_c99='yes' \
ac_cv_func_vsnprintf_c99='yes' \
glib_cv_stack_grows='no' \
diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta
index c069832ebb..317666404e 100644
--- a/packages/devel/glib/meta
+++ b/packages/devel/glib/meta
@@ -19,14 +19,14 @@
################################################################################
PKG_NAME="glib"
-PKG_VERSION="2.28.8"
+PKG_VERSION="2.30.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="zlib libiconv pcre"
-PKG_BUILD_DEPENDS="toolchain zlib libiconv pcre gtk-doc glib-host"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.30/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="zlib libiconv libffi pcre"
+PKG_BUILD_DEPENDS="toolchain zlib libiconv libffi pcre glib-host gtk-doc"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="glib: C support library"
diff --git a/packages/devel/libcap-ng/build b/packages/devel/json-c/build
similarity index 88%
rename from packages/devel/libcap-ng/build
rename to packages/devel/json-c/build
index ff54471dd4..632c3cf34b 100755
--- a/packages/devel/libcap-ng/build
+++ b/packages/devel/json-c/build
@@ -3,7 +3,6 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2010-2011 Roman Weber (roman@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
@@ -24,18 +23,16 @@
. config/options $1
cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
+ac_cv_func_realloc_0_nonnull=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
- --disable-static \
--enable-shared \
- --with-gnu-ld \
- --without-debug \
- --with-warn \
- --without-python
+ --disable-static \
make
diff --git a/packages/security/libtasn1/install b/packages/devel/json-c/install
similarity index 95%
rename from packages/security/libtasn1/install
rename to packages/devel/json-c/install
index b735c14c77..56e600ecb8 100755
--- a/packages/security/libtasn1/install
+++ b/packages/devel/json-c/install
@@ -23,4 +23,5 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
+ cp -P $PKG_BUILD/.libs/libjson*.so* $INSTALL/usr/lib
+
diff --git a/packages/security/libtasn1/meta b/packages/devel/json-c/meta
similarity index 69%
rename from packages/security/libtasn1/meta
rename to packages/devel/json-c/meta
index c60a72a046..bd14e416f6 100644
--- a/packages/security/libtasn1/meta
+++ b/packages/devel/json-c/meta
@@ -18,19 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="libtasn1"
-PKG_VERSION="2.9"
+PKG_NAME="json-c"
+PKG_VERSION="0.9"
PKG_REV="1"
PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.gnupg.org/"
-PKG_URL="http://ftp.gnu.org/gnu/libtasn1/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_LICENSE="MIT"
+PKG_SITE="http://oss.metaparadigm.com/json-c/"
+PKG_URL="http://oss.metaparadigm.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
-PKG_SECTION="security"
-PKG_SHORTDESC="libtasn1: Library for ASN.1 and DER manipulation"
-PKG_LONGDESC="Libtasn is a library written in C for manipulating ASN.1 objects including DER/BER encoding and DER/BER decoding. Libtasn is used by GnuTLS to manipulate X.509 objects and by GNU Shishi to handle Kerberos V5 packets."
+PKG_SECTION="devel"
+PKG_SHORTDESC="json-c: A JSON implementation in C"
+PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
diff --git a/packages/devel/libcap-ng/install b/packages/devel/libcap-ng/install
deleted file mode 100755
index 4d14480164..0000000000
--- a/packages/devel/libcap-ng/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2010-2011 Roman Weber (roman@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 -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/devel/libcap-ng/meta b/packages/devel/libcap-ng/meta
deleted file mode 100644
index 0e08fcc904..0000000000
--- a/packages/devel/libcap-ng/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2010-2011 Roman Weber (roman@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="libcap-ng"
-PKG_VERSION="0.6.6"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL="http://people.redhat.com/sgrubb/libcap-ng/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="attr"
-PKG_BUILD_DEPENDS="toolchain attr"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="libcap-ng: A library for getting and setting POSIX.1e capabilities"
-PKG_LONGDESC="As of Linux 2.2.0, the power of the superuser has been partitioned into a set of discrete capabilities (in other places, these capabilities are know as privileges). The contents of the libcap package are a library and a number of simple programs that are intended to show how an application/daemon can be protected (with wrappers) or rewritten to take advantage of this fine grained approach to constraining the danger to your system from programs running as 'root'."
-PKG_IS_ADDON="no"
diff --git a/packages/devel/libimobiledevice/build b/packages/devel/libcec/build
similarity index 92%
rename from packages/devel/libimobiledevice/build
rename to packages/devel/libcec/build
index d663aa9d58..31c65a3880 100755
--- a/packages/devel/libimobiledevice/build
+++ b/packages/devel/libcec/build
@@ -22,6 +22,9 @@
. config/options $1
+# libcec fails to build with LTO optimization
+ strip_lto
+
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
@@ -29,9 +32,7 @@ cd $PKG_BUILD
--sysconfdir=/etc \
--disable-static \
--enable-shared \
- --without-swig \
- --disable-largefile \
- --with-gnu-ld
-make V=1
+make
+
$MAKEINSTALL
diff --git a/packages/network/netmount/install b/packages/devel/libcec/install
similarity index 85%
rename from packages/network/netmount/install
rename to packages/devel/libcec/install
index 87546cd92a..aaafbd3334 100755
--- a/packages/network/netmount/install
+++ b/packages/devel/libcec/install
@@ -22,8 +22,10 @@
. config/options $1
- mkdir -p $INSTALL/usr/bin
- cp $PKG_DIR/scripts/netmount $INSTALL/usr/bin
+mkdir -p $INSTALL/usr/lib
+ cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
- mkdir -p $INSTALL/usr/config
- cp $PKG_DIR/config/netmount.conf.sample $INSTALL/usr/config
+if [ "$DEVTOOLS" = yes ]; then
+ mkdir -p $INSTALL/usr/bin
+ cp -P $PKG_BUILD/src/testclient/.libs/cec-client $INSTALL/usr/bin
+fi
\ No newline at end of file
diff --git a/packages/sysutils/ifuse/meta b/packages/devel/libcec/meta
similarity index 72%
rename from packages/sysutils/ifuse/meta
rename to packages/devel/libcec/meta
index f51bde9e09..531cfaa6b3 100644
--- a/packages/sysutils/ifuse/meta
+++ b/packages/devel/libcec/meta
@@ -18,19 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="ifuse"
-PKG_VERSION="1.0.0"
+PKG_NAME="libcec"
+PKG_VERSION="cc30d5c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="http://www.libimobiledevice.org"
-PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="fuse glib libimobiledevice"
-PKG_BUILD_DEPENDS="toolchain fuse glib libimobiledevice"
+PKG_SITE="http://libcec.pulse-eight.com/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="udev"
+PKG_BUILD_DEPENDS="toolchain udev"
PKG_PRIORITY="optional"
PKG_SECTION="system"
-PKG_SHORTDESC="ifuse: a fuse filesystem for mounting iPhone and iPod touch devices"
-PKG_LONGDESC="ifise is a fuse filesystem for mounting iPhone and iPod touch devices"
+PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
+PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
diff --git a/packages/devel/libevent/meta b/packages/devel/libevent/meta
index 1bea224424..5be8f1531c 100644
--- a/packages/devel/libevent/meta
+++ b/packages/devel/libevent/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libevent"
-PKG_VERSION="2.0.12-stable"
+PKG_VERSION="2.0.14-stable"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
diff --git a/packages/devel/libffi-host/build b/packages/devel/libffi-host/build
new file mode 100755
index 0000000000..6cc66d174c
--- /dev/null
+++ b/packages/devel/libffi-host/build
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC.tv; see the file COPYING. If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+$SCRIPTS/unpack libffi
+
+setup_toolchain host
+
+cd $BUILD/libffi-*
+mkdir -p .build-host && cd .build-host
+../configure --host=$HOST_NAME \
+ --build=$HOST_NAME \
+ --prefix=$ROOT/$TOOLCHAIN \
+ --sysconfdir=/etc \
+ --disable-static \
+ --enable-shared \
+ --disable-debug \
+ --enable-structs \
+ --enable-raw-api \
+ --disable-purify-safety \
+ --with-gnu-ld
+
+make
+make install
diff --git a/packages/3rdparty/multimedia/libao/meta b/packages/devel/libffi-host/meta
old mode 100755
new mode 100644
similarity index 75%
rename from packages/3rdparty/multimedia/libao/meta
rename to packages/devel/libffi-host/meta
index 9d3153e9a1..cad9095434
--- a/packages/3rdparty/multimedia/libao/meta
+++ b/packages/devel/libffi-host/meta
@@ -18,18 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="libao"
-PKG_VERSION="1.1.0"
+PKG_NAME="libffi-host"
+PKG_VERSION=""
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/Andywebs/shairport"
-PKG_URL="http://downloads.xiph.org/releases/ao/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="http://sourceware.org/$PKG_NAME/"
+PKG_URL=""
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="libao: a cross platform audio library"
-PKG_LONGDESC="Libao is a cross-platform audio library that allows programs to output audio using a simple API on a wide variety of platforms."
+PKG_SECTION="devel"
+PKG_SHORTDESC="Foreign Function Interface Library"
+PKG_LONGDESC="The libffi library provides a portable, high level programming interface to various calling conventions. This allows a programmer to call any function specified by a call interface description at run-time."
PKG_IS_ADDON="no"
+
PKG_AUTORECONF="no"
diff --git a/packages/devel/libffi/build b/packages/devel/libffi/build
index f7165b19be..08f3b805ef 100755
--- a/packages/devel/libffi/build
+++ b/packages/devel/libffi/build
@@ -23,13 +23,18 @@
. config/options $1
cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-static \
- --enable-shared \
- --disable-debug \
+mkdir -p .build-target && cd .build-target
+../configure --host=$TARGET_NAME \
+ --build=$HOST_NAME \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --enable-shared \
+ --disable-debug \
+ --enable-structs \
+ --enable-raw-api \
+ --disable-purify-safety \
+ --with-gnu-ld
make
diff --git a/packages/devel/libffi/install b/packages/devel/libffi/install
index 0895911777..a710883507 100755
--- a/packages/devel/libffi/install
+++ b/packages/devel/libffi/install
@@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
+ cp -P $PKG_BUILD/.build-target/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/devel/libffi/meta b/packages/devel/libffi/meta
index b51a15160b..097ccefe1f 100644
--- a/packages/devel/libffi/meta
+++ b/packages/devel/libffi/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libffi"
-PKG_VERSION="3.0.9"
+PKG_VERSION="3.0.10"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/devel/libiconv/build b/packages/devel/libiconv/build
index 17a9ace656..a57ebe0ffd 100755
--- a/packages/devel/libiconv/build
+++ b/packages/devel/libiconv/build
@@ -22,6 +22,9 @@
. config/options $1
+# libiconv-1.14 fails to build with LTO support
+ strip_lto
+
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
diff --git a/packages/devel/libiconv/meta b/packages/devel/libiconv/meta
index 1488a22983..09eb14abfc 100644
--- a/packages/devel/libiconv/meta
+++ b/packages/devel/libiconv/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libiconv"
-PKG_VERSION="1.13.1"
+PKG_VERSION="1.14"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/devel/libimobiledevice/meta b/packages/devel/libimobiledevice/meta
deleted file mode 100644
index 83577ef91e..0000000000
--- a/packages/devel/libimobiledevice/meta
+++ /dev/null
@@ -1,36 +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="libimobiledevice"
-PKG_VERSION="1.1.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.libimobiledevice.org/"
-PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="usbmuxd glib gnutls libtasn1 libplist"
-PKG_BUILD_DEPENDS="toolchain usbmuxd glib gnutls libtasn1 libplist"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="libimobiledevice: a software library that talks the protocols to support iPhone®, iPod Touch®, iPad® and Apple TV® devices."
-PKG_LONGDESC="libimobiledevice is a software library that talks the protocols to support iPhone®, iPod Touch®, iPad® and Apple TV® devices."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/devel/libplist/meta b/packages/devel/libplist/meta
index b575f8de4f..ae22690e96 100644
--- a/packages/devel/libplist/meta
+++ b/packages/devel/libplist/meta
@@ -19,12 +19,12 @@
################################################################################
PKG_NAME="libplist"
-PKG_VERSION="1.3"
+PKG_VERSION="1.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://matt.colyer.name/projects/iphone-linux/"
-PKG_URL="http://github.com/downloads/JonathanBeck/libplist/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libxml2 glib"
PKG_BUILD_DEPENDS="toolchain libxml2 glib"
PKG_PRIORITY="optional"
diff --git a/packages/devel/libtool/meta b/packages/devel/libtool/meta
index 0f81acece3..0842529948 100644
--- a/packages/devel/libtool/meta
+++ b/packages/devel/libtool/meta
@@ -33,4 +33,4 @@ PKG_SHORTDESC="libtool: Generic library support script"
PKG_LONGDESC="This is GNU Libtool, a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, portable interface."
PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 51888af2ad..98de9c053c 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -71,7 +71,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
--disable-gbm \
--disable-gallium-egl \
--disable-gallium-gbm \
- --disable-shared-glapi \
+ --enable-shared-glapi \
--enable-xcb \
--disable-shared-dricore \
--disable-egl \
diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install
index 6fd67ce905..45caf0386a 100755
--- a/packages/graphics/Mesa/install
+++ b/packages/graphics/Mesa/install
@@ -27,7 +27,7 @@ mkdir -p $INSTALL/usr/lib
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
-# cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
+ cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/dri
# cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
diff --git a/packages/graphics/libjpeg-turbo/build b/packages/graphics/libjpeg-turbo/build
index b3fd343617..33289e14b9 100755
--- a/packages/graphics/libjpeg-turbo/build
+++ b/packages/graphics/libjpeg-turbo/build
@@ -30,6 +30,7 @@ cd $PKG_BUILD
--localstatedir=/var \
--disable-static \
--enable-shared \
+ --with-jpeg8
make
diff --git a/packages/initramfs/meta b/packages/initramfs/meta
index 0207d6e94f..caed7b9357 100644
--- a/packages/initramfs/meta
+++ b/packages/initramfs/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
-PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite e2fsprogs-initramfs util-linux-initramfs"
+PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite diskdev_cmds-initramfs"
PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs plymouth-lite"
PKG_PRIORITY="optional"
PKG_SECTION="initramfs"
diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index fe5c56b66d..31b0962c15 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -102,7 +102,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
break
else
if [ -f "/sbin/ply-image" ]; then
- /sbin/ply-image "$SPLASHIMAGE"
+ /sbin/ply-image "$SPLASHIMAGE" &
fi
fi
}
@@ -149,11 +149,18 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
}
hfsdiskprep() {
- for DEV in `/bin/busybox ls /dev/sd*`; do
- FS_TYPE=$(/sbin/blkid -o value -s TYPE $DEV)
- if [ "$FS_TYPE" = "hfs" -o "$FS_TYPE" = "hfsplus" ]; then
- progress "check filesystem $DEV ..."
- /sbin/fsck_hfs -r -y $DEV > /dev/null 2>&1
+ for DEVICE in /dev/sd*; do
+ for device in $(/bin/busybox blkid $DEVICE); do
+ case $device in
+ TYPE=*)
+ FS_TYPE=${device#TYPE=}
+ ;;
+ esac
+ done
+
+ 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
fi
done
}
@@ -210,8 +217,6 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
- umount /storage
-
if test "$REBOOT" -eq "1"; then
echo "System reboots now..." && \
/bin/busybox reboot
@@ -228,6 +233,10 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
# move /flash and /storage to /sysroot
/bin/busybox mount --move /flash /sysroot/flash
+
+ if [ -n "$disk" ]; then
+ /bin/busybox mount --move /storage /sysroot/storage
+ fi
}
if [ -z "$NETBOOT" ]; then
@@ -236,10 +245,10 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
mount_nbd
fi
-# unmount all other filesystems
- /bin/busybox umount /dev
- /bin/busybox umount /proc
- /bin/busybox umount /sys
+# move some special filesystems
+ /bin/busybox mount --move /dev /sysroot/dev
+ /bin/busybox mount --move /proc /sysroot/proc
+ /bin/busybox mount --move /sys /sysroot/sys
# switch to new sysroot and start real init
exec /bin/busybox switch_root /sysroot /sbin/init
diff --git a/packages/lang/Python/build b/packages/lang/Python/build
index 165242fe80..91893fdbc5 100755
--- a/packages/lang/Python/build
+++ b/packages/lang/Python/build
@@ -95,6 +95,7 @@ LDFLAGS="$LDFLAGS -lexpat -lffi" \
make -j1 CC="$TARGET_CC" \
HOSTPYTHON=../.objdir-host/hostpython \
HOSTPGEN=../.objdir-host/hostpgen \
+ RUNSHARED="LD_LIBRARY_PATH=../.objdir-host:" \
BLDSHARED="$CC -shared" \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
CROSS_COMPILE="$TARGET_NAME" \
@@ -106,6 +107,7 @@ make -j1 CC="$TARGET_CC" \
DESTDIR=$SYSROOT_PREFIX \
HOSTPYTHON=../.objdir-host/hostpython \
HOSTPGEN=../.objdir-host/hostpgen \
+ RUNSHARED="LD_LIBRARY_PATH=../.objdir-host:" \
BLDSHARED="$CC -shared" \
PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
CROSS_COMPILE="$TARGET_NAME" \
diff --git a/packages/network/netstatus/build b/packages/linux-drivers/AF9035/build
similarity index 84%
rename from packages/network/netstatus/build
rename to packages/linux-drivers/AF9035/build
index e16a9e717b..9eb2940283 100755
--- a/packages/network/netstatus/build
+++ b/packages/linux-drivers/AF9035/build
@@ -3,7 +3,6 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2010-2011 Roman Weber (roman@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
@@ -23,9 +22,11 @@
. config/options $1
-# dont use some optimizations because of problems
- LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
-
cd $PKG_BUILD
-make
+# fix some directives after unpacking
+sed -i "s|KDIR = .*|KDIR = $(kernel_path)|" Makefile
+sed -i "s|KSRC = .*|KSRC = \$KDIR|" Makefile
+sed -i "s|KINS = .*|KINS = \./modules|" Makefile
+
+make CC=$CC
diff --git a/packages/linux-drivers/AF9035/firmware/dvb-usb-af9035-01.fw b/packages/linux-drivers/AF9035/firmware/dvb-usb-af9035-01.fw
new file mode 100644
index 0000000000..defff1dc37
Binary files /dev/null and b/packages/linux-drivers/AF9035/firmware/dvb-usb-af9035-01.fw differ
diff --git a/packages/linux-drivers/AF9035/firmware/readme b/packages/linux-drivers/AF9035/firmware/readme
new file mode 100644
index 0000000000..f8d56ab264
--- /dev/null
+++ b/packages/linux-drivers/AF9035/firmware/readme
@@ -0,0 +1 @@
+http://xgazza.altervista.org/Linux/DVB/dvb-usb-af9035-01.fw
\ No newline at end of file
diff --git a/packages/sysutils/fuse/install b/packages/linux-drivers/AF9035/install
similarity index 65%
rename from packages/sysutils/fuse/install
rename to packages/linux-drivers/AF9035/install
index 3c6a105391..d6ae5e6c2e 100755
--- a/packages/sysutils/fuse/install
+++ b/packages/linux-drivers/AF9035/install
@@ -22,19 +22,17 @@
. config/options $1
-mkdir -p $INSTALL/etc
- cp $PKG_DIR/config/fuse.conf $INSTALL/etc
+VER=`ls $BUILD/linux*/modules/lib/modules`
-mkdir -p $INSTALL/lib/udev/rules.d
- cp $PKG_BUILD/util/udev.rules $INSTALL/lib/udev/rules.d/99-fuse.rules
+mkdir -p $INSTALL/lib/modules/$VER/AF9035
+ cp $PKG_BUILD/dvb-usb-af9035.ko $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/sbin
- cp $PKG_BUILD/util/mount.fuse $INSTALL/sbin
-
-mkdir -p $INSTALL/bin
- cp $PKG_BUILD/util/fusermount $INSTALL/bin
- cp $PKG_BUILD/util/ulockmgr_server $INSTALL/bin
-
-mkdir -p $INSTALL/lib
- cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/lib
+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
diff --git a/packages/3rdparty/multimedia/tornado-ap/meta b/packages/linux-drivers/AF9035/meta
old mode 100755
new mode 100644
similarity index 71%
rename from packages/3rdparty/multimedia/tornado-ap/meta
rename to packages/linux-drivers/AF9035/meta
index cee56a1840..67803f5d29
--- a/packages/3rdparty/multimedia/tornado-ap/meta
+++ b/packages/linux-drivers/AF9035/meta
@@ -18,18 +18,18 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="tornado-ap"
-PKG_VERSION="1.2.1"
+PKG_NAME="AF9035"
+PKG_VERSION="2.6.38"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="http://www.tornadoweb.org/"
-PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+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="Python"
+PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
PKG_PRIORITY="optional"
-PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="tornado: a web server for Python"
-PKG_LONGDESC="Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed."
+PKG_SECTION="driver"
+PKG_SHORTDESC="AF9035 driver: Afa Technologies Inc. AF9035A USB Device"
+PKG_LONGDESC="AF9035 driver: Afa Technologies Inc. AF9035A USB Device"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
diff --git a/packages/linux-firmware/dvb-firmware/meta b/packages/linux-firmware/dvb-firmware/meta
index 88cce17371..462bac423b 100644
--- a/packages/linux-firmware/dvb-firmware/meta
+++ b/packages/linux-firmware/dvb-firmware/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.10"
+PKG_VERSION="0.0.13"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"
diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta
index f7db7b3771..b5ef66da2d 100644
--- a/packages/linux-firmware/wlan-firmware/meta
+++ b/packages/linux-firmware/wlan-firmware/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.5"
+PKG_VERSION="0.0.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"
diff --git a/packages/linux/init.d/02_cpupower b/packages/linux/init.d/02_cpupower
index 3a23f724de..8ef13f896b 100644
--- a/packages/linux/init.d/02_cpupower
+++ b/packages/linux/init.d/02_cpupower
@@ -23,12 +23,6 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- progress "set cpu's to full power"
- cpupower frequency-set -g performance > /dev/null 2>&1
- ;;
+progress "set cpu's to full power"
- poweroff|reboot)
- ;;
-esac
+ cpupower frequency-set -g performance > /dev/null 2>&1
diff --git a/packages/linux/init.d/15_modules b/packages/linux/init.d/15_modules
index 2a0dcdc197..72155f6e93 100644
--- a/packages/linux/init.d/15_modules
+++ b/packages/linux/init.d/15_modules
@@ -23,19 +23,13 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- progress "loading kernel modules"
+(
+ progress "loading kernel modules"
- IFS='
- '
- for module in `cat /etc/modules|grep "^[^#]"`; do
- eval "modprobe $module" >/dev/null 2>&1
- done
- )&
- ;;
+ IFS='
+'
+ for module in `cat /etc/modules|grep "^[^#]"`; do
+ eval "modprobe $module" >/dev/null 2>&1
+ done
- poweroff|reboot)
- ;;
-esac
+)&
diff --git a/packages/linux/meta b/packages/linux/meta
index 6a98e9c2c0..73dbdaac36 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -19,12 +19,14 @@
################################################################################
PKG_NAME="linux"
-PKG_VERSION="3.1-rc4"
+PKG_VERSION="3.1-rc9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kernel.org"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/kernel/v3.0/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils"
PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio pciutils"
PKG_PRIORITY="optional"
diff --git a/packages/linux/patches/linux-3.1-rc4-000_crosscompile.patch b/packages/linux/patches/linux-3.1-rc9-000_crosscompile.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-000_crosscompile.patch
rename to packages/linux/patches/linux-3.1-rc9-000_crosscompile.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-003-no_dev_console.patch b/packages/linux/patches/linux-3.1-rc9-003-no_dev_console.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-003-no_dev_console.patch
rename to packages/linux/patches/linux-3.1-rc9-003-no_dev_console.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.1-rc9-004_lower_undefined_mode_timeout.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-004_lower_undefined_mode_timeout.patch
rename to packages/linux/patches/linux-3.1-rc9-004_lower_undefined_mode_timeout.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-006_enable_utf8.patch b/packages/linux/patches/linux-3.1-rc9-006_enable_utf8.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-006_enable_utf8.patch
rename to packages/linux/patches/linux-3.1-rc9-006_enable_utf8.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-007_die_floppy_die.patch b/packages/linux/patches/linux-3.1-rc9-007_die_floppy_die.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-007_die_floppy_die.patch
rename to packages/linux/patches/linux-3.1-rc9-007_die_floppy_die.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.1-rc9-009_disable_i8042_check_on_apple_mac.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-009_disable_i8042_check_on_apple_mac.patch
rename to packages/linux/patches/linux-3.1-rc9-009_disable_i8042_check_on_apple_mac.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-3.1-rc9-050_add_appleir_usb_driver.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-050_add_appleir_usb_driver.patch
rename to packages/linux/patches/linux-3.1-rc9-050_add_appleir_usb_driver.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.1-rc9-052-aureal_remote_quirk-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-052-aureal_remote_quirk-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-052-aureal_remote_quirk-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-053-ati_remote-0.1.patch b/packages/linux/patches/linux-3.1-rc9-053-ati_remote-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-053-ati_remote-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-053-ati_remote-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-3.1-rc9-053_ati-remote_all_keys_and_keychange-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-053_ati-remote_all_keys_and_keychange-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-053_ati-remote_all_keys_and_keychange-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.1-rc9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
rename to packages/linux/patches/linux-3.1-rc9-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-058-add_rtl2832u_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.1-rc9-058-add_rtl2832u_dvb-usb_driver-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-058-add_rtl2832u_dvb-usb_driver-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-058-add_rtl2832u_dvb-usb_driver-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch b/packages/linux/patches/linux-3.1-rc9-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-060-fix_dib0700_buffer_access-0.1.patch b/packages/linux/patches/linux-3.1-rc9-060-fix_dib0700_buffer_access-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-060-fix_dib0700_buffer_access-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-060-fix_dib0700_buffer_access-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.1-rc9-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-061-add_ITE-IT9135_dvb-usb_driver-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.1-rc9-071-silence_i915_agp-module-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-071-silence_i915_agp-module-0.1.patch
rename to packages/linux/patches/linux-3.1-rc9-071-silence_i915_agp-module-0.1.patch
diff --git a/packages/linux/patches/linux-3.1-rc4-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.1-rc9-716_mm-zero_swappiness.patch
similarity index 100%
rename from packages/linux/patches/linux-3.1-rc4-716_mm-zero_swappiness.patch
rename to packages/linux/patches/linux-3.1-rc9-716_mm-zero_swappiness.patch
diff --git a/packages/mediacenter/meta b/packages/mediacenter/meta
index 0632bce908..3149e2e97e 100644
--- a/packages/mediacenter/meta
+++ b/packages/mediacenter/meta
@@ -35,6 +35,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
-for i in "$SKINS"; do
+for i in $SKINS; do
PKG_DEPENDS="$PKG_DEPENDS $MEDIACENTER-theme-$i"
done
\ No newline at end of file
diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index f386dcc550..d9ed681602 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="dc3bee7"
+PKG_VERSION="86683ca"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 72012336f0..bad981cda0 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -34,24 +34,54 @@ else
XBMC_PROJECTM="--disable-projectm"
fi
+if [ "$XBMC_VIS_GOOM" = yes ]; then
+ XBMC_GOOM="--enable-goom"
+else
+ XBMC_GOOM="--disable-goom"
+fi
+
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
XBMC_PULSEAUDIO="--enable-pulse"
else
XBMC_PULSEAUDIO="--disable-pulse"
fi
+if [ "$CEC_SUPPORT" = yes ]; then
+ XBMC_CEC="--enable-libcec --enable-external-libcec --enable-udev --disable-libusb"
+else
+ XBMC_CEC="--disable-libcec --disable-udev --disable-libusb"
+fi
+
if [ "$NONFREE_SUPPORT" = yes ]; then
XBMC_NONFREE="--enable-non-free"
else
XBMC_NONFREE="--disable-non-free"
fi
+if [ "$AIRPLAY_SUPPORT" = yes ]; then
+ XBMC_AIRPLAY="--enable-airplay"
+else
+ XBMC_AIRPLAY="--disable-airplay"
+fi
+
+if [ "$AIRTUNES_SUPPORT" = yes ]; then
+ XBMC_AIRTUNES="--enable-airtunes"
+else
+ XBMC_AIRTUNES="--disable-airtunes"
+fi
+
if [ "$DVDCSS_SUPPORT" = yes ]; then
XBMC_DVDCSS="--enable-dvdcss"
else
XBMC_DVDCSS="--disable-dvdcss"
fi
+if [ "$BLURAY_SUPPORT" = yes ]; then
+ XBMC_BLURAY="--enable-libbluray"
+else
+ XBMC_BLURAY="--disable-libbluray"
+fi
+
if [ "$AVAHI_DAEMON" = yes ]; then
XBMC_AVAHI="--enable-avahi"
else
@@ -64,6 +94,18 @@ else
XBMC_NFS="--disable-nfs"
fi
+if [ "$AFP_SUPPORT" = yes ]; then
+ XBMC_AFP="--enable-afpclient"
+else
+ XBMC_AFP="--disable-afpclient"
+fi
+
+if [ "$SAMBA_CLIENT" = yes ]; then
+ XBMC_SAMBA="--enable-samba"
+else
+ XBMC_SAMBA="--disable-samba"
+fi
+
if [ "$WEBSERVER" = yes ]; then
XBMC_WEBSERVER="--enable-webserver"
else
@@ -124,11 +166,14 @@ cd $PKG_BUILD
# adding fake Makefile for stripped skin
mkdir -p addons/skin.confluence/media
touch addons/skin.confluence/media/Makefile.in
+ mkdir -p addons/skin.touched/media
+ touch addons/skin.touched/media/Makefile.in
# autoreconf
do_autoreconf
do_autoreconf lib/libid3tag/libid3tag
do_autoreconf xbmc/screensavers/rsxs-0.9
+ do_autoreconf xbmc/visualizations/Goom/goom2k4-0
do_autoreconf lib/libapetag
do_autoreconf lib/cpluff
# order matters with libdvd and friends
@@ -161,26 +206,31 @@ cd $PKG_BUILD
--disable-tegra \
--disable-profiling \
--enable-joystick \
- --enable-xrandr \
- --disable-goom \
+ $XBMC_CEC \
+ $XBMC_GOOM \
$XBMC_RSXS \
$XBMC_PROJECTM \
--enable-x11 \
+ --enable-xrandr \
--disable-ccache \
$XBMC_PULSEAUDIO \
--enable-rtmp \
+ $XBMC_SAMBA \
$XBMC_NFS \
+ $XBMC_AFP \
--enable-ffmpeg-libvorbis \
--enable-lame \
$XBMC_DVDCSS \
--disable-mid \
--disable-hal \
$XBMC_AVAHI \
+ $XBMC_AIRPLAY \
+ $XBMC_AIRTUNES \
$XBMC_NONFREE \
--disable-asap-codec \
$XBMC_WEBSERVER \
--enable-optical-drive \
- --enable-libbluray \
+ $XBMC_BLURAY \
--enable-texturepacker \
--disable-external-libraries \
--disable-external-ffmpeg \
diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/xbmc/config/advancedsettings.xml
new file mode 100644
index 0000000000..c6f22f0a3a
--- /dev/null
+++ b/packages/mediacenter/xbmc/config/advancedsettings.xml
@@ -0,0 +1,10 @@
+
+
+ false
+ false
+ cputemp
+ gputemp
+
+ 30
+
+
diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
index b7a9fcabeb..dc1ce42edb 100644
--- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc
+++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
@@ -22,48 +22,31 @@
#
# runlevels: openelec
-case $RUNLEVEL in
- boot)
- progress "setup XBMC"
+progress "setup XBMC"
- #
- # clean temp dir
- #
- rm -rf $HOME/.xbmc/temp/*
+#
+# clean temp dir
+#
+ rm -rf $HOME/.xbmc/temp/*
- #
- # add some default settings
- #
- mkdir -p $HOME/.xbmc/userdata
+#
+# add some default settings
+#
+ mkdir -p $HOME/.xbmc/userdata
- # use dds fanarts by default
- if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
- cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
-
- true
- false
- cputemp
- gputemp
-
- 30
-
-
-EOF
- fi
+#
+# setup directories for XBMC sources
+#
- #
- # setup directories for XBMC sources
- #
+ [ ! -d "$HOME/music" ] && mkdir -p $HOME/music
+ [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
+ [ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows
+ [ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos
- [ ! -d "$HOME/music" ] && mkdir -p $HOME/music
- [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
- [ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows
- [ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos
+ mkdir -p $HOME/.xbmc/userdata
- mkdir -p $HOME/.xbmc/userdata
-
- if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then
- cat > $HOME/.xbmc/userdata/sources.xml << EOF
+ if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then
+ cat > $HOME/.xbmc/userdata/sources.xml << EOF
EOF
- fi
+ fi
- #
- # common setup guisettings
- #
+#
+# common setup guisettings
+#
- mkdir -p $HOME/.xbmc/userdata
+ mkdir -p $HOME/.xbmc/userdata
- [ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots
+ [ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots
- if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then
- echo "" > $HOME/.xbmc/userdata/guisettings.xml
+ if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then
+ echo "" > $HOME/.xbmc/userdata/guisettings.xml
- cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
+ cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
$HOME/screenshots/
EOF
- #
- # include project specific options
- #
+#
+# include project specific options
+#
- if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
- cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
- fi
+ if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
+ cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
+ fi
- #
- # common setup for amd and nvidia graphic
- #
+#
+# common setup for amd and nvidia graphic
+#
- # Always sync to vblank
- if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
- cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
+ # Always sync to vblank
+ if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
+ cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
2
EOF
- fi
- echo "" >> $HOME/.xbmc/userdata/guisettings.xml
- fi
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ fi
+ echo "" >> $HOME/.xbmc/userdata/guisettings.xml
+ fi
diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index 1db77b91b2..66dcf2910d 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -22,70 +22,66 @@
#
# runlevels: openelec
-case $RUNLEVEL in
- boot)
- LIRCDEV="/var/run/lirc/lircd"
- [ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
- XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
+LIRCDEV="/var/run/lirc/lircd"
+[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
+XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
- progress "starting XBMC"
+progress "starting XBMC"
- # hack for Boxee Remote
- if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
- export SDL_MOUSE_RELATIVE=0
- fi
+# hack for Boxee Remote
+if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
+ export SDL_MOUSE_RELATIVE=0
+fi
- # starting autostart script (will be removed later again, dont use it!!!)
- AUTOSTART="/storage/.config/autostart.sh"
- if [ -f $AUTOSTART ]; then
- echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
- cat "$AUTOSTART" >> /var/log/messages
- echo "!!! -End of autostart script- !!!" >> /var/log/messages
+# hack: make addon-bins executable
+ chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
- sh $AUTOSTART
- fi
+# starting autostart script (will be removed later again, dont use it!!!)
+ AUTOSTART="/storage/.config/autostart.sh"
+ if [ -f $AUTOSTART ]; then
+ echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
+ cat "$AUTOSTART" >> /var/log/messages
+ echo "!!! -End of autostart script- !!!" >> /var/log/messages
- # starting autoupdate
- [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
+ sh $AUTOSTART
+ fi
- # waiting for Xorg to start
- wait_for_xorg
+# starting autoupdate
+ [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
- # set cpu's to 'on demand'
- ( usleep 15000000
- progress "set cpu's to 'on demand'"
- cpupower frequency-set -g ondemand > /dev/null 2>&1
- )&
+# waiting for Xorg to start
+ wait_for_xorg
- # starting XBMC
- while true; do
+# set cpu's to 'on demand'
+ ( usleep 15000000
+ progress "set cpu's to 'on demand'"
+ cpupower frequency-set -g ondemand > /dev/null 2>&1
+ )&
- DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
- RET=$?
+# starting XBMC
+ while true; do
- case "$RET" in
- 0)
- RUNLEVEL="poweroff"
- ;;
- 64)
- RUNLEVEL="poweroff"
- ;;
- 66)
- RUNLEVEL="reboot"
- ;;
- 255)
- echo "Abnormal Exit. Exited with code $RET"
- echo "is Xorg running? check /var/log/Xorg.log"
- ;;
- *)
- echo "Abnormal Exit. Exited with code $RET"
- ;;
- esac
+ DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
+ RET=$?
- usleep 250000
- done
- ;;
+ case "$RET" in
+ 0)
+ poweroff -f
+ ;;
+ 64)
+ poweroff -f
+ ;;
+ 66)
+ reboot
+ ;;
+ 255)
+ echo "Abnormal Exit. Exited with code $RET"
+ echo "is Xorg running? check /var/log/Xorg.log"
+ ;;
+ *)
+ echo "Abnormal Exit. Exited with code $RET"
+ ;;
+ esac
- poweroff|reboot)
- ;;
-esac
+ usleep 250000
+ done
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index fcfb59bd33..a5a2669182 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -46,6 +46,18 @@ cd $PKG_BUILD
-exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
cd -
+if [ ! "$XBMC_SCR_RSXS" = yes ]; then
+ rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/screensaver.rsxs.*
+fi
+
+if [ ! "$XBMC_VIS_PROJECTM" = yes ]; then
+ rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.projectm
+fi
+
+rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.dxspectrum
+rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.itunes
+rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.milkdrop
+
# overriding Splash image
mkdir -p $INSTALL/usr/share/xbmc/media
rm -rf $INSTALL/usr/share/xbmc/media/Splash.png
@@ -61,6 +73,9 @@ mkdir -p $INSTALL/usr/share/xbmc/media
$INSTALL/usr/share/xbmc/addons/script.module.pil/lib/PIL
rm -rf $INSTALL/usr/share/xbmc/addons/script.module.pysqlite
+mkdir -p $INSTALL/usr/share/xbmc/system/
+ cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/
+
mkdir -p $INSTALL/usr/share/xbmc/addons
cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons
$SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 852748cf1f..1792f50deb 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,14 +19,14 @@
################################################################################
PKG_NAME="xbmc"
-PKG_VERSION="dc3bee7"
+PKG_VERSION="86683ca"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.xbmc.org"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -47,6 +47,11 @@ PKG_AUTORECONF="no"
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"
PKG_DEPENDS="$PKG_DEPENDS dbus"
+if [ "$CEC_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec"
+ PKG_DEPENDS="$PKG_DEPENDS libcec"
+fi
+
if [ "$XBMC_SCR_RSXS" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu"
PKG_DEPENDS="$PKG_DEPENDS libXt libXmu"
@@ -57,16 +62,41 @@ if [ "$FAAC_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS faac"
fi
+if [ "$BLURAY_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libbluray"
+ PKG_DEPENDS="$PKG_DEPENDS libbluray"
+fi
+
if [ "$AVAHI_DAEMON" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
PKG_DEPENDS="$PKG_DEPENDS avahi"
fi
+if [ "$AIRPLAY_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libplist"
+ PKG_DEPENDS="$PKG_DEPENDS libplist"
+fi
+
+if [ "$AIRTUNES_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libshairport"
+ PKG_DEPENDS="$PKG_DEPENDS libshairport"
+fi
+
if [ "$NFS_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libnfs"
PKG_DEPENDS="$PKG_DEPENDS libnfs"
fi
+if [ "$AFP_SUPPORT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
+ PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
+fi
+
+if [ "$SAMBA_CLIENT" = yes ]; then
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
+ PKG_DEPENDS="$PKG_DEPENDS samba"
+fi
+
if [ "$WEBSERVER" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd"
PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd"
@@ -99,3 +129,4 @@ fi
# some python stuff needed for various addons
PKG_DEPENDS="$PKG_DEPENDS Imaging"
PKG_DEPENDS="$PKG_DEPENDS simplejson"
+
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-013-reenable_lcd_config_settings-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-013-reenable_lcd_config_settings-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-013-reenable_lcd_config_settings-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-86683ca-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-311-fix_rsxs_build-0.1.patch
new file mode 100644
index 0000000000..fe0ee49cab
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-86683ca-311-fix_rsxs_build-0.1.patch
@@ -0,0 +1,12 @@
+diff -Naur xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h
+--- xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-09-27 15:56:19.000000000 +0200
++++ xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-10-16 02:13:13.805433847 +0200
+@@ -17,7 +17,7 @@
+ with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+-#if !_LIBC
++#if 0
+ /* This code is written for inclusion in gnu-libc, and uses names in the
+ namespace reserved for libc. If we're not compiling in libc, define those
+ names to be the normal ones instead. */
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-351-increase_YV12_buffers-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-351-increase_YV12_buffers-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-351-increase_YV12_buffers-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-404-add_lame_check-0.6.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-404-add_lame_check-0.6.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-404-add_lame_check-0.6.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-453-ps3_remote_be_more_quiet-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-453-ps3_remote_be_more_quiet-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-454-disable_backslash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-454-disable_backslash-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-454-disable_backslash-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-86683ca-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-86683ca-464-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch
deleted file mode 100644
index c6c5e2e5c6..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xbmc-dc3bee7/configure.in xbmc-dc3bee7.patch/configure.in
---- xbmc-dc3bee7/configure.in 2011-09-09 01:27:11.000000000 +0200
-+++ xbmc-dc3bee7.patch/configure.in 2011-09-09 03:37:55.671676295 +0200
-@@ -20,7 +20,7 @@
- [
- if [[ "$host_vendor" != "apple" ]]; then
- AC_MSG_CHECKING([for lib$2 soname])
-- $1_FILENAME=$($LD $LDFLAGS -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-+ $1_FILENAME=$($LD -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
- if [[ ! -z $$1_FILENAME ]]; then
- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
- fi
diff --git a/packages/mediacenter/xbmc/scripts/cputemp b/packages/mediacenter/xbmc/scripts/cputemp
index a9e7950a8b..3c35564ed1 100755
--- a/packages/mediacenter/xbmc/scripts/cputemp
+++ b/packages/mediacenter/xbmc/scripts/cputemp
@@ -1,8 +1,8 @@
#!/bin/sh
################################################################################
-# Copyright (C) 2009-2010 OpenELEC.tv
-# http://www.openelec.tv
+# 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
@@ -20,10 +20,32 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-TEMP="0"
+# inspired by
+# https://github.com/xtranophilist/gnome-shell-extension-cpu-temperature/blob/master/extension.js
-if [ -f /usr/bin/sensors ]; then
- TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp._input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'`
+TEMP=0
+
+if [ -f /sys/devices/platform/coretemp.0/temp1_input ]; then
+ # used with coretemp
+ TEMP=`cat /sys/devices/platform/coretemp.0/temp1_input`
+elif [ -f /sys/devices/platform/coretemp.0/temp2_input ]; then
+ # used with coretemp
+ TEMP=`cat /sys/devices/platform/coretemp.0/temp2_input`
+elif [ -f /sys/bus/acpi/devices/LNXTHERM\:00/thermal_zone/temp ]; then
+ # used on some intel systems
+ TEMP=`cat /sys/bus/acpi/devices/LNXTHERM\:00/thermal_zone/temp`
+elif [ -f /sys/devices/virtual/thermal/thermal_zone0/temp ]; then
+ # used on some intel systems
+ TEMP=`cat /sys/devices/virtual/thermal/thermal_zone0/temp`
+elif [ -f /sys/class/hwmon/hwmon0/temp1_input ]; then
+ # hwmon for new 2.6.39, 3.0 linux kernels
+ TEMP=`cat /sys/class/hwmon/hwmon0/temp1_input`
+elif [ -f /sys/class/hwmon/hwmon0/device/temp1_input ]; then
+ # used on AMD systems
+ TEMP=`cat /sys/class/hwmon/hwmon0/device/temp1_input`
+elif [ -f /sys/class/hwmon/hwmon0/device/temp2_input ]; then
+ # used on ION systems
+ TEMP=`cat /sys/class/hwmon/hwmon0/device/temp2_input`
fi
-echo "${TEMP} C"
+echo "$(( $TEMP / 1000 )) C"
diff --git a/packages/mediacenter/xbmc/scripts/gputemp b/packages/mediacenter/xbmc/scripts/gputemp
index 7ce4fce138..7767e885a9 100755
--- a/packages/mediacenter/xbmc/scripts/gputemp
+++ b/packages/mediacenter/xbmc/scripts/gputemp
@@ -27,7 +27,12 @@ if lspci -n | grep 0300 | grep -q 10de; then
fi
if lspci -n | grep 0300 | grep -q 1002; then
- [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
+ if [ -f /storage/.config/xorg.conf ]; then
+ XORG="/storage/.config/xorg.conf"
+ else
+ XORG="/etc/X11/xorg-fglrx.conf"
+ fi
+ [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
fi
echo "${TEMP} C"
diff --git a/packages/sysutils/ifuse/build b/packages/mediacenter/xbmc/sleep.d/00_addon-sleep
similarity index 87%
rename from packages/sysutils/ifuse/build
rename to packages/mediacenter/xbmc/sleep.d/00_addon-sleep
index 5559e24e5b..0a9d84e0c4 100755
--- a/packages/sysutils/ifuse/build
+++ b/packages/mediacenter/xbmc/sleep.d/00_addon-sleep
@@ -20,11 +20,9 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-. config/options $1
+. /etc/profile
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --prefix=/usr \
-
-make
+for script in $HOME/.xbmc/addons/*/sleep.d/*.power; do
+ progress "running addon sleep script $script ($1)..."
+ sh $script $1
+done
diff --git a/packages/sysutils/ifuse/install b/packages/mediacenter/xbmc/sleep.d/63_reload_skin
similarity index 89%
rename from packages/sysutils/ifuse/install
rename to packages/mediacenter/xbmc/sleep.d/63_reload_skin
index 7ed72d809a..c0c2068b28 100755
--- a/packages/sysutils/ifuse/install
+++ b/packages/mediacenter/xbmc/sleep.d/63_reload_skin
@@ -20,8 +20,12 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-. config/options $1
-
-mkdir -p $INSTALL/usr/bin
- cp $PKG_BUILD/src/ifuse $INSTALL/usr/bin
+. /etc/profile
+case "$1" in
+ thaw|resume)
+ xbmc-send --host=127.0.0.1 -a "ReloadSkin()"
+ ;;
+ *) exit $NA
+ ;;
+esac
diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build
index e1135f60ee..a17f05fafd 100755
--- a/packages/multimedia/SDL/build
+++ b/packages/multimedia/SDL/build
@@ -22,6 +22,12 @@
. config/options $1
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+ SDL_PULSEAUDIO="--enable-pulseaudio --enable-pulseaudio-shared"
+else
+ SDL_PULSEAUDIO="--disable-pulseaudio --disable-pulseaudio-shared"
+fi
+
cd $PKG_BUILD
rm -f acinclude/alsa.m4
@@ -58,8 +64,7 @@ rm -f acinclude/alsa.m4
--disable-esd \
--disable-esdtest \
--disable-esd-shared \
- --disable-pulseaudio \
- --disable-pulseaudio-shared \
+ $SDL_PULSEAUDIO \
--disable-arts \
--disable-arts-shared \
--disable-nas \
diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta
index 64142859ca..b6adedb2c8 100644
--- a/packages/multimedia/SDL/meta
+++ b/packages/multimedia/SDL/meta
@@ -34,3 +34,9 @@ PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform multimedia library de
PKG_IS_ADDON="no"
PKG_AUTORECONF=""
+
+if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+ PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
+ PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
+fi
+
diff --git a/packages/multimedia/libass/build b/packages/multimedia/libass/build
index 6873acc548..00aff9dbdc 100755
--- a/packages/multimedia/libass/build
+++ b/packages/multimedia/libass/build
@@ -31,7 +31,12 @@ cd $PKG_BUILD
--datadir=/usr/share \
--enable-shared \
--disable-static \
+ --disable-test \
--enable-enca \
+ --enable-fontconfig \
+ --disable-harfbuzz \
+ --disable-silent-rules \
+ --with-gnu-ld \
make
diff --git a/packages/multimedia/libass/meta b/packages/multimedia/libass/meta
index ab7816f3ba..c024162ba6 100644
--- a/packages/multimedia/libass/meta
+++ b/packages/multimedia/libass/meta
@@ -19,14 +19,14 @@
################################################################################
PKG_NAME="libass"
-PKG_VERSION="0.9.13"
+PKG_VERSION="0.10.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://code.google.com/p/libass/"
PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="freetype fontconfig enca"
-PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca"
+PKG_DEPENDS="freetype fontconfig enca fribidi"
+PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca fribidi"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libass: a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format."
diff --git a/packages/network/afpfs-ng/build b/packages/network/afpfs-ng/build
index 030b26b57b..ba70134707 100755
--- a/packages/network/afpfs-ng/build
+++ b/packages/network/afpfs-ng/build
@@ -30,7 +30,9 @@ ac_cv_func_malloc_0_nonnull=yes \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-gcrypt \
- --enable-fuse \
+ --disable-fuse \
make -C lib
-make -C fuse
+
+$MAKEINSTALL -C lib
+$MAKEINSTALL -C include
diff --git a/packages/network/afpfs-ng/install b/packages/network/afpfs-ng/install
index 55d15a74d9..92e34a1777 100755
--- a/packages/network/afpfs-ng/install
+++ b/packages/network/afpfs-ng/install
@@ -24,9 +24,3 @@
mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/bin
- cp $PKG_BUILD/fuse/afpfs $INSTALL/usr/bin
- cp $PKG_BUILD/fuse/.libs/afpfsd $INSTALL/usr/bin
- cp $PKG_BUILD/fuse/.libs/mount_afp $INSTALL/usr/bin
- ln -sf mount_afp $INSTALL/usr/bin/afp_client
diff --git a/packages/network/afpfs-ng/meta b/packages/network/afpfs-ng/meta
index d6c60127fb..8da6f7b096 100644
--- a/packages/network/afpfs-ng/meta
+++ b/packages/network/afpfs-ng/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://sourceforge.net/projects/afpfs-ng/"
PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libiconv libgpg-error libgcrypt fuse ncurses"
-PKG_BUILD_DEPENDS="toolchain libiconv libgpg-error libgcrypt fuse ncurses"
+PKG_DEPENDS="libiconv libgpg-error libgcrypt ncurses"
+PKG_BUILD_DEPENDS="toolchain libiconv libgpg-error libgcrypt ncurses"
PKG_PRIORITY="optional"
PKG_SECTION="network"
PKG_SHORTDESC="afpfs-ng: an Apple Filing Protocol client"
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-00-fix_afpfs-ng_includes-0.1.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-00-fix_afpfs-ng_includes-0.1.patch
new file mode 100644
index 0000000000..f507a485ef
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-00-fix_afpfs-ng_includes-0.1.patch
@@ -0,0 +1,3082 @@
+diff -Naur afpfs-ng-0.8.1/cmdline/cmdline_afp.c afpfs-ng-0.8.1.patch/cmdline/cmdline_afp.c
+--- afpfs-ng-0.8.1/cmdline/cmdline_afp.c 2008-02-19 02:54:19.000000000 +0100
++++ afpfs-ng-0.8.1.patch/cmdline/cmdline_afp.c 2011-09-10 12:13:50.102124369 +0200
+@@ -3,9 +3,9 @@
+
+ */
+
+-#include "afp.h"
+-#include "midlevel.h"
+-#include "map_def.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/midlevel.h"
++#include "afpfs-ng/map_def.h"
+
+ #include
+ #include
+diff -Naur afpfs-ng-0.8.1/cmdline/cmdline_testafp.c afpfs-ng-0.8.1.patch/cmdline/cmdline_testafp.c
+--- afpfs-ng-0.8.1/cmdline/cmdline_testafp.c 2008-03-04 21:16:50.000000000 +0100
++++ afpfs-ng-0.8.1.patch/cmdline/cmdline_testafp.c 2011-09-10 12:13:50.102124369 +0200
+@@ -3,8 +3,8 @@
+
+ */
+
+-#include "afp.h"
+-#include "midlevel.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/midlevel.h"
+
+ #include "cmdline_main.h"
+
+diff -Naur afpfs-ng-0.8.1/cmdline/getstatus.c afpfs-ng-0.8.1.patch/cmdline/getstatus.c
+--- afpfs-ng-0.8.1/cmdline/getstatus.c 2008-02-18 04:28:09.000000000 +0100
++++ afpfs-ng-0.8.1.patch/cmdline/getstatus.c 2011-09-10 12:13:50.109124463 +0200
+@@ -2,7 +2,7 @@
+ #include
+ #include
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+ static int getstatus(char * address_string, unsigned int port)
+ {
+diff -Naur afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1.patch/configure.ac
+--- afpfs-ng-0.8.1/configure.ac 2008-03-08 17:23:12.000000000 +0100
++++ afpfs-ng-0.8.1.patch/configure.ac 2011-09-10 12:13:50.109124463 +0200
+@@ -11,6 +11,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
++AM_PROG_CC_C_O
+
+ # Checks for libraries.
+ # FIXME: Replace `main' with a function in `-lncurses':
+@@ -105,7 +106,7 @@
+
+
+
+-AC_CONFIG_FILES([lib/Makefile fuse/Makefile cmdline/Makefile Makefile docs/Makefile])
++AC_CONFIG_FILES([lib/Makefile fuse/Makefile cmdline/Makefile Makefile include/Makefile include/afpfs-ng/Makefile docs/Makefile])
+
+ AC_OUTPUT
+
+diff -Naur afpfs-ng-0.8.1/fuse/client.c afpfs-ng-0.8.1.patch/fuse/client.c
+--- afpfs-ng-0.8.1/fuse/client.c 2008-03-08 03:44:16.000000000 +0100
++++ afpfs-ng-0.8.1.patch/fuse/client.c 2011-09-10 12:13:50.110124477 +0200
+@@ -12,11 +12,11 @@
+ #include
+
+ #include "config.h"
+-#include
++#include
+ #include "afp_server.h"
+-#include "uams_def.h"
+-#include "map_def.h"
+-#include "libafpclient.h"
++#include "afpfs-ng/uams_def.h"
++#include "afpfs-ng/map_def.h"
++#include "afpfs-ng/libafpclient.h"
+
+ #define default_uam "Cleartxt Passwrd"
+
+diff -Naur afpfs-ng-0.8.1/fuse/commands.c afpfs-ng-0.8.1.patch/fuse/commands.c
+--- afpfs-ng-0.8.1/fuse/commands.c 2008-03-08 17:06:25.000000000 +0100
++++ afpfs-ng-0.8.1.patch/fuse/commands.c 2011-09-10 12:13:50.110124477 +0200
+@@ -19,15 +19,15 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/dsi.h"
+ #include "afp_server.h"
+-#include "utils.h"
++#include "afpfs-ng/utils.h"
+ #include "daemon.h"
+-#include "uams_def.h"
+-#include "codepage.h"
+-#include "libafpclient.h"
+-#include "map_def.h"
++#include "afpfs-ng/uams_def.h"
++#include "afpfs-ng/codepage.h"
++#include "afpfs-ng/libafpclient.h"
++#include "afpfs-ng/map_def.h"
+ #include "fuse_int.h"
+ #include "fuse_error.h"
+ #include "fuse_internal.h"
+diff -Naur afpfs-ng-0.8.1/fuse/daemon.c afpfs-ng-0.8.1.patch/fuse/daemon.c
+--- afpfs-ng-0.8.1/fuse/daemon.c 2008-03-04 18:26:05.000000000 +0100
++++ afpfs-ng-0.8.1.patch/fuse/daemon.c 2011-09-10 12:13:50.110124477 +0200
+@@ -23,11 +23,11 @@
+ #include
+ #include
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+-#include "dsi.h"
++#include "afpfs-ng/dsi.h"
+ #include "afp_server.h"
+-#include "utils.h"
++#include "afpfs-ng/utils.h"
+ #include "daemon.h"
+ #include "commands.h"
+
+diff -Naur afpfs-ng-0.8.1/fuse/fuse_error.c afpfs-ng-0.8.1.patch/fuse/fuse_error.c
+--- afpfs-ng-0.8.1/fuse/fuse_error.c 2008-01-18 05:40:10.000000000 +0100
++++ afpfs-ng-0.8.1.patch/fuse/fuse_error.c 2011-09-10 12:13:50.111124491 +0200
+@@ -4,7 +4,7 @@
+ #include
+ #include
+ #include
+-#include "libafpclient.h"
++#include "afpfs-ng/libafpclient.h"
+ #include "fuse_internal.h"
+
+ #define TMP_FILE "/tmp/fuse_stderr"
+diff -Naur afpfs-ng-0.8.1/fuse/fuse_int.c afpfs-ng-0.8.1.patch/fuse/fuse_int.c
+--- afpfs-ng-0.8.1/fuse/fuse_int.c 2008-03-02 06:06:24.000000000 +0100
++++ afpfs-ng-0.8.1.patch/fuse/fuse_int.c 2011-09-10 12:13:50.111124491 +0200
+@@ -18,7 +18,7 @@
+ #define FUSE_USE_VERSION 25
+
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+ #include
+ #include
+@@ -39,10 +39,10 @@
+ #include
+ #include
+
+-#include "dsi.h"
+-#include "afp_protocol.h"
+-#include "codepage.h"
+-#include "midlevel.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp_protocol.h"
++#include "afpfs-ng/codepage.h"
++#include "afpfs-ng/midlevel.h"
+ #include "fuse_error.h"
+
+ /* Uncomment the following line to enable full debugging: */
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/afp.h afpfs-ng-0.8.1.patch/include/afpfs-ng/afp.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/afp.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/afp.h 2011-09-10 12:13:50.112124505 +0200
+@@ -0,0 +1,533 @@
++
++#ifndef _AFP_H_
++#define _AFP_H_
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++
++
++#define AFPFS_VERSION "0.8.1"
++
++/* This is the maximum AFP version this library supports */
++#define AFP_MAX_SUPPORTED_VERSION 32
++
++/* afp_url is used to pass locations around */
++struct afp_url {
++ enum {TCPIP,AT} protocol;
++ char username[AFP_MAX_USERNAME_LEN];
++ char uamname[50];
++ char password[AFP_MAX_PASSWORD_LEN];
++ char servername[AFP_SERVER_NAME_UTF8_LEN];
++ int port;
++ char volumename[AFP_VOLUME_NAME_UTF8_LEN];
++ char path[AFP_MAX_PATH];
++
++ int requested_version;
++ char zone[AFP_ZONE_LEN]; /* Only used for Appletalk */
++ char volpassword[9];;
++};
++
++struct afp_token {
++ unsigned int length;
++ char data[AFP_TOKEN_MAX_LEN];
++};
++
++#define SERVER_MAX_VERSIONS 10
++#define SERVER_MAX_UAMS 10
++
++struct afp_rx_buffer {
++ unsigned int size;
++ unsigned int maxsize;
++ char * data;
++ int errorcode;
++};
++
++
++struct afp_file_info {
++ unsigned short attributes;
++ unsigned int did;
++ unsigned int creation_date;
++ unsigned int modification_date;
++ unsigned int backup_date;
++ unsigned int fileid;
++ unsigned short offspring;
++ char sync;
++ char finderinfo[32];
++ char name[AFP_MAX_PATH];
++ char basename[AFP_MAX_PATH];
++ char translated_name[AFP_MAX_PATH];
++ struct afp_unixprivs unixprivs;
++ unsigned int accessrights;
++ struct afp_file_info * next;
++ struct afp_file_info * largelist_next;
++ unsigned char isdir;
++ unsigned long long size;
++ unsigned short resourcesize;
++ unsigned int resource;
++ unsigned short forkid;
++ struct afp_icon * icon;
++ int eof;
++};
++
++
++#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_KNOWN 0x1
++#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_BROKEN 0x2
++#define VOLUME_EXTRA_FLAGS_SHOW_APPLEDOUBLE 0x4
++#define VOLUME_EXTRA_FLAGS_VOL_SUPPORTS_UNIX 0x8
++#define VOLUME_EXTRA_FLAGS_NO_LOCKING 0x10
++#define VOLUME_EXTRA_FLAGS_IGNORE_UNIXPRIVS 0x20
++#define VOLUME_EXTRA_FLAGS_READONLY 0x40
++
++#define AFP_VOLUME_UNMOUNTED 0
++#define AFP_VOLUME_MOUNTED 1
++#define AFP_VOLUME_UNMOUNTING 2
++
++struct afp_volume {
++ unsigned short volid;
++ char flags; /* This is from afpGetSrvrParms */
++ unsigned short attributes; /* This is from VolOpen */
++ unsigned short signature; /* This is fixed or variable */
++ unsigned int creation_date;
++ unsigned int modification_date;
++ unsigned int backup_date;
++ struct statvfs stat;
++ unsigned char mounted;
++ char mountpoint[255];
++ struct afp_server * server;
++ char volume_name[AFP_VOLUME_NAME_LEN];
++ char volume_name_printable[AFP_VOLUME_NAME_UTF8_LEN];
++ unsigned short dtrefnum;
++ char volpassword[AFP_VOLPASS_LEN];
++ unsigned int extra_flags; /* This is an afpfs-ng specific field */
++
++ /* Our directory ID cache */
++ struct did_cache_entry * did_cache_base;
++ pthread_mutex_t did_cache_mutex;
++
++ /* Our journal of open forks */
++ struct afp_file_info * open_forks;
++ pthread_mutex_t open_forks_mutex;
++
++ /* Used to trigger startup */
++ pthread_cond_t startup_condition_cond;
++
++ struct {
++ uint64_t hits;
++ uint64_t misses;
++ uint64_t expired;
++ uint64_t force_removed;
++ } did_cache_stats;
++
++ void * priv; /* This is a private structure for fuse/cmdline, etc */
++ pthread_t thread; /* This is the per-volume thread */
++
++ int mapping;
++
++};
++
++#define SERVER_STATE_CONNECTED 1
++#define SERVER_STATE_DISCONNECTED 2
++
++enum server_type{
++ AFPFS_SERVER_TYPE_UNKNOWN,
++ AFPFS_SERVER_TYPE_NETATALK,
++ AFPFS_SERVER_TYPE_AIRPORT,
++ AFPFS_SERVER_TYPE_MACINTOSH,
++};
++
++#define is_netatalk(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_NETATALK )
++#define is_airport(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_AIRPORT )
++#define is_macintosh(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_MACINTOSH )
++
++
++
++struct afp_versions {
++ char *av_name;
++ int av_number;
++};
++extern struct afp_versions afp_versions[];
++
++struct afp_server {
++
++ /* Our buffer sizes */
++ unsigned int tx_quantum;
++ unsigned int rx_quantum;
++
++ unsigned int tx_delay;
++
++ /* Connection information */
++ struct sockaddr_in address;
++ int fd;
++
++ /* Some stats, for information only */
++ struct {
++ uint64_t runt_packets;
++ uint64_t incoming_dsi;
++ uint64_t rx_bytes;
++ uint64_t tx_bytes;
++ uint64_t requests_pending;
++ } stats;
++
++ /* General information */
++ char server_name[AFP_SERVER_NAME_LEN];
++ char server_name_utf8[AFP_SERVER_NAME_UTF8_LEN];
++ char server_name_printable[AFP_SERVER_NAME_UTF8_LEN];
++
++ char machine_type[17];
++ char icon[256];
++ char signature[16];
++ unsigned short flags;
++ int connect_state;
++ enum server_type server_type;
++
++ /* This is the time we connected */
++ time_t connect_time;
++
++ /* UAMs */
++ unsigned int supported_uams;
++ unsigned int using_uam;
++
++ /* Authentication */
++ char username[AFP_MAX_USERNAME_LEN];
++ char password[AFP_MAX_PASSWORD_LEN];
++
++ /* Session */
++ struct afp_token token;
++ char need_resume;
++
++ /* Versions */
++ unsigned char requested_version;
++ unsigned char versions[SERVER_MAX_VERSIONS];
++ struct afp_versions *using_version;
++
++ /* Volumes */
++ unsigned char num_volumes;
++ struct afp_volume * volumes;
++
++ void * dsi;
++ unsigned int exit_flag;
++
++ /* Our DSI request queue */
++ pthread_mutex_t requestid_mutex;
++ pthread_mutex_t request_queue_mutex;
++ unsigned short lastrequestid;
++ unsigned short expectedrequestid;
++ struct dsi_request * command_requests;
++
++
++ char loginmesg[200];
++ char servermesg[200];
++ char path_encoding;
++
++ /* This is the data for the incoming buffer */
++ char * incoming_buffer;
++ int data_read;
++ int bufsize;
++
++ /* And this is for the outgoing queue */
++ pthread_mutex_t send_mutex;
++
++ /* This is for user mapping */
++ struct passwd passwd;
++ unsigned int server_uid, server_gid;
++ int server_gid_valid;
++
++ struct afp_server *next;
++
++ /* These are for DSI attention packets */
++ unsigned int attention_quantum;
++ unsigned int attention_len;
++ char * attention_buffer;
++
++};
++
++struct afp_extattr_info {
++ unsigned int maxsize;
++ unsigned int size;
++ char data[1024];
++};
++struct afp_comment {
++ unsigned int maxsize;
++ unsigned int size;
++ char *data;
++};
++
++struct afp_icon {
++ unsigned int maxsize;
++ unsigned int size;
++ char *data;
++};
++
++#define AFP_DEFAULT_ATTENTION_QUANTUM 1024
++
++void afp_unixpriv_to_stat(struct afp_file_info *fp,
++ struct stat *stat);
++
++int init_uams(void) ;
++
++unsigned int find_uam_by_name(const char * name);
++char * uam_bitmap_to_string(unsigned int bitmap);
++
++
++char * get_uam_names_list(void);
++
++unsigned int default_uams_mask(void);
++
++struct afp_volume * find_volume_by_name(struct afp_server * server,
++ const char * volname);
++
++struct afp_connection_request {
++ unsigned int uam_mask;
++ struct afp_url url;
++};
++
++void afp_default_url(struct afp_url *url);
++int afp_parse_url(struct afp_url * url, const char * toparse, int verbose);
++void afp_print_url(struct afp_url * url);
++int afp_url_validate(char * url_string, struct afp_url * valid_url);
++
++int afp_list_volnames(struct afp_server * server, char * names, int max);
++
++/* User mapping */
++int afp_detect_mapping(struct afp_volume * volume);
++
++/* These are some functions that help with simple status text generation */
++
++int afp_status_header(char * text, int * len);
++int afp_status_server(struct afp_server * s,char * text, int * len);
++
++
++struct afp_server * afp_server_full_connect(void * priv, struct afp_connection_request * req);
++
++void * just_end_it_now(void *other);
++void add_fd_and_signal(int fd);
++void loop_disconnect(struct afp_server *s);
++void afp_wait_for_started_loop(void);
++
++
++struct afp_versions * pick_version(unsigned char *versions,
++ unsigned char requested) ;
++int pick_uam(unsigned int u1, unsigned int u2);
++
++int afp_server_login(struct afp_server *server,
++ char * mesg, unsigned int *l, unsigned int max);
++
++
++int afp_dologin(struct afp_server *server,
++ unsigned int uam, char * username, char * passwd);
++
++void afp_free_server(struct afp_server **server);
++
++struct afp_server * afp_server_init(struct sockaddr_in * address);
++int afp_get_address(void * priv, const char * hostname, unsigned int port,
++ struct sockaddr_in * address);
++
++
++int afp_main_loop(int command_fd);
++int afp_main_quick_startup(pthread_t * thread);
++
++int afp_server_destroy(struct afp_server *s) ;
++int afp_server_reconnect(struct afp_server * s, char * mesg,
++ unsigned int *l, unsigned int max);
++int afp_server_connect(struct afp_server *s, int full);
++
++struct afp_server * afp_server_complete_connection(
++ void * priv,
++ struct afp_server * server,
++ struct sockaddr_in * address, unsigned char * versions,
++ unsigned int uams, char * username, char * password,
++ unsigned int requested_version, unsigned int uam_mask);
++
++int afp_connect_volume(struct afp_volume * volume, struct afp_server * server,
++ char * mesg, unsigned int * l, unsigned int max);
++int something_is_mounted(struct afp_server * server);
++
++int add_cache_entry(struct afp_file_info * file) ;
++struct afp_file_info * get_cache_by_name(char * name);
++struct afp_server * find_server_by_address(struct sockaddr_in * address);
++struct afp_server * find_server_by_signature(char * signature);
++struct afp_server * find_server_by_name(char * name);
++int server_still_valid(struct afp_server * server);
++
++
++struct afp_server * get_server_base(void);
++int afp_server_remove(struct afp_server * server);
++
++int afp_unmount_volume(struct afp_volume * volume);
++int afp_unmount_all_volumes(struct afp_server * server);
++
++#define volume_is_readonly(x) (((x)->attributes&kReadOnly) || \
++ ((x)->extra_flags & VOLUME_EXTRA_FLAGS_READONLY))
++
++int afp_opendt(struct afp_volume *volume, unsigned short * refnum);
++
++int afp_closedt(struct afp_server * server, unsigned short * refnum);
++
++int afp_getcomment(struct afp_volume *volume, unsigned int did,
++ const char * pathname, struct afp_comment * comment);
++
++int afp_addcomment(struct afp_volume *volume, unsigned int did,
++ const char * pathname, char * comment,uint64_t *size);
++
++int afp_geticon(struct afp_volume * volume, unsigned int filecreator,
++ unsigned int filetype, unsigned char icontype,
++ unsigned short length, struct afp_icon * icon);
++
++/* Things you want to do to a server */
++
++int afp_getsrvrmsg(struct afp_server *server, unsigned short messagetype,unsigned char utf8, unsigned char block, char * mesg);
++
++int afp_login(struct afp_server *server, char * uaname,
++ char * userauthinfo, unsigned int userauthinfo_len,
++ struct afp_rx_buffer *rx);
++
++int afp_changepassword(struct afp_server *server, char * uaname,
++ char * userauthinfo, unsigned int userauthinfo_len,
++ struct afp_rx_buffer *rx);
++
++int afp_logincont(struct afp_server *server, unsigned short id,
++ char * userauthinfo, unsigned int userauthinfo_len,
++ struct afp_rx_buffer *rx);
++
++int afp_getsessiontoken(struct afp_server * server, int type,
++ unsigned int timestamp, struct afp_token *outgoing_token,
++ struct afp_token * incoming_token);
++
++int afp_getsrvrparms(struct afp_server *server);
++
++int afp_logout(struct afp_server *server,unsigned char wait);
++
++int afp_mapname(struct afp_server * server, unsigned char subfunction,
++ char * name, unsigned int * id);
++
++int afp_mapid(struct afp_server * server, unsigned char subfunction,
++ unsigned int id, char *name);
++
++int afp_getuserinfo(struct afp_server * server, int thisuser,
++ unsigned int userid, unsigned short bitmap,
++ unsigned int *newuid, unsigned int *newgid);
++
++int afp_zzzzz(struct afp_server *server);
++
++int afp_volopen(struct afp_volume * volume,
++ unsigned short bitmap, char * password);
++
++int afp_flush(struct afp_volume * volume);
++
++int afp_getfiledirparms(struct afp_volume *volume, unsigned int did,
++ unsigned int filebitmap, unsigned int dirbitmap, const char * pathname,
++ struct afp_file_info *fp);
++
++int afp_enumerate(struct afp_volume * volume,
++ unsigned int dirid,
++ unsigned int filebitmap, unsigned int dirbitmap,
++ unsigned short reqcount,
++ unsigned short startindex,
++ char * path,
++ struct afp_file_info ** file_p);
++
++int afp_enumerateext2(struct afp_volume * volume,
++ unsigned int dirid,
++ unsigned int filebitmap, unsigned int dirbitmap,
++ unsigned short reqcount,
++ unsigned long startindex,
++ char * path,
++ struct afp_file_info ** file_p);
++
++int afp_openfork(struct afp_volume * volume,
++ unsigned char forktype,
++ unsigned int dirid,
++ unsigned short accessmode,
++ char * filename,
++ struct afp_file_info *fp);
++
++int afp_read(struct afp_volume * volume, unsigned short forkid,
++ uint32_t offset,
++ uint32_t count, struct afp_rx_buffer * rx);
++
++int afp_readext(struct afp_volume * volume, unsigned short forkid,
++ uint64_t offset,
++ uint64_t count, struct afp_rx_buffer * rx);
++
++int afp_getvolparms(struct afp_volume * volume, unsigned short bitmap);
++
++
++int afp_createdir(struct afp_volume * volume, unsigned int dirid, const char * pathname, unsigned int *did_p);
++
++int afp_delete(struct afp_volume * volume,
++ unsigned int dirid, char * pathname);
++
++
++int afp_createfile(struct afp_volume * volume, unsigned char flag,
++ unsigned int did, char * pathname);
++
++int afp_write(struct afp_volume * volume, unsigned short forkid,
++ uint32_t offset, uint32_t reqcount,
++ char * data, uint32_t * written);
++
++int afp_writeext(struct afp_volume * volume, unsigned short forkid,
++ uint64_t offset, uint64_t reqcount,
++ char * data, uint64_t * written);
++
++int afp_flushfork(struct afp_volume * volume, unsigned short forkid);
++
++int afp_closefork(struct afp_volume * volume, unsigned short forkid);
++int afp_setfileparms(struct afp_volume * volume,
++ unsigned int dirid, const char * pathname, unsigned short bitmap,
++ struct afp_file_info *fp);
++int afp_setfiledirparms(struct afp_volume * volume,
++ unsigned int dirid, const char * pathname, unsigned short bitmap,
++ struct afp_file_info *fp);
++
++int afp_setdirparms(struct afp_volume * volume,
++ unsigned int dirid, const char * pathname, unsigned short bitmap,
++ struct afp_file_info *fp);
++
++int afp_volclose(struct afp_volume * volume);
++
++
++int afp_setforkparms(struct afp_volume *volume,
++ unsigned short forkid, unsigned short bitmap, unsigned long len);
++
++int afp_byterangelock(struct afp_volume * volume,
++ unsigned char flag,
++ unsigned short forkid,
++ uint32_t offset,
++ uint32_t len, uint32_t *generated_offset);
++
++int afp_byterangelockext(struct afp_volume * volume,
++ unsigned char flag,
++ unsigned short forkid,
++ uint64_t offset,
++ uint64_t len, uint64_t *generated_offset);
++
++int afp_moveandrename(struct afp_volume *volume,
++ unsigned int src_did,
++ unsigned int dst_did,
++ char * src_path, char * dst_path, char *new_name);
++
++int afp_rename(struct afp_volume * volume,
++ unsigned int dirid,
++ char * path_from, char * path_to);
++
++int afp_listextattr(struct afp_volume * volume,
++ unsigned int dirid, unsigned short bitmap,
++ char * pathname, struct afp_extattr_info * info);
++
++/* This is a currently undocumented command */
++int afp_newcommand76(struct afp_volume * volume, unsigned int dlen, char * data);
++
++/* For debugging */
++char * afp_get_command_name(char code);
++
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/afp_protocol.h afpfs-ng-0.8.1.patch/include/afpfs-ng/afp_protocol.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/afp_protocol.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/afp_protocol.h 2011-09-10 12:13:50.112124505 +0200
+@@ -0,0 +1,361 @@
++
++#ifndef _AFP_PROTOCOL_H_
++#define _AFP_PROTOCOL_H_
++
++#include
++#include
++#include
++#include
++
++/* This file defines constants for the Apple File Protocol.
++ All page references are from "Apple Filing Protocol Programming" version 3.2.
++ except where noted.
++*/
++
++#define AFP_SERVER_NAME_LEN 33
++#define AFP_SERVER_NAME_UTF8_LEN 255
++#define AFP_VOLUME_NAME_LEN 33
++#define AFP_VOLUME_NAME_UTF8_LEN 33
++#define AFP_SIGNATURE_LEN 16
++#define AFP_MACHINETYPE_LEN 33
++#define AFP_LOGINMESG_LEN 200
++#define AFP_VOLPASS_LEN 8
++#define AFP_HOSTNAME_LEN 255
++/* This is actually just a guess, and only used for appletalk */
++#define AFP_ZONE_LEN 255
++
++#define AFP_SERVER_ICON_LEN 256
++
++
++#define AFP_MAX_USERNAME_LEN 127
++#define AFP_MAX_PASSWORD_LEN 127
++
++
++/* This is the maximum length of any UAM string */
++#define AFP_UAM_LENGTH 24
++
++/* This is the maximum length of any path description */
++#define AFP_MAX_PATH 768
++
++#define AFP_VOL_FLAT 1
++#define AFP_VOL_FIXED 2
++#define AFP_VOL_VARIABLE 3
++
++/* The root directory ID, p.26 */
++
++#define AFP_ROOT_DID 2
++
++/* Path type constants, p.249 */
++
++enum {
++kFPShortName = 1,
++kFPLongName = 2,
++kFPUTF8Name = 3
++};
++
++/* fork types */
++
++#define AFP_FORKTYPE_DATA 0x0
++#define AFP_FORKTYPE_RESOURCE 0x80
++
++/* openfork access modes, from p.196 */
++
++#define AFP_OPENFORK_ALLOWREAD 1
++#define AFP_OPENFORK_ALLOWWRITE 2
++#define AFP_OPENFORK_DENYREAD 0x10
++#define AFP_OPENFORK_DENYWRITE 0x20
++
++/* Message type for getsrvmesg, p. 169*/
++
++typedef enum {
++ AFPMESG_LOGIN = 0,
++ AFPMESG_SERVER = 1
++} afpmessage_t;
++
++/* Message bitmap for getsrvrmsg */
++
++#define AFP_GETSRVRMSG_UTF8 0x2
++#define AFP_GETSRVRMSG_GETMSG 0x1
++
++
++/* Maximum Version length, p.17 */
++#define AFP_MAX_VERSION_LENGTH 16
++
++/* Maximum length of a token, this is undocumented */
++#define AFP_TOKEN_MAX_LEN 256
++
++/* The maximum size of a file for AFP 2 */
++#define AFP_MAX_AFP2_FILESIZE (4294967296)
++
++/* Unix privs, p.240 */
++
++struct afp_unixprivs {
++ uint32_t uid __attribute__((__packed__));
++ uint32_t gid __attribute__((__packed__));
++ uint32_t permissions __attribute__((__packed__));
++ uint32_t ua_permissions __attribute__((__packed__));
++
++};
++
++
++/* AFP Volume attributes bitmap, p.241 */
++
++enum {
++ kReadOnly = 0x01,
++ kHasVolumePassword = 0x02,
++ kSupportsFileIDs = 0x04,
++ kSupportsCatSearch = 0x08,
++ kSupportsBlankAccessPrivs = 0x10,
++ kSupportsUnixPrivs = 0x20,
++ kSupportsUTF8Names = 0x40,
++ kNoNetworkUserIDs = 0x80,
++ kDefaultPrivsFromParent = 0x100,
++ kNoExchangeFiles = 0x200,
++ kSupportsExtAttrs = 0x400,
++ kSupportsACLs=0x800
++};
++
++/* AFP file creation constantes, p.250 */
++enum {
++kFPSoftCreate = 0,
++kFPHardCreate = 0x80
++};
++
++/* AFP Directory attributes, taken from the protocol guide p.236 */
++
++enum {
++ kFPAttributeBit = 0x1,
++ kFPParentDirIDBit = 0x2,
++ kFPCreateDateBit = 0x4,
++ kFPModDateBit = 0x8,
++ kFPBackupDateBit = 0x10,
++ kFPFinderInfoBit = 0x20,
++ kFPLongNameBit = 0x40,
++ kFPShortNameBit = 0x80,
++ kFPNodeIDBit = 0x100,
++ kFPOffspringCountBit = 0x0200,
++ kFPOwnerIDBit = 0x0400,
++ kFPGroupIDBit = 0x0800,
++ kFPAccessRightsBit = 0x1000,
++ kFPProDOSInfoBit = 0x2000, // AFP version 2.2 and earlier
++ kFPUTF8NameBit = 0x2000, // AFP version 3.0 and later
++ kFPUnixPrivsBit = 0x8000 // AFP version 3.0 and later
++};
++
++/* AFP File bitmap, p.238. These are the ones not in the AFP Directory
++ attributes map. */
++
++enum {
++ kFPDataForkLenBit = 0x0200,
++ kFPRsrcForkLenBit = 0x0400,
++ kFPExtDataForkLenBit = 0x0800, // AFP version 3.0 and later
++ kFPLaunchLimitBit = 0x1000,
++ kFPExtRsrcForkLenBit = 0x4000, // AFP version 3.0 and later
++};
++
++/* AFP Extended Attributes Bitmap, p.238 */
++
++enum {
++ kXAttrNoFollow = 0x1,
++ kXAttrCreate = 0x2,
++ kXAttrREplace=0x4
++};
++
++
++/* AFP function codes */
++enum AFPFunction
++{
++ afpByteRangeLock = 1, afpCloseVol, afpCloseDir, afpCloseFork,
++ afpCopyFile, afpCreateDir, afpCreateFile,
++ afpDelete, afpEnumerate, afpFlush, afpFlushFork,
++ afpGetForkParms = 14, afpGetSrvrInfo, afpGetSrvrParms,
++ afpGetVolParms, afpLogin, afpLoginCont, afpLogout, afpMapID,
++ afpMapName, afpMoveAndRename, afpOpenVol, afpOpenDir, afpOpenFork,
++ afpRead, afpRename, afpSetDirParms, afpSetFileParms,
++ afpSetForkParms, afpSetVolParms, afpWrite, afpGetFileDirParms,
++ afpSetFileDirParms, afpChangePassword,
++ afpGetUserInfo=37,afpGetSrvrMsg = 38,
++ afpOpenDT=48,
++ afpCloseDT=49,
++ afpGetIcon=51, afpGetIconInfo=52,
++ afpAddComment=56, afpRemoveComment=57, afpGetComment=58,
++ afpByteRangeLockExt=59, afpReadExt, afpWriteExt,
++ afpGetAuthMethods=62,
++ afp_LoginExt=63,
++ afpGetSessionToken=64,
++ afpDisconnectOldSession=65,
++ afpEnumerateExt=66,
++ afpCatSearchExt = 67,
++ afpEnumerateExt2 = 68, afpGetExtAttr, afpSetExtAttr,
++ afpRemoveExtAttr , afpListExtAttrs,
++ afpZzzzz = 122,
++ afpAddIcon=192,
++};
++
++/* AFP Volume bitmap. Take from 242 of the protocol guide. */
++enum {
++ kFPBadVolPre222Bitmap = 0xFe00,
++ kFPBadVolBitmap = 0xF000,
++ kFPVolAttributeBit = 0x1,
++ kFPVolSignatureBit = 0x2,
++ kFPVolCreateDateBit = 0x4,
++ kFPVolModDateBit = 0x8,
++ kFPVolBackupDateBit = 0x10,
++ kFPVolIDBit = 0x20,
++ kFPVolBytesFreeBit = 0x40,
++ kFPVolBytesTotalBit = 0x80,
++ kFPVolNameBit = 0x100,
++ kFPVolExtBytesFreeBit = 0x200,
++ kFPVolExtBytesTotalBit = 0x400,
++ kFPVolBlockSizeBit = 0x800
++};
++
++/* AFP Attention Codes -- 4 bits */
++#define AFPATTN_SHUTDOWN (1 << 15) /* shutdown/disconnect */
++#define AFPATTN_CRASH (1 << 14) /* server crashed */
++#define AFPATTN_MESG (1 << 13) /* server has message */
++#define AFPATTN_NORECONNECT (1 << 12) /* don't reconnect */
++/* server notification */
++#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT)
++
++/* extended bitmap -- 12 bits. volchanged is only useful w/ a server
++ * notification, and time is only useful for shutdown. */
++#define AFPATTN_VOLCHANGED (1 << 0) /* volume has changed */
++#define AFPATTN_TIME(x) ((x) & 0xfff) /* time in minutes */
++
++#define kFPNoErr 0
++
++/* AFP result codes, p252 */
++#define kASPSessClosed -1072
++#define kFPAccessDenied -5000
++#define kFPAuthContinue -5001
++#define kFPBadUAM -5002
++#define kFPBadVersNum -5003
++#define kFPBitmapErr -5004
++#define kFPCantMove -5005
++#define kFPDenyConflict -5006
++#define kFPDirNotEmpty -5007
++#define kFPDiskFull -5008
++#define kFPEOFErr -5009
++#define kFPFileBusy -5010
++#define kFPFlatVol -5011
++#define kFPItemNotFound -5012
++#define kFPLockErr -5013
++#define kFPMiscErr -5014
++#define kFPNoMoreLocks -5015
++#define kFPNoServer -5016
++#define kFPObjectExists -5017
++#define kFPObjectNotFound -5018
++#define kFPParamErr -5019
++#define kFPRangeNotLocked -5020
++#define kFPRangeOverlap -5021
++#define kFPSessClosed -5022
++#define kFPUserNotAuth -5023
++#define kFPCallNotSupported -5024
++#define kFPObjectTypeErr -5025
++#define kFPTooManyFilesOpen -5026
++#define kFPServerGoingDown -5027
++#define kFPCantRename -5028
++#define kFPDirNotFound -5029
++#define kFPIconTypeError -5030
++#define kFPVolLocked -5031
++#define kFPObjectLocked -5032
++#define kFPContainsSharedErr -5033
++#define kFPIDNotFound -5034
++#define kFPIDExists -5035
++#define kFPDiffVolErr -5036
++#define kFPCatalogChanged -5037
++#define kFPSameObjectErr -5038
++#define kFPBadIDErr -5039
++#define kFPPwdSameErr -5040
++#define kFPPwdTooShortErr -5041
++#define kFPPwdExpiredErr -5042
++#define kFPInsideSharedErr -5043
++#define kFPInsideTrashErr -5044
++#define kFPPwdNeedsChangeErr -5045
++#define kFPPwdPolicyErr -5046
++#define kFPDiskQuotaExceeded –5047
++
++
++
++/* These flags determine to lock or unlock in ByteRangeLock(Ext) */
++
++enum {
++ByteRangeLock_Lock = 0,
++ByteRangeLock_Unlock = 1
++};
++
++/* These flags are used in volopen and getsrvrparm replies, p.171 */
++
++#define HasConfigInfo 0x1
++#define HasPassword 0x80
++
++/* These are the subfunction for kFPMapID, as per p.248 */
++
++enum {
++kUserIDToName = 1,
++kGroupIDToName = 2,
++kUserIDToUTF8Name = 3,
++kGroupIDToUTF8Name = 4,
++kUserUUIDToUTF8Name = 5,
++kGroupUUIDToUTF8Name = 6
++};
++
++
++/* These are the subfunction flags described in the FPMapName command, p.286.
++ Note that this is different than what's described on p. 186. */
++
++enum {
++kNameToUserID = 1,
++kNameToGroupID = 2,
++kUTF8NameToUserID = 3,
++kUTF8NameToGroupID = 4,
++kUTF8NameToUserUUID = 5,
++kUTF8NameToGroupUUID = 6
++};
++
++/* These are bits for FPGetUserInfo, p.173. */
++#define kFPGetUserInfo_USER_ID 1
++#define kFPGetUserInfo_PRI_GROUPID 2
++
++/* Flags for the replies of GetSrvrInfo and DSI GetStatus, p.240 */
++
++enum {
++ kSupportsCopyfile = 0x01,
++ kSupportsChgPwd = 0x02,
++ kDontAllowSavePwd = 0x04,
++ kSupportsSrvrMsg = 0x08,
++ kSrvrSig = 0x10,
++ kSupportsTCP = 0x20,
++ kSupportsSrvrNotify = 0x40,
++ kSupportsReconnect = 0x80,
++ kSupportsDirServices = 0x100,
++ kSupportsUTF8SrvrName = 0x200,
++ kSupportsUUIDs = 0x400,
++ kSupportsSuperClient = 0x8000
++};
++
++
++/* p.247 */
++
++enum {
++ kLoginWithoutID = 0,
++ kLoginWithID = 1,
++ kReconnWithID = 2,
++ kLoginWithTimeAndID = 3,
++ kReconnWithTimeAndID = 4,
++ kRecon1Login = 5,
++ kRecon1ReconnectLogin = 6,
++ kRecon1Refresh = 7, kGetKerberosSessionKey = 8
++};
++
++
++#define AFP_CHMOD_ALLOWED_BITS_22 \
++ (S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH | S_IFREG )
++
++
++#endif
++
++
++
++
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/codepage.h afpfs-ng-0.8.1.patch/include/afpfs-ng/codepage.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/codepage.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/codepage.h 2011-09-10 12:13:50.113124518 +0200
+@@ -0,0 +1,11 @@
++#ifndef __CODE_PAGE_H_
++#define __CODE_PAGE_H_
++int convert_utf8dec_to_utf8pre(const char *src, int src_len,
++ char * dest, int dest_len);
++int convert_utf8pre_to_utf8dec(const char * src, int src_len,
++ char * dest, int dest_len);
++int convert_path_to_unix(char encoding, char * dest,
++ char * src, int dest_len);
++int convert_path_to_afp(char encoding, char * dest,
++ char * src, int dest_len);
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/dsi.h afpfs-ng-0.8.1.patch/include/afpfs-ng/dsi.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/dsi.h 2011-09-10 12:13:50.115124544 +0200
+@@ -0,0 +1,33 @@
++
++#ifndef __DSI_H_
++#define __DSI_H_
++
++#include "afpfs-ng/afp.h"
++
++struct dsi_request
++{
++ unsigned short requestid;
++ unsigned char subcommand;
++ void * other;
++ unsigned char wait;
++ pthread_cond_t condition_cond;
++ struct dsi_request * next;
++ int return_code;
++};
++
++int dsi_receive(struct afp_server * server, void * data, int size);
++int dsi_getstatus(struct afp_server * server);
++
++int dsi_opensession(struct afp_server *server);
++
++int dsi_send(struct afp_server *server, char * msg, int size,int wait,unsigned char subcommand, void ** other);
++struct dsi_session * dsi_create(struct afp_server *server);
++int dsi_restart(struct afp_server *server);
++int dsi_recv(struct afp_server * server);
++
++#define DSI_BLOCK_TIMEOUT -1
++#define DSI_DONT_WAIT 0
++#define DSI_DEFAULT_TIMEOUT 5
++
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/libafpclient.h afpfs-ng-0.8.1.patch/include/afpfs-ng/libafpclient.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/libafpclient.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/libafpclient.h 2011-09-10 12:13:50.115124544 +0200
+@@ -0,0 +1,50 @@
++
++#ifndef __CLIENT_H_
++#define __CLIENT_H_
++
++#include
++#include
++
++#define MAX_CLIENT_RESPONSE 2048
++
++
++enum loglevels {
++ AFPFSD,
++};
++
++struct afp_server;
++struct afp_volume;
++
++struct libafpclient {
++ int (*unmount_volume) (struct afp_volume * volume);
++ void (*log_for_client)(void * priv,
++ enum loglevels loglevel, int logtype, const char *message);
++ void (*forced_ending_hook)(void);
++ int (*scan_extra_fds)(int command_fd,fd_set *set, int * max_fd);
++ void (*loop_started)(void);
++} ;
++
++extern struct libafpclient * libafpclient;
++
++void libafpclient_register(struct libafpclient * tmpclient);
++
++
++void signal_main_thread(void);
++
++/* These are logging functions */
++
++#define MAXLOGSIZE 2048
++
++#define LOG_METHOD_SYSLOG 1
++#define LOG_METHOD_STDOUT 2
++
++void set_log_method(int m);
++
++
++void log_for_client(void * priv,
++ enum loglevels loglevel, int logtype, char * message,...);
++
++void stdout_log_for_client(void * priv,
++ enum loglevels loglevel, int logtype, const char *message);
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/Makefile.am afpfs-ng-0.8.1.patch/include/afpfs-ng/Makefile.am
+--- afpfs-ng-0.8.1/include/afpfs-ng/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/Makefile.am 2011-09-10 12:13:50.115124544 +0200
+@@ -0,0 +1,6 @@
++## Process this file with automake to produce Makefile.in
++
++afpfsincludedir = $(includedir)/afpfs-ng
++
++afpfsinclude_HEADERS = afp.h afp_protocol.h libafpclient.h
++nodist_afpfsinclude_HEADERS = codepage.h dsi.h map_def.h midlevel.h uams_def.h utils.h
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/map_def.h afpfs-ng-0.8.1.patch/include/afpfs-ng/map_def.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/map_def.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/map_def.h 2011-09-10 12:13:50.116124557 +0200
+@@ -0,0 +1,15 @@
++#ifndef __MAP_H_
++#define __MAP_H_
++
++#include "afpfs-ng/afp.h"
++
++#define AFP_MAPPING_UNKNOWN 0
++#define AFP_MAPPING_COMMON 1
++#define AFP_MAPPING_LOGINIDS 2
++#define AFP_MAPPING_NAME 3
++
++unsigned int map_string_to_num(char * name);
++char * get_mapping_name(struct afp_volume * volume);
++
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/midlevel.h afpfs-ng-0.8.1.patch/include/afpfs-ng/midlevel.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/midlevel.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/midlevel.h 2011-09-10 12:13:50.116124557 +0200
+@@ -0,0 +1,64 @@
++#ifndef __MIDLEVEL_H_
++#define __MIDLEVEL_H_
++
++#include
++#include "afpfs-ng/afp.h"
++
++int ml_open(struct afp_volume * volume, const char *path, int flags,
++ struct afp_file_info **newfp);
++
++int ml_creat(struct afp_volume * volume, const char *path,mode_t mode);
++
++int ml_readdir(struct afp_volume * volume,
++ const char *path,
++ struct afp_file_info **base);
++
++int ml_read(struct afp_volume * volume, const char *path,
++ char *buf, size_t size, off_t offset,
++ struct afp_file_info *fp, int * eof);
++
++int ml_chmod(struct afp_volume * vol, const char * path, mode_t mode);
++
++int ml_unlink(struct afp_volume * vol, const char *path);
++
++int ml_mkdir(struct afp_volume * vol, const char * path, mode_t mode);
++
++int ml_close(struct afp_volume * volume, const char * path,
++ struct afp_file_info * fp);
++
++int ml_getattr(struct afp_volume * volume, const char *path,
++ struct stat *stbuf);
++
++int ml_write(struct afp_volume * volume, const char * path,
++ const char *data, size_t size, off_t offset,
++ struct afp_file_info * fp, uid_t uid,
++ gid_t gid);
++
++int ml_readlink(struct afp_volume * vol, const char * path,
++ char *buf, size_t size);
++
++int ml_rmdir(struct afp_volume * vol, const char *path);
++
++int ml_chown(struct afp_volume * vol, const char * path,
++ uid_t uid, gid_t gid);
++
++int ml_truncate(struct afp_volume * vol, const char * path, off_t offset);
++
++int ml_utime(struct afp_volume * vol, const char * path,
++ struct utimbuf * timebuf);
++
++int ml_symlink(struct afp_volume *vol, const char * path1, const char * path2);
++
++int ml_rename(struct afp_volume * vol,
++ const char * path_from, const char * path_to);
++
++int ml_statfs(struct afp_volume * vol, const char *path, struct statvfs *stat);
++
++void afp_ml_filebase_free(struct afp_file_info **filebase);
++
++int ml_passwd(struct afp_server *server,
++ char * username, char * oldpasswd, char * newpasswd);
++
++
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/uams_def.h afpfs-ng-0.8.1.patch/include/afpfs-ng/uams_def.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/uams_def.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/uams_def.h 2011-09-10 12:13:50.116124557 +0200
+@@ -0,0 +1,16 @@
++#ifndef __UAM_DEFS_H_
++#define __UAM_DEFS_H_
++
++#define UAM_NOUSERAUTHENT 0x1
++#define UAM_CLEARTXTPASSWRD 0x2
++#define UAM_RANDNUMEXCHANGE 0x4
++#define UAM_2WAYRANDNUM 0x8
++#define UAM_DHCAST128 0x10
++#define UAM_CLIENTKRB 0x20
++#define UAM_DHX2 0x40
++#define UAM_RECON1 0x80
++
++int uam_string_to_bitmap(char * name);
++char * uam_bitmap_to_string(unsigned int bitmap);
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/utils.h afpfs-ng-0.8.1.patch/include/afpfs-ng/utils.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/utils.h 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/utils.h 2011-09-10 12:13:50.116124557 +0200
+@@ -0,0 +1,43 @@
++#ifndef __UTILS_H_
++#define __UTILS_H_
++#include
++
++#include "afpfs-ng/afp.h"
++
++#if BYTE_ORDER == BIG_ENDIAN
++#define hton64(x) (x)
++#define ntoh64(x) (x)
++#else /* BYTE_ORDER == BIG_ENDIAN */
++#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \
++ (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32))
++#define ntoh64(x) (hton64(x))
++#endif /* BYTE_ORDER == BIG_ENDIAN */
++
++#define min(a,b) (((a)<(b)) ? (a) : (b))
++#define max(a,b) (((a)>(b)) ? (a) : (b))
++
++
++
++unsigned char unixpath_to_afppath(
++ struct afp_server * server,
++ char * buf);
++
++unsigned char sizeof_path_header(struct afp_server * server);
++
++
++
++unsigned char copy_from_pascal(char *dest, char *pascal,unsigned int max_len) ;
++unsigned short copy_from_pascal_two(char *dest, char *pascal,unsigned int max_len);
++
++unsigned char copy_to_pascal(char *dest, const char *src);
++unsigned short copy_to_pascal_two(char *dest, const char *src);
++
++void copy_path(struct afp_server * server, char * dest, const char * pathname, unsigned char len);
++
++
++char * create_path(struct afp_server * server, char * pathname, unsigned short * len);
++
++
++int invalid_filename(struct afp_server * server, const char * filename);
++
++#endif
+diff -Naur afpfs-ng-0.8.1/include/afp.h afpfs-ng-0.8.1.patch/include/afp.h
+--- afpfs-ng-0.8.1/include/afp.h 2008-03-08 17:08:18.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afp.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,533 +0,0 @@
+-
+-#ifndef _AFP_H_
+-#define _AFP_H_
+-
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-
+-
+-#define AFPFS_VERSION "0.8.1"
+-
+-/* This is the maximum AFP version this library supports */
+-#define AFP_MAX_SUPPORTED_VERSION 32
+-
+-/* afp_url is used to pass locations around */
+-struct afp_url {
+- enum {TCPIP,AT} protocol;
+- char username[AFP_MAX_USERNAME_LEN];
+- char uamname[50];
+- char password[AFP_MAX_PASSWORD_LEN];
+- char servername[AFP_SERVER_NAME_UTF8_LEN];
+- int port;
+- char volumename[AFP_VOLUME_NAME_UTF8_LEN];
+- char path[AFP_MAX_PATH];
+-
+- int requested_version;
+- char zone[AFP_ZONE_LEN]; /* Only used for Appletalk */
+- char volpassword[9];;
+-};
+-
+-struct afp_token {
+- unsigned int length;
+- char data[AFP_TOKEN_MAX_LEN];
+-};
+-
+-#define SERVER_MAX_VERSIONS 10
+-#define SERVER_MAX_UAMS 10
+-
+-struct afp_rx_buffer {
+- unsigned int size;
+- unsigned int maxsize;
+- char * data;
+- int errorcode;
+-};
+-
+-
+-struct afp_file_info {
+- unsigned short attributes;
+- unsigned int did;
+- unsigned int creation_date;
+- unsigned int modification_date;
+- unsigned int backup_date;
+- unsigned int fileid;
+- unsigned short offspring;
+- char sync;
+- char finderinfo[32];
+- char name[AFP_MAX_PATH];
+- char basename[AFP_MAX_PATH];
+- char translated_name[AFP_MAX_PATH];
+- struct afp_unixprivs unixprivs;
+- unsigned int accessrights;
+- struct afp_file_info * next;
+- struct afp_file_info * largelist_next;
+- unsigned char isdir;
+- unsigned long long size;
+- unsigned short resourcesize;
+- unsigned int resource;
+- unsigned short forkid;
+- struct afp_icon * icon;
+- int eof;
+-};
+-
+-
+-#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_KNOWN 0x1
+-#define VOLUME_EXTRA_FLAGS_VOL_CHMOD_BROKEN 0x2
+-#define VOLUME_EXTRA_FLAGS_SHOW_APPLEDOUBLE 0x4
+-#define VOLUME_EXTRA_FLAGS_VOL_SUPPORTS_UNIX 0x8
+-#define VOLUME_EXTRA_FLAGS_NO_LOCKING 0x10
+-#define VOLUME_EXTRA_FLAGS_IGNORE_UNIXPRIVS 0x20
+-#define VOLUME_EXTRA_FLAGS_READONLY 0x40
+-
+-#define AFP_VOLUME_UNMOUNTED 0
+-#define AFP_VOLUME_MOUNTED 1
+-#define AFP_VOLUME_UNMOUNTING 2
+-
+-struct afp_volume {
+- unsigned short volid;
+- char flags; /* This is from afpGetSrvrParms */
+- unsigned short attributes; /* This is from VolOpen */
+- unsigned short signature; /* This is fixed or variable */
+- unsigned int creation_date;
+- unsigned int modification_date;
+- unsigned int backup_date;
+- struct statvfs stat;
+- unsigned char mounted;
+- char mountpoint[255];
+- struct afp_server * server;
+- char volume_name[AFP_VOLUME_NAME_LEN];
+- char volume_name_printable[AFP_VOLUME_NAME_UTF8_LEN];
+- unsigned short dtrefnum;
+- char volpassword[AFP_VOLPASS_LEN];
+- unsigned int extra_flags; /* This is an afpfs-ng specific field */
+-
+- /* Our directory ID cache */
+- struct did_cache_entry * did_cache_base;
+- pthread_mutex_t did_cache_mutex;
+-
+- /* Our journal of open forks */
+- struct afp_file_info * open_forks;
+- pthread_mutex_t open_forks_mutex;
+-
+- /* Used to trigger startup */
+- pthread_cond_t startup_condition_cond;
+-
+- struct {
+- uint64_t hits;
+- uint64_t misses;
+- uint64_t expired;
+- uint64_t force_removed;
+- } did_cache_stats;
+-
+- void * priv; /* This is a private structure for fuse/cmdline, etc */
+- pthread_t thread; /* This is the per-volume thread */
+-
+- int mapping;
+-
+-};
+-
+-#define SERVER_STATE_CONNECTED 1
+-#define SERVER_STATE_DISCONNECTED 2
+-
+-enum server_type{
+- AFPFS_SERVER_TYPE_UNKNOWN,
+- AFPFS_SERVER_TYPE_NETATALK,
+- AFPFS_SERVER_TYPE_AIRPORT,
+- AFPFS_SERVER_TYPE_MACINTOSH,
+-};
+-
+-#define is_netatalk(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_NETATALK )
+-#define is_airport(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_AIRPORT )
+-#define is_macintosh(x) ( (x)->machine_type == AFPFS_SERVER_TYPE_MACINTOSH )
+-
+-
+-
+-struct afp_versions {
+- char *av_name;
+- int av_number;
+-};
+-extern struct afp_versions afp_versions[];
+-
+-struct afp_server {
+-
+- /* Our buffer sizes */
+- unsigned int tx_quantum;
+- unsigned int rx_quantum;
+-
+- unsigned int tx_delay;
+-
+- /* Connection information */
+- struct sockaddr_in address;
+- int fd;
+-
+- /* Some stats, for information only */
+- struct {
+- uint64_t runt_packets;
+- uint64_t incoming_dsi;
+- uint64_t rx_bytes;
+- uint64_t tx_bytes;
+- uint64_t requests_pending;
+- } stats;
+-
+- /* General information */
+- char server_name[AFP_SERVER_NAME_LEN];
+- char server_name_utf8[AFP_SERVER_NAME_UTF8_LEN];
+- char server_name_printable[AFP_SERVER_NAME_UTF8_LEN];
+-
+- char machine_type[17];
+- char icon[256];
+- char signature[16];
+- unsigned short flags;
+- int connect_state;
+- enum server_type server_type;
+-
+- /* This is the time we connected */
+- time_t connect_time;
+-
+- /* UAMs */
+- unsigned int supported_uams;
+- unsigned int using_uam;
+-
+- /* Authentication */
+- char username[AFP_MAX_USERNAME_LEN];
+- char password[AFP_MAX_PASSWORD_LEN];
+-
+- /* Session */
+- struct afp_token token;
+- char need_resume;
+-
+- /* Versions */
+- unsigned char requested_version;
+- unsigned char versions[SERVER_MAX_VERSIONS];
+- struct afp_versions *using_version;
+-
+- /* Volumes */
+- unsigned char num_volumes;
+- struct afp_volume * volumes;
+-
+- void * dsi;
+- unsigned int exit_flag;
+-
+- /* Our DSI request queue */
+- pthread_mutex_t requestid_mutex;
+- pthread_mutex_t request_queue_mutex;
+- unsigned short lastrequestid;
+- unsigned short expectedrequestid;
+- struct dsi_request * command_requests;
+-
+-
+- char loginmesg[200];
+- char servermesg[200];
+- char path_encoding;
+-
+- /* This is the data for the incoming buffer */
+- char * incoming_buffer;
+- int data_read;
+- int bufsize;
+-
+- /* And this is for the outgoing queue */
+- pthread_mutex_t send_mutex;
+-
+- /* This is for user mapping */
+- struct passwd passwd;
+- unsigned int server_uid, server_gid;
+- int server_gid_valid;
+-
+- struct afp_server *next;
+-
+- /* These are for DSI attention packets */
+- unsigned int attention_quantum;
+- unsigned int attention_len;
+- char * attention_buffer;
+-
+-};
+-
+-struct afp_extattr_info {
+- unsigned int maxsize;
+- unsigned int size;
+- char data[1024];
+-};
+-struct afp_comment {
+- unsigned int maxsize;
+- unsigned int size;
+- char *data;
+-};
+-
+-struct afp_icon {
+- unsigned int maxsize;
+- unsigned int size;
+- char *data;
+-};
+-
+-#define AFP_DEFAULT_ATTENTION_QUANTUM 1024
+-
+-void afp_unixpriv_to_stat(struct afp_file_info *fp,
+- struct stat *stat);
+-
+-int init_uams(void) ;
+-
+-unsigned int find_uam_by_name(const char * name);
+-char * uam_bitmap_to_string(unsigned int bitmap);
+-
+-
+-char * get_uam_names_list(void);
+-
+-unsigned int default_uams_mask(void);
+-
+-struct afp_volume * find_volume_by_name(struct afp_server * server,
+- const char * volname);
+-
+-struct afp_connection_request {
+- unsigned int uam_mask;
+- struct afp_url url;
+-};
+-
+-void afp_default_url(struct afp_url *url);
+-int afp_parse_url(struct afp_url * url, const char * toparse, int verbose);
+-void afp_print_url(struct afp_url * url);
+-int afp_url_validate(char * url_string, struct afp_url * valid_url);
+-
+-int afp_list_volnames(struct afp_server * server, char * names, int max);
+-
+-/* User mapping */
+-int afp_detect_mapping(struct afp_volume * volume);
+-
+-/* These are some functions that help with simple status text generation */
+-
+-int afp_status_header(char * text, int * len);
+-int afp_status_server(struct afp_server * s,char * text, int * len);
+-
+-
+-struct afp_server * afp_server_full_connect(void * priv, struct afp_connection_request * req);
+-
+-void * just_end_it_now(void *other);
+-void add_fd_and_signal(int fd);
+-void loop_disconnect(struct afp_server *s);
+-void afp_wait_for_started_loop(void);
+-
+-
+-struct afp_versions * pick_version(unsigned char *versions,
+- unsigned char requested) ;
+-int pick_uam(unsigned int u1, unsigned int u2);
+-
+-int afp_server_login(struct afp_server *server,
+- char * mesg, unsigned int *l, unsigned int max);
+-
+-
+-int afp_dologin(struct afp_server *server,
+- unsigned int uam, char * username, char * passwd);
+-
+-void afp_free_server(struct afp_server **server);
+-
+-struct afp_server * afp_server_init(struct sockaddr_in * address);
+-int afp_get_address(void * priv, const char * hostname, unsigned int port,
+- struct sockaddr_in * address);
+-
+-
+-int afp_main_loop(int command_fd);
+-int afp_main_quick_startup(pthread_t * thread);
+-
+-int afp_server_destroy(struct afp_server *s) ;
+-int afp_server_reconnect(struct afp_server * s, char * mesg,
+- unsigned int *l, unsigned int max);
+-int afp_server_connect(struct afp_server *s, int full);
+-
+-struct afp_server * afp_server_complete_connection(
+- void * priv,
+- struct afp_server * server,
+- struct sockaddr_in * address, unsigned char * versions,
+- unsigned int uams, char * username, char * password,
+- unsigned int requested_version, unsigned int uam_mask);
+-
+-int afp_connect_volume(struct afp_volume * volume, struct afp_server * server,
+- char * mesg, unsigned int * l, unsigned int max);
+-int something_is_mounted(struct afp_server * server);
+-
+-int add_cache_entry(struct afp_file_info * file) ;
+-struct afp_file_info * get_cache_by_name(char * name);
+-struct afp_server * find_server_by_address(struct sockaddr_in * address);
+-struct afp_server * find_server_by_signature(char * signature);
+-struct afp_server * find_server_by_name(char * name);
+-int server_still_valid(struct afp_server * server);
+-
+-
+-struct afp_server * get_server_base(void);
+-int afp_server_remove(struct afp_server * server);
+-
+-int afp_unmount_volume(struct afp_volume * volume);
+-int afp_unmount_all_volumes(struct afp_server * server);
+-
+-#define volume_is_readonly(x) (((x)->attributes&kReadOnly) || \
+- ((x)->extra_flags & VOLUME_EXTRA_FLAGS_READONLY))
+-
+-int afp_opendt(struct afp_volume *volume, unsigned short * refnum);
+-
+-int afp_closedt(struct afp_server * server, unsigned short * refnum);
+-
+-int afp_getcomment(struct afp_volume *volume, unsigned int did,
+- const char * pathname, struct afp_comment * comment);
+-
+-int afp_addcomment(struct afp_volume *volume, unsigned int did,
+- const char * pathname, char * comment,uint64_t *size);
+-
+-int afp_geticon(struct afp_volume * volume, unsigned int filecreator,
+- unsigned int filetype, unsigned char icontype,
+- unsigned short length, struct afp_icon * icon);
+-
+-/* Things you want to do to a server */
+-
+-int afp_getsrvrmsg(struct afp_server *server, unsigned short messagetype,unsigned char utf8, unsigned char block, char * mesg);
+-
+-int afp_login(struct afp_server *server, char * uaname,
+- char * userauthinfo, unsigned int userauthinfo_len,
+- struct afp_rx_buffer *rx);
+-
+-int afp_changepassword(struct afp_server *server, char * uaname,
+- char * userauthinfo, unsigned int userauthinfo_len,
+- struct afp_rx_buffer *rx);
+-
+-int afp_logincont(struct afp_server *server, unsigned short id,
+- char * userauthinfo, unsigned int userauthinfo_len,
+- struct afp_rx_buffer *rx);
+-
+-int afp_getsessiontoken(struct afp_server * server, int type,
+- unsigned int timestamp, struct afp_token *outgoing_token,
+- struct afp_token * incoming_token);
+-
+-int afp_getsrvrparms(struct afp_server *server);
+-
+-int afp_logout(struct afp_server *server,unsigned char wait);
+-
+-int afp_mapname(struct afp_server * server, unsigned char subfunction,
+- char * name, unsigned int * id);
+-
+-int afp_mapid(struct afp_server * server, unsigned char subfunction,
+- unsigned int id, char *name);
+-
+-int afp_getuserinfo(struct afp_server * server, int thisuser,
+- unsigned int userid, unsigned short bitmap,
+- unsigned int *newuid, unsigned int *newgid);
+-
+-int afp_zzzzz(struct afp_server *server);
+-
+-int afp_volopen(struct afp_volume * volume,
+- unsigned short bitmap, char * password);
+-
+-int afp_flush(struct afp_volume * volume);
+-
+-int afp_getfiledirparms(struct afp_volume *volume, unsigned int did,
+- unsigned int filebitmap, unsigned int dirbitmap, const char * pathname,
+- struct afp_file_info *fp);
+-
+-int afp_enumerate(struct afp_volume * volume,
+- unsigned int dirid,
+- unsigned int filebitmap, unsigned int dirbitmap,
+- unsigned short reqcount,
+- unsigned short startindex,
+- char * path,
+- struct afp_file_info ** file_p);
+-
+-int afp_enumerateext2(struct afp_volume * volume,
+- unsigned int dirid,
+- unsigned int filebitmap, unsigned int dirbitmap,
+- unsigned short reqcount,
+- unsigned long startindex,
+- char * path,
+- struct afp_file_info ** file_p);
+-
+-int afp_openfork(struct afp_volume * volume,
+- unsigned char forktype,
+- unsigned int dirid,
+- unsigned short accessmode,
+- char * filename,
+- struct afp_file_info *fp);
+-
+-int afp_read(struct afp_volume * volume, unsigned short forkid,
+- uint32_t offset,
+- uint32_t count, struct afp_rx_buffer * rx);
+-
+-int afp_readext(struct afp_volume * volume, unsigned short forkid,
+- uint64_t offset,
+- uint64_t count, struct afp_rx_buffer * rx);
+-
+-int afp_getvolparms(struct afp_volume * volume, unsigned short bitmap);
+-
+-
+-int afp_createdir(struct afp_volume * volume, unsigned int dirid, const char * pathname, unsigned int *did_p);
+-
+-int afp_delete(struct afp_volume * volume,
+- unsigned int dirid, char * pathname);
+-
+-
+-int afp_createfile(struct afp_volume * volume, unsigned char flag,
+- unsigned int did, char * pathname);
+-
+-int afp_write(struct afp_volume * volume, unsigned short forkid,
+- uint32_t offset, uint32_t reqcount,
+- char * data, uint32_t * written);
+-
+-int afp_writeext(struct afp_volume * volume, unsigned short forkid,
+- uint64_t offset, uint64_t reqcount,
+- char * data, uint64_t * written);
+-
+-int afp_flushfork(struct afp_volume * volume, unsigned short forkid);
+-
+-int afp_closefork(struct afp_volume * volume, unsigned short forkid);
+-int afp_setfileparms(struct afp_volume * volume,
+- unsigned int dirid, const char * pathname, unsigned short bitmap,
+- struct afp_file_info *fp);
+-int afp_setfiledirparms(struct afp_volume * volume,
+- unsigned int dirid, const char * pathname, unsigned short bitmap,
+- struct afp_file_info *fp);
+-
+-int afp_setdirparms(struct afp_volume * volume,
+- unsigned int dirid, const char * pathname, unsigned short bitmap,
+- struct afp_file_info *fp);
+-
+-int afp_volclose(struct afp_volume * volume);
+-
+-
+-int afp_setforkparms(struct afp_volume *volume,
+- unsigned short forkid, unsigned short bitmap, unsigned long len);
+-
+-int afp_byterangelock(struct afp_volume * volume,
+- unsigned char flag,
+- unsigned short forkid,
+- uint32_t offset,
+- uint32_t len, uint32_t *generated_offset);
+-
+-int afp_byterangelockext(struct afp_volume * volume,
+- unsigned char flag,
+- unsigned short forkid,
+- uint64_t offset,
+- uint64_t len, uint64_t *generated_offset);
+-
+-int afp_moveandrename(struct afp_volume *volume,
+- unsigned int src_did,
+- unsigned int dst_did,
+- char * src_path, char * dst_path, char *new_name);
+-
+-int afp_rename(struct afp_volume * volume,
+- unsigned int dirid,
+- char * path_from, char * path_to);
+-
+-int afp_listextattr(struct afp_volume * volume,
+- unsigned int dirid, unsigned short bitmap,
+- char * pathname, struct afp_extattr_info * info);
+-
+-/* This is a currently undocumented command */
+-int afp_newcommand76(struct afp_volume * volume, unsigned int dlen, char * data);
+-
+-/* For debugging */
+-char * afp_get_command_name(char code);
+-
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/afp_protocol.h afpfs-ng-0.8.1.patch/include/afp_protocol.h
+--- afpfs-ng-0.8.1/include/afp_protocol.h 2008-02-18 04:33:43.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/afp_protocol.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,361 +0,0 @@
+-
+-#ifndef _AFP_PROTOCOL_H_
+-#define _AFP_PROTOCOL_H_
+-
+-#include
+-#include
+-#include
+-#include
+-
+-/* This file defines constants for the Apple File Protocol.
+- All page references are from "Apple Filing Protocol Programming" version 3.2.
+- except where noted.
+-*/
+-
+-#define AFP_SERVER_NAME_LEN 33
+-#define AFP_SERVER_NAME_UTF8_LEN 255
+-#define AFP_VOLUME_NAME_LEN 33
+-#define AFP_VOLUME_NAME_UTF8_LEN 33
+-#define AFP_SIGNATURE_LEN 16
+-#define AFP_MACHINETYPE_LEN 33
+-#define AFP_LOGINMESG_LEN 200
+-#define AFP_VOLPASS_LEN 8
+-#define AFP_HOSTNAME_LEN 255
+-/* This is actually just a guess, and only used for appletalk */
+-#define AFP_ZONE_LEN 255
+-
+-#define AFP_SERVER_ICON_LEN 256
+-
+-
+-#define AFP_MAX_USERNAME_LEN 127
+-#define AFP_MAX_PASSWORD_LEN 127
+-
+-
+-/* This is the maximum length of any UAM string */
+-#define AFP_UAM_LENGTH 24
+-
+-/* This is the maximum length of any path description */
+-#define AFP_MAX_PATH 768
+-
+-#define AFP_VOL_FLAT 1
+-#define AFP_VOL_FIXED 2
+-#define AFP_VOL_VARIABLE 3
+-
+-/* The root directory ID, p.26 */
+-
+-#define AFP_ROOT_DID 2
+-
+-/* Path type constants, p.249 */
+-
+-enum {
+-kFPShortName = 1,
+-kFPLongName = 2,
+-kFPUTF8Name = 3
+-};
+-
+-/* fork types */
+-
+-#define AFP_FORKTYPE_DATA 0x0
+-#define AFP_FORKTYPE_RESOURCE 0x80
+-
+-/* openfork access modes, from p.196 */
+-
+-#define AFP_OPENFORK_ALLOWREAD 1
+-#define AFP_OPENFORK_ALLOWWRITE 2
+-#define AFP_OPENFORK_DENYREAD 0x10
+-#define AFP_OPENFORK_DENYWRITE 0x20
+-
+-/* Message type for getsrvmesg, p. 169*/
+-
+-typedef enum {
+- AFPMESG_LOGIN = 0,
+- AFPMESG_SERVER = 1
+-} afpmessage_t;
+-
+-/* Message bitmap for getsrvrmsg */
+-
+-#define AFP_GETSRVRMSG_UTF8 0x2
+-#define AFP_GETSRVRMSG_GETMSG 0x1
+-
+-
+-/* Maximum Version length, p.17 */
+-#define AFP_MAX_VERSION_LENGTH 16
+-
+-/* Maximum length of a token, this is undocumented */
+-#define AFP_TOKEN_MAX_LEN 256
+-
+-/* The maximum size of a file for AFP 2 */
+-#define AFP_MAX_AFP2_FILESIZE (4294967296)
+-
+-/* Unix privs, p.240 */
+-
+-struct afp_unixprivs {
+- uint32_t uid __attribute__((__packed__));
+- uint32_t gid __attribute__((__packed__));
+- uint32_t permissions __attribute__((__packed__));
+- uint32_t ua_permissions __attribute__((__packed__));
+-
+-};
+-
+-
+-/* AFP Volume attributes bitmap, p.241 */
+-
+-enum {
+- kReadOnly = 0x01,
+- kHasVolumePassword = 0x02,
+- kSupportsFileIDs = 0x04,
+- kSupportsCatSearch = 0x08,
+- kSupportsBlankAccessPrivs = 0x10,
+- kSupportsUnixPrivs = 0x20,
+- kSupportsUTF8Names = 0x40,
+- kNoNetworkUserIDs = 0x80,
+- kDefaultPrivsFromParent = 0x100,
+- kNoExchangeFiles = 0x200,
+- kSupportsExtAttrs = 0x400,
+- kSupportsACLs=0x800
+-};
+-
+-/* AFP file creation constantes, p.250 */
+-enum {
+-kFPSoftCreate = 0,
+-kFPHardCreate = 0x80
+-};
+-
+-/* AFP Directory attributes, taken from the protocol guide p.236 */
+-
+-enum {
+- kFPAttributeBit = 0x1,
+- kFPParentDirIDBit = 0x2,
+- kFPCreateDateBit = 0x4,
+- kFPModDateBit = 0x8,
+- kFPBackupDateBit = 0x10,
+- kFPFinderInfoBit = 0x20,
+- kFPLongNameBit = 0x40,
+- kFPShortNameBit = 0x80,
+- kFPNodeIDBit = 0x100,
+- kFPOffspringCountBit = 0x0200,
+- kFPOwnerIDBit = 0x0400,
+- kFPGroupIDBit = 0x0800,
+- kFPAccessRightsBit = 0x1000,
+- kFPProDOSInfoBit = 0x2000, // AFP version 2.2 and earlier
+- kFPUTF8NameBit = 0x2000, // AFP version 3.0 and later
+- kFPUnixPrivsBit = 0x8000 // AFP version 3.0 and later
+-};
+-
+-/* AFP File bitmap, p.238. These are the ones not in the AFP Directory
+- attributes map. */
+-
+-enum {
+- kFPDataForkLenBit = 0x0200,
+- kFPRsrcForkLenBit = 0x0400,
+- kFPExtDataForkLenBit = 0x0800, // AFP version 3.0 and later
+- kFPLaunchLimitBit = 0x1000,
+- kFPExtRsrcForkLenBit = 0x4000, // AFP version 3.0 and later
+-};
+-
+-/* AFP Extended Attributes Bitmap, p.238 */
+-
+-enum {
+- kXAttrNoFollow = 0x1,
+- kXAttrCreate = 0x2,
+- kXAttrREplace=0x4
+-};
+-
+-
+-/* AFP function codes */
+-enum AFPFunction
+-{
+- afpByteRangeLock = 1, afpCloseVol, afpCloseDir, afpCloseFork,
+- afpCopyFile, afpCreateDir, afpCreateFile,
+- afpDelete, afpEnumerate, afpFlush, afpFlushFork,
+- afpGetForkParms = 14, afpGetSrvrInfo, afpGetSrvrParms,
+- afpGetVolParms, afpLogin, afpLoginCont, afpLogout, afpMapID,
+- afpMapName, afpMoveAndRename, afpOpenVol, afpOpenDir, afpOpenFork,
+- afpRead, afpRename, afpSetDirParms, afpSetFileParms,
+- afpSetForkParms, afpSetVolParms, afpWrite, afpGetFileDirParms,
+- afpSetFileDirParms, afpChangePassword,
+- afpGetUserInfo=37,afpGetSrvrMsg = 38,
+- afpOpenDT=48,
+- afpCloseDT=49,
+- afpGetIcon=51, afpGetIconInfo=52,
+- afpAddComment=56, afpRemoveComment=57, afpGetComment=58,
+- afpByteRangeLockExt=59, afpReadExt, afpWriteExt,
+- afpGetAuthMethods=62,
+- afp_LoginExt=63,
+- afpGetSessionToken=64,
+- afpDisconnectOldSession=65,
+- afpEnumerateExt=66,
+- afpCatSearchExt = 67,
+- afpEnumerateExt2 = 68, afpGetExtAttr, afpSetExtAttr,
+- afpRemoveExtAttr , afpListExtAttrs,
+- afpZzzzz = 122,
+- afpAddIcon=192,
+-};
+-
+-/* AFP Volume bitmap. Take from 242 of the protocol guide. */
+-enum {
+- kFPBadVolPre222Bitmap = 0xFe00,
+- kFPBadVolBitmap = 0xF000,
+- kFPVolAttributeBit = 0x1,
+- kFPVolSignatureBit = 0x2,
+- kFPVolCreateDateBit = 0x4,
+- kFPVolModDateBit = 0x8,
+- kFPVolBackupDateBit = 0x10,
+- kFPVolIDBit = 0x20,
+- kFPVolBytesFreeBit = 0x40,
+- kFPVolBytesTotalBit = 0x80,
+- kFPVolNameBit = 0x100,
+- kFPVolExtBytesFreeBit = 0x200,
+- kFPVolExtBytesTotalBit = 0x400,
+- kFPVolBlockSizeBit = 0x800
+-};
+-
+-/* AFP Attention Codes -- 4 bits */
+-#define AFPATTN_SHUTDOWN (1 << 15) /* shutdown/disconnect */
+-#define AFPATTN_CRASH (1 << 14) /* server crashed */
+-#define AFPATTN_MESG (1 << 13) /* server has message */
+-#define AFPATTN_NORECONNECT (1 << 12) /* don't reconnect */
+-/* server notification */
+-#define AFPATTN_NOTIFY (AFPATTN_MESG | AFPATTN_NORECONNECT)
+-
+-/* extended bitmap -- 12 bits. volchanged is only useful w/ a server
+- * notification, and time is only useful for shutdown. */
+-#define AFPATTN_VOLCHANGED (1 << 0) /* volume has changed */
+-#define AFPATTN_TIME(x) ((x) & 0xfff) /* time in minutes */
+-
+-#define kFPNoErr 0
+-
+-/* AFP result codes, p252 */
+-#define kASPSessClosed -1072
+-#define kFPAccessDenied -5000
+-#define kFPAuthContinue -5001
+-#define kFPBadUAM -5002
+-#define kFPBadVersNum -5003
+-#define kFPBitmapErr -5004
+-#define kFPCantMove -5005
+-#define kFPDenyConflict -5006
+-#define kFPDirNotEmpty -5007
+-#define kFPDiskFull -5008
+-#define kFPEOFErr -5009
+-#define kFPFileBusy -5010
+-#define kFPFlatVol -5011
+-#define kFPItemNotFound -5012
+-#define kFPLockErr -5013
+-#define kFPMiscErr -5014
+-#define kFPNoMoreLocks -5015
+-#define kFPNoServer -5016
+-#define kFPObjectExists -5017
+-#define kFPObjectNotFound -5018
+-#define kFPParamErr -5019
+-#define kFPRangeNotLocked -5020
+-#define kFPRangeOverlap -5021
+-#define kFPSessClosed -5022
+-#define kFPUserNotAuth -5023
+-#define kFPCallNotSupported -5024
+-#define kFPObjectTypeErr -5025
+-#define kFPTooManyFilesOpen -5026
+-#define kFPServerGoingDown -5027
+-#define kFPCantRename -5028
+-#define kFPDirNotFound -5029
+-#define kFPIconTypeError -5030
+-#define kFPVolLocked -5031
+-#define kFPObjectLocked -5032
+-#define kFPContainsSharedErr -5033
+-#define kFPIDNotFound -5034
+-#define kFPIDExists -5035
+-#define kFPDiffVolErr -5036
+-#define kFPCatalogChanged -5037
+-#define kFPSameObjectErr -5038
+-#define kFPBadIDErr -5039
+-#define kFPPwdSameErr -5040
+-#define kFPPwdTooShortErr -5041
+-#define kFPPwdExpiredErr -5042
+-#define kFPInsideSharedErr -5043
+-#define kFPInsideTrashErr -5044
+-#define kFPPwdNeedsChangeErr -5045
+-#define kFPPwdPolicyErr -5046
+-#define kFPDiskQuotaExceeded –5047
+-
+-
+-
+-/* These flags determine to lock or unlock in ByteRangeLock(Ext) */
+-
+-enum {
+-ByteRangeLock_Lock = 0,
+-ByteRangeLock_Unlock = 1
+-};
+-
+-/* These flags are used in volopen and getsrvrparm replies, p.171 */
+-
+-#define HasConfigInfo 0x1
+-#define HasPassword 0x80
+-
+-/* These are the subfunction for kFPMapID, as per p.248 */
+-
+-enum {
+-kUserIDToName = 1,
+-kGroupIDToName = 2,
+-kUserIDToUTF8Name = 3,
+-kGroupIDToUTF8Name = 4,
+-kUserUUIDToUTF8Name = 5,
+-kGroupUUIDToUTF8Name = 6
+-};
+-
+-
+-/* These are the subfunction flags described in the FPMapName command, p.286.
+- Note that this is different than what's described on p. 186. */
+-
+-enum {
+-kNameToUserID = 1,
+-kNameToGroupID = 2,
+-kUTF8NameToUserID = 3,
+-kUTF8NameToGroupID = 4,
+-kUTF8NameToUserUUID = 5,
+-kUTF8NameToGroupUUID = 6
+-};
+-
+-/* These are bits for FPGetUserInfo, p.173. */
+-#define kFPGetUserInfo_USER_ID 1
+-#define kFPGetUserInfo_PRI_GROUPID 2
+-
+-/* Flags for the replies of GetSrvrInfo and DSI GetStatus, p.240 */
+-
+-enum {
+- kSupportsCopyfile = 0x01,
+- kSupportsChgPwd = 0x02,
+- kDontAllowSavePwd = 0x04,
+- kSupportsSrvrMsg = 0x08,
+- kSrvrSig = 0x10,
+- kSupportsTCP = 0x20,
+- kSupportsSrvrNotify = 0x40,
+- kSupportsReconnect = 0x80,
+- kSupportsDirServices = 0x100,
+- kSupportsUTF8SrvrName = 0x200,
+- kSupportsUUIDs = 0x400,
+- kSupportsSuperClient = 0x8000
+-};
+-
+-
+-/* p.247 */
+-
+-enum {
+- kLoginWithoutID = 0,
+- kLoginWithID = 1,
+- kReconnWithID = 2,
+- kLoginWithTimeAndID = 3,
+- kReconnWithTimeAndID = 4,
+- kRecon1Login = 5,
+- kRecon1ReconnectLogin = 6,
+- kRecon1Refresh = 7, kGetKerberosSessionKey = 8
+-};
+-
+-
+-#define AFP_CHMOD_ALLOWED_BITS_22 \
+- (S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH | S_IFREG )
+-
+-
+-#endif
+-
+-
+-
+-
+diff -Naur afpfs-ng-0.8.1/include/codepage.h afpfs-ng-0.8.1.patch/include/codepage.h
+--- afpfs-ng-0.8.1/include/codepage.h 2007-09-23 16:21:30.000000000 +0200
++++ afpfs-ng-0.8.1.patch/include/codepage.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,11 +0,0 @@
+-#ifndef __CODE_PAGE_H_
+-#define __CODE_PAGE_H_
+-int convert_utf8dec_to_utf8pre(const char *src, int src_len,
+- char * dest, int dest_len);
+-int convert_utf8pre_to_utf8dec(const char * src, int src_len,
+- char * dest, int dest_len);
+-int convert_path_to_unix(char encoding, char * dest,
+- char * src, int dest_len);
+-int convert_path_to_afp(char encoding, char * dest,
+- char * src, int dest_len);
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/dsi.h afpfs-ng-0.8.1.patch/include/dsi.h
+--- afpfs-ng-0.8.1/include/dsi.h 2008-02-18 04:33:24.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/dsi.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,33 +0,0 @@
+-
+-#ifndef __DSI_H_
+-#define __DSI_H_
+-
+-#include "afp.h"
+-
+-struct dsi_request
+-{
+- unsigned short requestid;
+- unsigned char subcommand;
+- void * other;
+- unsigned char wait;
+- pthread_cond_t condition_cond;
+- struct dsi_request * next;
+- int return_code;
+-};
+-
+-int dsi_receive(struct afp_server * server, void * data, int size);
+-int dsi_getstatus(struct afp_server * server);
+-
+-int dsi_opensession(struct afp_server *server);
+-
+-int dsi_send(struct afp_server *server, char * msg, int size,int wait,unsigned char subcommand, void ** other);
+-struct dsi_session * dsi_create(struct afp_server *server);
+-int dsi_restart(struct afp_server *server);
+-int dsi_recv(struct afp_server * server);
+-
+-#define DSI_BLOCK_TIMEOUT -1
+-#define DSI_DONT_WAIT 0
+-#define DSI_DEFAULT_TIMEOUT 5
+-
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/libafpclient.h afpfs-ng-0.8.1.patch/include/libafpclient.h
+--- afpfs-ng-0.8.1/include/libafpclient.h 2008-01-30 05:37:59.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/libafpclient.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,50 +0,0 @@
+-
+-#ifndef __CLIENT_H_
+-#define __CLIENT_H_
+-
+-#include
+-#include
+-
+-#define MAX_CLIENT_RESPONSE 2048
+-
+-
+-enum loglevels {
+- AFPFSD,
+-};
+-
+-struct afp_server;
+-struct afp_volume;
+-
+-struct libafpclient {
+- int (*unmount_volume) (struct afp_volume * volume);
+- void (*log_for_client)(void * priv,
+- enum loglevels loglevel, int logtype, const char *message);
+- void (*forced_ending_hook)(void);
+- int (*scan_extra_fds)(int command_fd,fd_set *set, int * max_fd);
+- void (*loop_started)(void);
+-} ;
+-
+-extern struct libafpclient * libafpclient;
+-
+-void libafpclient_register(struct libafpclient * tmpclient);
+-
+-
+-void signal_main_thread(void);
+-
+-/* These are logging functions */
+-
+-#define MAXLOGSIZE 2048
+-
+-#define LOG_METHOD_SYSLOG 1
+-#define LOG_METHOD_STDOUT 2
+-
+-void set_log_method(int m);
+-
+-
+-void log_for_client(void * priv,
+- enum loglevels loglevel, int logtype, char * message,...);
+-
+-void stdout_log_for_client(void * priv,
+- enum loglevels loglevel, int logtype, const char *message);
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/Makefile.am afpfs-ng-0.8.1.patch/include/Makefile.am
+--- afpfs-ng-0.8.1/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/Makefile.am 2011-09-10 12:13:50.126124692 +0200
+@@ -0,0 +1,3 @@
++## Process this file with automake to produce Makefile.in
++
++SUBDIRS = afpfs-ng
+diff -Naur afpfs-ng-0.8.1/include/map_def.h afpfs-ng-0.8.1.patch/include/map_def.h
+--- afpfs-ng-0.8.1/include/map_def.h 2008-01-17 05:55:46.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/map_def.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,15 +0,0 @@
+-#ifndef __MAP_H_
+-#define __MAP_H_
+-
+-#include "afp.h"
+-
+-#define AFP_MAPPING_UNKNOWN 0
+-#define AFP_MAPPING_COMMON 1
+-#define AFP_MAPPING_LOGINIDS 2
+-#define AFP_MAPPING_NAME 3
+-
+-unsigned int map_string_to_num(char * name);
+-char * get_mapping_name(struct afp_volume * volume);
+-
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/midlevel.h afpfs-ng-0.8.1.patch/include/midlevel.h
+--- afpfs-ng-0.8.1/include/midlevel.h 2007-12-24 20:39:25.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/midlevel.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,64 +0,0 @@
+-#ifndef __MIDLEVEL_H_
+-#define __MIDLEVEL_H_
+-
+-#include
+-#include "afp.h"
+-
+-int ml_open(struct afp_volume * volume, const char *path, int flags,
+- struct afp_file_info **newfp);
+-
+-int ml_creat(struct afp_volume * volume, const char *path,mode_t mode);
+-
+-int ml_readdir(struct afp_volume * volume,
+- const char *path,
+- struct afp_file_info **base);
+-
+-int ml_read(struct afp_volume * volume, const char *path,
+- char *buf, size_t size, off_t offset,
+- struct afp_file_info *fp, int * eof);
+-
+-int ml_chmod(struct afp_volume * vol, const char * path, mode_t mode);
+-
+-int ml_unlink(struct afp_volume * vol, const char *path);
+-
+-int ml_mkdir(struct afp_volume * vol, const char * path, mode_t mode);
+-
+-int ml_close(struct afp_volume * volume, const char * path,
+- struct afp_file_info * fp);
+-
+-int ml_getattr(struct afp_volume * volume, const char *path,
+- struct stat *stbuf);
+-
+-int ml_write(struct afp_volume * volume, const char * path,
+- const char *data, size_t size, off_t offset,
+- struct afp_file_info * fp, uid_t uid,
+- gid_t gid);
+-
+-int ml_readlink(struct afp_volume * vol, const char * path,
+- char *buf, size_t size);
+-
+-int ml_rmdir(struct afp_volume * vol, const char *path);
+-
+-int ml_chown(struct afp_volume * vol, const char * path,
+- uid_t uid, gid_t gid);
+-
+-int ml_truncate(struct afp_volume * vol, const char * path, off_t offset);
+-
+-int ml_utime(struct afp_volume * vol, const char * path,
+- struct utimbuf * timebuf);
+-
+-int ml_symlink(struct afp_volume *vol, const char * path1, const char * path2);
+-
+-int ml_rename(struct afp_volume * vol,
+- const char * path_from, const char * path_to);
+-
+-int ml_statfs(struct afp_volume * vol, const char *path, struct statvfs *stat);
+-
+-void afp_ml_filebase_free(struct afp_file_info **filebase);
+-
+-int ml_passwd(struct afp_server *server,
+- char * username, char * oldpasswd, char * newpasswd);
+-
+-
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/uams_def.h afpfs-ng-0.8.1.patch/include/uams_def.h
+--- afpfs-ng-0.8.1/include/uams_def.h 2007-09-07 15:10:51.000000000 +0200
++++ afpfs-ng-0.8.1.patch/include/uams_def.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-#ifndef __UAM_DEFS_H_
+-#define __UAM_DEFS_H_
+-
+-#define UAM_NOUSERAUTHENT 0x1
+-#define UAM_CLEARTXTPASSWRD 0x2
+-#define UAM_RANDNUMEXCHANGE 0x4
+-#define UAM_2WAYRANDNUM 0x8
+-#define UAM_DHCAST128 0x10
+-#define UAM_CLIENTKRB 0x20
+-#define UAM_DHX2 0x40
+-#define UAM_RECON1 0x80
+-
+-int uam_string_to_bitmap(char * name);
+-char * uam_bitmap_to_string(unsigned int bitmap);
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/include/utils.h afpfs-ng-0.8.1.patch/include/utils.h
+--- afpfs-ng-0.8.1/include/utils.h 2008-02-18 04:33:58.000000000 +0100
++++ afpfs-ng-0.8.1.patch/include/utils.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,43 +0,0 @@
+-#ifndef __UTILS_H_
+-#define __UTILS_H_
+-#include
+-
+-#include "afp.h"
+-
+-#if BYTE_ORDER == BIG_ENDIAN
+-#define hton64(x) (x)
+-#define ntoh64(x) (x)
+-#else /* BYTE_ORDER == BIG_ENDIAN */
+-#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \
+- (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32))
+-#define ntoh64(x) (hton64(x))
+-#endif /* BYTE_ORDER == BIG_ENDIAN */
+-
+-#define min(a,b) (((a)<(b)) ? (a) : (b))
+-#define max(a,b) (((a)>(b)) ? (a) : (b))
+-
+-
+-
+-unsigned char unixpath_to_afppath(
+- struct afp_server * server,
+- char * buf);
+-
+-unsigned char sizeof_path_header(struct afp_server * server);
+-
+-
+-
+-unsigned char copy_from_pascal(char *dest, char *pascal,unsigned int max_len) ;
+-unsigned short copy_from_pascal_two(char *dest, char *pascal,unsigned int max_len);
+-
+-unsigned char copy_to_pascal(char *dest, const char *src);
+-unsigned short copy_to_pascal_two(char *dest, const char *src);
+-
+-void copy_path(struct afp_server * server, char * dest, const char * pathname, unsigned char len);
+-
+-
+-char * create_path(struct afp_server * server, char * pathname, unsigned short * len);
+-
+-
+-int invalid_filename(struct afp_server * server, const char * filename);
+-
+-#endif
+diff -Naur afpfs-ng-0.8.1/lib/afp.c afpfs-ng-0.8.1.patch/lib/afp.c
+--- afpfs-ng-0.8.1/lib/afp.c 2008-03-08 03:44:16.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/afp.c 2011-09-10 12:13:50.131124759 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+ #include
+
+ #include
+@@ -21,17 +21,17 @@
+ #include
+ #include
+
+-#include "afp_protocol.h"
+-#include "libafpclient.h"
++#include "afpfs-ng/afp_protocol.h"
++#include "afpfs-ng/libafpclient.h"
+ #include "server.h"
+-#include "dsi.h"
++#include "afpfs-ng/dsi.h"
+ #include "dsi_protocol.h"
+-#include "utils.h"
++#include "afpfs-ng/utils.h"
+ #include "afp_replies.h"
+ #include "afp_internal.h"
+ #include "did.h"
+ #include "forklist.h"
+-#include "codepage.h"
++#include "afpfs-ng/codepage.h"
+
+ struct afp_versions afp_versions[] = {
+ { "AFPVersion 1.1", 11 },
+diff -Naur afpfs-ng-0.8.1/lib/afp_internal.h afpfs-ng-0.8.1.patch/lib/afp_internal.h
+--- afpfs-ng-0.8.1/lib/afp_internal.h 2007-11-09 05:27:20.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/afp_internal.h 2011-09-10 12:13:50.132124772 +0200
+@@ -1,7 +1,7 @@
+ #ifndef _AFP_INTERNAL_H_
+ #define _AFP_INTERNAL_H_
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+ extern struct afp_versions afp_versions[];
+
+diff -Naur afpfs-ng-0.8.1/lib/afp_url.c afpfs-ng-0.8.1.patch/lib/afp_url.c
+--- afpfs-ng-0.8.1/lib/afp_url.c 2008-03-04 21:16:49.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/afp_url.c 2011-09-10 12:13:50.132124772 +0200
+@@ -3,7 +3,7 @@
+ #include
+ #include
+ #include
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+ void afp_default_url(struct afp_url *url)
+ {
+diff -Naur afpfs-ng-0.8.1/lib/client.c afpfs-ng-0.8.1.patch/lib/client.c
+--- afpfs-ng-0.8.1/lib/client.c 2008-02-18 04:36:30.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/client.c 2011-09-10 12:13:50.132124772 +0200
+@@ -1,5 +1,5 @@
+-#include
+-#include
++#include
++#include
+
+
+ struct libafpclient * libafpclient = NULL;
+diff -Naur afpfs-ng-0.8.1/lib/codepage.c afpfs-ng-0.8.1.patch/lib/codepage.c
+--- afpfs-ng-0.8.1/lib/codepage.c 2008-02-18 04:36:54.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/codepage.c 2011-09-10 12:13:50.133124786 +0200
+@@ -14,8 +14,8 @@
+
+ #include
+ #include
+-#include "afp_protocol.h"
+-#include "utils.h"
++#include "afpfs-ng/afp_protocol.h"
++#include "afpfs-ng/utils.h"
+ #include "unicode.h"
+
+ int convert_utf8dec_to_utf8pre(const char *src, int src_len,
+diff -Naur afpfs-ng-0.8.1/lib/connect.c afpfs-ng-0.8.1.patch/lib/connect.c
+--- afpfs-ng-0.8.1/lib/connect.c 2008-02-18 04:38:59.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/connect.c 2011-09-10 12:13:50.133124786 +0200
+@@ -10,13 +10,13 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "dsi.h"
+-#include "utils.h"
+-#include "uams_def.h"
+-#include "codepage.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/uams_def.h"
++#include "afpfs-ng/codepage.h"
+ #include "users.h"
+-#include "libafpclient.h"
++#include "afpfs-ng/libafpclient.h"
+ #include "server.h"
+
+
+diff -Naur afpfs-ng-0.8.1/lib/did.c afpfs-ng-0.8.1.patch/lib/did.c
+--- afpfs-ng-0.8.1/lib/did.c 2008-02-18 04:39:17.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/did.c 2011-09-10 12:13:50.133124786 +0200
+@@ -9,8 +9,8 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/afp_protocol.h"
+
+ #undef DID_CACHE_DISABLE
+
+diff -Naur afpfs-ng-0.8.1/lib/dsi.c afpfs-ng-0.8.1.patch/lib/dsi.c
+--- afpfs-ng-0.8.1/lib/dsi.c 2008-02-18 04:53:03.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/dsi.c 2011-09-10 12:13:50.134124800 +0200
+@@ -19,12 +19,12 @@
+ #include
+ #include
+
+-#include "utils.h"
+-#include "dsi.h"
+-#include "afp.h"
+-#include "uams_def.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/uams_def.h"
+ #include "dsi_protocol.h"
+-#include "libafpclient.h"
++#include "afpfs-ng/libafpclient.h"
+ #include "afp_internal.h"
+ #include "afp_replies.h"
+
+diff -Naur afpfs-ng-0.8.1/lib/forklist.c afpfs-ng-0.8.1.patch/lib/forklist.c
+--- afpfs-ng-0.8.1/lib/forklist.c 2008-01-17 05:49:16.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/forklist.c 2011-09-10 12:13:50.135124814 +0200
+@@ -10,7 +10,7 @@
+ */
+
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+ #include
+ #include
+diff -Naur afpfs-ng-0.8.1/lib/log.c afpfs-ng-0.8.1.patch/lib/log.c
+--- afpfs-ng-0.8.1/lib/log.c 2008-01-30 05:37:58.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/log.c 2011-09-10 12:13:50.135124814 +0200
+@@ -3,7 +3,7 @@
+ #include
+ #include
+ #include
+-#include "libafpclient.h"
++#include "afpfs-ng/libafpclient.h"
+
+ void log_for_client(void * priv,
+ enum loglevels loglevel, int logtype, char *format, ...) {
+diff -Naur afpfs-ng-0.8.1/lib/loop.c afpfs-ng-0.8.1.patch/lib/loop.c
+--- afpfs-ng-0.8.1/lib/loop.c 2008-02-18 04:40:11.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/loop.c 2011-09-10 12:13:50.135124814 +0200
+@@ -16,9 +16,9 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "dsi.h"
+-#include "utils.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/utils.h"
+
+ #define SIGNAL_TO_USE SIGUSR2
+
+diff -Naur afpfs-ng-0.8.1/lib/lowlevel.c afpfs-ng-0.8.1.patch/lib/lowlevel.c
+--- afpfs-ng-0.8.1/lib/lowlevel.c 2008-02-20 02:33:17.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/lowlevel.c 2011-09-10 12:13:50.136124828 +0200
+@@ -19,10 +19,10 @@
+ #else
+ #include
+ #endif
+-#include "afp.h"
+-#include "afp_protocol.h"
+-#include "codepage.h"
+-#include "utils.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/afp_protocol.h"
++#include "afpfs-ng/codepage.h"
++#include "afpfs-ng/utils.h"
+ #include "did.h"
+ #include "users.h"
+
+diff -Naur afpfs-ng-0.8.1/lib/map_def.c afpfs-ng-0.8.1.patch/lib/map_def.c
+--- afpfs-ng-0.8.1/lib/map_def.c 2007-09-07 15:10:59.000000000 +0200
++++ afpfs-ng-0.8.1.patch/lib/map_def.c 2011-09-10 12:13:50.136124828 +0200
+@@ -1,6 +1,6 @@
+ #include
+-#include "afp.h"
+-#include "map_def.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/map_def.h"
+
+ static char *afp_map_strings[] = {
+ "Unknown",
+diff -Naur afpfs-ng-0.8.1/lib/meta.c afpfs-ng-0.8.1.patch/lib/meta.c
+--- afpfs-ng-0.8.1/lib/meta.c 2008-01-04 04:52:44.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/meta.c 2011-09-10 12:13:50.137124841 +0200
+@@ -17,10 +17,10 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "dsi.h"
+-#include "afp_protocol.h"
+-#include "utils.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp_protocol.h"
++#include "afpfs-ng/utils.h"
+
+
+ int afp_meta_getattr(const char *path, struct stat *stbuf)
+diff -Naur afpfs-ng-0.8.1/lib/midlevel.c afpfs-ng-0.8.1.patch/lib/midlevel.c
+--- afpfs-ng-0.8.1/lib/midlevel.c 2008-03-08 17:08:18.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/midlevel.c 2011-09-10 12:13:50.160125150 +0200
+@@ -10,7 +10,7 @@
+ */
+
+
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+
+ #include
+ #include
+@@ -28,9 +28,9 @@
+ #include "users.h"
+ #include "did.h"
+ #include "resource.h"
+-#include "utils.h"
+-#include "codepage.h"
+-#include "midlevel.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/codepage.h"
++#include "afpfs-ng/midlevel.h"
+ #include "afp_internal.h"
+ #include "forklist.h"
+ #include "uams.h"
+diff -Naur afpfs-ng-0.8.1/lib/proto_attr.c afpfs-ng-0.8.1.patch/lib/proto_attr.c
+--- afpfs-ng-0.8.1/lib/proto_attr.c 2008-01-30 05:37:58.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_attr.c 2011-09-10 12:13:50.168125257 +0200
+@@ -7,10 +7,10 @@
+
+ #include
+ #include
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/afp_protocol.h"
+ #include "dsi_protocol.h"
+
+ /* This is a new command, function 76. There are currently no docs, so this
+diff -Naur afpfs-ng-0.8.1/lib/proto_desktop.c afpfs-ng-0.8.1.patch/lib/proto_desktop.c
+--- afpfs-ng-0.8.1/lib/proto_desktop.c 2008-02-18 04:44:11.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_desktop.c 2011-09-10 12:13:50.168125257 +0200
+@@ -9,10 +9,10 @@
+ #include
+ #include
+
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/afp_protocol.h"
+ #include "dsi_protocol.h"
+
+ /* closedt, addicon, geticoninfo, addappl, removeappl */
+diff -Naur afpfs-ng-0.8.1/lib/proto_directory.c afpfs-ng-0.8.1.patch/lib/proto_directory.c
+--- afpfs-ng-0.8.1/lib/proto_directory.c 2008-02-19 03:39:29.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_directory.c 2011-09-10 12:13:50.168125257 +0200
+@@ -9,10 +9,10 @@
+ #include
+ #include
+
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/afp_protocol.h"
+ #include "dsi_protocol.h"
+ #include "afp_replies.h"
+
+diff -Naur afpfs-ng-0.8.1/lib/proto_files.c afpfs-ng-0.8.1.patch/lib/proto_files.c
+--- afpfs-ng-0.8.1/lib/proto_files.c 2008-02-18 04:46:18.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_files.c 2011-09-10 12:13:50.169125270 +0200
+@@ -8,11 +8,11 @@
+
+ #include
+ #include
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "dsi_protocol.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/afp_protocol.h"
+ #include "afp_internal.h"
+
+ /* afp_setfileparms, afp_setdirparms and afpsetfiledirparms are all remarkably
+diff -Naur afpfs-ng-0.8.1/lib/proto_fork.c afpfs-ng-0.8.1.patch/lib/proto_fork.c
+--- afpfs-ng-0.8.1/lib/proto_fork.c 2008-01-30 05:37:58.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_fork.c 2011-09-10 12:13:50.169125270 +0200
+@@ -9,11 +9,11 @@
+ #include
+ #include
+
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "dsi_protocol.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/afp_protocol.h"
+
+ int afp_setforkparms(struct afp_volume * volume,
+ unsigned short forkid, unsigned short bitmap, unsigned long len)
+diff -Naur afpfs-ng-0.8.1/lib/proto_login.c afpfs-ng-0.8.1.patch/lib/proto_login.c
+--- afpfs-ng-0.8.1/lib/proto_login.c 2008-01-30 05:37:59.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_login.c 2011-09-10 12:13:50.169125270 +0200
+@@ -10,10 +10,10 @@
+
+ #include
+ #include
+-#include "dsi.h"
++#include "afpfs-ng/dsi.h"
+ #include "dsi_protocol.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "afp_internal.h"
+
+
+diff -Naur afpfs-ng-0.8.1/lib/proto_map.c afpfs-ng-0.8.1.patch/lib/proto_map.c
+--- afpfs-ng-0.8.1/lib/proto_map.c 2008-01-30 05:37:59.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_map.c 2011-09-10 12:13:50.170125283 +0200
+@@ -9,11 +9,11 @@
+ #include
+ #include
+
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "dsi_protocol.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/afp_protocol.h"
+
+ /* This is used to pass the return values back from afp_getuserinfo_reply() */
+ struct uidgid {
+diff -Naur afpfs-ng-0.8.1/lib/proto_replyblock.c afpfs-ng-0.8.1.patch/lib/proto_replyblock.c
+--- afpfs-ng-0.8.1/lib/proto_replyblock.c 2008-02-18 04:46:19.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_replyblock.c 2011-09-10 12:13:50.170125283 +0200
+@@ -6,9 +6,9 @@
+ */
+
+ #include
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "afp_internal.h"
+
+
+diff -Naur afpfs-ng-0.8.1/lib/proto_server.c afpfs-ng-0.8.1.patch/lib/proto_server.c
+--- afpfs-ng-0.8.1/lib/proto_server.c 2008-02-19 02:56:21.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_server.c 2011-09-10 12:13:50.170125283 +0200
+@@ -7,12 +7,12 @@
+ */
+ #include
+ #include
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "dsi_protocol.h"
+-#include "afp_protocol.h"
+-#include "codepage.h"
++#include "afpfs-ng/afp_protocol.h"
++#include "afpfs-ng/codepage.h"
+ #include "afp_internal.h"
+
+ int afp_getsrvrparms(struct afp_server *server)
+diff -Naur afpfs-ng-0.8.1/lib/proto_session.c afpfs-ng-0.8.1.patch/lib/proto_session.c
+--- afpfs-ng-0.8.1/lib/proto_session.c 2008-02-18 04:46:19.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_session.c 2011-09-10 12:13:50.170125283 +0200
+@@ -8,10 +8,10 @@
+ */
+ #include
+ #include
+-#include "dsi.h"
++#include "afpfs-ng/dsi.h"
+ #include "dsi_protocol.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+
+ int afp_getsessiontoken(struct afp_server * server, int type,
+ unsigned int timestamp, struct afp_token *outgoing_token,
+diff -Naur afpfs-ng-0.8.1/lib/proto_volume.c afpfs-ng-0.8.1.patch/lib/proto_volume.c
+--- afpfs-ng-0.8.1/lib/proto_volume.c 2008-02-18 04:47:48.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/proto_volume.c 2011-09-10 12:13:50.171125296 +0200
+@@ -8,13 +8,13 @@
+
+ #include
+ #include
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "dsi_protocol.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/afp_protocol.h"
+ #include "afp_internal.h"
+-#include "codepage.h"
++#include "afpfs-ng/codepage.h"
+
+ static int parse_volbitmap_reply(struct afp_server * server,
+ struct afp_volume * tmpvol,
+diff -Naur afpfs-ng-0.8.1/lib/resource.c afpfs-ng-0.8.1.patch/lib/resource.c
+--- afpfs-ng-0.8.1/lib/resource.c 2008-02-18 04:46:56.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/resource.c 2011-09-10 12:13:50.171125296 +0200
+@@ -3,11 +3,11 @@
+ #include
+ #include
+ #include
+-#include "afp.h"
++#include "afpfs-ng/afp.h"
+ #include "resource.h"
+ #include "lowlevel.h"
+ #include "did.h"
+-#include "midlevel.h"
++#include "afpfs-ng/midlevel.h"
+
+ #define appledouble ".AppleDouble"
+ #define finderinfo_string ".finderinfo"
+diff -Naur afpfs-ng-0.8.1/lib/server.c afpfs-ng-0.8.1.patch/lib/server.c
+--- afpfs-ng-0.8.1/lib/server.c 2008-02-19 02:56:21.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/server.c 2011-09-10 12:13:50.172125310 +0200
+@@ -8,15 +8,15 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "dsi.h"
+-#include "utils.h"
+-#include "uams_def.h"
+-#include "codepage.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/uams_def.h"
++#include "afpfs-ng/codepage.h"
+ #include "users.h"
+-#include "libafpclient.h"
++#include "afpfs-ng/libafpclient.h"
+ #include "afp_internal.h"
+-#include "dsi.h"
++#include "afpfs-ng/dsi.h"
+
+
+ struct afp_server * afp_server_complete_connection(
+diff -Naur afpfs-ng-0.8.1/lib/status.c afpfs-ng-0.8.1.patch/lib/status.c
+--- afpfs-ng-0.8.1/lib/status.c 2008-03-08 17:08:38.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/status.c 2011-09-10 12:13:50.172125310 +0200
+@@ -1,8 +1,8 @@
+ #include
+ #include
+-#include "map_def.h"
+-#include "dsi.h"
+-#include "afp.h"
++#include "afpfs-ng/map_def.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
+
+ int afp_status_header(char * text, int * len)
+ {
+diff -Naur afpfs-ng-0.8.1/lib/uams.c afpfs-ng-0.8.1.patch/lib/uams.c
+--- afpfs-ng-0.8.1/lib/uams.c 2008-01-04 04:52:44.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/uams.c 2011-09-10 12:13:50.173125324 +0200
+@@ -8,10 +8,10 @@
+
+ #include
+ #include
+-#include "dsi.h"
+-#include "afp.h"
+-#include "utils.h"
+-#include "uams_def.h"
++#include "afpfs-ng/dsi.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
++#include "afpfs-ng/uams_def.h"
+ #include "config.h"
+
+ #ifdef HAVE_LIBGCRYPT
+diff -Naur afpfs-ng-0.8.1/lib/users.c afpfs-ng-0.8.1.patch/lib/users.c
+--- afpfs-ng-0.8.1/lib/users.c 2008-02-18 04:48:56.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/users.c 2011-09-10 12:13:50.174125338 +0200
+@@ -3,8 +3,8 @@
+ #include
+ #include
+
+-#include "afp.h"
+-#include "map_def.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/map_def.h"
+
+ /* How mapping works
+ *
+diff -Naur afpfs-ng-0.8.1/lib/utils.c afpfs-ng-0.8.1.patch/lib/utils.c
+--- afpfs-ng-0.8.1/lib/utils.c 2008-02-18 04:53:37.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/utils.c 2011-09-10 12:13:50.174125338 +0200
+@@ -8,10 +8,10 @@
+ #include
+ #include
+ #include
+-#include "afp.h"
+-#include "utils.h"
++#include "afpfs-ng/afp.h"
++#include "afpfs-ng/utils.h"
+ #include "afp_internal.h"
+-#include "afp_protocol.h"
++#include "afpfs-ng/afp_protocol.h"
+
+ struct afp_path_header_long {
+ unsigned char type;
+diff -Naur afpfs-ng-0.8.1/Makefile.am afpfs-ng-0.8.1.patch/Makefile.am
+--- afpfs-ng-0.8.1/Makefile.am 2008-02-18 04:24:14.000000000 +0100
++++ afpfs-ng-0.8.1.patch/Makefile.am 2011-09-10 12:13:50.176125365 +0200
+@@ -1,5 +1,5 @@
+ if HAVE_LIBFUSE
+-SUBDIRS = lib fuse cmdline docs
++SUBDIRS = lib fuse cmdline include docs
+ else
+-SUBDIRS = lib cmdline docs
++SUBDIRS = lib cmdline include docs
+ endif
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-Fix_searching_of_afpfsd.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-Fix_searching_of_afpfsd.patch
deleted file mode 100644
index 6de072ea77..0000000000
--- a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-Fix_searching_of_afpfsd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur afpfs-ng-0.8.1/fuse/client.c afpfs-ng-0.8.1.patch/fuse/client.c
---- afpfs-ng-0.8.1/fuse/client.c 2008-03-08 03:44:16.000000000 +0100
-+++ afpfs-ng-0.8.1.patch/fuse/client.c 2011-05-22 19:08:53.938152499 +0200
-@@ -61,8 +61,8 @@
- snprintf(filename, PATH_MAX,
- "/usr/local/bin/%s",AFPFSD_FILENAME);
- if (access(filename,X_OK)) {
-- snprintf(filename, "/usr/bin/%s",
-- AFPFSD_FILENAME);
-+ snprintf(filename, PATH_MAX,
-+ "/usr/bin/%s", AFPFSD_FILENAME);
- if (access(filename,X_OK)) {
- printf("Could not find server (%s)\n",
- filename);
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-gcrypt.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-gcrypt.patch
new file mode 100644
index 0000000000..2544bbef53
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-gcrypt.patch
@@ -0,0 +1,25 @@
+diff -Naur afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1.patch/configure.ac
+--- afpfs-ng-0.8.1/configure.ac 2011-09-10 12:14:34.164716403 +0200
++++ afpfs-ng-0.8.1.patch/configure.ac 2011-09-10 12:15:13.266241771 +0200
+@@ -51,21 +51,6 @@
+ case $host in
+ *-*-darwin*)
+ AC_MSG_CHECKING([for correct gcrypt version])
+- AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM([
+- #include
+- #include ],[
+- char*p= GCRYPT_VERSION;
+- unsigned int vers;
+- vers=atoi(p)*10000;
+- p=strchr(p,'.')+1;
+- vers+=atoi(p)*100;
+- p=strchr(p,'.')+1;
+- vers+=atoi(p);
+- if (vers<10400) return 1;
+- ])],
+- [AC_MSG_RESULT([yes])],
+- [AC_MSG_ERROR([version is < 1.4.0])])
+ AM_CONDITIONAL(HAVE_LIBGCRYPT, true)
+ AC_DEFINE([HAVE_LIBGCRYPT], [1] )
+ ;;
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-02-pointer.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-02-pointer.patch
new file mode 100644
index 0000000000..a1916c3306
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-02-pointer.patch
@@ -0,0 +1,280 @@
+diff -Naur afpfs-ng-0.8.1/cmdline/getstatus.c afpfs-ng-0.8.1.patch/cmdline/getstatus.c
+--- afpfs-ng-0.8.1/cmdline/getstatus.c 2011-09-10 12:14:34.164716403 +0200
++++ afpfs-ng-0.8.1.patch/cmdline/getstatus.c 2011-09-10 12:16:23.717188342 +0200
+@@ -1,4 +1,5 @@
+ #include
++#include
+ #include
+ #include
+
+diff -Naur afpfs-ng-0.8.1/fuse/client.c afpfs-ng-0.8.1.patch/fuse/client.c
+--- afpfs-ng-0.8.1/fuse/client.c 2011-09-10 12:14:34.165716416 +0200
++++ afpfs-ng-0.8.1.patch/fuse/client.c 2011-09-10 12:16:23.737188610 +0200
+@@ -61,8 +61,9 @@
+ snprintf(filename, PATH_MAX,
+ "/usr/local/bin/%s",AFPFSD_FILENAME);
+ if (access(filename,X_OK)) {
+- snprintf(filename, "/usr/bin/%s",
++ snprintf(filename, sizeof(filename), "/usr/bin/%s",
+ AFPFSD_FILENAME);
++ filename[sizeof(filename) - 1] = 0;
+ if (access(filename,X_OK)) {
+ printf("Could not find server (%s)\n",
+ filename);
+diff -Naur afpfs-ng-0.8.1/fuse/fuse_int.c afpfs-ng-0.8.1.patch/fuse/fuse_int.c
+--- afpfs-ng-0.8.1/fuse/fuse_int.c 2011-09-10 12:14:34.167716442 +0200
++++ afpfs-ng-0.8.1.patch/fuse/fuse_int.c 2011-09-10 12:16:23.745188717 +0200
+@@ -197,7 +197,7 @@
+ ret = ml_open(volume,path,flags,&fp);
+
+ if (ret==0)
+- fi->fh=(void *) fp;
++ fi->fh=(unsigned long) fp;
+
+ return ret;
+ }
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/afp.h afpfs-ng-0.8.1.patch/include/afpfs-ng/afp.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/afp.h 2011-09-10 12:14:34.168716455 +0200
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/afp.h 2011-09-10 12:16:37.588374712 +0200
+@@ -370,7 +370,7 @@
+
+ int afp_opendt(struct afp_volume *volume, unsigned short * refnum);
+
+-int afp_closedt(struct afp_server * server, unsigned short * refnum);
++int afp_closedt(struct afp_server * server, unsigned short refnum);
+
+ int afp_getcomment(struct afp_volume *volume, unsigned int did,
+ const char * pathname, struct afp_comment * comment);
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/utils.h afpfs-ng-0.8.1.patch/include/afpfs-ng/utils.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/utils.h 2011-09-10 12:14:34.173716523 +0200
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/utils.h 2011-09-10 12:16:47.234504316 +0200
+@@ -8,8 +8,8 @@
+ #define hton64(x) (x)
+ #define ntoh64(x) (x)
+ #else /* BYTE_ORDER == BIG_ENDIAN */
+-#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \
+- (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32))
++#define hton64(x) ((u_int64_t) (htonl((((unsigned long long)(x)) >> 32) & 0xffffffffLL)) | \
++ (u_int64_t) ((htonl((unsigned long long)(x)) & 0xffffffffLL) << 32))
+ #define ntoh64(x) (hton64(x))
+ #endif /* BYTE_ORDER == BIG_ENDIAN */
+
+diff -Naur afpfs-ng-0.8.1/lib/afp_url.c afpfs-ng-0.8.1.patch/lib/afp_url.c
+--- afpfs-ng-0.8.1/lib/afp_url.c 2011-09-10 12:14:34.182716644 +0200
++++ afpfs-ng-0.8.1.patch/lib/afp_url.c 2011-09-10 12:16:47.235504329 +0200
+@@ -33,7 +33,7 @@
+ static int check_uamname(const char * uam)
+ {
+ char * p;
+- for (p=uam;*p;p++) {
++ for (p=(char *)uam;*p;p++) {
+ if (*p==' ') continue;
+ if ((*p<'A') || (*p>'z')) return -1;
+ }
+@@ -188,7 +188,7 @@
+ return -1;
+
+ }
+- if (p==NULL) p=toparse;
++ if (p==NULL) p=(char *)toparse;
+
+ /* Now split on the first / */
+ if (sscanf(p,"%[^/]/%[^$]",
+diff -Naur afpfs-ng-0.8.1/lib/did.c afpfs-ng-0.8.1.patch/lib/did.c
+--- afpfs-ng-0.8.1/lib/did.c 2011-09-10 12:14:34.184716670 +0200
++++ afpfs-ng-0.8.1.patch/lib/did.c 2011-09-10 12:16:47.235504329 +0200
+@@ -226,7 +226,7 @@
+
+
+ /* Go to the end of last known entry */
+- p=path+(p-copy);
++ p=(char *)path+(p-copy);
+ p2=p;
+
+ while ((p=strchr(p+1,'/'))) {
+diff -Naur afpfs-ng-0.8.1/lib/dsi.c afpfs-ng-0.8.1.patch/lib/dsi.c
+--- afpfs-ng-0.8.1/lib/dsi.c 2011-09-10 12:14:34.185716683 +0200
++++ afpfs-ng-0.8.1.patch/lib/dsi.c 2011-09-10 12:16:47.236504342 +0200
+@@ -474,7 +474,7 @@
+ }
+ server->flags=ntohs(reply1->flags);
+
+- p=(void *)((unsigned int) server->incoming_buffer + sizeof(*reply1));
++ p=(void *)((unsigned long) server->incoming_buffer + sizeof(*reply1));
+ p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1;
+
+ /* Now work our way through the variable bits */
+@@ -757,7 +757,7 @@
+ printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read);
+ #endif
+ ret = read(server->fd, (void *)
+- (((unsigned int) server->incoming_buffer)+server->data_read),
++ (((unsigned long) server->incoming_buffer)+server->data_read),
+ amount_to_read);
+ if (ret<0) return -1;
+ if (ret==0) {
+diff -Naur afpfs-ng-0.8.1/lib/loop.c afpfs-ng-0.8.1.patch/lib/loop.c
+--- afpfs-ng-0.8.1/lib/loop.c 2011-09-10 12:14:34.186716697 +0200
++++ afpfs-ng-0.8.1.patch/lib/loop.c 2011-09-10 12:16:47.257504624 +0200
+@@ -25,7 +25,7 @@
+ static unsigned char exit_program=0;
+
+ static pthread_t ending_thread;
+-static pthread_t main_thread = NULL;
++static pthread_t main_thread = (pthread_t)NULL;
+
+ static int loop_started=0;
+ static pthread_cond_t loop_started_condition;
+diff -Naur afpfs-ng-0.8.1/lib/lowlevel.c afpfs-ng-0.8.1.patch/lib/lowlevel.c
+--- afpfs-ng-0.8.1/lib/lowlevel.c 2011-09-10 12:14:34.186716697 +0200
++++ afpfs-ng-0.8.1.patch/lib/lowlevel.c 2011-09-10 12:16:47.288505041 +0200
+@@ -582,7 +582,7 @@
+ if (volume->server->using_version->av_number>=30)
+ stbuf->st_mode |= fp.unixprivs.permissions;
+ else
+- set_nonunix_perms(stbuf,&fp);
++ set_nonunix_perms(&stbuf->st_mode,&fp);
+
+ stbuf->st_uid=fp.unixprivs.uid;
+ stbuf->st_gid=fp.unixprivs.gid;
+diff -Naur afpfs-ng-0.8.1/lib/midlevel.c afpfs-ng-0.8.1.patch/lib/midlevel.c
+--- afpfs-ng-0.8.1/lib/midlevel.c 2011-09-10 12:14:34.189716738 +0200
++++ afpfs-ng-0.8.1.patch/lib/midlevel.c 2011-09-10 12:16:47.316505416 +0200
+@@ -713,7 +713,7 @@
+ {
+
+ int ret,err=0;
+- int totalwritten = 0;
++ size_t totalwritten = 0;
+ uint64_t sizetowrite, ignored;
+ unsigned char flags = 0;
+ unsigned int max_packet_size=volume->server->tx_quantum;
+diff -Naur afpfs-ng-0.8.1/lib/proto_attr.c afpfs-ng-0.8.1.patch/lib/proto_attr.c
+--- afpfs-ng-0.8.1/lib/proto_attr.c 2011-09-10 12:14:34.189716738 +0200
++++ afpfs-ng-0.8.1.patch/lib/proto_attr.c 2011-09-10 12:16:47.317505429 +0200
+@@ -166,7 +166,7 @@
+ copy_path(server,p,pathname,strlen(pathname));
+ unixpath_to_afppath(server,p);
+ p2=p+sizeof_path_header(server)+strlen(pathname);
+- if (((unsigned int ) p2) & 0x1) p2++;
++ if (((unsigned long) p2) & 0x1) p2++;
+ req2=(void *) p2;
+
+ req2->len=htons(namelen);
+diff -Naur afpfs-ng-0.8.1/lib/proto_desktop.c afpfs-ng-0.8.1.patch/lib/proto_desktop.c
+--- afpfs-ng-0.8.1/lib/proto_desktop.c 2011-09-10 12:14:34.197716845 +0200
++++ afpfs-ng-0.8.1.patch/lib/proto_desktop.c 2011-09-10 12:16:47.317505429 +0200
+@@ -168,7 +168,7 @@
+ return 0;
+ }
+
+-int afp_closedt(struct afp_server * server, unsigned short * refnum)
++int afp_closedt(struct afp_server * server, unsigned short refnum)
+ {
+ struct {
+ struct dsi_header dsi_header __attribute__((__packed__));
+diff -Naur afpfs-ng-0.8.1/lib/proto_directory.c afpfs-ng-0.8.1.patch/lib/proto_directory.c
+--- afpfs-ng-0.8.1/lib/proto_directory.c 2011-09-10 12:14:34.205716953 +0200
++++ afpfs-ng-0.8.1.patch/lib/proto_directory.c 2011-09-10 12:16:47.317505429 +0200
+@@ -248,6 +248,7 @@
+
+ return 0;
+ }
++
+ int afp_enumerateext2_reply(struct afp_server *server, char * buf, unsigned int size, void * other)
+ {
+
+@@ -266,8 +267,7 @@
+ char * p = buf + sizeof(*reply);
+ int i;
+ char *max=buf+size;
+- struct afp_file_info * filebase = NULL, *filecur=NULL, *new_file=NULL;
+- void ** x = other;
++ struct afp_file_info * filebase = NULL, *filecur = NULL, *new_file = NULL, **x = (struct afp_file_info **) other;
+
+ if (reply->dsi_header.return_code.error_code) {
+ return reply->dsi_header.return_code.error_code;
+diff -Naur afpfs-ng-0.8.1/lib/proto_map.c afpfs-ng-0.8.1.patch/lib/proto_map.c
+--- afpfs-ng-0.8.1/lib/proto_map.c 2011-09-10 12:14:34.207716979 +0200
++++ afpfs-ng-0.8.1.patch/lib/proto_map.c 2011-09-10 12:16:47.318505443 +0200
+@@ -122,7 +122,7 @@
+
+ if (reply->header.return_code.error_code!=kFPNoErr) return -1;
+
+- copy_from_pascal_two(name,&reply->name,255);
++ copy_from_pascal_two(name,reply->name,255);
+
+ return 0;
+ }
+diff -Naur afpfs-ng-0.8.1/lib/proto_session.c afpfs-ng-0.8.1.patch/lib/proto_session.c
+--- afpfs-ng-0.8.1/lib/proto_session.c 2011-09-10 12:14:34.208716992 +0200
++++ afpfs-ng-0.8.1.patch/lib/proto_session.c 2011-09-10 12:16:47.318505443 +0200
+@@ -39,7 +39,7 @@
+ switch (type) {
+ case kLoginWithTimeAndID:
+ case kReconnWithTimeAndID: {
+- uint32_t *p = (void *) (((unsigned int) request)+
++ uint32_t *p = (void *) (((unsigned long) request)+
+ sizeof(*request));
+
+ offset=sizeof(timestamp);
+@@ -63,7 +63,7 @@
+ goto error;
+ }
+
+- data=(void *) (((unsigned int) request)+sizeof(*request)+offset);
++ data=(void *) (((unsigned long) request)+sizeof(*request)+offset);
+ request->idlength=htonl(datalen);
+ request->pad=0;
+ request->type=htons(type);
+@@ -127,7 +127,7 @@
+ if ((request=malloc(sizeof(*request) + AFP_TOKEN_MAX_LEN))==NULL)
+ return -1;
+
+- token_data = request + sizeof(*request);
++ token_data = (char *)request + sizeof(*request);
+
+ request->type=htons(type);
+
+diff -Naur afpfs-ng-0.8.1/lib/uams.c afpfs-ng-0.8.1.patch/lib/uams.c
+--- afpfs-ng-0.8.1/lib/uams.c 2011-09-10 12:14:34.212717047 +0200
++++ afpfs-ng-0.8.1.patch/lib/uams.c 2011-09-10 12:16:47.319505457 +0200
+@@ -180,7 +180,7 @@
+ goto cleartxt_fail;
+
+ p += copy_to_pascal(p, username) + 1;
+- if ((int)p & 0x1)
++ if ((long)p & 0x1)
+ len--;
+ else
+ p++;
+@@ -230,7 +230,7 @@
+ goto cleartxt_fail;
+
+ p += copy_to_pascal(p, username) + 1;
+- if ((int)p & 0x1)
++ if ((long)p & 0x1)
+ len--;
+ else
+ p++;
+@@ -580,7 +580,7 @@
+ if (ai == NULL)
+ goto dhx_noctx_fail;
+ d += copy_to_pascal(ai, username) + 1;
+- if (((int)d) % 2)
++ if (((long)d) % 2)
+ d++;
+ else
+ ai_len--;
+diff -Naur afpfs-ng-0.8.1/lib/utils.c afpfs-ng-0.8.1.patch/lib/utils.c
+--- afpfs-ng-0.8.1/lib/utils.c 2011-09-10 12:14:34.213717060 +0200
++++ afpfs-ng-0.8.1.patch/lib/utils.c 2011-09-10 12:16:47.319505457 +0200
+@@ -196,7 +196,7 @@
+ maxlen=255;
+
+
+- p=filename+1;
++ p=(char *)filename+1;
+ while ((q=strchr(p,'/'))) {
+ if (q>p+maxlen)
+ return 1;
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-04-boxee1.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-04-boxee1.patch
new file mode 100644
index 0000000000..f50e6a7438
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-04-boxee1.patch
@@ -0,0 +1,26 @@
+diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/dsi.h afpfs-ng-0.8.1.patch/include/afpfs-ng/dsi.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 2011-09-10 12:14:34.170716482 +0200
++++ afpfs-ng-0.8.1.patch/include/afpfs-ng/dsi.h 2011-09-10 12:22:28.790093211 +0200
+@@ -6,13 +6,15 @@
+
+ struct dsi_request
+ {
+- unsigned short requestid;
+- unsigned char subcommand;
+- void * other;
+- unsigned char wait;
+- pthread_cond_t condition_cond;
+- struct dsi_request * next;
+- int return_code;
++ unsigned short requestid;
++ unsigned char subcommand;
++ void * other;
++ int wait;
++ int done_waiting;
++ pthread_cond_t waiting_cond;
++ pthread_mutex_t waiting_mutex;
++ struct dsi_request * next;
++ int return_code;
+ };
+
+ int dsi_receive(struct afp_server * server, void * data, int size);
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-05-boxee2.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-05-boxee2.patch
new file mode 100644
index 0000000000..a952302a91
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-05-boxee2.patch
@@ -0,0 +1,90 @@
+diff -Naur afpfs-ng-0.8.1/lib/afp.c afpfs-ng-0.8.1.patch/lib/afp.c
+--- afpfs-ng-0.8.1/lib/afp.c 2011-09-10 12:14:34.181716631 +0200
++++ afpfs-ng-0.8.1.patch/lib/afp.c 2011-09-10 12:23:15.935726602 +0200
+@@ -68,7 +68,7 @@
+ afp_getsessiontoken_reply,afp_blank_reply, NULL, NULL,
+ afp_enumerateext2_reply, NULL, NULL, NULL, /*64 - 71 */
+ afp_listextattrs_reply, NULL, NULL, NULL,
+- afp_blank_reply, NULL, NULL, NULL, /*72 - 79 */
++ afp_blank_reply, NULL, afp_blank_reply, afp_blank_reply, /*72 - 79 */
+
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+@@ -320,8 +320,16 @@
+
+ struct dsi_request * p;
+ struct afp_server *s2;
++
++
++ if (s==NULL)
++ goto out;
++
+ for (p=s->command_requests;p;p=p->next) {
+- pthread_cond_signal(&p->condition_cond);
++ pthread_mutex_lock(&p->waiting_mutex);
++ p->done_waiting=1;
++ pthread_cond_signal(&p->waiting_cond);
++ pthread_mutex_unlock(&p->waiting_mutex);
+ }
+
+ if (s==server_base) {
+@@ -354,7 +362,7 @@
+ s->exit_flag = 0;
+ s->path_encoding=kFPUTF8Name; /* This is a default */
+ s->next=NULL;
+- s->bufsize=2048;
++ s->bufsize=4096;
+ s->incoming_buffer=malloc(s->bufsize);
+
+ s->attention_quantum=AFP_DEFAULT_ATTENTION_QUANTUM;
+@@ -524,13 +532,14 @@
+ kFPVolCreateDateBit|kFPVolIDBit |
+ kFPVolNameBit;
+ char new_encoding;
++ int ret;
+
+ if (server->using_version->av_number>=30)
+ bitmap|= kFPVolNameBit|kFPVolBlockSizeBit;
+
+- switch (afp_volopen(volume,bitmap,
+- (strlen(volume->volpassword)>0) ? volume->volpassword : NULL))
+- {
++ ret = afp_volopen(volume,bitmap,
++ (strlen(volume->volpassword)>0) ? volume->volpassword : NULL);
++ switch(ret){
+ case kFPAccessDenied:
+ *l+=snprintf(mesg,max-*l,
+ "Incorrect volume password\n");
+@@ -544,6 +553,10 @@
+ *l+=snprintf(mesg,max-*l,
+ "Could not open volume\n");
+ goto error;
++ case ETIMEDOUT:
++ *l+=snprintf(mesg,max-*l,
++ "Timed out waiting to open volume\n");
++ goto error;
+ }
+
+ /* It is said that if a volume's encoding will be the same
+@@ -641,7 +654,6 @@
+ add_server(server);
+
+ add_fd_and_signal(server->fd);
+-
+ if (!full) {
+ return 0;
+ }
+@@ -649,10 +661,13 @@
+ /* Get the status, and calculate the transmit time. We use this to
+ * calculate our rx quantum. */
+ gettimeofday(&t1,NULL);
++
+ if ((error=dsi_getstatus(server))!=0)
+ goto error;
+ gettimeofday(&t2,NULL);
+
++ afp_server_identify(server);
++
+ if ((t2.tv_sec - t1.tv_sec) > 0)
+ server->tx_delay= (t2.tv_sec - t1.tv_sec) * 1000;
+ else
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-06-boxee3.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-06-boxee3.patch
new file mode 100644
index 0000000000..7d17a7837c
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-06-boxee3.patch
@@ -0,0 +1,142 @@
+diff -Naur afpfs-ng-0.8.1/lib/dsi.c afpfs-ng-0.8.1.patch/lib/dsi.c
+--- afpfs-ng-0.8.1/lib/dsi.c 2011-09-10 12:21:39.948437027 +0200
++++ afpfs-ng-0.8.1.patch/lib/dsi.c 2011-09-10 12:25:57.688903825 +0200
+@@ -64,7 +64,7 @@
+ rx.size=0;
+ dsi_setup_header(server,&header,DSI_DSIGetStatus);
+ /* We're intentionally ignoring the results */
+- ret=dsi_send(server,(char *) &header,sizeof(struct dsi_header),20,
++ ret=dsi_send(server,(char *) &header,sizeof(struct dsi_header),60,
+ 0,(void *) &rx);
+
+ free(rx.data);
+@@ -197,6 +197,7 @@
+ new_request->other=other;
+ new_request->wait=wait;
+ new_request->next=NULL;
++ new_request->done_waiting=0;
+
+ pthread_mutex_lock(&server->request_queue_mutex);
+ if (server->command_requests==NULL) {
+@@ -208,7 +209,8 @@
+ server->stats.requests_pending++;
+ pthread_mutex_unlock(&server->request_queue_mutex);
+
+- pthread_cond_init(&new_request->condition_cond,NULL);
++ pthread_cond_init(&new_request->waiting_cond,NULL);
++ pthread_mutex_init(&new_request->waiting_mutex,NULL);
+
+ if (server->connect_state==SERVER_STATE_DISCONNECTED) {
+ char mesg[1024];
+@@ -240,16 +242,12 @@
+ server->stats.tx_bytes+=size;
+ pthread_mutex_unlock(&server->send_mutex);
+
+- int tmpwait=new_request->wait;
+ #ifdef DEBUG_DSI
+ printf("=== Waiting for response for %d %s\n",
+ new_request->requestid,
+ afp_get_command_name(new_request->subcommand));
+ #endif
+- if (tmpwait<0) {
+-
+- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+- pthread_mutex_lock(&mutex);
++ if (new_request->wait<0) {
+
+ /* Wait forever */
+ #ifdef DEBUG_DSI
+@@ -258,14 +256,17 @@
+ afp_get_command_name(new_request->subcommand));
+ #endif
+
+- rc=pthread_cond_wait(
+- &new_request->condition_cond,
+- &mutex );
+- pthread_mutex_unlock(&mutex);
+-
+- } else if (tmpwait>0) {
+- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+- pthread_mutex_lock(&mutex);
++ pthread_mutex_lock(&new_request->waiting_mutex);
++
++ if (new_request->done_waiting==0)
++ rc=pthread_cond_wait(
++ &new_request->waiting_cond,
++ &new_request->waiting_mutex );
++
++ pthread_mutex_unlock(&new_request->waiting_mutex);
++
++ } else if (new_request->wait>0) {
++ /* wait for new_request->wait seconds */
+
+ #ifdef DEBUG_DSI
+ printf("=== Waiting for %d %s, for %ds\n",
+@@ -283,13 +284,15 @@
+ printf("=== Changing my mind, no longer waiting for %d\n",
+ new_request->requestid);
+ #endif
+- pthread_mutex_unlock(&mutex);
+ goto skip;
+ }
+- rc=pthread_cond_timedwait(
+- &new_request->condition_cond,
+- &mutex,&ts);
+- pthread_mutex_unlock(&mutex);
++ pthread_mutex_lock(&new_request->waiting_mutex);
++ if (new_request->done_waiting==0)
++ rc=pthread_cond_timedwait(
++ &new_request->waiting_cond,
++ &new_request->waiting_mutex,&ts);
++ pthread_mutex_unlock(&new_request->waiting_mutex);
++
+ if (rc==ETIMEDOUT) {
+ /* FIXME: should handle this case properly */
+ #ifdef DEBUG_DSI
+@@ -299,6 +302,7 @@
+ goto out;
+ }
+ } else {
++ /* Don't wait */
+ #ifdef DEBUG_DSI
+ printf("=== Skipping wait altogether for %d\n",new_request->requestid);
+ #endif
+@@ -474,7 +478,7 @@
+ }
+ server->flags=ntohs(reply1->flags);
+
+- p=(void *)((unsigned long) server->incoming_buffer + sizeof(*reply1));
++ p=(void *)((unsigned int) server->incoming_buffer + sizeof(*reply1));
+ p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1;
+
+ /* Now work our way through the variable bits */
+@@ -577,6 +581,7 @@
+ unsigned char mins=0;
+ unsigned char checkmessage=0;
+
++ memset(mesg,0,AFP_LOGINMESG_LEN);
+
+ /* The logic here's undocumented. If we get an attention packet and
+ there's no flag, then go check the message. Also, go check the
+@@ -757,7 +762,7 @@
+ printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read);
+ #endif
+ ret = read(server->fd, (void *)
+- (((unsigned long) server->incoming_buffer)+server->data_read),
++ (((unsigned int) server->incoming_buffer)+server->data_read),
+ amount_to_read);
+ if (ret<0) return -1;
+ if (ret==0) {
+@@ -862,8 +867,11 @@
+ #ifdef DEBUG_DSI
+ printf("<<< Signalling %d, returning %d or %d\n",request->requestid,request->return_code,rc);
+ #endif
++ pthread_mutex_lock(&request->waiting_mutex);
+ request->wait=0;
+- pthread_cond_signal(&request->condition_cond);
++ request->done_waiting=1;
++ pthread_cond_signal(&request->waiting_cond);
++ pthread_mutex_unlock(&request->waiting_mutex);
+ } else {
+ dsi_remove_from_request_queue(server,request);
+ }
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-07-boxee4.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-07-boxee4.patch
new file mode 100644
index 0000000000..e5ce7d1af1
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-07-boxee4.patch
@@ -0,0 +1,28 @@
+diff -Naur afpfs-ng-0.8.1/lib/identify.c afpfs-ng-0.8.1.patch/lib/identify.c
+--- afpfs-ng-0.8.1/lib/identify.c 1970-01-01 01:00:00.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/identify.c 2011-09-10 12:26:30.257389169 +0200
+@@ -0,0 +1,24 @@
++#include
++#include "afpfs-ng/afp.h"
++
++
++/*
++ * afp_server_identify()
++ *
++ * Identifies a server
++ *
++ * Right now, this only does identification using the machine_type
++ * given in getsrvrinfo, but this could later use mDNS to get
++ * more details.
++ */
++void afp_server_identify(struct afp_server * s)
++{
++ if (strcmp(s->machine_type,"Netatalk")==0)
++ s->server_type=AFPFS_SERVER_TYPE_NETATALK;
++ else if (strcmp(s->machine_type,"AirPort")==0)
++ s->server_type=AFPFS_SERVER_TYPE_AIRPORT;
++ else if (strcmp(s->machine_type,"Macintosh")==0)
++ s->server_type=AFPFS_SERVER_TYPE_MACINTOSH;
++ else
++ s->server_type=AFPFS_SERVER_TYPE_UNKNOWN;
++}
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-08-boxee5.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-08-boxee5.patch
new file mode 100644
index 0000000000..3605626a5e
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-08-boxee5.patch
@@ -0,0 +1,12 @@
+diff -Naur afpfs-ng-0.8.1/lib/Makefile.am afpfs-ng-0.8.1.patch/lib/Makefile.am
+--- afpfs-ng-0.8.1/lib/Makefile.am 2008-02-18 04:34:32.000000000 +0100
++++ afpfs-ng-0.8.1.patch/lib/Makefile.am 2011-09-10 12:27:09.833978612 +0200
+@@ -4,7 +4,7 @@
+
+ lib_LTLIBRARIES = libafpclient.la
+
+-libafpclient_la_SOURCES = afp.c codepage.c did.c dsi.c map_def.c uams.c uams_def.c unicode.c users.c utils.c resource.c log.c client.c server.c connect.c loop.c midlevel.c proto_attr.c proto_desktop.c proto_directory.c proto_files.c proto_fork.c proto_login.c proto_map.c proto_replyblock.c proto_server.c proto_volume.c proto_session.c afp_url.c status.c forklist.c debug.c lowlevel.c
++libafpclient_la_SOURCES = afp.c codepage.c did.c dsi.c map_def.c uams.c uams_def.c unicode.c users.c utils.c resource.c log.c client.c server.c connect.c loop.c midlevel.c proto_attr.c proto_desktop.c proto_directory.c proto_files.c proto_fork.c proto_login.c proto_map.c proto_replyblock.c proto_server.c proto_volume.c proto_session.c afp_url.c status.c forklist.c debug.c lowlevel.c identify.c
+
+ # libafpclient_la_LDFLAGS = -module -avoid-version
+
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-10-fix-errno.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-10-fix-errno.patch
new file mode 100644
index 0000000000..d53d8e8a2d
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-10-fix-errno.patch
@@ -0,0 +1,25 @@
+diff -Naur afpfs-ng-0.8.1/lib/afp.c afpfs-ng-0.8.1.patch/lib/afp.c
+--- afpfs-ng-0.8.1/lib/afp.c 2011-09-10 12:23:38.207025811 +0200
++++ afpfs-ng-0.8.1.patch/lib/afp.c 2011-09-10 12:30:20.305810381 +0200
+@@ -19,7 +19,6 @@
+ #include
+ #include
+ #include
+-#include
+
+ #include "afpfs-ng/afp_protocol.h"
+ #include "afpfs-ng/libafpclient.h"
+diff -Naur afpfs-ng-0.8.1/lib/afp_url.c afpfs-ng-0.8.1.patch/lib/afp_url.c
+--- afpfs-ng-0.8.1/lib/afp_url.c 2011-09-10 12:21:39.946437001 +0200
++++ afpfs-ng-0.8.1.patch/lib/afp_url.c 2011-09-10 12:30:20.306810396 +0200
+@@ -21,7 +21,9 @@
+
+ static int check_port(char * port)
+ {
+- long long ret = strtol(port,NULL,10);
++ long long ret = 0;
++ errno = 0;
++ ret = strtol(port,NULL,10);
+ if ((ret<0) || (ret>32767)) return -1;
+ if (errno) {
+ printf("port error\n");
diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-11-fix-stat.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-11-fix-stat.patch
new file mode 100644
index 0000000000..09e9a35231
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-11-fix-stat.patch
@@ -0,0 +1,11 @@
+--- afpfs-ng-0.8.1/lib/lowlevel.c 2011-10-01 20:36:55.000000000 +0200
++++ afpfs-ng-0.8.1/lib/lowlevel.c 2011-10-01 20:46:00.000000000 +0200
+@@ -579,7 +579,7 @@
+ return -EIO;
+ }
+
+- if (volume->server->using_version->av_number>=30)
++ if (volume->server->using_version->av_number>=30 && fp.unixprivs.permissions != 0)
+ stbuf->st_mode |= fp.unixprivs.permissions;
+ else
+ set_nonunix_perms(&stbuf->st_mode,&fp);
diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi
index 6206310e7e..49ec27cc49 100644
--- a/packages/network/avahi/init.d/53_avahi
+++ b/packages/network/avahi/init.d/53_avahi
@@ -22,19 +22,9 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- wait_for_network
+(
+ progress "Starting Avahi Daemon"
- progress "Starting Avahi Daemon"
- mkdir -p /var/run/avahi-daemon
- avahi-daemon -D
- )&
- ;;
-
- poweroff|reboot)
- progress "Starting Avahi Daemon"
- killall avahi-daemon
- ;;
-esac
+ mkdir -p /var/run/avahi-daemon
+ avahi-daemon -D
+)&
diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index f61562fd81..33e97f9f70 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -52,7 +52,7 @@ cd $PKG_BUILD
--disable-proximity \
--disable-serial \
--enable-input \
- --disable-audio \
+ --enable-audio \
--enable-service \
--enable-health \
--disable-pnat \
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index 54efddd911..121eb88ac7 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -46,8 +46,8 @@ mkdir -p $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
-mkdir -p $INSTALL/usr/lib/alsa-lib
- cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa-lib
+mkdir -p $INSTALL/usr/lib/alsa
+ cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa
mkdir -p $INSTALL/usr/lib/bluetooth/plugins
diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta
index 9b575e8e5d..6071ab0b4a 100644
--- a/packages/network/bluez/meta
+++ b/packages/network/bluez/meta
@@ -24,7 +24,9 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/"
-PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="alsa-lib libusb-compat dbus glib"
PKG_BUILD_DEPENDS="toolchain alsa-lib libusb-compat dbus glib"
PKG_PRIORITY="optional"
diff --git a/packages/network/cifs-utils/build b/packages/network/cifs-utils/build
deleted file mode 100755
index ff05151ad8..0000000000
--- a/packages/network/cifs-utils/build
+++ /dev/null
@@ -1,40 +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
-
-cd $PKG_BUILD
-ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_realloc_0_nonnull=yes \
-./configure --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-cifsupcall \
- --disable-cifscreds \
- --disable-cifsidmap \
- --with-libcap-ng \
- --with-libcap \
-
-make
diff --git a/packages/network/cifs-utils/meta b/packages/network/cifs-utils/meta
deleted file mode 100644
index 949b5a8e71..0000000000
--- a/packages/network/cifs-utils/meta
+++ /dev/null
@@ -1,36 +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="cifs-utils"
-PKG_VERSION="5.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.samba.org"
-PKG_URL="ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libcap-ng"
-PKG_BUILD_DEPENDS="toolchain libcap-ng"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="cifs-utils: a set of user-space tools to mount/umount CIFS filesystems"
-PKG_LONGDESC="The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 970b26552e..a678a1297f 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -22,182 +22,175 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- if [ -f /var/config/settings.conf ]; then
- . /var/config/settings.conf
+if [ -f /var/config/settings.conf ]; then
+ . /var/config/settings.conf
- # save original interface names (eth0, eth1)
- NET_IFACE_NAME=$NET_IFACE
- NET2_IFACE_NAME=$NET2_IFACE
+# save original interface names (eth0, eth1)
+ NET_IFACE_NAME=$NET_IFACE
+ NET2_IFACE_NAME=$NET2_IFACE
+fi
+
+[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
+
+# setup hostname
+ progress "Setup hostname"
+ echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
+
+# create /etc/hosts file, useful for gethostbyname(localhost)
+ progress "creating /etc/hosts"
+ echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
+
+# add user defined hosts.conf entry's
+ [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
+
+(
+ # setup Networking 1
+ progress "setup Networking 1"
+
+ CONNMAN_PROFILE="/var/lib/connman/default.profile"
+
+ mkdir -p /var/run/connman
+ mkdir -p /var/lib/connman
+
+ # NETWORK 1: ( LAN / WLAN )
+ for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
+ if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
+ logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
+ else
+ logger -t Connman "### [$i] found /sys/class/net/$NET_IFACE/address, continue ###"
+ NET_IFACE=`cat /sys/class/net/$NET_IFACE/address | sed 's/://g'`
+ break
+ fi
+ usleep 500000
+ done
+
+ if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
+ NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
+
+ # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
+ if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
+ MODE="managed_wep"
+ elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE" ]; then
+ MODE="managed_psk"
+ else
+ MODE="managed_none"
+ fi
+
+ if [ "$NET_HIDDEN" = "true" ]; then
+ echo "[wifi_${NET_IFACE}_hidden_${MODE}]" > $CONNMAN_PROFILE
+ else
+ echo "[wifi_${NET_IFACE}_${NET_SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
+ fi
+
+ echo "Name=$NET_SSID" >> $CONNMAN_PROFILE
+ echo "SSID=$NET_SSID_HEX" >> $CONNMAN_PROFILE
+ [ -n "$NET_PASSPHRASE" ] && echo "Passphrase=$NET_PASSPHRASE" >> $CONNMAN_PROFILE
+ echo "Favorite=true" >> $CONNMAN_PROFILE
+ echo "AutoConnect=true" >> $CONNMAN_PROFILE
+ else
+ MODE="cable"
+ echo "[ethernet_${NET_IFACE}_${MODE}]" > $CONNMAN_PROFILE
fi
- [ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
+ # IP settings
+ if [ -z "$NET_IPADDRESS" ]; then
+ echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
+ else
+ echo "IPv4.method=manual" >> $CONNMAN_PROFILE
+ echo "IPv4.local_address=$NET_IPADDRESS" >> $CONNMAN_PROFILE
+ [ -n "$NET_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET_PREFIXLEN" >> $CONNMAN_PROFILE
+ [ -n "$NET_GATEWAY" ] && echo "IPv4.gateway=$NET_GATEWAY" >> $CONNMAN_PROFILE
+ fi
- # setup hostname
- progress "Setup hostname"
- echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
+ [ -n "$NET_DNS1" ] && NET_NAMESERVER="$NET_DNS1"
+ [ -n "$NET_DNS2" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS2"
+ [ -n "$NET_DNS3" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS3"
+ [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER;" >> $CONNMAN_PROFILE
- # create /etc/hosts file, useful for gethostbyname(localhost)
- progress "creating /etc/hosts"
- echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
+ # END OF NETWORK 1
- # add user defined hosts.conf entry's
- [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
-
- (
- # setup Networking 1
- progress "setup Networking 1"
-
- CONNMAN_PROFILE="/var/lib/connman/default.profile"
-
- mkdir -p /var/run/connman
- mkdir -p /var/lib/connman
-
- # NETWORK 1: ( LAN / WLAN )
- for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
- if [ ! -f /sys/class/net/$NET_IFACE/address ]; then
- logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###"
- else
- logger -t Connman "### [$i] found /sys/class/net/$NET_IFACE/address, continue ###"
- NET_IFACE=`cat /sys/class/net/$NET_IFACE/address | sed 's/://g'`
- break
- fi
- usleep 500000
- done
-
- if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
- NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
-
- # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
- if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
- MODE="managed_wep"
- elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE" ]; then
- MODE="managed_psk"
- else
- MODE="managed_none"
- fi
-
- if [ "$NET_HIDDEN" = "true" ]; then
- echo "[wifi_${NET_IFACE}_hidden_${MODE}]" > $CONNMAN_PROFILE
- else
- echo "[wifi_${NET_IFACE}_${NET_SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
- fi
-
- echo "Name=$NET_SSID" >> $CONNMAN_PROFILE
- echo "SSID=$NET_SSID_HEX" >> $CONNMAN_PROFILE
- [ -n "$NET_PASSPHRASE" ] && echo "Passphrase=$NET_PASSPHRASE" >> $CONNMAN_PROFILE
- echo "Favorite=true" >> $CONNMAN_PROFILE
- echo "AutoConnect=true" >> $CONNMAN_PROFILE
- else
- MODE="cable"
- echo "[ethernet_${NET_IFACE}_${MODE}]" > $CONNMAN_PROFILE
- fi
-
- # IP settings
- if [ -z "$NET_IPADDRESS" ]; then
- echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
- else
- echo "IPv4.method=manual" >> $CONNMAN_PROFILE
- echo "IPv4.local_address=$NET_IPADDRESS" >> $CONNMAN_PROFILE
- [ -n "$NET_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET_PREFIXLEN" >> $CONNMAN_PROFILE
- [ -n "$NET_GATEWAY" ] && echo "IPv4.gateway=$NET_GATEWAY" >> $CONNMAN_PROFILE
- fi
-
- [ -n "$NET_DNS1" ] && NET_NAMESERVER="$NET_DNS1"
- [ -n "$NET_DNS2" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS2"
- [ -n "$NET_DNS3" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS3"
- [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER;" >> $CONNMAN_PROFILE
-
- # END OF NETWORK 1
-
- # NETWORK 2: ( LAN / WLAN )
- if [ -n "$NET2_NETWORK" -a "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then
- # setup Networking 2
- progress "setup Networking 2"
-
- for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
- if [ ! -f /sys/class/net/$NET2_IFACE/address ]; then
- logger -t Connman "### [$i] cannot find /sys/class/net/$NET2_IFACE/address ###"
- else
- logger -t Connman "### [$i] found /sys/class/net/$NET2_IFACE/address, continue ###"
- NET2_IFACE=`cat /sys/class/net/$NET2_IFACE/address | sed 's/://g'`
- break
- fi
- usleep 500000
- done
-
- if [ "$NET2_NETWORK" = "WLAN" -a -n "$NET2_SSID" ]; then
- NET2_SSID_HEX=`echo -n "$NET2_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
-
- # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
- if [ "$NET2_SECURITY" = "WEP" -a -n "$NET2_PASSPHRASE" ]; then
- MODE="managed_wep"
- elif [ "$NET2_SECURITY" = "WPA/WPA2" -a -n "$NET2_PASSPHRASE" ]; then
- MODE="managed_psk"
- else
- MODE="managed_none"
- fi
-
- if [ "$NET2_HIDDEN" = "true" ]; then
- echo "[wifi_${NET2_IFACE}_hidden_${MODE}]" >> $CONNMAN_PROFILE
- else
- echo "[wifi_${NET2_IFACE}_${NET2_SSID_HEX}_${MODE}]" >> $CONNMAN_PROFILE
- fi
-
- echo "Name=$NET2_SSID" >> $CONNMAN_PROFILE
- echo "SSID=$NET2_SSID_HEX" >> $CONNMAN_PROFILE
- [ -n "$NET2_PASSPHRASE" ] && echo "Passphrase=$NET2_PASSPHRASE" >> $CONNMAN_PROFILE
- echo "Favorite=true" >> $CONNMAN_PROFILE
- echo "AutoConnect=true" >> $CONNMAN_PROFILE
- else
- MODE="cable"
- echo "[ethernet_${NET2_IFACE}_${MODE}]" >> $CONNMAN_PROFILE
- fi
-
- # IP settings
- if [ -z "$NET2_IPADDRESS" ]; then
- echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
- else
- echo "IPv4.method=manual" >> $CONNMAN_PROFILE
- echo "IPv4.local_address=$NET2_IPADDRESS" >> $CONNMAN_PROFILE
- [ -n "$NET2_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET2_PREFIXLEN" >> $CONNMAN_PROFILE
- [ -n "$NET2_GATEWAY" ] && echo "IPv4.gateway=$NET2_GATEWAY" >> $CONNMAN_PROFILE
- fi
-
- [ -n "$NET2_DNS1" ] && NET2_NAMESERVER="$NET2_DNS1"
- [ -n "$NET2_DNS2" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS2"
- [ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
- [ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
-
- (
- # wait some time, put eth1 (NET2_IFACE) down and then up
- # this is just temporary solution until I figure out how to
- # do properly with connman
- usleep 5000000
- ifconfig $NET2_IFACE_NAME down
- usleep 1000000
- ifconfig $NET2_IFACE_NAME up
- )&
+ # NETWORK 2: ( LAN / WLAN )
+ if [ -n "$NET2_NETWORK" -a "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then
+ # setup Networking 2
+ progress "setup Networking 2"
+ for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
+ if [ ! -f /sys/class/net/$NET2_IFACE/address ]; then
+ logger -t Connman "### [$i] cannot find /sys/class/net/$NET2_IFACE/address ###"
+ else
+ logger -t Connman "### [$i] found /sys/class/net/$NET2_IFACE/address, continue ###"
+ NET2_IFACE=`cat /sys/class/net/$NET2_IFACE/address | sed 's/://g'`
+ break
fi
- # END OF NETWORK 2
+ usleep 500000
+ done
- # overwrite created profile with custom one if exist (debug use only)
- DEBUG_CONNMAN_PROFILE="/storage/.config/connman.profile"
- [ -f "$DEBUG_CONNMAN_PROFILE" ] && cp $DEBUG_CONNMAN_PROFILE $CONNMAN_PROFILE
- [ -f "$DEBUG_CONNMAN_PROFILE" ] && mv $DEBUG_CONNMAN_PROFILE ${DEBUG_CONNMAN_PROFILE}_saved
+ if [ "$NET2_NETWORK" = "WLAN" -a -n "$NET2_SSID" ]; then
+ NET2_SSID_HEX=`echo -n "$NET2_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
- # starting Connection manager
- progress "starting Connection manager"
+ # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
+ if [ "$NET2_SECURITY" = "WEP" -a -n "$NET2_PASSPHRASE" ]; then
+ MODE="managed_wep"
+ elif [ "$NET2_SECURITY" = "WPA/WPA2" -a -n "$NET2_PASSPHRASE" ]; then
+ MODE="managed_psk"
+ else
+ MODE="managed_none"
+ fi
- while true; do
- /usr/sbin/connmand -n > /dev/null 2>&1
- usleep 250000
- done
- )&
- ;;
+ if [ "$NET2_HIDDEN" = "true" ]; then
+ echo "[wifi_${NET2_IFACE}_hidden_${MODE}]" >> $CONNMAN_PROFILE
+ else
+ echo "[wifi_${NET2_IFACE}_${NET2_SSID_HEX}_${MODE}]" >> $CONNMAN_PROFILE
+ fi
- poweroff|reboot)
- ;;
-esac
+ echo "Name=$NET2_SSID" >> $CONNMAN_PROFILE
+ echo "SSID=$NET2_SSID_HEX" >> $CONNMAN_PROFILE
+ [ -n "$NET2_PASSPHRASE" ] && echo "Passphrase=$NET2_PASSPHRASE" >> $CONNMAN_PROFILE
+ echo "Favorite=true" >> $CONNMAN_PROFILE
+ echo "AutoConnect=true" >> $CONNMAN_PROFILE
+ else
+ MODE="cable"
+ echo "[ethernet_${NET2_IFACE}_${MODE}]" >> $CONNMAN_PROFILE
+ fi
+
+ # IP settings
+ if [ -z "$NET2_IPADDRESS" ]; then
+ echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
+ else
+ echo "IPv4.method=manual" >> $CONNMAN_PROFILE
+ echo "IPv4.local_address=$NET2_IPADDRESS" >> $CONNMAN_PROFILE
+ [ -n "$NET2_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET2_PREFIXLEN" >> $CONNMAN_PROFILE
+ [ -n "$NET2_GATEWAY" ] && echo "IPv4.gateway=$NET2_GATEWAY" >> $CONNMAN_PROFILE
+ fi
+
+ [ -n "$NET2_DNS1" ] && NET2_NAMESERVER="$NET2_DNS1"
+ [ -n "$NET2_DNS2" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS2"
+ [ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
+ [ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
+
+(
+ # wait some time, put eth1 (NET2_IFACE) down and then up
+ # this is just temporary solution until I figure out how to
+ # do properly with connman
+ usleep 5000000
+ ifconfig $NET2_IFACE_NAME down
+ usleep 1000000
+ ifconfig $NET2_IFACE_NAME up
+)&
+
+ fi
+ # END OF NETWORK 2
+
+ # overwrite created profile with custom one if exist (debug use only)
+ DEBUG_CONNMAN_PROFILE="/storage/.config/connman.profile"
+ [ -f "$DEBUG_CONNMAN_PROFILE" ] && cp $DEBUG_CONNMAN_PROFILE $CONNMAN_PROFILE
+ [ -f "$DEBUG_CONNMAN_PROFILE" ] && mv $DEBUG_CONNMAN_PROFILE ${DEBUG_CONNMAN_PROFILE}_saved
+
+ # starting Connection manager
+ progress "starting Connection manager"
+
+ while true; do
+ /usr/sbin/connmand -n > /dev/null 2>&1
+ usleep 250000
+ done
+)&
diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index e5c0f24ce3..5b29edb1bb 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,14 +19,16 @@
################################################################################
PKG_NAME="connman"
-PKG_VERSION="0.76"
+PKG_VERSION="0.77"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.connman.net"
-PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/network/connman//$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
+PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp"
PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
PKG_PRIORITY="optional"
PKG_SECTION="network"
diff --git a/packages/network/ethtool/meta b/packages/network/ethtool/meta
index 5aab5d1686..0a6d7d4113 100644
--- a/packages/network/ethtool/meta
+++ b/packages/network/ethtool/meta
@@ -19,12 +19,13 @@
################################################################################
PKG_NAME="ethtool"
-PKG_VERSION="2.6.39"
+PKG_VERSION="3.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
-PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
diff --git a/packages/network/install b/packages/network/install
index 2fd089413d..09c85ca17b 100755
--- a/packages/network/install
+++ b/packages/network/install
@@ -25,7 +25,3 @@
$SCRIPTS/install connman
$SCRIPTS/install ethtool
$SCRIPTS/install openssh
-
-if [ "$NETMOUNT" = "yes" ]; then
- $SCRIPTS/install netmount
-fi
diff --git a/packages/network/iptables/install b/packages/network/iptables/install
index 7536ea6d2b..cbf550e9ec 100755
--- a/packages/network/iptables/install
+++ b/packages/network/iptables/install
@@ -23,24 +23,23 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/.libs/libxtables.so* $INSTALL/usr/lib/
+ cp -P $PKG_BUILD/iptables/.libs/libxtables.so* $INSTALL/usr/lib/
cp -P $PKG_BUILD/libiptc/.libs/libip4tc.so* $INSTALL/usr/lib/
cp -P $PKG_BUILD/libiptc/.libs/libip6tc.so* $INSTALL/usr/lib/
cp -P $PKG_BUILD/libiptc/.libs/libiptc.so* $INSTALL/usr/lib/
rm -rf $INSTALL/usr/lib/libiptc.so*T
+mkdir -p $INSTALL/usr/lib/xtables
+ cp -P $PKG_BUILD/extensions/*.so $INSTALL/usr/lib/xtables
+
mkdir -p $INSTALL/usr/sbin
- cp -P $PKG_BUILD/.libs/ip6tables-multi $INSTALL/usr/sbin
- cp -P $PKG_BUILD/.libs/iptables-multi $INSTALL/usr/sbin
- ln -sf /usr/sbin/ip6tables-multi $INSTALL/usr/sbin/ip6tables
- ln -sf /usr/sbin/ip6tables-multi $INSTALL/usr/sbin/ip6tables-restore
- ln -sf /usr/sbin/ip6tables-multi $INSTALL/usr/sbin/ip6tables-save
- ln -sf /usr/sbin/iptables-multi $INSTALL/usr/sbin/iptables
- ln -sf /usr/sbin/iptables-multi $INSTALL/usr/sbin/iptables-restore
- ln -sf /usr/sbin/iptables-multi $INSTALL/usr/sbin/iptables-save
+ cp -P $PKG_BUILD/iptables/.libs/xtables-multi $INSTALL/usr/sbin
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables-restore
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables-save
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/iptables
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/iptables-restore
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/iptables-save
mkdir -p $INSTALL/usr/bin
- ln -sf /usr/sbin/iptables-multi $INSTALL/usr/bin/iptables-xml
-
-mkdir -p $INSTALL/usr/libexec/xtables
- cp -P $PKG_BUILD/extensions/*.so $INSTALL/usr/libexec/xtables
+ ln -sf /usr/sbin/xtables-multi $INSTALL/usr/bin/iptables-xml
diff --git a/packages/network/iptables/meta b/packages/network/iptables/meta
index 1f5e7e6c34..6309c48174 100644
--- a/packages/network/iptables/meta
+++ b/packages/network/iptables/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="iptables"
-PKG_VERSION="1.4.10"
+PKG_VERSION="1.4.12.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/network/libnfs/build b/packages/network/libnfs/build
index 9c424ca591..6cc0ac13ab 100755
--- a/packages/network/libnfs/build
+++ b/packages/network/libnfs/build
@@ -31,8 +31,9 @@ cd $PKG_BUILD
--prefix=/usr \
--libdir=/usr/lib \
--sysconfdir=/etc \
+ --disable-examples \
+ --disable-tirpc \
make
-
$MAKEINSTALL
diff --git a/packages/network/libnfs/meta b/packages/network/libnfs/meta
index 0435ec78ab..4cd20ac533 100644
--- a/packages/network/libnfs/meta
+++ b/packages/network/libnfs/meta
@@ -19,14 +19,14 @@
################################################################################
PKG_NAME="libnfs"
-PKG_VERSION="37d1475"
+PKG_VERSION="14a062e"
PKG_REV="1"
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=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS="libtirpc"
+PKG_BUILD_DEPENDS="toolchain libtirpc"
PKG_PRIORITY="optional"
PKG_SECTION="network"
PKG_SHORTDESC="libnfs: a client library for accessing NFS shares over a network."
diff --git a/packages/security/libtasn1/build b/packages/network/libshairport/build
similarity index 99%
rename from packages/security/libtasn1/build
rename to packages/network/libshairport/build
index ff561a806d..2c2acbb431 100755
--- a/packages/security/libtasn1/build
+++ b/packages/network/libshairport/build
@@ -31,4 +31,5 @@ cd $PKG_BUILD
--enable-shared \
make
+
$MAKEINSTALL
diff --git a/packages/devel/libimobiledevice/install b/packages/network/libshairport/install
similarity index 100%
rename from packages/devel/libimobiledevice/install
rename to packages/network/libshairport/install
diff --git a/packages/3rdparty/multimedia/shairport/meta b/packages/network/libshairport/meta
old mode 100755
new mode 100644
similarity index 75%
rename from packages/3rdparty/multimedia/shairport/meta
rename to packages/network/libshairport/meta
index 2bf3666181..96e246c5df
--- a/packages/3rdparty/multimedia/shairport/meta
+++ b/packages/network/libshairport/meta
@@ -18,18 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="shairport"
-PKG_VERSION="346db95"
+PKG_NAME="libshairport"
+PKG_VERSION="1.2.0.20310_lib"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/Andywebs/shairport"
-PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_SITE="http://www.xbmc.org"
+PKG_URL="http://mirrors.xbmc.org/build-deps/darwin-libs/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="network"
-PKG_SHORTDESC="shairport: emulates AirPort Express"
-PKG_LONGDESC="ShairPort emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods."
+PKG_SHORTDESC="libshairport: emulates AirPort Express"
+PKG_LONGDESC="libshairPort emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods."
PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-001_add_ao.patch b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-001_add_ao.patch
new file mode 100644
index 0000000000..afeeef2db7
--- /dev/null
+++ b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-001_add_ao.patch
@@ -0,0 +1,270 @@
+diff -uP libshairport-1.2.0.20310_lib/src/ao.h ../../../../../libshairport-1.2.0.20310_lib/src/ao.h
+--- a/src/ao.h 1970-01-01 01:00:00.000000000 +0100
++++ b/src/ao.h 2011-09-25 20:36:36.000000000 +0200
+@@ -0,0 +1,156 @@
++/*
++ *
++ * ao.h
++ *
++ * Original Copyright (C) Aaron Holtzman - May 1999
++ * Modifications Copyright (C) Stan Seibert - July 2000, July 2001
++ * More Modifications Copyright (C) Jack Moffitt - October 2000
++ *
++ * This file is part of libao, a cross-platform audio outputlibrary. See
++ * README for a history of this source code.
++ *
++ * libao 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.
++ *
++ * libao 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 GNU Make; see the file COPYING. If not, write to
++ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++#ifndef __AO_H__
++#define __AO_H__
++
++#ifdef __cplusplus
++extern "C"
++{
++#endif /* __cplusplus */
++
++#include
++#include
++#include
++#include
++
++/* --- Constants ---*/
++
++#define AO_TYPE_LIVE 1
++#define AO_TYPE_FILE 2
++
++
++#define AO_ENODRIVER 1
++#define AO_ENOTFILE 2
++#define AO_ENOTLIVE 3
++#define AO_EBADOPTION 4
++#define AO_EOPENDEVICE 5
++#define AO_EOPENFILE 6
++#define AO_EFILEEXISTS 7
++#define AO_EBADFORMAT 8
++
++#define AO_EFAIL 100
++
++
++#define AO_FMT_LITTLE 1
++#define AO_FMT_BIG 2
++#define AO_FMT_NATIVE 4
++
++/* --- Structures --- */
++
++typedef struct ao_info {
++ int type; /* live output or file output? */
++ char *name; /* full name of driver */
++ char *short_name; /* short name of driver */
++ char *author; /* driver author */
++ char *comment; /* driver comment */
++ int preferred_byte_format;
++ int priority;
++ char **options;
++ int option_count;
++} ao_info;
++
++typedef struct ao_functions ao_functions;
++typedef struct ao_device ao_device;
++
++typedef struct ao_sample_format {
++ int bits; /* bits per sample */
++ int rate; /* samples per second (in a single channel) */
++ int channels; /* number of audio channels */
++ int byte_format; /* Byte ordering in sample, see constants below */
++ char *matrix; /* input channel location/ordering */
++} ao_sample_format;
++
++typedef struct ao_option {
++ char *key;
++ char *value;
++ struct ao_option *next;
++} ao_option;
++
++#if defined(AO_BUILDING_LIBAO)
++#include "ao_private.h"
++#endif
++
++/* --- Functions --- */
++
++/* library setup/teardown */
++void ao_initialize(void);
++void ao_shutdown(void);
++
++/* device setup/playback/teardown */
++int ao_append_global_option(const char *key,
++ const char *value);
++int ao_append_option(ao_option **options,
++ const char *key,
++ const char *value);
++void ao_free_options(ao_option *options);
++
++char* ao_get_option(ao_option *options, const char* key);
++
++ao_device* ao_open_live(int driver_id,
++ ao_sample_format *format,
++ ao_option *option);
++ao_device* ao_open_file(int driver_id,
++ const char *filename,
++ int overwrite,
++ ao_sample_format *format,
++ ao_option *option);
++
++int ao_play(ao_device *device,
++ char *output_samples,
++ uint32_t num_bytes);
++int ao_close(ao_device *device);
++
++/* driver information */
++int ao_driver_id(const char *short_name);
++int ao_default_driver_id(void);
++ao_info *ao_driver_info(int driver_id);
++ao_info **ao_driver_info_list(int *driver_count);
++char *ao_file_extension(int driver_id);
++
++/* miscellaneous */
++int ao_is_big_endian(void);
++
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif /* __AO_H__ */
++
++extern struct AudioOutput g_ao;
++struct AudioOutput
++ {
++ void (*ao_initialize)(void);
++ int (*ao_play)(ao_device *, char *, uint32_t);
++ int (*ao_default_driver_id)(void);
++ ao_device* (*ao_open_live)( int, ao_sample_format *, ao_option *);
++ int (*ao_close)(ao_device *);
++ /* -- Device Setup/Playback/Teardown -- */
++ int (*ao_append_option)(ao_option **, const char *, const char *);
++ void (*ao_free_options)(ao_option *);
++ char* (*ao_get_option)(ao_option *, const char* );
++ };
+diff -uP libshairport-1.2.0.20310_lib/src/hairtunes.c ../../../../../libshairport-1.2.0.20310_lib/src/hairtunes.c
+--- a/src/hairtunes.c 2011-09-23 21:55:48.000000000 +0200
++++ b/src/hairtunes.c 2011-09-25 20:37:49.000000000 +0200
+@@ -25,7 +25,7 @@
+ */
+
+ #define XBMC
+-//#defined HAS_AO
++#define HAS_AO
+
+ #include
+ #include
+@@ -45,7 +45,7 @@
+ #include
+ #include
+ #ifdef HAS_AO
+-#include
++#include "ao.h"
+ #endif
+
+ #ifdef FANCY_RESAMPLING
+@@ -881,7 +881,7 @@
+ }
+ #ifdef HAS_AO
+ } else {
+- ao_play(dev, (char *)outbuf, play_samples*4);
++ g_ao.ao_play(dev, (char *)outbuf, play_samples*4);
+ #endif
+ }
+ }
+@@ -906,7 +906,7 @@
+ ao_device *dev;
+
+ void* init_ao() {
+- ao_initialize();
++ g_ao.ao_initialize();
+
+ int driver;
+ #ifndef XBMC
+@@ -921,7 +921,7 @@
+ #endif
+ {
+ // otherwise choose the default
+- driver = ao_default_driver_id();
++ driver = g_ao.ao_default_driver_id();
+ }
+
+ ao_sample_format fmt;
+@@ -944,9 +944,9 @@
+ }
+ #endif
+
+- ao_append_option(&ao_opts, "name", "Streaming...");
++ g_ao.ao_append_option(&ao_opts, "name", "Streaming...");
+
+- dev = ao_open_live(driver, &fmt, ao_opts);
++ dev = g_ao.ao_open_live(driver, &fmt, ao_opts);
+ if (dev == NULL) {
+ die("Could not open ao device");
+ }
+@@ -985,7 +985,7 @@
+ audio_running = 0;
+ pthread_join(audio_thread, NULL);
+ #ifdef HAS_AO
+- ao_close(dev);
++ g_ao.ao_close(dev);
+ #endif
+ }
+
+diff -uP libshairport-1.2.0.20310_lib/src/shairport.c ../../../../../libshairport-1.2.0.20310_lib/src/shairport.c
+--- a/src/shairport.c 2011-08-21 01:57:56.000000000 +0200
++++ b/src/shairport.c 2011-09-25 20:44:40.000000000 +0200
+@@ -92,6 +92,14 @@
+ static char tPassword[56] = "";
+ static char tHWID[HWID_SIZE] = {0,51,52,53,54,55};
+
++#ifdef XBMC
++struct AudioOutput g_ao;
++void shairport_set_ao(struct AudioOutput *ao)
++{
++ g_ao=*ao;
++}
++#endif
++
+ #ifndef XBMC
+ int main(int argc, char **argv)
+ #else
+diff -uP libshairport-1.2.0.20310_lib/src/shairport.h ../../../../../libshairport-1.2.0.20310_lib/src/shairport.h
+--- a/src/shairport.h 2011-08-21 01:58:11.000000000 +0200
++++ b/src/shairport.h 2011-09-25 20:36:43.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include
+ #include
+ #include
++#include "ao.h"
+
+
+ #define HWID_SIZE 6
+@@ -62,9 +63,11 @@
+ void shairport_exit(void);
+ int shairport_loop(void);
+ int shairport_is_running(void);
++void shairport_set_ao(struct AudioOutput *ao);
+
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+
+ #endif
++
diff --git a/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-002_fix_install_header.patch b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-002_fix_install_header.patch
new file mode 100644
index 0000000000..15a1dd379a
--- /dev/null
+++ b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-002_fix_install_header.patch
@@ -0,0 +1,12 @@
+--- a/src/Makefile.am.old 2011-09-23 23:14:39.000000000 +0200
++++ b/src/Makefile.am 2011-09-25 21:38:08.000000000 +0200
+@@ -1,7 +1,7 @@
+ lib_LTLIBRARIES=libshairport.la
+
+-library_includedir=$(includedir)
+-library_include_HEADERS = shairport.h
++library_includedir=$(includedir)/shairport
++library_include_HEADERS = shairport.h ao.h socketlib.h
+
+ libshairport_la_SOURCES=shairport.c hairtunes.c socketlib.c alac.c
+ libshairport_la_LDFLAGS=-dynamiclib
diff --git a/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-003_fix_deadlock.patch b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-003_fix_deadlock.patch
new file mode 100644
index 0000000000..d685391d98
--- /dev/null
+++ b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-003_fix_deadlock.patch
@@ -0,0 +1,10 @@
+--- a/src/hairtunes.c.orig 2011-09-25 21:58:08.000000000 +0200
++++ b/src/hairtunes.c 2011-09-25 21:58:12.000000000 +0200
+@@ -991,6 +991,7 @@
+
+ void hairtunes_cleanup(void)
+ {
++ pthread_cond_signal(&ab_buffer_ready);
+ clean_output();
+ clean_rtp();
+ clean_buffer();
diff --git a/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-004_fix_bad_access.patch b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-004_fix_bad_access.patch
new file mode 100644
index 0000000000..8a39598437
--- /dev/null
+++ b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-004_fix_bad_access.patch
@@ -0,0 +1,22 @@
+--- a/src/hairtunes.c.orig 2011-09-25 23:26:56.000000000 +0200
++++ b/src/hairtunes.c 2011-09-25 23:29:27.000000000 +0200
+@@ -89,7 +89,6 @@
+ // maximal resampling shift - conservative
+ #define OUTFRAME_BYTES (4*(frame_size+3))
+
+-
+ alac_file *decoder_info;
+
+ #ifdef FANCY_RESAMPLING
+@@ -849,6 +848,11 @@
+ inbuf = buffer_get_frame();
+ } while (!inbuf && audio_running);
+
++ if(!audio_running)
++ {
++ return 0; //don't access inbuf if audio stopped
++ }
++
+ #ifdef FANCY_RESAMPLING
+ if (fancy_resampling) {
+ int i;
diff --git a/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-005_fix_shutdown.patch b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-005_fix_shutdown.patch
new file mode 100644
index 0000000000..775c825649
--- /dev/null
+++ b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-005_fix_shutdown.patch
@@ -0,0 +1,10 @@
+--- a/src/shairport.c 2011-09-25 23:58:06.000000000 +0200
++++ b/src/shairport.c.new 2011-09-25 23:57:54.000000000 +0200
+@@ -368,6 +368,7 @@
+ void shairport_exit(void)
+ {
+ m_running = 0;
++ close(tServerSock);
+ }
+
+ int shairport_is_running(void)
diff --git a/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-006_no_printf.patch b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-006_no_printf.patch
new file mode 100644
index 0000000000..b4e721b526
--- /dev/null
+++ b/packages/network/libshairport/patches/libshairport-1.2.0.20310_lib-006_no_printf.patch
@@ -0,0 +1,843 @@
+--- a/src/alac.c 2011-08-21 00:06:21.000000000 +0200
++++ b/src/alac.c 2011-10-01 04:12:09.000000000 +0200
+@@ -804,7 +804,7 @@
+ }
+ else
+ {
+- fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type);
++ xprintf("FIXME: unhandled predicition type: %i\n", prediction_type);
+ /* i think the only other prediction type (or perhaps this is just a
+ * boolean?) runs adaptive fir twice.. like:
+ * predictor_decompress_fir_adapt(predictor_error, tempout, ...)
+@@ -885,7 +885,7 @@
+ }
+ case 20:
+ case 32:
+- fprintf(stderr, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
++ xprintf("FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
+ break;
+ default:
+ break;
+@@ -1004,7 +1004,7 @@
+ }
+ else
+ { /* see mono case */
+- fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type_a);
++ xprintf("FIXME: unhandled predicition type: %i\n", prediction_type_a);
+ }
+
+ /* channel 2 */
+@@ -1029,7 +1029,7 @@
+ }
+ else
+ {
+- fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type_b);
++ xprintf("FIXME: unhandled predicition type: %i\n", prediction_type_b);
+ }
+ }
+ else
+@@ -1106,7 +1106,7 @@
+ }
+ case 20:
+ case 32:
+- fprintf(stderr, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
++ xprintf("FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
+ break;
+ default:
+ break;
+--- a/src/hairtunes.c 2011-10-01 17:45:08.000000000 +0200
++++ b/src/hairtunes.c 2011-10-01 17:42:07.000000000 +0200
+@@ -121,8 +121,8 @@
+ pthread_cond_t ab_buffer_ready;
+
+ static void die(char *why) {
+- fprintf(stderr, "FATAL: %s\n", why);
+- exit(1);
++ xprintf("FATAL: %s\n", why);
++ //exit(1);
+ }
+
+ static int hex2bin(unsigned char *buf, char *hex) {
+@@ -245,13 +245,13 @@
+ continue;
+ }
+ if (!strcmp(line, "exit\n")) {
+- exit(0);
++ ;//exit(0);
+ }
+ if (!strcmp(line, "flush\n")) {
+ hairtunes_flush();
+ }
+ }
+- fprintf(stderr, "bye!\n");
++ xprintf("bye!\n");
+ fflush(stderr);
+ #endif
+
+@@ -262,7 +262,7 @@
+ {
+ assert(f<=0);
+ if (debug)
+- fprintf(stderr, "VOL: %lf\n", f);
++ xprintf("VOL: %lf\n", f);
+ volume = pow(10.0,0.05*f);
+ fix_volume = 65536.0 * volume;
+ }
+@@ -273,7 +273,7 @@
+ ab_resync();
+ pthread_mutex_unlock(&ab_mutex);
+ if (debug)
+- fprintf(stderr, "FLUSH\n");
++ xprintf("FLUSH\n");
+ }
+
+ #ifdef HAIRTUNES_STANDALONE
+@@ -423,7 +423,7 @@
+ } else if (seq_order(ab_read, seqno)) { // late but not yet played
+ abuf = audio_buffer + BUFIDX(seqno);
+ } else { // too late.
+- fprintf(stderr, "\nlate packet %04X (%04X:%04X)\n", seqno, ab_read, ab_write);
++ xprintf("\nlate packet %04X (%04X:%04X)\n", seqno, ab_read, ab_write);
+ }
+ buf_fill = ab_write - ab_read;
+ pthread_mutex_unlock(&ab_mutex);
+@@ -520,7 +520,7 @@
+ if (seq_order(last, first))
+ return;
+
+- fprintf(stderr, "requesting resend on %d packets (port %d)\n", last-first+1, controlport);
++ xprintf("requesting resend on %d packets (port %d)\n", last-first+1, controlport);
+
+ char req[8]; // *not* a standard RTCP NACK
+ req[0] = 0x80;
+@@ -604,8 +604,8 @@
+ port += 3;
+ }
+
+- printf("port: %d\n", port); // let our handler know where we end up listening
+- printf("cport: %d\n", port+1);
++ xprintf("port: %d\n", port); // let our handler know where we end up listening
++ xprintf("cport: %d\n", port+1);
+
+ rtp_sockets[0] = sock;
+ rtp_sockets[1] = csock;
+@@ -708,7 +708,7 @@
+ bf_est_drift = biquad_filt(&bf_drift_lpf, CONTROL_B*(bf_est_err*CONTROL_A + err_deriv) + bf_est_drift);
+
+ if (debug)
+- fprintf(stderr, "bf %d err %f drift %f desiring %f ed %f estd %f\r", fill, bf_est_err, bf_est_drift, desired_fill, err_deriv, err_deriv + CONTROL_A*bf_est_err);
++ xprintf("bf %d err %f drift %f desiring %f ed %f estd %f\r", fill, bf_est_err, bf_est_drift, desired_fill, err_deriv, err_deriv + CONTROL_A*bf_est_err);
+ bf_playback_rate = 1.0 + CONTROL_A*bf_est_err + bf_est_drift;
+
+ bf_last_err = bf_est_err;
+@@ -724,7 +724,7 @@
+ buf_fill = ab_write - ab_read;
+ if (buf_fill < 1 || !ab_synced || ab_buffering) { // init or underrun. stop and wait
+ if (ab_synced)
+- fprintf(stderr, "\nunderrun\n");
++ xprintf("\nunderrun\n");
+
+ ab_buffering = 1;
+ pthread_cond_wait(&ab_buffer_ready, &ab_mutex);
+@@ -736,7 +736,7 @@
+ return 0;
+ }
+ if (buf_fill >= BUFFER_FRAMES) { // overrunning! uh-oh. restart at a sane distance
+- fprintf(stderr, "\noverrun.\n");
++ xprintf("\noverrun.\n");
+ ab_read = ab_write - START_FILL;
+ }
+ read = ab_read;
+@@ -748,7 +748,7 @@
+
+ volatile abuf_t *curframe = audio_buffer + BUFIDX(read);
+ if (!curframe->ready) {
+- fprintf(stderr, "\nmissing frame.\n");
++ xprintf("\nmissing frame.\n");
+ memset(curframe->data, 0, FRAME_BYTES);
+ }
+ curframe->ready = 0;
+@@ -775,13 +775,13 @@
+ if (stuff) {
+ if (stuff==1) {
+ if (debug)
+- fprintf(stderr, "+++++++++\n");
++ xprintf("+++++++++\n");
+ // interpolate one sample
+ *outptr++ = dithered_vol(((long)inptr[-2] + (long)inptr[0]) >> 1);
+ *outptr++ = dithered_vol(((long)inptr[-1] + (long)inptr[1]) >> 1);
+ } else if (stuff==-1) {
+ if (debug)
+- fprintf(stderr, "---------\n");
++ xprintf("---------\n");
+ inptr++;
+ inptr++;
+ }
+--- a/src/shairport.c 2011-10-01 17:45:08.000000000 +0200
++++ b/src/shairport.c 2011-10-01 17:41:04.000000000 +0200
+@@ -31,6 +31,27 @@
+ #include "shairport.h"
+ #include "hairtunes.h"
+
++static struct printfPtr g_printf={NULL};
++
++int xprintf(const char *format, ...)
++{
++ char dbg[2048];
++ va_list args;
++ va_start(args, format);
++ vsnprintf(dbg, sizeof(dbg), format, args);
++ va_end(args);
++ if(g_printf.extprintf)
++ {
++ g_printf.extprintf(dbg, sizeof(dbg));
++ }
++ else
++ {
++ printf(dbg);
++ }
++
++ return 1;
++}
++
+ #ifndef TRUE
+ #define TRUE (-1)
+ #endif
+@@ -98,6 +119,11 @@
+ {
+ g_ao=*ao;
+ }
++
++void shairport_set_printf(struct printfPtr *funcPtr)
++{
++ g_printf = *funcPtr;
++}
+ #endif
+
+ #ifndef XBMC
+@@ -106,7 +132,7 @@
+ int shairport_main(int argc, char **argv)
+ #endif
+ {
+- printf("initializing shairport\n");
++ xprintf("initializing shairport\n",NULL);
+ char tHWID_Hex[HWID_SIZE * 2 + 1];
+ char tKnownHwid[32];
+
+@@ -185,22 +211,22 @@
+ }
+ else if(!strcmp(arg, "-h") || !strcmp(arg, "--help"))
+ {
+- slog(LOG_INFO, "ShairPort version 0.05 C port - Airport Express emulator\n");
+- slog(LOG_INFO, "Usage:\nshairport [OPTION...]\n\nOptions:\n");
+- slog(LOG_INFO, " -a, --apname=AirPort Sets Airport name\n");
+- slog(LOG_INFO, " -p, --password=secret Sets Password (not working)\n");
+- slog(LOG_INFO, " -o, --server_port=5000 Sets Port for Avahi/dns-sd\n");
+- slog(LOG_INFO, " -b, --buffer=282 Sets Number of frames to buffer before beginning playback\n");
+- slog(LOG_INFO, " -d Daemon mode\n");
+- slog(LOG_INFO, " -q, --quiet Supresses all output.\n");
+- slog(LOG_INFO, " -v,-v2,-v3,-vv Various debugging levels\n");
+- slog(LOG_INFO, "\n");
++ xprintf("ShairPort version 0.05 C port - Airport Express emulator\n");
++ xprintf("Usage:\nshairport [OPTION...]\n\nOptions:\n");
++ xprintf(" -a, --apname=AirPort Sets Airport name\n");
++ xprintf(" -p, --password=secret Sets Password (not working)\n");
++ xprintf(" -o, --server_port=5000 Sets Port for Avahi/dns-sd\n");
++ xprintf(" -b, --buffer=282 Sets Number of frames to buffer before beginning playback\n");
++ xprintf(" -d Daemon mode\n");
++ xprintf(" -q, --quiet Supresses all output.\n");
++ xprintf(" -v,-v2,-v3,-vv Various debugging levels\n");
++ xprintf("\n");
+ return 0;
+ }
+ }
+
+ if ( buffer_start_fill < 30 || buffer_start_fill > BUFFER_FRAMES ) {
+- fprintf(stderr, "buffer value must be > 30 and < %d\n", BUFFER_FRAMES);
++ xprintf("buffer value must be > 30 and < %d\n", BUFFER_FRAMES);
+ return(0);
+ }
+
+@@ -209,11 +235,11 @@
+ int tPid = fork();
+ if(tPid < 0)
+ {
+- exit(1); // Error on fork
++ //exit(1); // Error on fork
+ }
+ else if(tPid > 0)
+ {
+- exit(0);
++ //exit(0);
+ }
+ else
+ {
+@@ -254,10 +280,10 @@
+ sscanf(tHWID_Hex, "%02X%02X%02X%02X%02X%02X", &tHWID[0], &tHWID[1], &tHWID[2], &tHWID[3], &tHWID[4], &tHWID[5]);
+ }
+
+- slog(LOG_INFO, "LogLevel: %d\n", kCurrentLogLevel);
+- slog(LOG_INFO, "AirName: %s\n", tServerName);
+- slog(LOG_INFO, "HWID: %.*s\n", HWID_SIZE, tHWID+1);
+- slog(LOG_INFO, "HWID_Hex(%d): %s\n", strlen(tHWID_Hex), tHWID_Hex);
++ xprintf("LogLevel: %d\n", kCurrentLogLevel);
++ xprintf("AirName: %s\n", tServerName);
++ xprintf("HWID: %.*s\n", HWID_SIZE, tHWID+1);
++ xprintf("HWID_Hex(%d): %s\n", strlen(tHWID_Hex), tHWID_Hex);
+
+ if(tSimLevel >= 1)
+ {
+@@ -271,12 +297,12 @@
+ #ifndef XBMC
+ startAvahi(tHWID_Hex, tServerName, tPort);
+ #endif
+- slog(LOG_DEBUG_V, "Starting connection server: specified server port: %d\n", tPort);
++ xprintf("Starting connection server: specified server port: %d\n", tPort);
+ tServerSock = setupListenServer(&tAddrInfo, tPort);
+ if(tServerSock < 0)
+ {
+ freeaddrinfo(tAddrInfo);
+- slog(LOG_INFO, "Error setting up server socket on port %d, try specifying a different port\n", tPort);
++ xprintf("Error setting up server socket on port %d, try specifying a different port\n", tPort);
+ return 0;
+ }
+
+@@ -303,7 +329,7 @@
+
+ int readsock;
+
+- slog(LOG_DEBUG_V, "Waiting for clients to connect\n");
++ xprintf("Waiting for clients to connect\n");
+
+ while(m_running)
+ {
+@@ -335,7 +361,7 @@
+ {
+ freeaddrinfo(tAddrInfo);
+ tAddrInfo = NULL;
+- slog(LOG_DEBUG, "...Accepted Client Connection..\n");
++ xprintf("...Accepted Client Connection..\n");
+ close(tServerSock);
+ handleClient(tClientSock, tPassword, tHWID);
+ //close(tClientSock);
+@@ -343,11 +369,11 @@
+ }
+ else
+ {
+- slog(LOG_DEBUG_VV, "Child now busy handling new client\n");
++ xprintf("Child now busy handling new client\n");
+ close(tClientSock);
+ }
+ #else
+- slog(LOG_DEBUG, "...Accepted Client Connection..\n");
++ xprintf("...Accepted Client Connection..\n");
+ handleClient(tClientSock, tPassword, tHWID);
+ #endif
+ }
+@@ -357,7 +383,7 @@
+ }
+ }
+
+- slog(LOG_DEBUG_VV, "Finished\n");
++ xprintf("Finished\n");
+ if(tAddrInfo != NULL)
+ {
+ freeaddrinfo(tAddrInfo);
+@@ -416,7 +442,7 @@
+
+ void handleClient(int pSock, char *pPassword, char *pHWADDR)
+ {
+- slog(LOG_DEBUG_VV, "In Handle Client\n");
++ xprintf("In Handle Client\n");
+ fflush(stdout);
+
+ socklen_t len;
+@@ -435,7 +461,7 @@
+
+ // deal with both IPv4 and IPv6:
+ if (addr.ss_family == AF_INET) {
+- slog(LOG_DEBUG_V, "Constructing ipv4 address\n");
++ xprintf("Constructing ipv4 address\n");
+ struct sockaddr_in *s = (struct sockaddr_in *)&addr;
+ port = ntohs(s->sin_port);
+ inet_ntop(AF_INET, &s->sin_addr, ipstr, sizeof ipstr);
+@@ -455,20 +481,20 @@
+ if(memcmp(&addr.bin[0], "\x00\x00\x00\x00" "\x00\x00\x00\x00" "\x00\x00\xff\xff", 12) == 0)
+ {
+ // its ipv4...
+- slog(LOG_DEBUG_V, "Constructing ipv4 from ipv6 address\n");
++ xprintf("Constructing ipv4 from ipv6 address\n");
+ memcpy(ipbin, &addr.bin[12], 4);
+ ipbinlen = 4;
+ }
+ else
+ {
+- slog(LOG_DEBUG_V, "Constructing ipv6 address\n");
++ xprintf("Constructing ipv6 address\n");
+ memcpy(ipbin, &s->sin6_addr, 16);
+ ipbinlen = 16;
+ }
+ }
+
+- slog(LOG_DEBUG_V, "Peer IP address: %s\n", ipstr);
+- slog(LOG_DEBUG_V, "Peer port : %d\n", port);
++ xprintf("Peer IP address: %s\n", ipstr);
++ xprintf("Peer port : %d\n", port);
+
+ int tMoreDataNeeded = 1;
+ struct keyring tKeys;
+@@ -489,16 +515,16 @@
+ tError = readDataFromClient(pSock, &(tConn.recv));
+ if(!tError && strlen(tConn.recv.data) > 0)
+ {
+- slog(LOG_DEBUG_VV, "Finished Reading some data from client\n");
++ xprintf("Finished Reading some data from client\n");
+ // parse client request
+ tMoreDataNeeded = parseMessage(&tConn, ipbin, ipbinlen, pHWADDR);
+ if(1 == tMoreDataNeeded)
+ {
+- slog(LOG_DEBUG_VV, "\n\nNeed to read more data\n");
++ xprintf("\n\nNeed to read more data\n");
+ }
+ else if(-1 == tMoreDataNeeded) // Forked process down below ended.
+ {
+- slog(LOG_DEBUG_V, "Forked Process ended...cleaning up\n");
++ xprintf("Forked Process ended...cleaning up\n");
+ cleanup(&tConn);
+ // pSock was already closed
+ return;
+@@ -507,13 +533,13 @@
+ }
+ else
+ {
+- slog(LOG_DEBUG, "Error reading from socket, closing client\n");
++ xprintf("Error reading from socket, closing client\n");
+ // Error reading data....quit.
+ cleanup(&tConn);
+ return;
+ }
+ }
+- slog(LOG_DEBUG_VV, "Writing: %d chars to socket\n", tConn.resp.current);
++ xprintf("Writing: %d chars to socket\n", tConn.resp.current);
+ //tConn->resp.data[tConn->resp.current-1] = '\0';
+ writeDataToClient(pSock, &(tConn.resp));
+ // Finished reading one message...
+@@ -526,9 +552,9 @@
+
+ void writeDataToClient(int pSock, struct shairbuffer *pResponse)
+ {
+- slog(LOG_DEBUG_VV, "\n----Beg Send Response Header----\n%.*s\n", pResponse->current, pResponse->data);
++ xprintf("\n----Beg Send Response Header----\n%.*s\n", pResponse->current, pResponse->data);
+ send(pSock, pResponse->data, pResponse->current,0);
+- slog(LOG_DEBUG_VV, "----Send Response Header----\n");
++ xprintf("----Send Response Header----\n");
+ }
+
+ int readDataFromClient(int pSock, struct shairbuffer *pClientBuffer)
+@@ -541,7 +567,7 @@
+ while(tRetval > 0 && tEnd < 0)
+ {
+ // Read from socket until \n\n, \r\n\r\n, or \r\r is found
+- slog(LOG_DEBUG_V, "Waiting To Read...\n");
++ xprintf("Waiting To Read...\n");
+ fflush(stdout);
+ tRetval = read(pSock, tReadBuf, MAX_SIZE);
+ // if new buffer contains the end of request string, only copy partial buffer?
+@@ -552,40 +578,40 @@
+ {
+ pClientBuffer->marker = tEnd+1; // Marks start of content
+ }
+- slog(SOCKET_LOG_LEVEL, "Found end of http request at: %d\n", tEnd);
++ xprintf("Found end of http request at: %d\n", tEnd);
+ fflush(stdout);
+ }
+ else
+ {
+ tEnd = MAX_SIZE;
+- slog(SOCKET_LOG_LEVEL, "Read %d of data so far\n%s\n", tRetval, tReadBuf);
++ xprintf("Read %d of data so far\n%s\n", tRetval, tReadBuf);
+ fflush(stdout);
+ }
+ if(tRetval > 0)
+ {
+ // Copy read data into tReceive;
+- slog(SOCKET_LOG_LEVEL, "Read %d data, using %d of it\n", tRetval, tEnd);
++ xprintf("Read %d data, using %d of it\n", tRetval, tEnd);
+ addNToShairBuffer(pClientBuffer, tReadBuf, tRetval);
+- slog(LOG_DEBUG_VV, "Finished copying data\n");
++ xprintf("Finished copying data\n");
+ }
+ else
+ {
+- slog(LOG_DEBUG, "Error reading data from socket, got: %d bytes", tRetval);
++ xprintf("Error reading data from socket, got: %d bytes", tRetval);
+ return tRetval;
+ }
+ }
+ if(tEnd + 1 != tRetval)
+ {
+- slog(SOCKET_LOG_LEVEL, "Read more data after end of http request. %d instead of %d\n", tRetval, tEnd+1);
++ xprintf("Read more data after end of http request. %d instead of %d\n", tRetval, tEnd+1);
+ }
+- slog(SOCKET_LOG_LEVEL, "Finished Reading Data:\n%s\nEndOfData\n", pClientBuffer->data);
++ xprintf("Finished Reading Data:\n%s\nEndOfData\n", pClientBuffer->data);
+ fflush(stdout);
+ return 0;
+ }
+
+ char *getFromBuffer(char *pBufferPtr, const char *pField, int pLenAfterField, int *pReturnSize, char *pDelims)
+ {
+- slog(LOG_DEBUG_V, "GettingFromBuffer: %s\n", pField);
++ xprintf("GettingFromBuffer: %s\n", pField);
+ char* tFound = strstr(pBufferPtr, pField);
+ int tSize = 0;
+ if(tFound != NULL)
+@@ -606,7 +632,7 @@
+ }
+
+ tSize = (int) (tShortest - tFound);
+- slog(LOG_DEBUG_VV, "Found %.*s length: %d\n", tSize, tFound, tSize);
++ xprintf("Found %.*s length: %d\n", tSize, tFound, tSize);
+ if(pReturnSize != NULL)
+ {
+ *pReturnSize = tSize;
+@@ -614,7 +640,7 @@
+ }
+ else
+ {
+- slog(LOG_DEBUG_V, "Not Found\n");
++ xprintf("Not Found\n");
+ }
+ return tFound;
+ }
+@@ -648,10 +674,10 @@
+ {
+ char tTrim[tFoundSize + 2];
+ getTrimmed(tFound, tFoundSize, TRUE, TRUE, tTrim);
+- slog(LOG_DEBUG_VV, "HeaderChallenge: [%s] len: %d sizeFound: %d\n", tTrim, strlen(tTrim), tFoundSize);
++ xprintf("HeaderChallenge: [%s] len: %d sizeFound: %d\n", tTrim, strlen(tTrim), tFoundSize);
+ int tChallengeDecodeSize = 16;
+ char *tChallenge = decode_base64((unsigned char *)tTrim, tFoundSize, &tChallengeDecodeSize);
+- slog(LOG_DEBUG_VV, "Challenge Decode size: %d expected 16\n", tChallengeDecodeSize);
++ xprintf("Challenge Decode size: %d expected 16\n", tChallengeDecodeSize);
+
+ int tCurSize = 0;
+ unsigned char tChalResp[38];
+@@ -673,7 +699,7 @@
+ }
+
+ char *tTmp = encode_base64((unsigned char *)tChalResp, tCurSize);
+- slog(LOG_DEBUG_VV, "Full sig: %s\n", tTmp);
++ xprintf("Full sig: %s\n", tTmp);
+ free(tTmp);
+
+ // RSA Encrypt
+@@ -722,10 +748,10 @@
+ {
+ if(isLogEnabledFor(HEADER_LOG_LEVEL))
+ {
+- slog(HEADER_LOG_LEVEL, "Content-Length: %s value -> %d\n", tContent, tContentSize);
++ xprintf("Content-Length: %s value -> %d\n", tContent, tContentSize);
+ if(pConn->recv.marker != 0)
+ {
+- slog(HEADER_LOG_LEVEL, "ContentPtr has %d, but needs %d\n",
++ xprintf("ContentPtr has %d, but needs %d\n",
+ strlen(pConn->recv.data+pConn->recv.marker), tContentSize);
+ }
+ }
+@@ -735,7 +761,7 @@
+ }
+ else
+ {
+- slog(LOG_DEBUG_VV, "No content, header only\n");
++ xprintf("No content, header only\n");
+ }
+
+ // "Creates" a new Response Header for our response message
+@@ -748,7 +774,7 @@
+ {
+ tLen = 20;
+ }
+- slog(LOG_INFO, "********** RECV %.*s **********\n", tLen, pConn->recv.data);
++ xprintf("********** RECV %.*s **********\n", tLen, pConn->recv.data);
+ }
+
+ if(pConn->password != NULL)
+@@ -758,7 +784,7 @@
+
+ if(buildAppleResponse(pConn, pIpBin, pIpBinLen, pHWID)) // need to free sig
+ {
+- slog(LOG_DEBUG_V, "Added AppleResponse to Apple-Challenge request\n");
++ xprintf("Added AppleResponse to Apple-Challenge request\n");
+ }
+
+ // Find option, then based on option, do different actions.
+@@ -778,14 +804,14 @@
+ int tKeySize = 0;
+ char tEncodedAesIV[tSize + 2];
+ getTrimmed(tHeaderVal, tSize, TRUE, TRUE, tEncodedAesIV);
+- slog(LOG_DEBUG_VV, "AESIV: [%.*s] Size: %d Strlen: %d\n", tSize, tEncodedAesIV, tSize, strlen(tEncodedAesIV));
++ xprintf("AESIV: [%.*s] Size: %d Strlen: %d\n", tSize, tEncodedAesIV, tSize, strlen(tEncodedAesIV));
+ char *tDecodedIV = decode_base64((unsigned char*) tEncodedAesIV, tSize, &tSize);
+
+ // grab the key, copy it out of the receive buffer
+ tHeaderVal = getFromContent(tContent, "a=rsaaeskey", &tKeySize);
+ char tEncodedAesKey[tKeySize + 2]; // +1 for nl, +1 for \0
+ getTrimmed(tHeaderVal, tKeySize, TRUE, TRUE, tEncodedAesKey);
+- slog(LOG_DEBUG_VV, "AES KEY: [%s] Size: %d Strlen: %d\n", tEncodedAesKey, tKeySize, strlen(tEncodedAesKey));
++ xprintf("AES KEY: [%s] Size: %d Strlen: %d\n", tEncodedAesKey, tKeySize, strlen(tEncodedAesKey));
+ // remove base64 coding from key
+ char *tDecodedAesKey = decode_base64((unsigned char*) tEncodedAesKey,
+ tKeySize, &tKeySize); // Need to free DecodedAesKey
+@@ -794,7 +820,7 @@
+ int tFmtpSize = 0;
+ char *tFmtp = getFromContent(tContent, "a=fmtp", &tFmtpSize); // Don't need to free
+ tFmtp = getTrimmedMalloc(tFmtp, tFmtpSize, TRUE, FALSE); // will need to free
+- slog(LOG_DEBUG_VV, "Format: %s\n", tFmtp);
++ xprintf("Format: %s\n", tFmtp);
+
+ RSA *rsa = loadKey();
+ // Decrypt the binary aes key
+@@ -803,11 +829,11 @@
+ if(RSA_private_decrypt(tKeySize, (unsigned char *)tDecodedAesKey,
+ (unsigned char*) tDecryptedKey, rsa, RSA_PKCS1_OAEP_PADDING) >= 0)
+ {
+- slog(LOG_DEBUG, "Decrypted AES key from RSA Successfully\n");
++ xprintf("Decrypted AES key from RSA Successfully\n");
+ }
+ else
+ {
+- slog(LOG_INFO, "Error Decrypting AES key from RSA\n");
++ xprintf("Error Decrypting AES key from RSA\n");
+ }
+ free(tDecodedAesKey);
+ RSA_free(rsa);
+@@ -823,13 +849,13 @@
+ // struct comms *tComms = pConn->hairtunes;
+ // if (! (pipe(tComms->in) == 0 && pipe(tComms->out) == 0))
+ // {
+-// slog(LOG_INFO, "Error setting up hairtunes communications...some things probably wont work very well.\n");
++// xprintf("Error setting up hairtunes communications...some things probably wont work very well.\n");
+ // }
+
+ // Setup fork
+ char tPort[8] = "6000"; // get this from dup()'d stdout of child pid
+
+- printf("******** SETUP!!!!!\n");
++ xprintf("******** SETUP!!!!!\n",NULL);
+ #ifndef XBMC
+ int tPid = fork();
+ if(tPid == 0)
+@@ -845,11 +871,11 @@
+ tFound = getFromSetup(pConn->recv.data, "timing_port", &tSize);
+ getTrimmed(tFound, tSize, 1, 0, tTPortStr);
+
+- slog(LOG_DEBUG_VV, "converting %s and %s from str->int\n", tCPortStr, tTPortStr);
++ xprintf("converting %s and %s from str->int\n", tCPortStr, tTPortStr);
+ int tControlport = atoi(tCPortStr);
+ int tTimingport = atoi(tTPortStr);
+
+- slog(LOG_DEBUG_V, "Got %d for CPort and %d for TPort\n", tControlport, tTimingport);
++ xprintf("Got %d for CPort and %d for TPort\n", tControlport, tTimingport);
+ char *tRtp = NULL;
+ char *tPipe = NULL;
+ char *tAoDriver = NULL;
+@@ -884,7 +910,7 @@
+ tDataport, tRtp, tPipe, tAoDriver, tAoDeviceName, tAoDeviceId);
+ #ifndef XBMC
+ // Quit when finished.
+- slog(LOG_DEBUG, "Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");
++ xprintf("Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");
+ return -1;
+ }
+ else if(tPid >0)
+@@ -897,7 +923,7 @@
+ int tRead = read(tComms->out[0], tFromHairtunes, 80);
+ if(tRead <= 0)
+ {
+- slog(LOG_INFO, "Error reading port from hairtunes function, assuming default port: %d\n", tPort);
++ xprintf("Error reading port from hairtunes function, assuming default port: %d\n", tPort);
+ }
+ else
+ {
+@@ -909,7 +935,7 @@
+ }
+ else
+ {
+- slog(LOG_INFO, "Read %d bytes, Error translating %s into a port\n", tRead, tFromHairtunes);
++ xprintf("Read %d bytes, Error translating %s into a port\n", tRead, tFromHairtunes);
+ }
+ }
+
+@@ -930,7 +956,7 @@
+ }
+ else
+ {
+- slog(LOG_INFO, "Error forking process....dere' be errors round here.\n");
++ xprintf("Error forking process....dere' be errors round here.\n");
+ return -1;
+ }
+ #endif
+@@ -942,7 +968,7 @@
+ propogateCSeq(pConn);
+ #ifndef XBMC
+ close(pConn->hairtunes->in[1]);
+- slog(LOG_DEBUG, "Tearing down connection, closing pipes\n");
++ xprintf("Tearing down connection, closing pipes\n");
+ #else
+ hairtunes_cleanup();
+ #endif
+@@ -964,7 +990,7 @@
+ propogateCSeq(pConn);
+ int tSize = 0;
+ char *tVol = getFromHeader(pConn->recv.data, "volume", &tSize);
+- slog(LOG_DEBUG_VV, "About to write [vol: %.*s] data to hairtunes\n", tSize, tVol);
++ xprintf("About to write [vol: %.*s] data to hairtunes\n", tSize, tVol);
+ // TBD VOLUME
+ #ifndef XBMC
+ write(pConn->hairtunes->in[1], "vol: ", 5);
+@@ -973,11 +999,11 @@
+ #else
+ hairtunes_setvolume(atof(tVol));
+ #endif
+- slog(LOG_DEBUG_VV, "Finished writing data write data to hairtunes\n");
++ xprintf("Finished writing data write data to hairtunes\n");
+ }
+ else
+ {
+- slog(LOG_DEBUG, "\n\nUn-Handled recv: %s\n", pConn->recv.data);
++ xprintf("\n\nUn-Handled recv: %s\n", pConn->recv.data);
+ propogateCSeq(pConn);
+ }
+ addToShairBuffer(&(pConn->resp), "\r\n");
+@@ -1056,7 +1082,7 @@
+ char tName[100 + HWID_SIZE + 3];
+ if(strlen(pServerName) > tMaxServerName)
+ {
+- slog(LOG_INFO,"Hey dog, we see you like long server names, "
++ xprintf("Hey dog, we see you like long server names, "
+ "so we put a strncat in our command so we don't buffer overflow, while you listen to your flow.\n"
+ "We just used the first %d characters. Pick something shorter if you want\n", tMaxServerName);
+ }
+@@ -1067,7 +1093,7 @@
+ strcat(tName, pHWStr);
+ strcat(tName, "@");
+ strncat(tName, pServerName, tMaxServerName);
+- slog(AVAHI_LOG_LEVEL, "Avahi/DNS-SD Name: %s\n", tName);
++ xprintf("Avahi/DNS-SD Name: %s\n", tName);
+
+ execlp("avahi-publish-service", "avahi-publish-service", tName,
+ "_raop._tcp", tPort, "tp=UDP","sm=false","sv=false","ek=1","et=0,1",
+@@ -1079,12 +1105,12 @@
+ perror("error");
+ }
+
+- slog(LOG_INFO, "Bad error... couldn't find or failed to run: avahi-publish-service OR dns-sd\n");
+- exit(1);
++ xprintf("Bad error... couldn't find or failed to run: avahi-publish-service OR dns-sd\n");
++ //exit(1);
+ }
+ else
+ {
+- slog(LOG_DEBUG_VV, "Avahi/DNS-SD started on PID: %d\n", tPid);
++ xprintf("Avahi/DNS-SD started on PID: %d\n", tPid);
+ }
+ return tPid;
+ }
+@@ -1092,7 +1118,7 @@
+
+ void printBufferInfo(struct shairbuffer *pBuf, int pLevel)
+ {
+- slog(pLevel, "Buffer: [%s] size: %d maxchars:%d\n", pBuf->data, pBuf->current, pBuf->maxsize/sizeof(char));
++ xprintf("Buffer: [%s] size: %d maxchars:%d\n", pBuf->data, pBuf->current, pBuf->maxsize/sizeof(char));
+ }
+
+ int getAvailChars(struct shairbuffer *pBuf)
+@@ -1173,7 +1199,8 @@
+ {
+ va_list argp;
+ va_start(argp, pFormat);
+- vprintf(pFormat, argp);
++ xprintf(pFormat, argp);
++ //vprintf(pFormat, argp);
+ va_end(argp);
+ }
+ //#endif
+@@ -1227,9 +1254,9 @@
+ {
+ if(pBuf->data != NULL)
+ {
+- slog(LOG_DEBUG_VV, "Hrm, buffer wasn't cleaned up....trying to free\n");
++ xprintf("Hrm, buffer wasn't cleaned up....trying to free\n");
+ free(pBuf->data);
+- slog(LOG_DEBUG_VV, "Free didn't seem to seg fault....huzzah\n");
++ xprintf("Free didn't seem to seg fault....huzzah\n");
+ }
+ pBuf->current = 0;
+ pBuf->marker = 0;
+@@ -1287,6 +1314,6 @@
+ BIO *tBio = BIO_new_mem_buf(AIRPORT_PRIVATE_KEY, -1);
+ RSA *rsa = PEM_read_bio_RSAPrivateKey(tBio, NULL, NULL, NULL); //NULL, NULL, NULL);
+ BIO_free(tBio);
+- slog(RSA_LOG_LEVEL, "RSA Key: %d\n", RSA_check_key(rsa));
++ xprintf("RSA Key: %d\n", RSA_check_key(rsa));
+ return rsa;
+ }
+--- a/src/shairport.h 2011-10-01 17:45:08.000000000 +0200
++++ b/src/shairport.h 2011-10-01 17:19:43.000000000 +0200
+@@ -59,11 +59,17 @@
+ {
+ #endif /* __cplusplus */
+
++struct printfPtr
++{
++ int (*extprintf)(const char* msg, size_t msgSize);
++};
++
+ int shairport_main(int argc, char **argv);
+ void shairport_exit(void);
+ int shairport_loop(void);
+ int shairport_is_running(void);
+ void shairport_set_ao(struct AudioOutput *ao);
++void shairport_set_printf(struct printfPtr *funcPtr);
+
+ #ifdef __cplusplus
+ }
+--- a/src/socketlib.c 2011-09-23 22:00:48.000000000 +0200
++++ b/src/socketlib.c 2011-10-01 17:42:39.000000000 +0200
+@@ -82,7 +82,7 @@
+ delay(RETRY_DELAY, &tRes);
+ }
+ }
+- printf("%d Retry attempts exceeded\n", RETRY_COUNT);
++ xprintf("%d Retry attempts exceeded\n", RETRY_COUNT);
+ return ERROR;
+ }
+
+@@ -102,7 +102,7 @@
+ tError = getaddrinfo(pHostname, pService, &hints, pAddrInfo);
+ if(tError != 0)
+ {
+- printf("Error getting address info\n");
++ xprintf("Error getting address info\n");
+ }
+ return tError;
+ }
+@@ -200,7 +200,7 @@
+ else
+ {
+ // Invalid encoded data, no other cases are possible.
+- printf("Unrecoverable error....base64 values are incorrectly encoded\n");
++ xprintf("Unrecoverable error....base64 values are incorrectly encoded\n");
+ return pSize;
+ }
+ }
+@@ -226,7 +226,7 @@
+ memset(input, 0, length);
+ memcpy(input, pInput, pLength);
+ memset(input+pLength, '=', length-pLength);
+- printf("Fixed value: [%.*s]\n", length, input);
++ xprintf("Fixed value: [%.*s]\n", length, input);
+ }
+ char *buffer = (char *)malloc(length);
+ memset(buffer, 0, length);
diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample
deleted file mode 100644
index 6190c959e7..0000000000
--- a/packages/network/netmount/config/netmount.conf.sample
+++ /dev/null
@@ -1,50 +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
-################################################################################
-# netmount.conf
-#
-# This configuration file allows you to setup network mounts via
-# CIFS (Samba), NFS or AFP while the system is booting
-#
-# This is an sample file, please rename or copy this file to
-# netmount.conf in the samba share "Configfiles" (or /storage/.config/)
-#
-# Usage:
-# service | share on server | local mountpoint <| mount options>
-#
-# - "service" can be "nfs" for NFS mounts, "cifs" for CIFS (Samba) or
-# "afp" for AFP (Apple File Protocol) mounts
-# - Please use an "|" as delimiter
-# - Don't use spaces in usernames, passwords and options
-# - be aware of the different syntax for NFS and AFP mounts
-# - Local mountpoints should only be on /storage
-#
-# Examples:
-# AFP (Apple File Protocol) mounts, please specify username and password if
-# needed.
-# afp | 192.168.1.44/videos | /storage/mount/videos | :
-
-# CIFS (Samba/ Windows share) mounts, please specify username and password if
-# needed (comma seperated).
-# cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
-# cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
-
-# NFS (Network File System) mounts, please specify additional options if needed
-# (comma seperated). Default options are 'tcp' and 'nolock'.
-# nfs | 192.168.1.44:/videos | /storage/mount/videos | ro,timeo=600
diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount
deleted file mode 100755
index 3a380f796d..0000000000
--- a/packages/network/netmount/scripts/netmount
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# Copyright (C) 2009-2010 OpenELEC.tv
-# http://www.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
-################################################################################
-
-# Mounting Network shares
-
-NETMOUNT_USERCONF="/storage/.config/netmount.conf"
-
-if [ -f "$NETMOUNT_USERCONF" ]; then
-
-IFS="
-"
- for i in `tr -d '\r' < $NETMOUNT_USERCONF |grep -v "^#"`; do
- SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
- SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
- MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
- OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-
- logger -t Netmount "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
-
- mkdir -p $MOUNTPOINT
- case "$SERVICE" in
- afp)
- sleep 1
- mount_afp afp://$OPTIONS@$SHARE "$MOUNTPOINT"
- ;;
- cifs)
- mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" &
- ;;
- nfs)
- mount "$SHARE" "$MOUNTPOINT" -o nolock,tcp,"$OPTIONS" &
- ;;
- esac
- done
-fi
-
-exit 0
diff --git a/packages/network/netstatus/install b/packages/network/netstatus/install
deleted file mode 100755
index 8990dd81ad..0000000000
--- a/packages/network/netstatus/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2010-2011 Roman Weber (roman@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/bin
- cp $PKG_BUILD/netstatus $INSTALL/usr/bin
diff --git a/packages/network/netstatus/profile.d/netstatus.conf b/packages/network/netstatus/profile.d/netstatus.conf
deleted file mode 100644
index 3f851e0d45..0000000000
--- a/packages/network/netstatus/profile.d/netstatus.conf
+++ /dev/null
@@ -1,29 +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
-################################################################################
-
-wait_for_network () {
- if [ -x /usr/bin/netstatus ]; then
- val=`/usr/bin/netstatus`
- while [ "$val" != "Network state is online" ]; do
- val=`/usr/bin/netstatus`
- usleep 250000
- done
- fi
-}
diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd
index 237e6fff87..abff4202df 100644
--- a/packages/network/openssh/init.d/51_sshd
+++ b/packages/network/openssh/init.d/51_sshd
@@ -22,63 +22,53 @@
#
# runlevels: openelec, textmode
- RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
- RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
- DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
+(
+ RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
+ RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
+ DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
- KEYGEN="/usr/bin/ssh-keygen"
- SSHD="/usr/sbin/sshd"
+ KEYGEN="/usr/bin/ssh-keygen"
+ SSHD="/usr/sbin/sshd"
-case $RUNLEVEL in
- boot)
- (
- # Check for the SSH1 RSA key
- if [ ! -f $RSA1_KEY ] ; then
- progress "SSH: generating SSH1 RSA key"
+ # Check for the SSH1 RSA key
+ if [ ! -f $RSA1_KEY ] ; then
+ progress "SSH: generating SSH1 RSA key"
- mkdir -p /storage/.cache/ssh
- $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null
- chmod 600 $RSA1_KEY
- fi
+ mkdir -p /storage/.cache/ssh
+ $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null
+ chmod 600 $RSA1_KEY
+ fi
- # Check for the SSH2 RSA key
- if [ ! -f $RSA2_KEY ] ; then
- progress "SSH: generating SSH2 RSA key"
+ # Check for the SSH2 RSA key
+ if [ ! -f $RSA2_KEY ] ; then
+ progress "SSH: generating SSH2 RSA key"
- mkdir -p /storage/.cache/ssh
- $KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null
- chmod 600 $RSA2_KEY
- fi
+ mkdir -p /storage/.cache/ssh
+ $KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null
+ chmod 600 $RSA2_KEY
+ fi
- # Check for the SSH2 DSA key
- if [ ! -f $DSA2_KEY ] ; then
- progress "SSH: generating SSH2 DSA key"
+ # Check for the SSH2 DSA key
+ if [ ! -f $DSA2_KEY ] ; then
+ progress "SSH: generating SSH2 DSA key"
- mkdir -p /storage/.cache/ssh
- $KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null
- chmod 600 $DSA2_KEY
- fi
+ mkdir -p /storage/.cache/ssh
+ $KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null
+ chmod 600 $DSA2_KEY
+ fi
- # Check for predifined known hosts file
- if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then
- progress "SSH: setup predifined known hosts"
+ # Check for predifined known hosts file
+ if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then
+ progress "SSH: setup predifined known hosts"
- mkdir -p /$HOME/.ssh
- cp /etc/ssh/known_hosts $HOME/.ssh
- fi
+ mkdir -p /$HOME/.ssh
+ cp /etc/ssh/known_hosts $HOME/.ssh
+ fi
- progress "Starting SSH Server"
+ progress "Starting SSH Server"
- wait_for_network
+ mkdir -p /var/empty
+ chmod -R 600 /var/empty
+ $SSHD
- mkdir -p /var/empty
- chmod -R 600 /var/empty
- $SSHD
- )&
- ;;
-
- poweroff|reboot)
- progress "Stopping SSH Server"
- killall sshd
- ;;
-esac
+)&
diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
index f301ecc96e..426dbba108 100644
--- a/packages/network/samba/config/smb.conf
+++ b/packages/network/samba/config/smb.conf
@@ -28,7 +28,8 @@
netbios name = openelec
security = share
guest account = root
- socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=65536 SO_SNDBUF=65536
+ mangled names = no
wins support = yes
syslog only = yes
name resolve order = lmhosts wins bcast host
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 4106e20bef..b5d3d76150 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="samba"
-PKG_VERSION="3.5.10"
+PKG_VERSION="3.5.11"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/network/samba/patches/samba-3.5.10-010_crosscompile-0.1.patch b/packages/network/samba/patches/samba-3.5.11-010_crosscompile-0.1.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.5.10-010_crosscompile-0.1.patch
rename to packages/network/samba/patches/samba-3.5.11-010_crosscompile-0.1.patch
diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba
index 897b261b68..7ebc7b5215 100644
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -22,38 +22,29 @@
#
# runlevels: openelec, textmode
-SMB_USERCONF="/storage/.config/samba.conf"
-SMB_DEFCONF="/etc/samba/smb.conf"
+(
+ if [ -f /var/config/settings.conf ]; then
+ . /var/config/settings.conf
-case $RUNLEVEL in
- boot)
- (
- if [ -f /var/config/settings.conf ]; then
- . /var/config/settings.conf
+ if [ "$SAMBA_START" = "true" ]; then
- if [ "$SAMBA_START" = "true" ]; then
+ # sleep 2 sec to be ensure network is started
+ usleep 2000000
- wait_for_network
+ progress "Starting Samba server"
- progress "Starting Samba server"
+ SMB_USERCONF="/storage/.config/samba.conf"
+ SMB_DEFCONF="/etc/samba/smb.conf"
- if [ -f $SMB_USERCONF ]; then
- SMB_ARG="--configfile=$SMB_USERCONF"
- else
- SMB_ARG="--configfile=$SMB_DEFCONF"
- fi
-
- mkdir -p /var/log/samba
- smbd --daemon $SMB_ARG > /dev/null 2>&1
- nmbd --daemon $SMB_ARG > /dev/null 2>&1
- fi
+ if [ -f $SMB_USERCONF ]; then
+ SMB_ARG="--configfile=$SMB_USERCONF"
+ else
+ SMB_ARG="--configfile=$SMB_DEFCONF"
fi
- )&
- ;;
- poweroff|reboot)
- progress "Stopping Samba server"
- killall nmbd
- killall smbd
- ;;
-esac
+ mkdir -p /var/log/samba
+ smbd --daemon $SMB_ARG > /dev/null 2>&1
+ nmbd --daemon $SMB_ARG > /dev/null 2>&1
+ fi
+ fi
+)&
diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build
index c804a252f2..cbfcf9cb08 100755
--- a/packages/network/wpa_supplicant/build
+++ b/packages/network/wpa_supplicant/build
@@ -28,6 +28,6 @@ cp $ROOT/$PKG_DIR/config/makefile.config .config
# echo "CONFIG_TLS=gnutls" >> .config
# echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-[ "$DEBUG" = "no" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
+[ ! "$DEBUG" = "yes" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
make
diff --git a/packages/other/fribidi/build b/packages/other/fribidi/build
index c7f6b7a915..3227d7242f 100755
--- a/packages/other/fribidi/build
+++ b/packages/other/fribidi/build
@@ -22,15 +22,20 @@
. config/options $1
+CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080"
+
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
- --disable-debug \
- --enable-malloc \
- --with-glib=no \
--enable-shared \
--disable-static \
+ --disable-debug \
+ --disable-deprecated \
+ --disable-malloc \
+ --enable-charsets \
+ --with-gnu-ld \
+ --without-glib
make
diff --git a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch b/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch
deleted file mode 100644
index e7256dabf5..0000000000
--- a/packages/other/fribidi/patches/fribidi-0.19.2-chunk_size.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Define FRIBIDI_CHUNK_SIZE only if using allocation pools
-
-diff -Nur fribidi2-cvs-20061020.orig/lib/common.h fribidi2-cvs-20061020/lib/common.h
---- fribidi2-cvs-20061020.orig/lib/common.h Tue Jan 31 05:23:12 2006
-+++ fribidi2-cvs-20061020/lib/common.h Sat Oct 21 16:42:41 2006
-@@ -131,6 +131,8 @@
-
- /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being
- * allocated for data structure pools. */
-+#if USE_SIMPLE_MALLOC+0
-+#else
- #ifndef FRIBIDI_CHUNK_SIZE
- # if HAVE_ASM_PAGE_H
- # ifndef __FRIBIDI_DOC
-@@ -145,6 +147,7 @@
- # error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes.
- # endif /* FRIBIDI_CHUNK_SIZE < 256 */
- #endif /* FRIBIDI_CHUNK_SIZE */
-+#endif /* USE_SIMPLE_MALLOC */
-
- /* FRIBIDI_BEGIN_STMT should be used at the beginning of your macro
- * definitions that are to behave like simple statements. Use
diff --git a/packages/security/libgpg-error/build b/packages/security/libgpg-error/build
index e579adc84c..5e5aea22bf 100755
--- a/packages/security/libgpg-error/build
+++ b/packages/security/libgpg-error/build
@@ -23,6 +23,7 @@
. config/options $1
cd $PKG_BUILD
+gettextize -f
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
diff --git a/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit b/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit
index 28e887cdac..40f3efa16f 100644
--- a/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit
+++ b/packages/sysutils/ConsoleKit/init.d/34_ConsoleKit
@@ -22,14 +22,8 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- progress "starting ConsoleKit daemon"
+progress "starting ConsoleKit daemon"
- install -m 755 -d /var/log/ConsoleKit
- install -m 755 -d /var/run/ConsoleKit
- ;;
+ install -m 755 -d /var/log/ConsoleKit
+ install -m 755 -d /var/run/ConsoleKit
- poweroff|reboot)
- ;;
-esac
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
index 160e50fac4..003c352270 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
@@ -20,20 +20,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-. /etc/profile
-
- progress "Reboot the syste"
- RET=0
-
- RUNLEVEL="reboot"
-
- for script in `ls -r1 /etc/init.d/*`; do
- if grep -q -e "^# runlevels:.*$MODE" $script; then
- . $script
- S_RET=$?
- test $S_RET -ge $RET && RET=$S_RET
- fi
- done
-
- sync
- reboot
+reboot
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
index 29be405b0f..a6e24e8385 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
@@ -20,20 +20,4 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-. /etc/profile
-
- progress "Poweroff the system"
- RET=0
-
- RUNLEVEL="poweroff"
-
- for script in `ls -r1 /etc/init.d/*`; do
- if grep -q -e "^# runlevels:.*$MODE" $script; then
- . $script
- S_RET=$?
- test $S_RET -ge $RET && RET=$S_RET
- fi
- done
-
- sync
- poweroff -f
+poweroff
diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index ff0a3db60f..9cb258f583 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.19.0
-# Sun Aug 14 01:33:34 2011
+# Busybox version: 1.19.2
+# Wed Sep 28 18:13:56 2011
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -465,9 +465,9 @@ CONFIG_LOGIN_SCRIPTS=y
# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
# CONFIG_CRYPTPW is not set
# CONFIG_CHPASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
# CONFIG_SULOGIN is not set
# CONFIG_VLOCK is not set
@@ -704,7 +704,7 @@ CONFIG_RFKILL=y
# CONFIG_STRINGS is not set
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_TIME is not set
+CONFIG_TIME=y
# CONFIG_TIMEOUT is not set
CONFIG_TTYSIZE=y
# CONFIG_VOLNAME is not set
diff --git a/packages/sysutils/busybox/init.d/01_mount-filesystem b/packages/sysutils/busybox/init.d/01_mount-filesystem
index bb6a18e50d..5cf3c27d0b 100644
--- a/packages/sysutils/busybox/init.d/01_mount-filesystem
+++ b/packages/sysutils/busybox/init.d/01_mount-filesystem
@@ -23,31 +23,5 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- progress "mounting needed filesystems"
- mount -n -t devtmpfs none /dev
- mkdir -p /dev/pts
- mount -n -t devpts -o gid=5,mode=620 none /dev/pts
- mkdir -p /dev/shm
- mount -n -t tmpfs none /dev/shm
- mount -n -t tmpfs none /run
- mount -n -t ramfs none /var
- mount "$disk" /storage -o rw,noatime > /dev/null 2>&1
- ;;
-
- poweroff|reboot)
- progress "unmounting filesystems"
- for i in 1 2 3 4 5 6 7 8 9 10; do
- echo "umount /storage"
- ERR_ENV=1
- umount /storage
- [ "$?" -eq "0" ] && ERR_ENV=0 && break
- usleep 1000000
- done
- if [ "$ERR_ENV" -ne "0" ]; then
- mount -o remount,ro /storage
- umount -l /storage
- fi
- ;;
-esac
+progress "mounting needed filesystems"
+ mount -n -t ramfs none /var
diff --git a/packages/sysutils/busybox/init.d/02_make-directorys b/packages/sysutils/busybox/init.d/02_make-directorys
index a2666de347..f52d5c4c69 100644
--- a/packages/sysutils/busybox/init.d/02_make-directorys
+++ b/packages/sysutils/busybox/init.d/02_make-directorys
@@ -23,47 +23,38 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- progress "make variable directory structure"
- mkdir -p /var/cache \
- /var/lock \
- /var/media \
- /var/run \
- /var/tmp \
- /var/run/sepermit \
- /var/run/lirc
+progress "make variable directory structure"
+ mkdir -p /var/cache \
+ /var/lock \
+ /var/media \
+ /var/run \
+ /var/tmp \
+ /var/run/sepermit \
+ /var/run/lirc
- chmod 1777 /var/run /var/tmp
+ chmod 1777 /var/run /var/tmp
- touch /var/run/utmp
- chmod 1777 /var/run/utmp
+ touch /var/run/utmp
+ chmod 1777 /var/run/utmp
- if test "$DEBUG" = "yes"; then
- mkdir -p $HOME/log
- ln -sf $HOME/log /var/log
- else
- mkdir -p /var/log
- fi
+ if test "$DEBUG" = "yes"; then
+ mkdir -p $HOME/log
+ ln -sf $HOME/log /var/log
+ else
+ mkdir -p /var/log
+ fi
- touch /var/log/wtmp
- chmod 1777 /var/log/wtmp
-
- # others:
- mkdir -p /var/lib/polkit-1
- chmod 700 /var/lib/polkit-1
- mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
- mkdir -p /var/lib/polkit-1/localauthority/20-org.d
- mkdir -p /var/lib/polkit-1/localauthority/30-site.d
- mkdir -p /var/lib/polkit-1/localauthority/50-local.d
- mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d
-
- mkdir -p /var/lib/udisks
- mkdir -p /var/lib/upower
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ touch /var/log/wtmp
+ chmod 1777 /var/log/wtmp
+# others:
+ mkdir -p /var/lib/polkit-1
+ chmod 700 /var/lib/polkit-1
+ mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
+ mkdir -p /var/lib/polkit-1/localauthority/20-org.d
+ mkdir -p /var/lib/polkit-1/localauthority/30-site.d
+ mkdir -p /var/lib/polkit-1/localauthority/50-local.d
+ mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d
+ mkdir -p /var/lib/udisks
+ mkdir -p /var/lib/upower
diff --git a/packages/sysutils/busybox/init.d/03_debugshell b/packages/sysutils/busybox/init.d/03_debugshell
index d66a742f9a..94e5da62c6 100644
--- a/packages/sysutils/busybox/init.d/03_debugshell
+++ b/packages/sysutils/busybox/init.d/03_debugshell
@@ -25,18 +25,13 @@
TTY="3"
if [ "$DEBUG" = "yes" ]; then
- case $RUNLEVEL in
- boot)
- echo "###########################################"
- echo "## it seems we are running in Debug mode ##"
- echo "## starting debugging shell on console $TTY ##"
- echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
- echo "###########################################"
- openvt -w -c $TTY /bin/sh &
- ;;
+ echo "###########################################"
+ echo "## it seems we are running in Debug mode ##"
+ echo "## starting debugging shell on console $TTY ##"
+ echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
+ echo "###########################################"
+
+ openvt -w -c $TTY /bin/sh &
- poweroff|reboot)
- ;;
- esac
fi
diff --git a/packages/sysutils/busybox/init.d/04_systemconfig b/packages/sysutils/busybox/init.d/04_systemconfig
index 7b8c90f0a2..7381f7bdcb 100644
--- a/packages/sysutils/busybox/init.d/04_systemconfig
+++ b/packages/sysutils/busybox/init.d/04_systemconfig
@@ -25,16 +25,9 @@
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
-case $RUNLEVEL in
- boot)
- if [ -f "$OPENELEC_SETTINGS" ]; then
- progress "creating system settings"
+if [ -f "$OPENELEC_SETTINGS" ]; then
+ progress "creating system settings"
- mkdir -p /var/config
- cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf
- fi
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ mkdir -p /var/config
+ cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf
+fi
diff --git a/packages/sysutils/busybox/init.d/04_userconfig b/packages/sysutils/busybox/init.d/04_userconfig
index 18743854fe..a9dc70dd55 100644
--- a/packages/sysutils/busybox/init.d/04_userconfig
+++ b/packages/sysutils/busybox/init.d/04_userconfig
@@ -23,30 +23,23 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- if [ -d /usr/config ]; then
- progress "copy userconfig and samples"
+if [ -d /usr/config ]; then
+ progress "copy userconfig and samples"
- cd /usr/config
- mkdir -p /storage/.config
+ cd /usr/config
+ mkdir -p /storage/.config
- for dir in `find . -type d`; do
- mkdir -p /storage/.config/$dir
- done
+ for dir in `find . -type d`; do
+ mkdir -p /storage/.config/$dir
+ done
- for config in `find . -type f -name "*.conf"`; do
- if [ ! -f /storage/.config/$config ]; then
- cp $config /storage/.config/$config
- fi
- done
+ for config in `find . -type f -name "*.conf"`; do
+ if [ ! -f /storage/.config/$config ]; then
+ cp $config /storage/.config/$config
+ fi
+ done
- for sample in `find . -type f -name "*.sample"`; do
- cp $sample /storage/.config/$sample
- done
- fi
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ for sample in `find . -type f -name "*.sample"`; do
+ cp $sample /storage/.config/$sample
+ done
+fi
diff --git a/packages/sysutils/busybox/init.d/08_syslogd b/packages/sysutils/busybox/init.d/08_syslogd
index 5b7ad390db..2bb855a3e2 100644
--- a/packages/sysutils/busybox/init.d/08_syslogd
+++ b/packages/sysutils/busybox/init.d/08_syslogd
@@ -23,22 +23,10 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- (
- progress "Starting Syslog daemon"
- syslogd
+(
+ progress "Starting Syslog daemon"
+ syslogd
- progress "Starting Kernellog daemon"
- klogd
- )&
- ;;
-
- poweroff|reboot)
- progress "Stopping Kernellog daemon"
- killall klogd
-
- progress "Stopping Syslog daemon"
- killall syslogd
- ;;
-esac
+ progress "Starting Kernellog daemon"
+ klogd
+)&
diff --git a/packages/sysutils/busybox/init.d/10_cdrom b/packages/sysutils/busybox/init.d/10_cdrom
index e24ae1fcc9..545552bd24 100644
--- a/packages/sysutils/busybox/init.d/10_cdrom
+++ b/packages/sysutils/busybox/init.d/10_cdrom
@@ -23,12 +23,5 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- progress "Setup some CDROM settings"
- sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
- ;;
-
- poweroff|reboot)
- ;;
-esac
+progress "Setup some CDROM settings"
+ sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
diff --git a/packages/sysutils/busybox/init.d/99_shell b/packages/sysutils/busybox/init.d/99_shell
index 90be4cf5b8..111fe07e08 100644
--- a/packages/sysutils/busybox/init.d/99_shell
+++ b/packages/sysutils/busybox/init.d/99_shell
@@ -24,19 +24,12 @@
TTY="1"
-case $RUNLEVEL in
- boot)
- echo "###########################################"
- echo "## it seems we are running in Text mode. ##"
- echo "## .... starting shell on console $TTY .... ##"
- echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
- echo "###########################################"
+echo "###########################################"
+echo "## it seems we are running in Text mode. ##"
+echo "## .... starting shell on console $TTY .... ##"
+echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
+echo "###########################################"
- while true; do
- openvt -w -c $TTY /bin/sh
- done
- ;;
-
- poweroff|reboot)
- ;;
-esac
+while true; do
+ openvt -w -c $TTY /bin/sh
+done
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-android.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-android.patch
new file mode 100644
index 0000000000..e2e6528a2f
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-android.patch
@@ -0,0 +1,11 @@
+--- busybox-1.19.2/include/platform.h
++++ busybox-1.19.2-android/include/platform.h
+@@ -433,7 +433,7 @@ typedef unsigned smalluint;
+ # undef HAVE_STPCPY
+ #endif
+
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(__ANDROID__)
+ # undef HAVE_DPRINTF
+ # undef HAVE_GETLINE
+ # undef HAVE_STPCPY
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-buildsys.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-buildsys.patch
new file mode 100644
index 0000000000..8e0c4c33ee
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-buildsys.patch
@@ -0,0 +1,19 @@
+--- busybox-1.19.2/applets/applet_tables.c
++++ busybox-1.19.2-buildsys/applets/applet_tables.c
+@@ -80,8 +80,15 @@ int main(int argc, char **argv)
+
+ printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
+ if (NUM_APPLETS == 1) {
++ char *dash_to_underscore, *p;
+ printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
+- printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
++ /* Example: "ether-wake" -> "ether_wake" */
++ p = dash_to_underscore = strdup(applets[0].name);
++ p--;
++ while (*++p)
++ if (*p == '-')
++ *p = '_';
++ printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore);
+ }
+ printf("\n");
+
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-chpasswd.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-chpasswd.patch
new file mode 100644
index 0000000000..0cba0e219a
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-chpasswd.patch
@@ -0,0 +1,55 @@
+--- busybox-1.19.2/loginutils/chpasswd.c
++++ busybox-1.19.2-chpasswd/loginutils/chpasswd.c
+@@ -33,9 +33,8 @@ static const char chpasswd_longopts[] AL
+ int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
+ {
+- char *name, *pass;
+- char salt[sizeof("$N$XXXXXXXX")];
+- int opt, rc;
++ char *name;
++ int opt;
+
+ if (getuid() != 0)
+ bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+@@ -45,6 +44,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ opt = getopt32(argv, "em");
+
+ while ((name = xmalloc_fgetline(stdin)) != NULL) {
++ char *free_me;
++ char *pass;
++ int rc;
++
+ pass = strchr(name, ':');
+ if (!pass)
+ bb_error_msg_and_die("missing new password");
+@@ -52,7 +55,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
+
+ xuname2uid(name); /* dies if there is no such user */
+
++ free_me = NULL;
+ if (!(opt & OPT_ENC)) {
++ char salt[sizeof("$N$XXXXXXXX")];
++
+ crypt_make_salt(salt, 1);
+ if (opt & OPT_MD5) {
+ salt[0] = '$';
+@@ -60,7 +66,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ salt[2] = '$';
+ crypt_make_salt(salt + 3, 4);
+ }
+- pass = pw_encrypt(pass, salt, 0);
++ free_me = pass = pw_encrypt(pass, salt, 0);
+ }
+
+ /* This is rather complex: if user is not found in /etc/shadow,
+@@ -81,8 +87,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
+ bb_info_msg("Password for '%s' changed", name);
+ logmode = LOGMODE_STDIO;
+ free(name);
+- if (!(opt & OPT_ENC))
+- free(pass);
++ free(free_me);
+ }
+ return EXIT_SUCCESS;
+ }
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-crond.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-crond.patch
new file mode 100644
index 0000000000..043a846ca4
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-crond.patch
@@ -0,0 +1,12 @@
+--- busybox-1.19.2/miscutils/crond.c
++++ busybox-1.19.2-crond/miscutils/crond.c
+@@ -861,7 +861,8 @@ int crond_main(int argc UNUSED_PARAM, ch
+
+ /* "-b after -f is ignored", and so on for every pair a-b */
+ opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
+- ":l+:d+"; /* -l and -d have numeric param */
++ /* -l and -d have numeric param */
++ ":l+" IF_FEATURE_CROND_D(":d+");
+ opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
+ &G.log_level, &G.log_filename, &G.crontab_dir_name
+ IF_FEATURE_CROND_D(,&G.log_level));
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-inetd.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-inetd.patch
new file mode 100644
index 0000000000..e1395a6b3b
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-inetd.patch
@@ -0,0 +1,47 @@
+--- busybox-1.19.2/networking/inetd.c
++++ busybox-1.19.2-inetd/networking/inetd.c
+@@ -1278,6 +1278,7 @@ int inetd_main(int argc UNUSED_PARAM, ch
+ sep->se_count = 0;
+ rearm_alarm(); /* will revive it in RETRYTIME sec */
+ restore_sigmask(&omask);
++ maybe_close(new_udp_fd);
+ maybe_close(accepted_fd);
+ continue; /* -> check next fd in fd set */
+ }
+@@ -1298,17 +1299,18 @@ int inetd_main(int argc UNUSED_PARAM, ch
+ bb_perror_msg("vfork"+1);
+ sleep(1);
+ restore_sigmask(&omask);
++ maybe_close(new_udp_fd);
+ maybe_close(accepted_fd);
+ continue; /* -> check next fd in fd set */
+ }
+ if (pid == 0)
+ pid--; /* -1: "we did fork and we are child" */
+ }
+- /* if pid == 0 here, we never forked */
++ /* if pid == 0 here, we didn't fork */
+
+ if (pid > 0) { /* parent */
+ if (sep->se_wait) {
+- /* tcp wait: we passed listening socket to child,
++ /* wait: we passed socket to child,
+ * will wait for child to terminate */
+ sep->se_wait = pid;
+ remove_fd_from_set(sep->se_fd);
+@@ -1345,9 +1347,13 @@ int inetd_main(int argc UNUSED_PARAM, ch
+ setsid();
+ /* "nowait" udp */
+ if (new_udp_fd >= 0) {
+- len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
++ len_and_sockaddr *lsa;
++ int r;
++
++ close(new_udp_fd);
++ lsa = xzalloc_lsa(sep->se_family);
+ /* peek at the packet and remember peer addr */
+- int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
++ r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
+ &lsa->u.sa, &lsa->len);
+ if (r < 0)
+ goto do_exit1;
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-syslogd.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-syslogd.patch
new file mode 100644
index 0000000000..d54f5d4307
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-syslogd.patch
@@ -0,0 +1,20 @@
+--- busybox-1.19.2/sysklogd/syslogd.c
++++ busybox-1.19.2-syslogd/sysklogd/syslogd.c
+@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char
+ parser_t *parser;
+
+ parser = config_open2(file ? file : "/etc/syslog.conf",
+- file ? xfopen_for_read : fopen_or_warn_stdin);
++ file ? xfopen_for_read : fopen_for_read);
+ if (!parser)
+ /* didn't find default /etc/syslog.conf */
+ /* proceed as if we built busybox without config support */
+@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c
+ if (LOG_PRI(pri) < G.logLevel) {
+ #if ENABLE_FEATURE_IPC_SYSLOG
+ if ((option_mask32 & OPT_circularlog) && G.shbuf) {
+- log_to_shmem(msg);
++ log_to_shmem(G.printbuf);
+ return;
+ }
+ #endif
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-tail.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-tail.patch
new file mode 100644
index 0000000000..f3cc79814e
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.19.2-tail.patch
@@ -0,0 +1,43 @@
+--- busybox-1.19.2/coreutils/tail.c
++++ busybox-1.19.2-tail/coreutils/tail.c
+@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv)
+ int fd = fds[i];
+
+ if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
+- continue; /* may happen with -E */
++ continue; /* may happen with -F */
+
+ if (nfiles > header_threshhold) {
+ tail_xprint_header(fmt, argv[i]);
+@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv)
+ * Used only by +N code ("start from Nth", 1-based): */
+ seen = 1;
+ newlines_seen = 0;
+- while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) {
++ while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
+ if (G.from_top) {
+ int nwrite = nread;
+ if (seen < count) {
+ /* We need to skip a few more bytes/lines */
+ if (COUNT_BYTES) {
+ nwrite -= (count - seen);
+- seen = count;
++ seen += nread;
+ } else {
+ char *s = buf;
+ do {
+--- busybox-1.19.2/testsuite/tail.tests
++++ busybox-1.19.2-tail/testsuite/tail.tests
+@@ -14,4 +14,12 @@ testing "tail: +N with N > file length"
+ "0\n" \
+ "" "qw"
+
++testing "tail: -c +N with largish N" \
++ "
++ dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c;
++ dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c;
++ " \
++ "8185\n8177\n" \
++ "" ""
++
+ exit $FAILCOUNT
diff --git a/packages/sysutils/busybox/profile.d/path.conf b/packages/sysutils/busybox/profile.d/path.conf
index 8922da6f75..80d106f6c6 100644
--- a/packages/sysutils/busybox/profile.d/path.conf
+++ b/packages/sysutils/busybox/profile.d/path.conf
@@ -25,4 +25,9 @@
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+# hack: add addons to $PATH
+ for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
+ PATH="$PATH:$i"
+ done
+
export PATH
diff --git a/packages/sysutils/busybox/profile.d/runlevel.conf b/packages/sysutils/busybox/profile.d/runlevel.conf
index 16d841da2e..2a65c191a3 100644
--- a/packages/sysutils/busybox/profile.d/runlevel.conf
+++ b/packages/sysutils/busybox/profile.d/runlevel.conf
@@ -24,14 +24,14 @@
################################################################################
# getting runlevel
- MODE="openelec"
+ RUNLEVEL="openelec"
if test "$TEXTMODE" = yes; then
- MODE="textmode"
+ RUNLEVEL="textmode"
fi
if test "$INSTALLER" = yes; then
- MODE="installer"
+ RUNLEVEL="installer"
fi
-export MODE
+export RUNLEVEL
diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 25f8afa3b4..33136cdd7d 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -21,11 +21,20 @@
################################################################################
# mounting needed special filesystems
- mount -n -t proc none /proc
- mount -n -t sysfs none /sys
+# mount -n -t proc none /proc # mounted in initramfs
+# mount -n -t sysfs none /sys # mounted in initramfs
+# mount -n -t devtmpfs none /dev # mounted in initramfs
echo 0 > /sys/devices/virtual/graphics/fbcon/cursor_blink
+ mkdir -p /dev/pts
+ mount -n -t devpts -o gid=5,mode=620 none /dev/pts
+
+ mkdir -p /dev/shm
+ mount -n -t tmpfs none /dev/shm
+
+ mount -n -t tmpfs none /run
+
# showing version
lsb_release
@@ -36,10 +45,8 @@
progress "Starting Init Scripts"
RET=0
- RUNLEVEL="boot"
-
- for script in `ls -1 /etc/init.d/*`; do
- if grep -q -e "^# runlevels:.*$MODE" $script; then
+ for script in /etc/init.d/*; do
+ if grep -q -e "^# runlevels:.*$RUNLEVEL" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET
diff --git a/packages/sysutils/dbus/init.d/14_dbus b/packages/sysutils/dbus/init.d/14_dbus
index 431a595f72..6e84b9b8c7 100644
--- a/packages/sysutils/dbus/init.d/14_dbus
+++ b/packages/sysutils/dbus/init.d/14_dbus
@@ -23,19 +23,10 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- progress "Starting D-BUS"
+(
+ progress "Starting D-BUS"
- mkdir -p /var/lib/dbus /var/run/dbus
- dbus-uuidgen --ensure
- dbus-daemon --system
- )&
- ;;
-
- poweroff|reboot)
- progress "Stopping D-BUS"
- killall dbus-daemon
- ;;
-esac
+ mkdir -p /var/lib/dbus /var/run/dbus
+ dbus-uuidgen --ensure
+ dbus-daemon --system
+)&
\ No newline at end of file
diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta
index e4f5adb65b..6f6c013875 100644
--- a/packages/sysutils/dbus/meta
+++ b/packages/sysutils/dbus/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dbus"
-PKG_VERSION="1.4.14"
+PKG_VERSION="1.4.16"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/sysutils/fuse/build b/packages/sysutils/fuse/build
deleted file mode 100755
index ea60500499..0000000000
--- a/packages/sysutils/fuse/build
+++ /dev/null
@@ -1,46 +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
-
-# 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 \
- --enable-mtab \
- --disable-rpath \
- --with-gnu-ld \
-
-make
-$MAKEINSTALL
diff --git a/packages/sysutils/fuse/config/fuse.conf b/packages/sysutils/fuse/config/fuse.conf
deleted file mode 100644
index cd4c6bdaf3..0000000000
--- a/packages/sysutils/fuse/config/fuse.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# mount_max = 1000
-# user_allow_other
diff --git a/packages/sysutils/fuse/init.d/15_fuse b/packages/sysutils/fuse/init.d/15_fuse
deleted file mode 100644
index 62df42dc12..0000000000
--- a/packages/sysutils/fuse/init.d/15_fuse
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-# Copyright (C) 2009-2010 OpenELEC.tv
-# http://www.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
-################################################################################
-
-#
-# mounting fuse filesystem
-#
-# runlevels: openelec, textmode
-
-case $RUNLEVEL in
- boot)
- progress "Starting Fuse"
- mount -t fusectl fusectl /sys/fs/fuse/connections >/dev/null 2>&1
- ;;
-
- poweroff|reboot)
- progress "Stopping Fuse"
- umount /sys/fs/fuse/connections
- ;;
-esac
diff --git a/packages/sysutils/fuse/meta b/packages/sysutils/fuse/meta
deleted file mode 100644
index 6f3fde5842..0000000000
--- a/packages/sysutils/fuse/meta
+++ /dev/null
@@ -1,36 +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="fuse"
-PKG_VERSION="2.8.5"
-PKG_REV="1"
-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="libiconv"
-PKG_BUILD_DEPENDS="toolchain libiconv"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="fuse: A simple user-space filesystem interface for Linux"
-PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export a virtual filesystem to the Linux kernel. FUSE also aims to provide a secure method for non privileged users to create and mount their own filesystem implementations."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/sysutils/fuse/patches/fuse-2.8.5-001-Fix-udev-rules-Fedora-specific.patch b/packages/sysutils/fuse/patches/fuse-2.8.5-001-Fix-udev-rules-Fedora-specific.patch
deleted file mode 100644
index d4bb54481c..0000000000
--- a/packages/sysutils/fuse/patches/fuse-2.8.5-001-Fix-udev-rules-Fedora-specific.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From ba47031f3557b81e732d41593c95e7b984b54b78 Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov
-Date: Mon, 9 Aug 2010 12:09:00 +0400
-Subject: [PATCH 1/3] Fix udev rules (Fedora-specific)
-
-Signed-off-by: Peter Lemenkov
----
- util/udev.rules | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/util/udev.rules b/util/udev.rules
-index 9585111..bb8033f 100644
---- a/util/udev.rules
-+++ b/util/udev.rules
-@@ -1 +1 @@
--KERNEL=="fuse", MODE="0666"
-+KERNEL=="fuse", MODE="0666",OWNER="root",GROUP="root"
---
-1.7.3.1
-
diff --git a/packages/sysutils/fuse/patches/fuse-2.8.5-002-More-parentheses.patch b/packages/sysutils/fuse/patches/fuse-2.8.5-002-More-parentheses.patch
deleted file mode 100644
index bf0eef0a2f..0000000000
--- a/packages/sysutils/fuse/patches/fuse-2.8.5-002-More-parentheses.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 459c84a3e5fda1ef7f7060d44903b31215857e70 Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov
-Date: Mon, 9 Aug 2010 12:10:40 +0400
-Subject: [PATCH 2/3] More parentheses
-
-Signed-off-by: Peter Lemenkov
----
- lib/fuse.c | 8 +++-----
- lib/fuse_lowlevel.c | 2 +-
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/lib/fuse.c b/lib/fuse.c
-index 95cf50b..76c2681 100644
---- a/lib/fuse.c
-+++ b/lib/fuse.c
-@@ -961,17 +961,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path,
- {
- int err;
- if (!fs->compat || fs->compat >= 25)
-- err = fs->op.open(path, fi);
-+ err = (fs->op.open)(path, fi);
- else if (fs->compat == 22) {
- struct fuse_file_info_compat tmp;
- memcpy(&tmp, fi, sizeof(tmp));
-- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path,
-- &tmp);
-+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp);
- memcpy(fi, &tmp, sizeof(tmp));
- fi->fh = tmp.fh;
- } else
-- err = ((struct fuse_operations_compat2 *) &fs->op)
-- ->open(path, fi->flags);
-+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags);
- return err;
- }
-
-diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
-index c519bfb..d6275b5 100644
---- a/lib/fuse_lowlevel.c
-+++ b/lib/fuse_lowlevel.c
-@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
- fi.flags = arg->flags;
-
- if (req->f->op.open)
-- req->f->op.open(req, nodeid, &fi);
-+ (req->f->op.open)(req, nodeid, &fi);
- else
- fuse_reply_open(req, &fi);
- }
---
-1.7.3.1
-
diff --git a/packages/sysutils/fuse/patches/fuse-2.8.5-003-Fix-mounting-FUSE-fs-into-current-working-directory.patch b/packages/sysutils/fuse/patches/fuse-2.8.5-003-Fix-mounting-FUSE-fs-into-current-working-directory.patch
deleted file mode 100644
index bd69cd0785..0000000000
--- a/packages/sysutils/fuse/patches/fuse-2.8.5-003-Fix-mounting-FUSE-fs-into-current-working-directory.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From d8bdebc639a84fa280153a466d4bb420fc9572bc Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov
-Date: Wed, 27 Oct 2010 16:29:45 +0400
-Subject: [PATCH 3/3] Fix mounting FUSE fs into current working directory
-
-See rhbz #622255 for bug description:
-
-https://bugzilla.redhat.com/622255
-
-Signed-off-by: Peter Lemenkov
----
- lib/mount_util.c | 75 +++++++++++++-----------------------------------------
- 1 files changed, 18 insertions(+), 57 deletions(-)
-
-diff --git a/lib/mount_util.c b/lib/mount_util.c
-index 33e6697..b9a0895 100644
---- a/lib/mount_util.c
-+++ b/lib/mount_util.c
-@@ -54,8 +54,8 @@ static int mtab_needs_update(const char *mnt)
- return 1;
- }
-
--static int add_mount_legacy(const char *progname, const char *fsname,
-- const char *mnt, const char *type, const char *opts)
-+static int add_mount(const char *progname, const char *fsname,
-+ const char *mnt, const char *type, const char *opts, int is_legacy)
- {
- int res;
- int status;
-@@ -76,6 +76,14 @@ static int add_mount_legacy(const char *progname, const char *fsname,
- goto out_restore;
- }
- if (res == 0) {
-+ /*
-+ * Hide output, because old versions don't support
-+ * --no-canonicalize
-+ */
-+ int fd = open("/dev/null", O_RDONLY);
-+ dup2(fd, 1);
-+ dup2(fd, 2);
-+
- char templ[] = "/tmp/fusermountXXXXXX";
- char *tmp;
-
-@@ -99,59 +107,12 @@ static int add_mount_legacy(const char *progname, const char *fsname,
- exit(1);
- }
- rmdir(tmp);
-- execl("/bin/mount", "/bin/mount", "-i", "-f", "-t", type,
-- "-o", opts, fsname, mnt, NULL);
-- fprintf(stderr, "%s: failed to execute /bin/mount: %s\n",
-- progname, strerror(errno));
-- exit(1);
-- }
-- res = waitpid(res, &status, 0);
-- if (res == -1)
-- fprintf(stderr, "%s: waitpid: %s\n", progname, strerror(errno));
--
-- if (status != 0)
-- res = -1;
--
-- out_restore:
-- sigprocmask(SIG_SETMASK, &oldmask, NULL);
--
-- return res;
--}
--
--static int add_mount(const char *progname, const char *fsname,
-- const char *mnt, const char *type, const char *opts)
--{
-- int res;
-- int status;
-- sigset_t blockmask;
-- sigset_t oldmask;
--
-- sigemptyset(&blockmask);
-- sigaddset(&blockmask, SIGCHLD);
-- res = sigprocmask(SIG_BLOCK, &blockmask, &oldmask);
-- if (res == -1) {
-- fprintf(stderr, "%s: sigprocmask: %s\n", progname, strerror(errno));
-- return -1;
-- }
--
-- res = fork();
-- if (res == -1) {
-- fprintf(stderr, "%s: fork: %s\n", progname, strerror(errno));
-- goto out_restore;
-- }
-- if (res == 0) {
-- /*
-- * Hide output, because old versions don't support
-- * --no-canonicalize
-- */
-- int fd = open("/dev/null", O_RDONLY);
-- dup2(fd, 1);
-- dup2(fd, 2);
--
-- sigprocmask(SIG_SETMASK, &oldmask, NULL);
-- setuid(geteuid());
-- execl("/bin/mount", "/bin/mount", "--no-canonicalize", "-i",
-- "-f", "-t", type, "-o", opts, fsname, mnt, NULL);
-+ if(is_legacy)
-+ execl("/bin/mount", "/bin/mount", "-i",
-+ "-f", "-t", type, "-o", opts, fsname, mnt, NULL);
-+ else
-+ execl("/bin/mount", "/bin/mount", "--no-canonicalize", "-i",
-+ "-f", "-t", type, "-o", opts, fsname, mnt, NULL);
- fprintf(stderr, "%s: failed to execute /bin/mount: %s\n",
- progname, strerror(errno));
- exit(1);
-@@ -177,9 +138,9 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname,
- if (!mtab_needs_update(mnt))
- return 0;
-
-- res = add_mount(progname, fsname, mnt, type, opts);
-+ res = add_mount(progname, fsname, mnt, type, opts, 0);
- if (res == -1)
-- res = add_mount_legacy(progname, fsname, mnt, type, opts);
-+ res = add_mount(progname, fsname, mnt, type, opts, 1);
-
- return res;
- }
---
-1.7.3.1
-
diff --git a/packages/sysutils/ifuse/udev.d/91-iphone-automount.rules b/packages/sysutils/ifuse/udev.d/91-iphone-automount.rules
deleted file mode 100644
index 5362439727..0000000000
--- a/packages/sysutils/ifuse/udev.d/91-iphone-automount.rules
+++ /dev/null
@@ -1,43 +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
-################################################################################
-
-ACTION!="add|remove", GOTO="end"
-SUBSYSTEM!="usb", GOTO="end"
-
-# Detect type of iPhoneOS it is
- ENV{PRODUCT}=="5ac/129[1369e]/*", ENV{INTERFACE}=="255/*", ENV{dir_name}="iPod"
- ENV{PRODUCT}=="5ac/129[0247]/*", ENV{INTERFACE}=="255/*", ENV{dir_name}="iPhone"
- ENV{PRODUCT}=="5ac/129[a]/*", ENV{INTERFACE}=="255/*", ENV{dir_name}="iPad"
-
- ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[1369e]", ENV{dir_name}="iPod"
- ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0247]", ENV{dir_name}="iPhone"
- ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[a]", ENV{dir_name}="iPad"
-
-# mount the device on add
- ACTION=="add", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a-f]", \
- RUN+="/bin/mkdir -p '/media/%E{dir_name}'", \
- RUN+="/usr/bin/ifuse '/media/%E{dir_name}' -u '%s{serial}' -o sync,allow_other"
-
-# unmount the device on remove
- ACTION=="remove", ENV{PRODUCT}=="5ac/129[0-9a-f]/*", ENV{INTERFACE}=="255/*", \
- RUN+="/bin/umount -l '/media/%E{dir_name}'", \
- RUN+="/bin/rmdir '/media/%E{dir_name}'"
-
-LABEL="end"
diff --git a/packages/sysutils/kbd/build b/packages/sysutils/kbd/build
index 0a22b573e8..d3087e8bd9 100755
--- a/packages/sysutils/kbd/build
+++ b/packages/sysutils/kbd/build
@@ -29,5 +29,6 @@ cd $PKG_BUILD
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
+ --disable-nls \
make
diff --git a/packages/sysutils/kbd/meta b/packages/sysutils/kbd/meta
index b36b34da34..479be1711a 100644
--- a/packages/sysutils/kbd/meta
+++ b/packages/sysutils/kbd/meta
@@ -19,12 +19,14 @@
################################################################################
PKG_NAME="kbd"
-PKG_VERSION="1.15.2"
+PKG_VERSION="1.15.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="ftp://devel.altlinux.org/legion/kbd/"
-PKG_URL="http://www.kernel.org/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kbd/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
diff --git a/packages/sysutils/lcdproc/init.d/63_lcdproc b/packages/sysutils/lcdproc/init.d/63_lcdproc
index 68af96fb0d..f8bcf55c73 100644
--- a/packages/sysutils/lcdproc/init.d/63_lcdproc
+++ b/packages/sysutils/lcdproc/init.d/63_lcdproc
@@ -22,37 +22,28 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- if [ -f /var/config/settings.conf ]; then
- . /var/config/settings.conf
+(
+ if [ -f /var/config/settings.conf ]; then
+ . /var/config/settings.conf
- if [ ! "$LCD_DRIVER" = none ]; then
+ if [ ! "$LCD_DRIVER" = none ]; then
- progress "Starting LCD daemon with driver: $LCD_DRIVER"
+ progress "Starting LCD daemon with driver: $LCD_DRIVER"
- if [ -f /storage/.config/LCDd.conf ]; then
- LCD_CONFIG="/storage/.config/LCDd.conf"
- else
- LCD_CONFIG="/etc/LCDd.conf"
- fi
-
- # sleep 10sec. to for irserver loading
- if [ "$LCD_DRIVER" = "irtrans" ]; then
- usleep 7000000
- fi
-
- # sleep another 3sec. to for irserver loading
- usleep 3000000
- LCDd -c $LCD_CONFIG -d $LCD_DRIVER -s true > /dev/null 2>&1
- fi
+ if [ -f /storage/.config/LCDd.conf ]; then
+ LCD_CONFIG="/storage/.config/LCDd.conf"
+ else
+ LCD_CONFIG="/etc/LCDd.conf"
fi
- )&
- ;;
- poweroff|reboot)
- progress "Stopping LCD daemon"
- killall LCDd
- ;;
-esac
+ # sleep 10sec. to for irserver loading
+ if [ "$LCD_DRIVER" = "irtrans" ]; then
+ usleep 7000000
+ fi
+
+ # sleep another 3sec. to for irserver loading
+ usleep 3000000
+ LCDd -c $LCD_CONFIG -d $LCD_DRIVER -s true > /dev/null 2>&1
+ fi
+ fi
+)&
diff --git a/packages/sysutils/pciutils/build b/packages/sysutils/pciutils/build
index deb46ebd16..4420ffafc6 100755
--- a/packages/sysutils/pciutils/build
+++ b/packages/sysutils/pciutils/build
@@ -24,7 +24,7 @@
cd $PKG_BUILD
-make OPT="$TARGET_CFLAGS" \
+make OPT="$CFLAGS" \
CROSS_COMPILE=${TARGET_PREFIX} \
HOST=$TARGET_ARCH-linux \
IDSDIR="/usr/share" \
diff --git a/packages/sysutils/pciutils/meta b/packages/sysutils/pciutils/meta
index 174f1875cb..2d53e442a4 100644
--- a/packages/sysutils/pciutils/meta
+++ b/packages/sysutils/pciutils/meta
@@ -24,7 +24,8 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
-PKG_URL="http://ftp.de.kernel.org/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://ftp.de.kernel.org/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
diff --git a/packages/sysutils/pm-utils/config.d/module b/packages/sysutils/pm-utils/config.d/module
index 1974341822..cccef5656a 100644
--- a/packages/sysutils/pm-utils/config.d/module
+++ b/packages/sysutils/pm-utils/config.d/module
@@ -1 +1 @@
-SUSPEND_MODULES="jme anysee"
+SUSPEND_MODULES="xhci-hcd jme anysee"
diff --git a/packages/sysutils/remote/atvclient/init.d/63_atvclient b/packages/sysutils/remote/atvclient/init.d/63_atvclient
index a11518a7f9..ae9fec59dc 100644
--- a/packages/sysutils/remote/atvclient/init.d/63_atvclient
+++ b/packages/sysutils/remote/atvclient/init.d/63_atvclient
@@ -22,17 +22,8 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- progress "starting ATVclient"
- mkdir -p /storage/.cache
- atvclient -m > /dev/null 2>&1
- )&
- ;;
-
- poweroff|reboot)
- progress "stopping ATVclient"
- killall atvclient
- ;;
-esac
+(
+ progress "starting ATVclient"
+ mkdir -p /storage/.cache
+ atvclient -m > /dev/null 2>&1
+)&
\ No newline at end of file
diff --git a/packages/sysutils/remote/eventlircd/evmap/03_04b4_0101.evmap b/packages/sysutils/remote/eventlircd/evmap/03_04b4_0101.evmap
new file mode 100644
index 0000000000..494effdfc9
--- /dev/null
+++ b/packages/sysutils/remote/eventlircd/evmap/03_04b4_0101.evmap
@@ -0,0 +1,54 @@
+# Cypress Receiver support
+# Bus=0003 Vendor=04b4 Product=0101 Version=0100
+# N: Name="Cypress Cypress USB Keyboard / PS2 Mouse"
+
+ KEY_POWER = KEY_POWER # Power
+ alt+meta+KEY_ENTER = KEY_PROG1 # Start Key
+ ctrl+shift+KEY_P = KEY_PLAY # Play
+ ctrl+KEY_R = KEY_RECORD # Record
+ ctrl+KEY_P = KEY_PAUSE # Pause
+ ctrl+shift+KEY_S = KEY_STOP # Stop
+ KEY_VOLUMEUP = KEY_VOLUMEUP # Volume Up
+ KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Volume Down
+ KEY_MUTE = KEY_MUTE # Mute
+
+
+ ctrl+shift+KEY_F = KEY_FASTFORWARD # Forward
+ ctrl+shift+KEY_B = KEY_REWIND # Reverse
+ ctrl+KEY_F = KEY_NEXT # Next track
+ ctrl+KEY_B = KEY_PREVIOUS # Pre-track
+ KEY_PAGEDOWN = KEY_CHANNELDOWN # Channel Up
+ KEY_PAGEUP = KEY_CHANNELUP # Channel Down
+
+ KEY_0 = KEY_NUMERIC_0 # 0
+ KEY_1 = KEY_NUMERIC_1 # 1
+ KEY_2 = KEY_NUMERIC_2 # 2
+ KEY_3 = KEY_NUMERIC_3 # 3
+ KEY_4 = KEY_NUMERIC_4 # 4
+ KEY_5 = KEY_NUMERIC_5 # 5
+ KEY_6 = KEY_NUMERIC_6 # 6
+ KEY_7 = KEY_NUMERIC_7 # 7
+ KEY_8 = KEY_NUMERIC_8 # 8
+ KEY_9 = KEY_NUMERIC_9 # 9
+ KEY_KPASTERISK = KEY_NUMERIC_STAR # *
+ shift+KEY_3 = KEY_POUND # #
+
+ KEY_UP = KEY_UP # Direction Up
+ KEY_DOWN = KEY_DOWN # Direction Down
+ KEY_LEFT = KEY_LEFT # Direction Left
+ KEY_RIGHT = KEY_RIGHT # Direction Right
+ KEY_ENTER = KEY_OK # Direction OK (also used for Enter)
+ KEY_BACKSPACE = KEY_EXIT # Back
+ KEY_DELETE = KEY_DELETE # Clear
+
+ KEY_COMPOSE = KEY_INFO # Information (also used for Mouse Right) # maybe contextmenu (KEY_EPG)
+ alt+KEY_ENTER = KEY_ZOOM # Zoom
+
+ ctrl+KEY_E = KEY_VIDEO # My Videos
+ ctrl+KEY_M = KEY_AUDIO # My Music
+ ctrl+KEY_A = KEY_INFO # My Audio
+ ctrl+KEY_I = KEY_CAMERA # My Pictures
+ ctrl+shift+KEY_T = KEY_TV # My TV
+ ctrl+KEY_A = KEY_RADIO # Radio
+ ctrl+KEY_O = KEY_TUNER # Record TV
+ ctrl+shift+KEY_M = KEY_DVD # DVD Menu
diff --git a/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap b/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
index abad061a8e..609980333a 100644
--- a/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
@@ -49,7 +49,7 @@
KEY_HOME = KEY_PROG1 # Start Key
KEY_D = KEY_PROG1 # Start Key (World)
- KEY_MENU = KEY_EXIT # Back
+# KEY_MENU = KEY_EXIT # Back
KEY_BACK = KEY_EXIT # Back
KEY_FRONT = KEY_EXIT # Back
KEY_END = KEY_DELETE # Button "RC"
diff --git a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
index 2d4c7e7257..9983fc44c8 100644
--- a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
@@ -40,3 +40,6 @@ KEY_PLAYPAUSE = KEY_PLAY
KEY_TITLE = KEY_SUBTITLE
KEY_CONTEXT_MENU = KEY_EPG # used for context menu # todo
KEY_EJECTCLOSECD = KEY_EJECT
+KEY_EJECTCD = KEY_EJECT
+
+KEY_SLEEP = KEY_POWER
diff --git a/packages/sysutils/remote/eventlircd/init.d/62_eventlircd b/packages/sysutils/remote/eventlircd/init.d/62_eventlircd
index 7267c652b3..337ceaee87 100644
--- a/packages/sysutils/remote/eventlircd/init.d/62_eventlircd
+++ b/packages/sysutils/remote/eventlircd/init.d/62_eventlircd
@@ -22,17 +22,8 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- progress "starting eventlircd"
- mkdir -p /var/run/lirc
- eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
- )&
- ;;
-
- poweroff|reboot)
- progress "starting eventlircd"
- killall eventlircd
- ;;
-esac
+(
+ progress "starting eventlircd"
+ mkdir -p /var/run/lirc
+ eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
+)&
\ No newline at end of file
diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
index e248b688fc..259831e33e 100644
--- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
+++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
@@ -91,6 +91,10 @@ ENV{ID_VENDOR_ID}=="046e", ENV{ID_MODEL_ID}=="5578", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="topseed.evmap"
+ENV{ID_VENDOR_ID}=="04b4", ENV{ID_MODEL_ID}=="0101", \
+ ENV{eventlircd_enable}="true", \
+ ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
+
ENV{ID_VENDOR_ID}=="04f2", ENV{ID_MODEL_ID}=="0618", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="topseed.evmap"
diff --git a/packages/sysutils/remote/irserver/init.d/61_irserver b/packages/sysutils/remote/irserver/init.d/61_irserver
index 9e39b10c09..264b3557c8 100644
--- a/packages/sysutils/remote/irserver/init.d/61_irserver
+++ b/packages/sysutils/remote/irserver/init.d/61_irserver
@@ -25,25 +25,16 @@
[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
-case $RUNLEVEL in
- boot)
- if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
+if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
- progress "Starting IRtrans daemon"
+ progress "Starting IRtrans daemon"
- mkdir -p /var/run/lirc
+ mkdir -p /var/run/lirc
- [ "$DEBUG" = "yes" ] && \
- IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
+ [ "$DEBUG" = "yes" ] && \
+ IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
- irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \
- $IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1
+ irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \
+ $IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1
- fi
- ;;
-
- poweroff|reboot)
- progress "Stopping IRtrans daemon"
- killall irserver
- ;;
-esac
+fi
\ No newline at end of file
diff --git a/packages/sysutils/remote/xwiimote/install b/packages/sysutils/remote/xwiimote/install
index 369a0b7509..63fac13375 100755
--- a/packages/sysutils/remote/xwiimote/install
+++ b/packages/sysutils/remote/xwiimote/install
@@ -23,13 +23,11 @@
. config/options $1
mkdir -p $INSTALL/usr/bin
- cp $PKG_BUILD/tools/xwii $INSTALL/usr/bin
- cp $PKG_BUILD/tools/xwiiconn $INSTALL/usr/bin
cp $PKG_BUILD/tools/xwiidump $INSTALL/usr/bin
cp $PKG_BUILD/tools/xwiishow $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib
- cp $PKG_BUILD/libxwiimote.so* $INSTALL/usr/lib
+ cp $PKG_BUILD/lib/libxwiimote.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/share/X11/xorg.conf.d
cp $PKG_BUILD/res/50-xorg-disable-wiimote.conf $INSTALL/usr/share/X11/xorg.conf.d
diff --git a/packages/sysutils/remote/xwiimote/meta b/packages/sysutils/remote/xwiimote/meta
index 9f0f767a4d..e07c7fc0e8 100644
--- a/packages/sysutils/remote/xwiimote/meta
+++ b/packages/sysutils/remote/xwiimote/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xwiimote"
-PKG_VERSION="7341491"
+PKG_VERSION="0b79d97"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/sysutils/remote/xwiimote/patches/xwiimote-0b79d97-makefile.patch b/packages/sysutils/remote/xwiimote/patches/xwiimote-0b79d97-makefile.patch
new file mode 100644
index 0000000000..a0d51e1695
--- /dev/null
+++ b/packages/sysutils/remote/xwiimote/patches/xwiimote-0b79d97-makefile.patch
@@ -0,0 +1,45 @@
+diff -Naur xwiimote-0b79d97/lib/Makefile xwiimote-0b79d97.patch/lib/Makefile
+--- xwiimote-0b79d97/lib/Makefile 2011-10-07 01:24:24.000000000 +0200
++++ xwiimote-0b79d97.patch/lib/Makefile 2011-10-07 01:32:17.403217723 +0200
+@@ -4,13 +4,15 @@
+ # Dedicated to the Public Domain
+ #
+
++CC ?= gcc
++
+ SFSPATH=../../misc/libmisc/libsfs
+
+ all: libxwiimote.so
+
+ # build xwiimote library
+ libxwiimote.so: event.c udev.c sfs.c xwiimote.h libsfs.h
+- gcc -o $@ $^ -ludev -Wall -shared -fPIC
++ $(CC) -o $@ $^ -ludev -Wall -shared -fPIC
+
+ #
+ # The copy rule is only used by maintainers to copy the most recent version of
+diff -Naur xwiimote-0b79d97/tools/Makefile xwiimote-0b79d97.patch/tools/Makefile
+--- xwiimote-0b79d97/tools/Makefile 2011-10-07 01:24:24.000000000 +0200
++++ xwiimote-0b79d97.patch/tools/Makefile 2011-10-07 01:32:53.053681433 +0200
+@@ -4,6 +4,8 @@
+ # Dedicated to the Public Domain
+ #
+
++CC ?= gcc
++
+ .PHONY: all clean
+
+ all: xwiishow xwiidump
+@@ -12,10 +14,10 @@
+ @rm -fv xwiishow xwiidump
+
+ xwiishow: xwiishow.c ../lib/libxwiimote.so
+- gcc -o xwiishow xwiishow.c -Wall ../lib/libxwiimote.so -I../lib
++ $(CC) -o xwiishow xwiishow.c -Wall -L../lib/ -lxwiimote -I../lib
+
+ xwiidump: xwiidump.c
+- gcc -o xwiidump xwiidump.c -Wall
++ $(CC) -o xwiidump xwiidump.c -Wall
+
+ ../lib/libxwiimote.so:
+ @echo Making library
diff --git a/packages/sysutils/remote/xwiimote/patches/xwiimote-7341491-makefile.patch b/packages/sysutils/remote/xwiimote/patches/xwiimote-7341491-makefile.patch
deleted file mode 100644
index 485887a9f7..0000000000
--- a/packages/sysutils/remote/xwiimote/patches/xwiimote-7341491-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur xwiimote-7341491-old/makefile xwiimote-7341491-new/makefile
---- xwiimote-7341491-old/makefile 2011-08-02 10:16:15.000000000 -0700
-+++ xwiimote-7341491-new/makefile 2011-08-02 10:20:01.000000000 -0700
-@@ -4,12 +4,14 @@
- # Dedicated to the Public Domain
- #
-
-+CC ?= gcc
-+
- .PHONY: build clean
-
- build: libxwiimote.so
-
- libxwiimote.so: lib/*.c
-- gcc -shared -o libxwiimote.so lib/*.c -fPIC -Wall -O2 -ludev
-+ $(CC) -shared -o libxwiimote.so lib/*.c -fPIC -Wall -O2 -ludev $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-
- clean:
- @rm -fv libxwiimote.so
-diff -Naur xwiimote-7341491-old/tools/makefile xwiimote-7341491-new/tools/makefile
---- xwiimote-7341491-old/tools/makefile 2011-08-02 10:16:15.000000000 -0700
-+++ xwiimote-7341491-new/tools/makefile 2011-08-02 10:21:44.000000000 -0700
-@@ -4,6 +4,8 @@
- # Dedicated to the Public Domain
- #
-
-+CC ?= gcc
-+
- .PHONY: all clean
-
- all: xwiiconn xwii xwiishow xwiidump
-@@ -12,16 +14,16 @@
- @rm -fv xwiiconn xwii xwiishow xwiidump
-
- xwiiconn: xwiiconn.c
-- gcc -o xwiiconn xwiiconn.c -Wall -O0 -g -lbluetooth `pkg-config --libs --cflags dbus-glib-1 glib-2.0`
-+ $(CC) -o xwiiconn xwiiconn.c -Wall -O0 -g -lbluetooth `pkg-config --libs --cflags dbus-glib-1 glib-2.0` $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-
- xwii: xwii.c ../libxwiimote.so
-- gcc -o xwii xwii.c -Wall -O0 -g ../libxwiimote.so -I../lib
-+ $(CC) -o xwii xwii.c -Wall -O0 -g -L../ -lxwiimote -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-
- xwiishow: xwiishow.c ../libxwiimote.so
-- gcc -o xwiishow xwiishow.c -Wall -O0 -g ../libxwiimote.so -I../lib
-+ $(CC) -o xwiishow xwiishow.c -Wall -O0 -g -L../ -lxwiimote -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-
- xwiidump: xwiidump.c
-- gcc -o xwiidump xwiidump.c -Wall -O0 -g
-+ $(CC) -o xwiidump xwiidump.c -Wall -O0 -g $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-
- ../libxwiimote.so:
- @echo Making library
diff --git a/packages/sysutils/sshfs-fuse/install b/packages/sysutils/sshfs-fuse/install
deleted file mode 100755
index a590424e19..0000000000
--- a/packages/sysutils/sshfs-fuse/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/usr/bin
- cp $PKG_BUILD/sshfs $INSTALL/usr/bin
diff --git a/packages/sysutils/sshfs-fuse/meta b/packages/sysutils/sshfs-fuse/meta
deleted file mode 100644
index 2fa0e8058b..0000000000
--- a/packages/sysutils/sshfs-fuse/meta
+++ /dev/null
@@ -1,36 +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="sshfs-fuse"
-PKG_VERSION="2.2"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://fuse.sourceforge.net/sshfs.html"
-PKG_URL="$SOURCEFORGE_SRC/fuse/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="glib fuse"
-PKG_BUILD_DEPENDS="toolchain glib fuse"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="sshfs-fuse: A filesystem client based on the SSH File Transfer Protocol"
-PKG_LONGDESC="This is a filesystem client based on the SSH File Transfer Protocol. Since most SSH servers already support this protocol it is very easy to set up: i.e. on the server side there's nothing to do. On the client side mounting the filesystem is as easy as logging into the server with ssh."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/sysutils/sshfs-fuse/patches/sshfs-fuse-2.2_add_dropbear_compatibility-0.1.patch b/packages/sysutils/sshfs-fuse/patches/sshfs-fuse-2.2_add_dropbear_compatibility-0.1.patch
deleted file mode 100644
index 9df53d775a..0000000000
--- a/packages/sysutils/sshfs-fuse/patches/sshfs-fuse-2.2_add_dropbear_compatibility-0.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur sshfs-fuse-2.2/sshfs.c sshfs-fuse-2.2.patch/sshfs.c
---- sshfs-fuse-2.2/sshfs.c 2008-10-20 14:10:09.000000000 +0200
-+++ sshfs-fuse-2.2.patch/sshfs.c 2011-03-03 21:23:02.721900708 +0100
-@@ -2920,7 +2920,7 @@
- return 1;
-
- case KEY_PORT:
-- tmp = g_strdup_printf("-oPort=%s", arg + 2);
-+ tmp = g_strdup_printf("-p %s", arg + 2);
- ssh_add_arg(tmp);
- g_free(tmp);
- return 0;
-@@ -3183,9 +3183,9 @@
- sshfs.ptyfd = -1;
- sshfs.ptyslavefd = -1;
- ssh_add_arg("ssh");
-- ssh_add_arg("-x");
-- ssh_add_arg("-a");
-- ssh_add_arg("-oClearAllForwardings=yes");
-+// ssh_add_arg("-x");
-+// ssh_add_arg("-a");
-+// ssh_add_arg("-oClearAllForwardings=yes");
-
- if (fuse_opt_parse(&args, &sshfs, sshfs_opts, sshfs_opt_proc) == -1 ||
- parse_workarounds() == -1)
diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build
index f3b1da0e71..8acffaf7b1 100755
--- a/packages/sysutils/udev/build
+++ b/packages/sysutils/udev/build
@@ -43,7 +43,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
--disable-debug \
--disable-logging \
--disable-rule_generator \
- --disable-hwdb \
+ --enable-hwdb \
--disable-udev_acl \
--enable-gudev \
--disable-introspection \
diff --git a/packages/sysutils/udev/init.d/11_udevd b/packages/sysutils/udev/init.d/11_udevd
index 95f15c296b..7ec43042e6 100644
--- a/packages/sysutils/udev/init.d/11_udevd
+++ b/packages/sysutils/udev/init.d/11_udevd
@@ -23,16 +23,7 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- progress "starting udev daemon"
- echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
- mkdir -p /dev/rules.d
- udevd --daemon
- ;;
-
- poweroff|reboot)
- progress "stopping udev daemon"
- killall udevd
- ;;
-esac
+progress "starting udev daemon"
+ echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+ mkdir -p /dev/rules.d
+ udevd --daemon
diff --git a/packages/sysutils/udev/init.d/12_udev-monitor b/packages/sysutils/udev/init.d/12_udev-monitor
index 9b48ba912a..14f8204e21 100644
--- a/packages/sysutils/udev/init.d/12_udev-monitor
+++ b/packages/sysutils/udev/init.d/12_udev-monitor
@@ -23,14 +23,7 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- progress "monitoring udev events"
- udevadm monitor -e > /dev/udev.log &
- ;;
-
- poweroff|reboot)
- progress "Stopping udev monitor"
- killall udevadm
- ;;
-esac
+(
+ progress "monitoring udev events"
+ udevadm monitor -e > /dev/udev.log
+)&
diff --git a/packages/sysutils/udev/init.d/13_udev-trigger b/packages/sysutils/udev/init.d/13_udev-trigger
index ce3c6d1662..65f1cebc65 100644
--- a/packages/sysutils/udev/init.d/13_udev-trigger
+++ b/packages/sysutils/udev/init.d/13_udev-trigger
@@ -23,15 +23,11 @@
#
# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- (
- progress "request udev events from the kernel"
- udevadm trigger --action=add
- udevadm settle
- )&
- ;;
+ progress "request udev events from the kernel (type: subsystems)"
+ /sbin/udevadm trigger --type=subsystems --action=add
- poweroff|reboot)
- ;;
-esac
+ progress "request udev events from the kernel (type: devices)"
+ /sbin/udevadm trigger --type=devices --action=add
+
+ progress "watching udev event queue from the kernel"
+ /sbin/udevadm settle &
diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install
index 1140f2c62a..20f83e0763 100755
--- a/packages/sysutils/udev/install
+++ b/packages/sysutils/udev/install
@@ -42,11 +42,13 @@ mkdir -p $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libgudev*.*T
mkdir -p $INSTALL/lib/udev
- for i in ata_id cdrom_id collect firmware input_id mtd_probe path_id scsi_id usb_id v4l_id; do
+ for i in accelerometer ata_id cdrom_id collect firmware input_id mtd_probe path_id scsi_id usb-db usb_id v4l_id; do
cp $PKG_BUILD/extras/$i/$i $INSTALL/lib/udev
done
+ cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/rules.d
+ cp $PKG_BUILD/extras/accelerometer/61-accelerometer.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/firmware/50-firmware.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/50-udev-default.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/cdrom_id/60-cdrom_id.rules $INSTALL/lib/udev/rules.d
@@ -57,6 +59,7 @@ mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/60-persistent-storage.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/v4l_id/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/mtd_probe/75-probe_mtd.rules $INSTALL/lib/udev/rules.d
+ cp $PKG_BUILD/rules/rules.d/78-sound-card.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/80-drivers.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/95-udev-late.rules $INSTALL/lib/udev/rules.d
diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta
index 5f1bf71743..ae102e74f2 100644
--- a/packages/sysutils/udev/meta
+++ b/packages/sysutils/udev/meta
@@ -24,7 +24,9 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="glib pciutils usbutils libusb-compat"
PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat"
PKG_PRIORITY="optional"
diff --git a/packages/network/netmount/init.d/59_netmount b/packages/sysutils/udisks/init.d/15_automount
similarity index 80%
rename from packages/network/netmount/init.d/59_netmount
rename to packages/sysutils/udisks/init.d/15_automount
index b054d468d8..bdaec73e5e 100644
--- a/packages/network/netmount/init.d/59_netmount
+++ b/packages/sysutils/udisks/init.d/15_automount
@@ -18,20 +18,10 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-# Mounting Network shares
#
-# runlevels: openelec, textmode
+# request events from the kernel
+#
+# runlevels: openelec, installer, textmode
-case $RUNLEVEL in
- boot)
- (
- wait_for_network
-
- progress "mounting Network shares"
- netmount > /dev/null 2>&1
- )&
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ progress "request events from the kernel (subsystem: block)"
+ /sbin/udevadm trigger --subsystem-match=block --action=add &
diff --git a/packages/sysutils/upower/build b/packages/sysutils/upower/build
index 99c7db3d8e..7d3507c2fe 100755
--- a/packages/sysutils/upower/build
+++ b/packages/sysutils/upower/build
@@ -23,6 +23,7 @@
. config/options $1
cd $PKG_BUILD
+intltoolize --force
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta
index 76f55343a7..0ee19e7b86 100644
--- a/packages/sysutils/upower/meta
+++ b/packages/sysutils/upower/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="upower"
-PKG_VERSION="0.9.12"
+PKG_VERSION="0.9.14"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/sysutils/usbutils/meta b/packages/sysutils/usbutils/meta
index de3bdbc12d..1ae5e0e889 100644
--- a/packages/sysutils/usbutils/meta
+++ b/packages/sysutils/usbutils/meta
@@ -19,12 +19,14 @@
################################################################################
PKG_NAME="usbutils"
-PKG_VERSION="003"
+PKG_VERSION="004"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.linux-usb.org/"
-PKG_URL="http://www.kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.gz"
+#PKG_URL="http://www.kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib libusb-compat"
PKG_BUILD_DEPENDS="toolchain zlib libusb-compat"
PKG_PRIORITY="optional"
diff --git a/packages/sysutils/util-linux/init.d/32_swapfile b/packages/sysutils/util-linux/init.d/32_swapfile
index 4f30fb20b4..80cb8be661 100644
--- a/packages/sysutils/util-linux/init.d/32_swapfile
+++ b/packages/sysutils/util-linux/init.d/32_swapfile
@@ -23,36 +23,29 @@
#
# runlevels: openelec, textmode
-case $RUNLEVEL in
- boot)
- (
- INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
- SWAP=`blkid -t TYPE="swap" -o device`
- SWAPFILE="$HOME/.cache/swapfile"
+(
+ INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
+ SWAP=`blkid -t TYPE="swap" -o device`
+ SWAPFILE="$HOME/.cache/swapfile"
- if [ "$INSTALLED_MEMORY" -le "500000" ]; then
- if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then
- progress "creating swapfile"
- mkdir -p $HOME/.cache
- dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null
- mkswap $SWAPFILE 2>&1 > /dev/null
- fi
+ if [ "$INSTALLED_MEMORY" -le "500000" ]; then
+ if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then
+ progress "creating swapfile"
+ mkdir -p $HOME/.cache
+ dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null
+ mkswap $SWAPFILE 2>&1 > /dev/null
+ fi
- progress "enable swap"
- [ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE
- for i in $SWAP; do
- swapon -p 10000 $SWAP 2>&1 > /dev/null
- done
+ progress "enable swap"
+ [ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE
+ for i in $SWAP; do
+ swapon -p 10000 $SWAP 2>&1 > /dev/null
+ done
- if [ "$INSTALLED_MEMORY" -le "260000" ]; then
- sysctl -w vm.swappiness=100 2>&1 > /dev/null
- else
- sysctl -w vm.swappiness=60 2>&1 > /dev/null
- fi
- fi
- )&
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ if [ "$INSTALLED_MEMORY" -le "260000" ]; then
+ sysctl -w vm.swappiness=100 2>&1 > /dev/null
+ else
+ sysctl -w vm.swappiness=60 2>&1 > /dev/null
+ fi
+ fi
+)&
\ No newline at end of file
diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta
index 07b16d33f8..545039e829 100644
--- a/packages/sysutils/util-linux/meta
+++ b/packages/sysutils/util-linux/meta
@@ -24,7 +24,9 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://userweb.kernel.org/~kzak/util-linux-ng/"
-PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-11-fix_keytables_xbox360-0.1.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-11-fix_keytables_xbox360-0.1.patch
new file mode 100644
index 0000000000..8445731065
--- /dev/null
+++ b/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-11-fix_keytables_xbox360-0.1.patch
@@ -0,0 +1,71 @@
+diff -rupN v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce
+--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce 2011-08-19 19:08:11.000000000 +0200
++++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce 2011-09-22 21:50:44.000000000 +0200
+@@ -60,3 +60,67 @@
+ 0x800f046f KEY_MEDIA
+ 0x800f0480 KEY_BRIGHTNESSDOWN
+ 0x800f0481 KEY_PLAYPAUSE
++#xbox360 remote
++0x800f7400 KEY_NUMERIC_0
++0x800f7401 KEY_NUMERIC_1
++0x800f7402 KEY_NUMERIC_2
++0x800f7403 KEY_NUMERIC_3
++0x800f7404 KEY_NUMERIC_4
++0x800f7405 KEY_NUMERIC_5
++0x800f7406 KEY_NUMERIC_6
++0x800f7407 KEY_NUMERIC_7
++0x800f7408 KEY_NUMERIC_8
++0x800f7409 KEY_NUMERIC_9
++0x800f740a KEY_DELETE
++0x800f740b KEY_ENTER
++0x800f740c KEY_SLEEP
++0x800f740d KEY_MEDIA
++0x800f740e KEY_MUTE
++0x800f740f KEY_INFO
++0x800f7410 KEY_VOLUMEUP
++0x800f7411 KEY_VOLUMEDOWN
++0x800f7412 KEY_CHANNELUP
++0x800f7413 KEY_CHANNELDOWN
++0x800f7414 KEY_FASTFORWARD
++0x800f7415 KEY_REWIND
++0x800f7416 KEY_PLAY
++0x800f7417 KEY_RECORD
++0x800f7418 KEY_PAUSE
++0x800f7419 KEY_STOP
++0x800f741a KEY_NEXT
++0x800f741b KEY_PREVIOUS
++0x800f741c KEY_NUMERIC_POUND
++0x800f741d KEY_NUMERIC_STAR
++0x800f741e KEY_UP
++0x800f741f KEY_DOWN
++0x800f7420 KEY_LEFT
++0x800f7421 KEY_RIGHT
++0x800f7422 KEY_OK
++0x800f7423 KEY_EXIT
++0x800f7424 KEY_DVD
++0x800f744f KEY_EPG
++0x800f7427 KEY_ZOOM
++0x800f7432 KEY_MODE
++0x800f7433 KEY_PRESENTATION
++0x800f7428 KEY_EJECTCD
++0x800f743a KEY_BRIGHTNESSUP
++0x800f7446 KEY_TV
++0x800f7447 KEY_AUDIO
++0x800f7448 KEY_PVR
++0x800f7449 KEY_CAMERA
++0x800f744a KEY_VIDEO
++0x800f744c KEY_LANGUAGE
++0x800f7451 KEY_TITLE
++0x800f744e KEY_PRINT
++0x800f7450 KEY_RADIO
++0x800f745a KEY_SUBTITLE
++0x800f7425 KEY_RED
++0x800f7466 KEY_GREEN
++0x800f7426 KEY_YELLOW
++0x800f7468 KEY_BLUE
++0x800f7465 KEY_POWER2
++0x800f746e KEY_PLAYPAUSE
++0x800f746f KEY_PLAYER
++0x800f7480 KEY_BRIGHTNESSDOWN
++0x800f7481 KEY_PLAYPAUSE
++
diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch
new file mode 100644
index 0000000000..0a0f83c9e4
--- /dev/null
+++ b/packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch
@@ -0,0 +1,59 @@
+diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce
+--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce 2011-09-29 16:58:43.791771663 +0200
++++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce 2011-09-29 16:59:59.449760665 +0200
+@@ -60,6 +60,7 @@
+ 0x800f046f KEY_MEDIA
+ 0x800f0480 KEY_BRIGHTNESSDOWN
+ 0x800f0481 KEY_PLAYPAUSE
++
+ #xbox360 remote
+ 0x800f7400 KEY_NUMERIC_0
+ 0x800f7401 KEY_NUMERIC_1
+@@ -124,3 +125,47 @@
+ 0x800f7480 KEY_BRIGHTNESSDOWN
+ 0x800f7481 KEY_PLAYPAUSE
+
++Zotac AD10 Remote
++0x8034048e KEY_POWER
++0x8034043d KEY_POWER
++0x80340400 KEY_NUMERIC_0
++0x80340401 KEY_NUMERIC_1
++0x80340402 KEY_NUMERIC_2
++0x80340403 KEY_NUMERIC_3
++0x80340404 KEY_NUMERIC_4
++0x80340405 KEY_NUMERIC_5
++0x80340406 KEY_NUMERIC_6
++0x80340407 KEY_NUMERIC_7
++0x80340408 KEY_NUMERIC_8
++0x80340409 KEY_NUMERIC_9
++0x80340432 KEY_NUMERIC_POUND
++0x80340433 KEY_NUMERIC_STAR
++0x8034043a KEY_DELETE
++0x80340434 KEY_ENTER
++0x8034045d KEY_PROG1
++0x8034040d KEY_MUTE
++0x803404cb KEY_INFO
++0x80340410 KEY_VOLUMEUP
++0x80340411 KEY_VOLUMEDOWN
++0x8034041e KEY_CHANNELUP
++0x8034041f KEY_CHANNELDOWN
++0x80340428 KEY_FASTFORWARD
++0x80340429 KEY_REWIND
++0x8034042c KEY_PLAY
++0x80340437 KEY_RECORD
++0x80340430 KEY_PAUSE
++0x80340431 KEY_STOP
++0x80340420 KEY_NEXT
++0x80340421 KEY_PREVIOUS
++0x80340458 KEY_UP
++0x80340459 KEY_DOWN
++0x8034045a KEY_LEFT
++0x8034045b KEY_RIGHT
++0x8034045c KEY_OK
++0x80340483 KEY_EXIT
++0x8034043e KEY_EPG
++0x8034042f KEY_TITLE
++0x8034046d KEY_RED
++0x8034046e KEY_GREEN
++0x8034046f KEY_YELLOW
++0x80340470 KEY_BLUE
diff --git a/packages/sysutils/sshfs-fuse/build b/packages/toolchain/devel/autotools/autoconf-archive/build
similarity index 85%
rename from packages/sysutils/sshfs-fuse/build
rename to packages/toolchain/devel/autotools/autoconf-archive/build
index f480a4a51b..0546c63078 100755
--- a/packages/sysutils/sshfs-fuse/build
+++ b/packages/toolchain/devel/autotools/autoconf-archive/build
@@ -22,10 +22,15 @@
. config/options $1
+setup_toolchain host
+
cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
+
+./configure --host=$HOST_NAME \
--build=$HOST_NAME \
- --prefix=/usr \
- --enable-shared \
+ --target=$TARGET_NAME \
+ --prefix=$ROOT/$TOOLCHAIN \
make
+# make install
+make prefix=$SYSROOT_PREFIX/usr install
diff --git a/packages/network/netmount/meta b/packages/toolchain/devel/autotools/autoconf-archive/meta
similarity index 75%
rename from packages/network/netmount/meta
rename to packages/toolchain/devel/autotools/autoconf-archive/meta
index 339fa62b77..ac656dd7ee 100644
--- a/packages/network/netmount/meta
+++ b/packages/toolchain/devel/autotools/autoconf-archive/meta
@@ -18,19 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="netmount"
-PKG_VERSION="0.1"
+PKG_NAME="autoconf-archive"
+PKG_VERSION="2011.09.17"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv"
-PKG_URL=""
-PKG_DEPENDS="afpfs-ng cifs-utils sshfs-fuse connman"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_SITE="http://ftp.gnu.org/gnu/autoconf-archive"
+PKG_URL="http://ftp.gnu.org/gnu/autoconf-archive/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="ccache"
PKG_PRIORITY="optional"
-PKG_SECTION="tools"
-PKG_SHORTDESC="netmount: scripts for mounting network shares on boottime"
-PKG_LONGDESC="netmount: scripts for mounting network shares on boottime"
+PKG_SECTION="toolchain/devel"
+PKG_SHORTDESC="autoconf-archive: macros for autoconf"
+PKG_LONGDESC="autoconf-archive is an package of m4 macros"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
diff --git a/packages/toolchain/devel/autotools/autoconf/meta b/packages/toolchain/devel/autotools/autoconf/meta
index 7ac89b1cdf..4e42810efa 100644
--- a/packages/toolchain/devel/autotools/autoconf/meta
+++ b/packages/toolchain/devel/autotools/autoconf/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://sources.redhat.com/autoconf/"
PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache m4 libtool-host"
+PKG_BUILD_DEPENDS="ccache m4 gettext libtool-host"
PKG_PRIORITY="optional"
PKG_SECTION="toolchain/devel"
PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
diff --git a/packages/toolchain/devel/autotools/gettext/build b/packages/toolchain/devel/autotools/gettext/build
new file mode 100755
index 0000000000..365d30daed
--- /dev/null
+++ b/packages/toolchain/devel/autotools/gettext/build
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenELEC.tv; see the file COPYING. If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+setup_toolchain host
+
+cd $PKG_BUILD
+./configure --host=$HOST_NAME \
+ --build=$HOST_NAME \
+ --target=$TARGET_NAME \
+ --prefix=$ROOT/$TOOLCHAIN \
+ --enable-shared \
+ --disable-static \
+ --disable-rpath \
+ --with-gnu-ld
+
+make
+make install
diff --git a/packages/3rdparty/multimedia/simplejson-ap/meta b/packages/toolchain/devel/autotools/gettext/meta
old mode 100755
new mode 100644
similarity index 65%
rename from packages/3rdparty/multimedia/simplejson-ap/meta
rename to packages/toolchain/devel/autotools/gettext/meta
index 40091c5a84..ea26fd830c
--- a/packages/3rdparty/multimedia/simplejson-ap/meta
+++ b/packages/toolchain/devel/autotools/gettext/meta
@@ -18,18 +18,19 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-PKG_NAME="simplejson-ap"
-PKG_VERSION="2.1.3"
+PKG_NAME="gettext"
+PKG_VERSION="0.18.1.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
-PKG_SITE="http://pypi.python.org/"
-PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="http://www.gnu.org/s/gettext/"
+PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="Python"
+PKG_BUILD_DEPENDS="ccache"
PKG_PRIORITY="optional"
-PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="simplejson: JSON encoder and decoder for Python"
-PKG_LONGDESC="simplejson is a simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+. It is pure Python code with no dependencies, but includes an optional C extension for a serious speed boost."
+PKG_SECTION="toolchain/devel"
+PKG_SHORTDESC="gettext: A program internationalization library and tools"
+PKG_LONGDESC="This is the GNU gettext package. It is interesting for authors or maintainers of other packages or programs which they want to see internationalized. As one step the handling of messages in different languages should be implemented. For this task GNU gettext provides the needed tools and library functions."
PKG_IS_ADDON="no"
+
PKG_AUTORECONF="no"
diff --git a/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch b/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch
new file mode 100644
index 0000000000..86ca2db57f
--- /dev/null
+++ b/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch
@@ -0,0 +1,18 @@
+diff -Naur gettext-0.18.1.1-old/gettext-tools/misc/gettextize.in gettext-0.18.1.1-new/gettext-tools/misc/gettextize.in
+--- gettext-0.18.1.1-old/gettext-tools/misc/gettextize.in 2010-06-06 05:49:57.000000000 -0700
++++ gettext-0.18.1.1-new/gettext-tools/misc/gettextize.in 2010-08-18 06:52:51.000000000 -0700
+@@ -1272,10 +1272,10 @@
+ 5) count="five paragraphs";;
+ *) count="$count paragraphs";;
+ esac
+- echo "Press Return to acknowledge the previous $count."
+- # Read from /dev/tty, not stdin, so that gettextize cannot be abused by
+- # non-interactive tools.
+- read dummy < /dev/tty
++# echo "Press Return to acknowledge the previous $count."
++# # Read from /dev/tty, not stdin, so that gettextize cannot be abused by
++# # non-interactive tools.
++# read dummy < /dev/tty
+ fi
+
+ exit 0
diff --git a/packages/toolchain/devel/binutils/meta b/packages/toolchain/devel/binutils/meta
index 100059d37f..32c7de3622 100644
--- a/packages/toolchain/devel/binutils/meta
+++ b/packages/toolchain/devel/binutils/meta
@@ -24,8 +24,10 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="ccache bison flex linux-headers gmp mpfr ppl cloog-ppl libelf"
PKG_PRIORITY="optional"
diff --git a/packages/toolchain/devel/eglibc/meta b/packages/toolchain/devel/eglibc/meta
index d853fe93f7..68bfdde822 100644
--- a/packages/toolchain/devel/eglibc/meta
+++ b/packages/toolchain/devel/eglibc/meta
@@ -19,12 +19,12 @@
################################################################################
PKG_NAME="eglibc"
-PKG_VERSION="2.13-14178"
+PKG_VERSION="2.14-15360"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.eglibc.org/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="timezone-data"
PKG_BUILD_DEPENDS="ccache autotools linux-headers gcc-core"
PKG_PRIORITY="optional"
diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-Handle_DSOs_without_any_dependency_in_ld.so.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-Handle_DSOs_without_any_dependency_in_ld.so.patch
deleted file mode 100644
index 7d88fc3b77..0000000000
--- a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-Handle_DSOs_without_any_dependency_in_ld.so.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From glibc-cvs-return-51051-listarch-glibc-cvs=sources dot redhat dot com at sourceware dot org Mon May 30 16:32:22 2011
-Return-Path:
-Delivered-To: listarch-glibc-cvs at sources dot redhat dot com
-Received: (qmail 24844 invoked by alias); 30 May 2011 16:32:18 -0000
-Received: (qmail 24805 invoked by uid 321); 30 May 2011 16:32:17 -0000
-Date: 30 May 2011 16:32:15 -0000
-Message-ID: <20110530163215.24780.qmail@sourceware.org>
-From: drepper at sourceware dot org
-To: glibc-cvs at sourceware dot org
-Subject: GNU C Library master sources branch, master, updated. glibc-2.13-254-g6b1e7d1
-X-Git-Refname: refs/heads/master
-X-Git-Reftype: branch
-X-Git-Oldrev: 4997db742946d08be4378cf91221f558f928bc73
-X-Git-Newrev: 6b1e7d1992cd89032df431c0e0d1418b97e57cd8
-Mailing-List: contact glibc-cvs-help at sourceware dot org; run by ezmlm
-Precedence: bulk
-List-Id:
-List-Archive:
-List-Post:
-List-Help: ,
-Sender: glibc-cvs-owner at sourceware dot org
-List-Subscribe:
-Delivered-To: mailing list glibc-cvs at sourceware dot org
-
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "GNU C Library master sources".
-
-The branch, master has been updated
- via 6b1e7d1992cd89032df431c0e0d1418b97e57cd8 (commit)
- from 4997db742946d08be4378cf91221f558f928bc73 (commit)
-
-Those revisions listed above that are new to this repository have
-not appeared on any other notification email; so we list those
-revisions in full, below.
-
-- Log -----------------------------------------------------------------
-http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6b1e7d1992cd89032df431c0e0d1418b97e57cd8
-
-commit 6b1e7d1992cd89032df431c0e0d1418b97e57cd8
-Author: Ulrich Drepper
-Date: Mon May 30 12:31:25 2011 -0400
-
- Handle DSOs without any dependency in ld.so
-
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index d3c27f1..0b03b90 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -617,61 +617,64 @@ Filters not supported with LD_TRACE_PRELINKING"));
- map->l_searchlist.r_list[i]->l_reserved = 0;
- }
-
-- /* Now determine the order in which the initialization has to happen. */
-+ /* Sort the initializer list to take dependencies into account. The binary
-+ itself will always be initialize last. */
- memcpy (l_initfini, map->l_searchlist.r_list,
- nlist * sizeof (struct link_map *));
--
-- /* We can skip looking for the binary itself which is at the front
-- of the search list. */
-- assert (nlist > 1);
-- i = 1;
-- bool seen[nlist];
-- memset (seen, false, nlist * sizeof (seen[0]));
-- while (1)
-+ if (__builtin_expect (nlist > 1, 1))
- {
-- /* Keep track of which object we looked at this round. */
-- seen[i] = true;
-- struct link_map *thisp = l_initfini[i];
--
-- /* Find the last object in the list for which the current one is
-- a dependency and move the current object behind the object
-- with the dependency. */
-- unsigned int k = nlist - 1;
-- while (k > i)
-+ /* We can skip looking for the binary itself which is at the front
-+ of the search list. */
-+ i = 1;
-+ bool seen[nlist];
-+ memset (seen, false, nlist * sizeof (seen[0]));
-+ while (1)
- {
-- struct link_map **runp = l_initfini[k]->l_initfini;
-- if (runp != NULL)
-- /* Look through the dependencies of the object. */
-- while (*runp != NULL)
-- if (__builtin_expect (*runp++ == thisp, 0))
-- {
-- /* Move the current object to the back past the last
-- object with it as the dependency. */
-- memmove (&l_initfini[i], &l_initfini[i + 1],
-- (k - i) * sizeof (l_initfini[0]));
-- l_initfini[k] = thisp;
--
-- if (seen[i + 1])
-+ /* Keep track of which object we looked at this round. */
-+ seen[i] = true;
-+ struct link_map *thisp = l_initfini[i];
-+
-+ /* Find the last object in the list for which the current one is
-+ a dependency and move the current object behind the object
-+ with the dependency. */
-+ unsigned int k = nlist - 1;
-+ while (k > i)
-+ {
-+ struct link_map **runp = l_initfini[k]->l_initfini;
-+ if (runp != NULL)
-+ /* Look through the dependencies of the object. */
-+ while (*runp != NULL)
-+ if (__builtin_expect (*runp++ == thisp, 0))
- {
-- ++i;
-- goto next_clear;
-+ /* Move the current object to the back past the last
-+ object with it as the dependency. */
-+ memmove (&l_initfini[i], &l_initfini[i + 1],
-+ (k - i) * sizeof (l_initfini[0]));
-+ l_initfini[k] = thisp;
-+
-+ if (seen[i + 1])
-+ {
-+ ++i;
-+ goto next_clear;
-+ }
-+
-+ memmove (&seen[i], &seen[i + 1],
-+ (k - i) * sizeof (seen[0]));
-+ seen[k] = true;
-+
-+ goto next;
- }
-
-- memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0]));
-- seen[k] = true;
-+ --k;
-+ }
-
-- goto next;
-- }
-+ if (++i == nlist)
-+ break;
-+ next_clear:
-+ memset (&seen[i], false, (nlist - i) * sizeof (seen[0]));
-
-- --k;
-+ next:;
- }
--
-- if (++i == nlist)
-- break;
-- next_clear:
-- memset (&seen[i], false, (nlist - i) * sizeof (seen[0]));
--
-- next:;
- }
-
- /* Terminate the list of dependencies. */
-diff --git a/elf/dl-fini.c b/elf/dl-fini.c
-index ba6c62a..269bcec 100644
---- a/elf/dl-fini.c
-+++ b/elf/dl-fini.c
-@@ -33,9 +33,12 @@ internal_function
- _dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps,
- char *used, Lmid_t ns)
- {
-+ /* A list of one element need not be sorted. */
-+ if (nmaps == 1)
-+ return;
-+
- /* We can skip looking for the binary itself which is at the front
- of the search list for the main namespace. */
-- assert (nmaps > 1);
- unsigned int i = ns == LM_ID_BASE;
- bool seen[nmaps];
- memset (seen, false, nmaps * sizeof (seen[0]));
-@@ -195,9 +198,8 @@ _dl_fini (void)
- assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1);
- nmaps = i;
-
-- if (nmaps > 1)
-- /* Now we have to do the sorting. */
-- _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);
-+ /* Now we have to do the sorting. */
-+ _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);
-
- /* We do not rely on the linked list of loaded object anymore from
- this point on. We have our own list here (maps). The various
-
------------------------------------------------------------------------
-
-Summary of changes:
- ChangeLog | 6 ++++
- NEWS | 4 +-
- elf/dl-deps.c | 93 +++++++++++++++++++++++++++++---------------------------
- elf/dl-fini.c | 10 ++++--
- elf/rtld.c | 1 -
- 5 files changed, 62 insertions(+), 52 deletions(-)
-
-
-hooks/post-receive
---
-GNU C Library master sources
-
diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-bad-fix.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-bad-fix.patch
new file mode 100644
index 0000000000..1f67b780eb
--- /dev/null
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-bad-fix.patch
@@ -0,0 +1,137 @@
+From 675155e9084e060fd0e1e637b843f14e82898aa5 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab
+Date: Wed, 22 Sep 2010 12:06:30 +0200
+Subject: [PATCH] Fix memory leak on init/fini dependency list
+
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+ if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+ || dl_close_state != not_pending)
+ {
+- if (map->l_direct_opencount == 0)
+- {
+- if (map->l_type == lt_loaded)
+- dl_close_state = rerun;
+- else if (map->l_type == lt_library)
+- {
+- struct link_map **oldp = map->l_initfini;
+- map->l_initfini = map->l_orig_initfini;
+- _dl_scope_free (oldp);
+- }
+- }
++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
++ dl_close_state = rerun;
+
+ /* There are still references to this object. Do nothing more. */
+ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ nneeded * sizeof needed[0]);
+ atomic_write_barrier ();
+ l->l_initfini = l_initfini;
++ l->l_free_initfini = 1;
+ }
+
+ /* If we have no auxiliary objects just go on to the next map. */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ l_initfini[nlist] = NULL;
+ atomic_write_barrier ();
+ map->l_initfini = l_initfini;
++ map->l_free_initfini = 1;
+ if (l_reldeps != NULL)
+ {
+ atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ _dl_scope_free (old_l_reldeps);
+ }
+ if (old_l_initfini != NULL)
+- map->l_orig_initfini = old_l_initfini;
++ _dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
++++ b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+
+ for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+ {
+- /* Remove all additional names added to the objects. */
+ for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+ {
+ struct libname_list *lnp = l->l_libname->next;
+
+ l->l_libname->next = NULL;
+
++ /* Remove all additional names added to the objects. */
+ while (lnp != NULL)
+ {
+ struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ if (! old->dont_free)
+ free (old);
+ }
++
++ /* Free the initfini dependency list. */
++ if (l->l_free_initfini)
++ free (l->l_initfini);
+ }
+
+ if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ lnp->dont_free = 1;
+ lnp = lnp->next;
+ }
++ l->l_free_initfini = 0;
+
+ if (l != &GL(dl_rtld_map))
+ _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
++++ b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+ loaded ELF shared objects.
+- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -192,6 +192,9 @@ struct link_map
+ during LD_TRACE_PRELINKING=1
+ contains any DT_SYMBOLIC
+ libraries. */
++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++ freed, ie. not allocated with
++ the dummy malloc in ld.so. */
+
+ /* Collected information about own RPATH directories. */
+ struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+
+ /* List of object in order of the init and fini calls. */
+ struct link_map **l_initfini;
+- /* The init and fini list generated at startup, saved when the
+- object is also loaded dynamically. */
+- struct link_map **l_orig_initfini;
+
+ /* List of the dependencies introduced through symbol binding. */
+ struct link_map_reldeps
diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-libgcc_eh-1.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-libgcc_eh-1.patch
similarity index 100%
rename from packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-libgcc_eh-1.patch
rename to packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-libgcc_eh-1.patch
diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-restore-rpc+nis.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-restore-rpc+nis.patch
new file mode 100644
index 0000000000..4d56a40358
--- /dev/null
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-restore-rpc+nis.patch
@@ -0,0 +1,59 @@
+diff -Naur eglibc-2.14-15360/include/libc-symbols.h eglibc-2.14-15360.patch/include/libc-symbols.h
+--- eglibc-2.14-15360/include/libc-symbols.h 2011-09-17 16:13:20.000000000 +0200
++++ eglibc-2.14-15360.patch/include/libc-symbols.h 2011-09-18 19:00:16.559302295 +0200
+@@ -656,7 +656,7 @@
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
++# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+diff -Naur eglibc-2.14-15360/nis/Makefile eglibc-2.14-15360.patch/nis/Makefile
+--- eglibc-2.14-15360/nis/Makefile 2011-09-17 16:13:06.000000000 +0200
++++ eglibc-2.14-15360.patch/nis/Makefile 2011-09-18 19:00:16.526301845 +0200
+@@ -25,9 +25,9 @@
+
+ aux := nis_hash
+
++headers := $(wildcard rpcsvc/*.[hx])
+ distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
+- nisplus-parser.h nis_xdr.h nss \
+- $(wildcard rpcsvc/*.[hx])
++ nisplus-parser.h nis_xdr.h nss
+
+ # These are the databases available for the nis (and perhaps later nisplus)
+ # service. This must be a superset of the services in nss.
+@@ -78,6 +78,8 @@
+
+ include ../Rules
+
++CFLAGS-nis_findserv.c += -fno-strict-aliasing
++CFLAGS-ypclnt.c += -fno-strict-aliasing
+
+ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
+ $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
+diff -Naur eglibc-2.14-15360/sunrpc/Makefile eglibc-2.14-15360.patch/sunrpc/Makefile
+--- eglibc-2.14-15360/sunrpc/Makefile 2011-09-17 16:13:12.000000000 +0200
++++ eglibc-2.14-15360.patch/sunrpc/Makefile 2011-09-18 19:01:31.772325016 +0200
+@@ -55,7 +55,7 @@
+ des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
+ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
+ generated-dirs := rpcsvc
+@@ -165,6 +165,10 @@
+
+ CPPFLAGS += -D_RPC_THREAD_SAFE_
+
++CFLAGS-clnt_tcp.c += -fno-strict-aliasing
++CFLAGS-clnt_udp.c += -fno-strict-aliasing
++CFLAGS-clnt_unix.c += -fno-strict-aliasing
++
+ $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
+ $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
+ $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-select_fd_type.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-select_fd_type.patch
similarity index 100%
rename from packages/toolchain/devel/eglibc/patches/eglibc-2.13-14178-select_fd_type.patch
rename to packages/toolchain/devel/eglibc/patches/eglibc-2.14-15360-select_fd_type.patch
diff --git a/packages/toolchain/devel/fakeroot/meta b/packages/toolchain/devel/fakeroot/meta
index 7b88e4f7a7..b347aac6fe 100644
--- a/packages/toolchain/devel/fakeroot/meta
+++ b/packages/toolchain/devel/fakeroot/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="fakeroot"
-PKG_VERSION="1.18"
+PKG_VERSION="1.18.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL3"
diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build
index 883fe3fb0f..ee262fbc0c 100755
--- a/packages/toolchain/lang/gcc-final/build
+++ b/packages/toolchain/lang/gcc-final/build
@@ -61,6 +61,11 @@ mkdir -p objdir-$1 && cd objdir-$1
make
+if [ ! "$DEBUG" = yes ]; then
+ $STRIP `find . -name "*.so"`
+ $STRIP `find . -name "*.so.[0-9]*"`
+fi
+
make install
cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib
diff --git a/packages/toolchain/lang/nasm/meta b/packages/toolchain/lang/nasm/meta
index 0a42afd05e..e1158a7f3f 100644
--- a/packages/toolchain/lang/nasm/meta
+++ b/packages/toolchain/lang/nasm/meta
@@ -25,6 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://nasm.sourceforge.net/"
PKG_URL="http://www.nasm.us/pub/nasm/releasebuilds/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="ccache"
PKG_PRIORITY="optional"
diff --git a/packages/toolchain/math/mpfr/patches/mpfr-3.0.1-allpatches_20110509.patch b/packages/toolchain/math/mpfr/patches/mpfr-3.0.1-allpatches_20110917.patch
similarity index 100%
rename from packages/toolchain/math/mpfr/patches/mpfr-3.0.1-allpatches_20110509.patch
rename to packages/toolchain/math/mpfr/patches/mpfr-3.0.1-allpatches_20110917.patch
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index a54c60e700..a1aae5528d 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="make xz sed pkg-config automake autoconf intltool gcc-final bison flex cmake jam yasm nasm"
+PKG_BUILD_DEPENDS="make xz sed pkg-config automake autoconf autoconf-archive intltool gcc-final bison flex cmake jam yasm nasm"
PKG_PRIORITY="optional"
PKG_SECTION="toolchain/devel"
PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"
diff --git a/packages/tools/autoupdate/scripts/autoupdate.devel b/packages/tools/autoupdate/scripts/autoupdate.devel
index a30bc9f715..4642419fa2 100755
--- a/packages/tools/autoupdate/scripts/autoupdate.devel
+++ b/packages/tools/autoupdate/scripts/autoupdate.devel
@@ -42,13 +42,13 @@ fi
download () {
case "$DL_METHOD" in
- wget)
- wget -c $1 -P $TMP_DIR > /dev/null 2>&1
- ;;
- scp)
- scp $SCP_ARG "$1" $TMP_DIR
- ;;
- esac
+ wget)
+ wget -c $1 -P $TMP_DIR > /dev/null 2>&1
+ ;;
+ scp)
+ scp $SCP_ARG "$1" $TMP_DIR
+ ;;
+ esac
}
send_message () {
@@ -79,6 +79,10 @@ if [ ! -f /var/lock/update.lock ]; then
# compare installed version with latest released version
THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
+ if [ -Z $NEW_VERSION ]; then
+ NEW_VERSION="$THIS_VERSION"
+ fi
+
if [ "$THIS_VERSION" -lt "$NEW_VERSION" ]; then
if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then
diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release
index 5e716f0e7f..40744df76e 100755
--- a/packages/tools/autoupdate/scripts/autoupdate.release
+++ b/packages/tools/autoupdate/scripts/autoupdate.release
@@ -42,13 +42,13 @@ fi
download () {
case "$DL_METHOD" in
- wget)
- wget -c $1 -P $TMP_DIR > /dev/null 2>&1
- ;;
- scp)
- scp $SCP_ARG "$1" $TMP_DIR
- ;;
- esac
+ wget)
+ wget -c $1 -P $TMP_DIR > /dev/null 2>&1
+ ;;
+ scp)
+ scp $SCP_ARG "$1" $TMP_DIR
+ ;;
+ esac
}
send_message () {
@@ -84,54 +84,66 @@ if [ ! -f /var/lock/update.lock ]; then
NEW_MINOR="`echo "$NEW_VERSION" | cut -d "." -f2`"
NEW_PATCH="`echo "$NEW_VERSION" | cut -d "." -f3`"
- if [ "$THIS_MAJOR" -lt "$NEW_MAJOR" -o \
- "$THIS_MINOR" -lt "$NEW_MINOR" -o \
- "$THIS_PATCH" -lt "$NEW_PATCH" ]; then
+ if [ "$THIS_PATCH" -lt "$NEW_PATCH" -a \
+ "$THIS_MINOR" -eq "$NEW_MINOR" -a \
+ "$THIS_MAJOR" -eq "$NEW_MAJOR" ] || \
+ [ "$THIS_MINOR" -lt "$NEW_MINOR" -a \
+ "$THIS_MAJOR" -eq "$NEW_MAJOR" -a \
+ "$NEW_MINOR" -lt 90 ] || \
+ [ "$THIS_MINOR" -ge 90 -a \
+ "$NEW_MINOR" -lt 90 -a \
+ $(( $THIS_MAJOR + 1 )) -eq "$NEW_MAJOR" ]; then
+ AUTOUPDATE="$AUTOUPDATE"
+ elif [ "$THIS_MAJOR" -lt "$NEW_MAJOR" -a \
+ "$NEW_MINOR" -lt 90 ]; then
+ AUTOUPDATE="manually"
+ else
+ AUTOUPDATE="no"
+ fi
- if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then
+ if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "manual" ]; then
- # show a message if a new version is avaible
- send_message "New update avaible: $NEW_VERSION - please update manually"
+ # show a message if a new version is avaible
+ send_message "New update avaible: $NEW_VERSION - please update manually"
- elif [ "$AUTOUPDATE" = "auto" ]; then
+ elif [ "$AUTOUPDATE" = "auto" ]; then
- # show a message if a new version is avaible
- send_message "New update avaible: $NEW_VERSION - downloading and extracting the new version..."
+ # show a message if a new version is avaible
+ send_message "New update avaible: $NEW_VERSION - downloading and extracting the new version..."
- # locking autoupdate
- touch /var/lock/update.lock
+ # locking autoupdate
+ touch /var/lock/update.lock
- # downloading the new version
- rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
- download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
+ # downloading the new version
+ rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
+ download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
- # extract the image
- rm -rf $TMP_DIR/$NEW_IMAGE
- tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR
+ # extract the image
+ rm -rf $TMP_DIR/$NEW_IMAGE
+ tar -xjvf $TMP_DIR/$NEW_IMAGE.tar.bz2 -C $TMP_DIR
- # move KERNEL and SYSTEM to an temporary file
- mkdir -p /storage/.update
+ # move KERNEL and SYSTEM to an temporary file
+ mkdir -p /storage/.update
- [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \
- mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
+ [ -f $TMP_DIR/$NEW_IMAGE/target/KERNEL ] && \
+ mv $TMP_DIR/$NEW_IMAGE/target/KERNEL /storage/.update/KERNEL.tmp
- [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \
- mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
+ [ -f $TMP_DIR/$NEW_IMAGE/target/SYSTEM ] && \
+ mv $TMP_DIR/$NEW_IMAGE/target/SYSTEM /storage/.update/SYSTEM.tmp
sync
- # move KERNEL and SYSTEM to the right place
- mv /storage/.update/KERNEL.tmp /storage/.update/KERNEL
- mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM
+ # move KERNEL and SYSTEM to the right place
+ mv /storage/.update/KERNEL.tmp /storage/.update/KERNEL
+ mv /storage/.update/SYSTEM.tmp /storage/.update/SYSTEM
- # cleanup tmp files
- rm -rf $TMP_DIR/$NEW_IMAGE
- rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
- rm -rf /storage/.update/*.tmp
+ # cleanup tmp files
+ rm -rf $TMP_DIR/$NEW_IMAGE
+ rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
+ rm -rf /storage/.update/*.tmp
- # we are ready (hopefully)
- send_message "Update $NEW_VERSION - downloaded and extracted - please reboot to install"
+ # we are ready (hopefully)
+ send_message "Update $NEW_VERSION - downloaded and extracted - please reboot to install"
- fi
fi
fi
fi
diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer
index ab76c2ac7a..9215da5b9a 100755
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@@ -488,7 +488,7 @@ do_poweroff() {
BETA="yes"
INSTALLER_VERSION="0.2.5"
OS_VERSION=$(lsb_release)
- BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - Operating System: $OS_VERSION"
+ BACKTITLE="OpenELEC Installer $INSTALLER_VERSION - $OS_VERSION"
TMPDIR="/tmp/installer"
LOGFILE="$TMPDIR/install.log"
diff --git a/packages/tools/syslinux/meta b/packages/tools/syslinux/meta
index 49e81b63b4..6f47ea56c0 100644
--- a/packages/tools/syslinux/meta
+++ b/packages/tools/syslinux/meta
@@ -24,7 +24,9 @@ PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://syslinux.zytor.com/"
-PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/boot/syslinux/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/boot/syslinux/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
diff --git a/packages/web/curl/build b/packages/web/curl/build
index 041532e9d8..ec125577b5 100755
--- a/packages/web/curl/build
+++ b/packages/web/curl/build
@@ -85,3 +85,8 @@ ac_cv_header_librtmp_rtmp_h=yes \
make
$MAKEINSTALL
+
+$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
+ $SYSROOT_PREFIX/usr/bin/$1-config
+
+mv $SYSROOT_PREFIX/usr/bin/$1-config $ROOT/$TOOLCHAIN/bin
diff --git a/packages/web/curl/meta b/packages/web/curl/meta
index ffc7676ca4..b70eaed674 100644
--- a/packages/web/curl/meta
+++ b/packages/web/curl/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="curl"
-PKG_VERSION="7.21.7"
+PKG_VERSION="7.22.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"
diff --git a/packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch b/packages/web/curl/patches/curl-7.22.0-0108-threaded_dns_multi.patch
similarity index 100%
rename from packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch
rename to packages/web/curl/patches/curl-7.22.0-0108-threaded_dns_multi.patch
diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard
index c9887eede6..351f8875e0 100644
--- a/packages/x11/app/setxkbmap/init.d/72_keyboard
+++ b/packages/x11/app/setxkbmap/init.d/72_keyboard
@@ -22,31 +22,24 @@
#
# runlevels: openelec
-case $RUNLEVEL in
- boot)
- (
- if [ -f /var/config/settings.conf ]; then
- . /var/config/settings.conf
+(
+ if [ -f /var/config/settings.conf ]; then
+ . /var/config/settings.conf
- progress "setup keyboard layout"
+ progress "setup keyboard layout"
- if [ -z $X11_KEYMAP ]; then
- X11_KEYMAP="us"
- fi
+ if [ -z $X11_KEYMAP ]; then
+ X11_KEYMAP="us"
+ fi
- # waiting for Xorg to start
- wait_for_xorg
+ # waiting for Xorg to start
+ wait_for_xorg
- # setup keymap
- if [ -z $X11_KEYMAP2 ]; then
- setxkbmap -display $DISPLAY $X11_KEYMAP;
- else
- setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
- fi
+ # setup keymap
+ if [ -z $X11_KEYMAP2 ]; then
+ setxkbmap -display $DISPLAY $X11_KEYMAP;
+ else
+ setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
fi
- )&
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ fi
+)&
diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build
index 9580eb8bd3..9d496a1ab3 100755
--- a/packages/x11/data/xkeyboard-config/build
+++ b/packages/x11/data/xkeyboard-config/build
@@ -28,6 +28,7 @@ XKBCOMP="/usr/bin/xkbcomp" \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
+ --without-xsltproc \
--enable-compat-rules \
--with-xkb-base=$XORG_PATH_XKB \
--without-xkb-rules-symlink \
diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/meta
index 3cfee36011..3401e6e55d 100644
--- a/packages/x11/data/xkeyboard-config/meta
+++ b/packages/x11/data/xkeyboard-config/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.3"
+PKG_VERSION="2.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build
index 690376286e..f5969ab4cb 100755
--- a/packages/x11/driver/xf86-video-fglrx/build
+++ b/packages/x11/driver/xf86-video-fglrx/build
@@ -35,6 +35,7 @@ cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
ln -sf $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
cd 2.6.x
+sed -i -e 's/ -DPAGE_ATTR_FIX=/-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -DPAGE_ATTR_FIX=/' Makefile
make CC=${CC} KDIR=$(kernel_path)
diff --git a/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf
index 60f6205784..1ce2e85a0b 100644
--- a/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf
+++ b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf
@@ -1,7 +1,11 @@
+Section "ServerLayout"
+ Identifier "aticonfig Layout"
+ Screen 0 "screen" 0 0
+EndSection
+
Section "Device"
Identifier "fglrx"
Driver "fglrx"
-
Option "HWCursor" "false"
EndSection
@@ -14,7 +18,7 @@ Section "Screen"
Device "fglrx"
DefaultDepth 24
SubSection "Display"
- Depth 24
+ Depth 24
EndSubSection
EndSection
diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta
index e1b4a2815b..d09d651dcb 100644
--- a/packages/x11/driver/xf86-video-fglrx/meta
+++ b/packages/x11/driver/xf86-video-fglrx/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-fglrx"
-PKG_VERSION="11.8"
+PKG_VERSION="11.9"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"
diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta
index 1cbdafa919..013319b978 100644
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="285.03"
+PKG_VERSION="285.05.09"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"
diff --git a/packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch b/packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch
new file mode 100644
index 0000000000..6f9f795d73
--- /dev/null
+++ b/packages/x11/lib/libxcb/patches/libxcb-1.7-wait_for_reply.patch
@@ -0,0 +1,53 @@
+commit 5ceeaaa4294201b3f613c07f9ec610c0e5f673c7
+Author: Uli Schlachter
+Date: Thu Aug 25 14:18:16 2011 +0200
+
+ Fix a dead-lock due to xcb_poll_for_reply
+
+ Imagine two threads:
+
+ Thread#1: for(;;) { xcb_get_input_focus_reply(c, xcb_get_input_focus(c), 0); }
+
+ Thread#2: for(;;) { xcb_poll_for_event(c); }
+
+ Since xcb_poll_for_event() calls _xcb_in_read() directly without synchronizing
+ with any other readers, this causes two threads to end up calling recv() at the
+ same time. We now have a race because any of these two threads could get read
+ the GetInputFocus reply.
+
+ If thread#2 reads this reply, it will be put in the appropriate queue and
+ thread#1 will still be stuck in recv(), although its reply was already received.
+ If no other reply or event causes this thread to wake up, the process deadlocks.
+
+ To fix this, we have to make sure that there is only ever one thread reading
+ from the connection. The obvious solution is to check in poll_for_next_event()
+ if another thread is already reading (in which case c->in.reading != 0) and not
+ to read from the wire in this case.
+
+ This solution is actually correct if we assume that the other thread is blocked
+ in poll() which means there isn't any data which can be read. Since we already
+ checked that there is no event in the queue this means that
+ poll_for_next_event() didn't find any event to return.
+
+ There might be a small race here where the other thread already determined that
+ there is data to read, but it still has to wait for c->iolock. However, this
+ means that the next poll_for_next_event() will be able to read the event, so
+ this shouldn't cause any problems.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=40372
+
+ Signed-off-by: Uli Schlachter
+ Signed-off-by: Peter Harris
+
+diff -uNr libxcb-1.7/src/xcb_in.c libxcb-1.7-patched/src/xcb_in.c
+--- libxcb-1.7/src/xcb_in.c 2010-08-13 13:43:31.000000000 +0200
++++ libxcb-1.7-patched/src/xcb_in.c 2011-09-09 06:59:26.990634243 +0200
+@@ -548,7 +548,7 @@
+ pthread_mutex_lock(&c->iolock);
+ /* FIXME: follow X meets Z architecture changes. */
+ ret = get_event(c);
+- if(!ret && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
++ if(!ret && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+ ret = get_event(c);
+ pthread_mutex_unlock(&c->iolock);
+ }
diff --git a/packages/x11/other/ratpoison/init.d/73_ratpoison b/packages/x11/other/ratpoison/init.d/73_ratpoison
index 213997cdc0..1e3fa9a4cc 100644
--- a/packages/x11/other/ratpoison/init.d/73_ratpoison
+++ b/packages/x11/other/ratpoison/init.d/73_ratpoison
@@ -22,19 +22,12 @@
#
# runlevels: openelec
-case $RUNLEVEL in
- boot)
- (
- progress "starting Windowmanager"
+(
+ progress "starting Windowmanager"
- # waiting for Xorg to start
- wait_for_xorg
+ # waiting for Xorg to start
+ wait_for_xorg
- # starting ratpoison
- DISPLAY=:0.0 ratpoison > /dev/null 2>&1
- )&
- ;;
-
- poweroff|reboot)
- ;;
-esac
+ # starting ratpoison
+ DISPLAY=:0.0 ratpoison > /dev/null 2>&1
+)&
diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index 0656819acd..0974534002 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -61,4 +61,8 @@ fi
done
# Tools
- PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr setxkbmap"
+ PKG_DEPENDS="$PKG_DEPENDS pciutils xrandr setxkbmap"
+
+if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
+ PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER"
+fi
diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index e31c9a5c9d..c971eec77c 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -22,7 +22,7 @@
. /etc/profile
-if [ "$MODE" = openelec ]; then
+if [ "$RUNLEVEL" = openelec ]; then
logger -t Xorg "### starting Xorg with driver ${xorg_driver} ###"
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index bf3c8c3a5d..be91d507d6 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -146,7 +146,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -685,9 +685,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1410,11 +1408,11 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
@@ -1441,29 +1439,29 @@ CONFIG_IR_MCEUSB=m
# CONFIG_IR_WINBOND_CIR is not set
# CONFIG_RC_LOOPBACK is not set
# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1474,7 +1472,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
@@ -1559,7 +1557,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1576,13 +1574,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1674,6 +1672,8 @@ CONFIG_DVB_STB6000=m
CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA826X=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
@@ -1855,10 +1855,10 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
CONFIG_SND_JACK=y
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_MIXER_OSS is not set
@@ -1920,7 +1920,7 @@ CONFIG_SND_PCI=y
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PREALLOC_SIZE=64
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
@@ -2002,7 +2002,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2016,7 +2016,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2074,7 +2074,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2400,13 +2400,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/ATV/options b/projects/ATV/options
index c5ff112ddb..0d5294558b 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -107,6 +107,8 @@
MEDIACENTER="xbmc-pvr"
# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
SKINS="Confluence"
# Default Skin (Confluence)
@@ -121,11 +123,17 @@
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+ XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
+
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
-# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
- NFS_SUPPORT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
+ NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="yes"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index 334df874ca..a00dfdd40b 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -148,7 +148,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -693,9 +693,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -991,7 +989,27 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
CONFIG_MII=y
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
# CONFIG_NET_ETHERNET is not set
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
@@ -1009,7 +1027,7 @@ CONFIG_R8169=y
# CONFIG_SKGE is not set
CONFIG_SKY2=y
# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
+CONFIG_TIGON3=y
# CONFIG_BNX2 is not set
# CONFIG_CNIC is not set
# CONFIG_QLA3XXX is not set
@@ -1609,16 +1627,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1633,37 +1652,37 @@ CONFIG_IR_MCE_KBD_DECODER=y
CONFIG_IR_ENE=m
CONFIG_IR_IMON=m
CONFIG_IR_MCEUSB=m
-# CONFIG_IR_ITE_CIR is not set
+CONFIG_IR_ITE_CIR=m
CONFIG_IR_FINTEK=m
-# CONFIG_IR_NUVOTON is not set
+CONFIG_IR_NUVOTON=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1674,16 +1693,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1719,7 +1742,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1737,7 +1761,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1757,12 +1781,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1779,13 +1803,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1814,6 +1838,7 @@ CONFIG_SMS_USB_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -1833,8 +1858,8 @@ CONFIG_SMS_USB_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
# CONFIG_DVB_HOPPER is not set
#
@@ -1855,8 +1880,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -1869,32 +1894,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -1907,14 +1937,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -1929,17 +1960,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2050,7 +2081,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2204,7 +2235,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2218,7 +2249,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2260,7 +2291,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2282,7 +2313,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2632,13 +2663,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
new file mode 100644
index 0000000000..b8d83dba51
--- /dev/null
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -0,0 +1,3024 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
+#
+CONFIG_64BIT=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="openelec"
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+# CONFIG_SPARSE_IRQ is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+# CONFIG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=" "
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_NR_CPUS=4
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+# CONFIG_X86_MCE is not set
+# CONFIG_I8K is not set
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CLEANCACHE=y
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init threadirqs"
+# CONFIG_CMDLINE_OVERRIDE is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+# CONFIG_ACPI_PROC_EVENT is not set
+CONFIG_ACPI_AC=y
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_SBS is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_SFI is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+
+#
+# x86 CPU frequency scaling drivers
+#
+# CONFIG_X86_PCC_CPUFREQ is not set
+# CONFIG_X86_ACPI_CPUFREQ is not set
+CONFIG_X86_POWERNOW_K8=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+
+#
+# shared options
+#
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+# CONFIG_INTEL_IDLE is not set
+
+#
+# Memory power savings
+#
+# CONFIG_I7300_IDLE is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_PCIEPORTBUS=y
+# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_PME=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_STUB is not set
+CONFIG_HT_IRQ=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# CONFIG_PCCARD is not set
+CONFIG_HOTPLUG_PCI=m
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_ACPI is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_HAVE_BPF_JIT=y
+# CONFIG_BPF_JIT is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+CONFIG_BT_ATH3K=m
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=y
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=y
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=y
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_RBD is not set
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_VMWARE_BALLOON is not set
+# CONFIG_BMP085 is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_SENSORS_LIS3_I2C is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_VERBOSE_ERROR is not set
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+CONFIG_PATA_ATIIXP=y
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_ARCNET is not set
+CONFIG_MII=y
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=y
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+CONFIG_SKY2=y
+# CONFIG_VIA_VELOCITY is not set
+CONFIG_TIGON3=y
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+CONFIG_ATL1C=y
+# CONFIG_JME is not set
+# CONFIG_STMMAC_ETH is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+CONFIG_WLAN=y
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_AIRO is not set
+# CONFIG_ATMEL is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_MWL8K is not set
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWL4965 is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_HERMES is not set
+# CONFIG_P54_COMMON is not set
+CONFIG_RT2X00=m
+# CONFIG_RT2400PCI is not set
+# CONFIG_RT2500PCI is not set
+# CONFIG_RT61PCI is not set
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+# CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX_MENU is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_MWIFIEX is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET=m
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_WAN is not set
+
+#
+# CAIF transport drivers
+#
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=y
+CONFIG_INPUT_SPARSEKMAP=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_AS5011 is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_APPLEIR is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=y
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_CMA3000 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_PNP=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MFD_HSU is not set
+CONFIG_SERIAL_CORE=m
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_HANGCHECK_TIMER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+# CONFIG_RAMOOPS is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+CONFIG_I2C_PIIX4=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_I2C_SCMI is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2C_EG20T is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ20Z75 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_K8TEMP is not set
+CONFIG_SENSORS_K10TEMP=y
+CONFIG_SENSORS_FAM15H_POWER=y
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_APPLESMC is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_ATK0110 is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_F71808E_WDT is not set
+CONFIG_SP5100_TCO=m
+# CONFIG_SC520_WDT is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_ITCO_WDT is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_HP_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
+# CONFIG_MFD_SUPPORT is not set
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
+CONFIG_IR_MCE_KBD_DECODER=y
+# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+# CONFIG_RC_LOOPBACK is not set
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_WM8775=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+
+#
+# Camera sensor devices
+#
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+
+#
+# Miscelaneous helper chips
+#
+# CONFIG_VIDEO_VIVI is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+CONFIG_VIDEO_CX88=m
+# CONFIG_VIDEO_CX88_ALSA is not set
+# CONFIG_VIDEO_CX88_BLACKBIRD is not set
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+# CONFIG_VIDEO_AU0828 is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_CX18 is not set
+CONFIG_VIDEO_SAA7164=m
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_V4L_USB_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+# CONFIG_DVB_AV7110 is not set
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+# CONFIG_DVB_USB_A800 is not set
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+# CONFIG_DVB_USB_UMT_010 is not set
+# CONFIG_DVB_USB_CXUSB is not set
+# CONFIG_DVB_USB_M920X is not set
+# CONFIG_DVB_USB_GL861 is not set
+# CONFIG_DVB_USB_AU6610 is not set
+# CONFIG_DVB_USB_DIGITV is not set
+# CONFIG_DVB_USB_VP7045 is not set
+# CONFIG_DVB_USB_VP702X is not set
+# CONFIG_DVB_USB_GP8PSK is not set
+# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+# CONFIG_DVB_USB_OPERA1 is not set
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+# CONFIG_DVB_USB_DTV5100 is not set
+CONFIG_DVB_USB_RTL2832U=m
+CONFIG_DVB_USB_AF9015=m
+# CONFIG_DVB_USB_CE6230 is not set
+# CONFIG_DVB_USB_FRIIO is not set
+# CONFIG_DVB_USB_EC168 is not set
+# CONFIG_DVB_USB_AZ6027 is not set
+# CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_IT9135=m
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported SDMC DM1105 Adapters
+#
+# CONFIG_DVB_DM1105 is not set
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+# CONFIG_DVB_PT1 is not set
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+# CONFIG_DVB_HOPPER is not set
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported ddbridge ('Octopus') Adapters
+#
+CONFIG_DVB_DDBRIDGE=m
+
+#
+# Supported DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_STV0367=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_TDA665x=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+# CONFIG_AGP_AMD64 is not set
+# CONFIG_AGP_INTEL is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_VIA is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_DRM is not set
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=2
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
+# CONFIG_SND_HDA_CODEC_ANALOG is not set
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+# CONFIG_SND_HDA_CODEC_CIRRUS is not set
+# CONFIG_SND_HDA_CODEC_CONEXANT is not set
+# CONFIG_SND_HDA_CODEC_CA0110 is not set
+# CONFIG_SND_HDA_CODEC_CA0132 is not set
+# CONFIG_SND_HDA_CODEC_CMEDIA is not set
+# CONFIG_SND_HDA_CODEC_SI3054 is not set
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=y
+# CONFIG_HID_ACRUX is not set
+CONFIG_HID_APPLE=y
+CONFIG_HID_AUREAL=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+# CONFIG_HID_PRODIKEYS is not set
+CONFIG_HID_CYPRESS=y
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELECOM is not set
+CONFIG_HID_EZKEY=y
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_KEYTOUCH is not set
+CONFIG_HID_KYE=y
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+CONFIG_HID_GYRATION=y
+CONFIG_HID_TWINHAN=y
+CONFIG_HID_KENSINGTON=y
+# CONFIG_HID_LCPOWER is not set
+CONFIG_HID_LOGITECH=y
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+# CONFIG_LOGIWII_FF is not set
+# CONFIG_HID_MAGICMOUSE is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+CONFIG_HID_ORTEK=y
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAMSUNG is not set
+CONFIG_HID_SONY=y
+# CONFIG_HID_SPEEDLINK is not set
+CONFIG_HID_SUNPLUS=y
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_TOPSEED=y
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+CONFIG_HID_WIIMOTE=m
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_HID_ZYDACRON=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+CONFIG_USB_UAS=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_EZUSB is not set
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_ALIX2 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_DELL_NETBOOKS is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+CONFIG_STAGING=y
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_VIDEO_TM6000 is not set
+CONFIG_DVB_CXD2099=m
+# CONFIG_USBIP_CORE is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMDBG is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+CONFIG_R8187SE=m
+CONFIG_RTL8192U=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+CONFIG_R8712_AP=y
+# CONFIG_RTS_PSTOR is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+CONFIG_VT6656=m
+# CONFIG_HYPERV is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+CONFIG_XVMALLOC=y
+# CONFIG_ZRAM is not set
+CONFIG_ZCACHE=y
+# CONFIG_FB_SM7XX is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_FB_XGI is not set
+CONFIG_LIRC_STAGING=y
+# CONFIG_LIRC_BT829 is not set
+CONFIG_LIRC_IGORPLUGUSB=m
+# CONFIG_LIRC_IMON is not set
+# CONFIG_LIRC_SASEM is not set
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+# CONFIG_LIRC_SIR is not set
+# CONFIG_LIRC_TTUSBIR is not set
+# CONFIG_LIRC_ZILOG is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACERHDF is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_DELL_WMI is not set
+# CONFIG_DELL_WMI_AIO is not set
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_EEEPC_LAPTOP is not set
+CONFIG_ACPI_WMI=m
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_INTEL_IPS is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_XO15_EBOOK is not set
+# CONFIG_MXM_WMI is not set
+# CONFIG_SAMSUNG_Q10 is not set
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+# CONFIG_AMD_IOMMU is not set
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_DMAR_FLOPPY_WA=y
+# CONFIG_INTR_REMAP is not set
+# CONFIG_VIRT_DRIVERS is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+CONFIG_FIRMWARE_MEMMAP=y
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXT4_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TMPFS_XATTR is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_HFS_FS is not set
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=y
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+# CONFIG_FRAME_POINTER is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+CONFIG_OPTIMIZE_INLINING=y
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_INTEL_TXT is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_X86_64 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_HAVE_KVM=y
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_CRC8 is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+CONFIG_AVERAGE=y
+# CONFIG_CORDIC is not set
diff --git a/projects/Fusion/options b/projects/Fusion/options
index ae063aa82f..76696d57db 100644
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -107,6 +107,8 @@
MEDIACENTER="xbmc-pvr"
# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
SKINS="Confluence"
# Default Skin (Confluence)
@@ -121,11 +123,17 @@
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+ XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
+
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
-# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
- NFS_SUPPORT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
+ NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index d9c75b79a9..d8119d1509 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -148,7 +148,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -700,9 +700,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1657,7 +1655,7 @@ CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1775,16 +1773,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1807,29 +1806,29 @@ CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1840,16 +1839,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1885,7 +1888,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1903,7 +1907,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1923,12 +1927,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1945,13 +1949,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1981,6 +1985,7 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -2005,8 +2010,8 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
# CONFIG_DVB_HOPPER is not set
#
@@ -2027,8 +2032,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -2041,32 +2046,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -2079,14 +2089,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -2101,17 +2112,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2245,7 +2256,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2268,6 +2279,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
@@ -2285,7 +2297,7 @@ CONFIG_SND_PCI=y
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_CMIPCI=m
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
@@ -2404,7 +2416,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2418,7 +2430,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2460,7 +2472,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2483,7 +2495,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2895,13 +2907,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/Generic/options b/projects/Generic/options
index 9dd0baac88..3d4cca8085 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -109,8 +109,10 @@
# Skins to install (Confluence)
SKINS="Confluence"
-# Default Skin (Confluence)
- SKIN_DEFAULT="Confluence"
+# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
+ SKINS="Confluence"
# install extra subtitle Fonts for XBMC (yes / no)
XBMC_EXTRA_FONTS="yes"
@@ -121,11 +123,17 @@
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+ XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
+
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
-# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
- NFS_SUPPORT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
+ NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="yes"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index 24cedd6361..0b0dd06490 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -148,7 +148,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -696,9 +696,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1654,7 +1652,7 @@ CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1772,16 +1770,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1804,29 +1803,29 @@ CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1837,16 +1836,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1882,7 +1885,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1900,7 +1904,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1920,12 +1924,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1942,13 +1946,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1978,6 +1982,7 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -2002,8 +2007,8 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
# CONFIG_DVB_HOPPER is not set
#
@@ -2024,8 +2029,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -2038,32 +2043,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -2076,14 +2086,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -2098,17 +2109,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2243,7 +2254,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2266,6 +2277,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
@@ -2283,7 +2295,7 @@ CONFIG_SND_PCI=y
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_CMIPCI=m
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
@@ -2402,7 +2414,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2416,7 +2428,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2458,7 +2470,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2481,7 +2493,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2894,13 +2906,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index b5eb2d392a..ba847775da 100644
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -109,8 +109,10 @@
# Skins to install (Confluence)
SKINS="Confluence"
-# Default Skin (Confluence)
- SKIN_DEFAULT="Confluence"
+# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
+ SKINS="Confluence"
# install extra subtitle Fonts for XBMC (yes / no)
XBMC_EXTRA_FONTS="yes"
@@ -121,11 +123,17 @@
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+ XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
+
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
-# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
- NFS_SUPPORT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
+ NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="yes"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index e75e75f2c1..fd4e9a6d93 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -148,7 +148,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -687,9 +687,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1467,7 +1465,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_MAX8903 is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
+CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1568,7 +1566,7 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1636,16 +1634,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1668,29 +1667,29 @@ CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1701,16 +1700,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1746,7 +1749,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1764,7 +1768,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1799,12 +1803,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1821,13 +1825,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1857,6 +1861,7 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -1881,8 +1886,8 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
# CONFIG_DVB_HOPPER is not set
#
@@ -1903,8 +1908,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -1917,32 +1922,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -1955,14 +1965,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -1977,17 +1988,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2100,7 +2111,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2257,7 +2268,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2271,7 +2282,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2313,7 +2324,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2335,7 +2346,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2694,13 +2705,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 31622d22c5..653cd0c780 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -150,7 +150,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -644,9 +644,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1417,7 +1415,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_MAX8903 is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
+CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1518,7 +1516,7 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1586,16 +1584,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1618,29 +1617,29 @@ CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1651,16 +1650,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1696,7 +1699,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1714,7 +1718,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1749,12 +1753,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1771,13 +1775,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1807,6 +1811,7 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -1831,8 +1836,8 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
# CONFIG_DVB_HOPPER is not set
#
@@ -1853,8 +1858,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -1867,32 +1872,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -1905,14 +1915,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -1927,17 +1938,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2043,7 +2054,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2199,7 +2210,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2213,7 +2224,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2255,7 +2266,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2277,7 +2288,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2646,13 +2657,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/ION/options b/projects/ION/options
index 4d9d75a250..f701142799 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -107,6 +107,8 @@
MEDIACENTER="xbmc-pvr"
# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
SKINS="Confluence"
# Default Skin (Confluence)
@@ -121,11 +123,17 @@
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+ XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
+
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
-# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
- NFS_SUPPORT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
+ NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index 4e687d7249..fc0f3b8f6e 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc4 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -148,7 +148,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -689,9 +689,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1510,7 +1508,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_MAX8903 is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
+CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1611,7 +1609,7 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1679,16 +1677,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1711,27 +1710,27 @@ CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1742,16 +1741,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1787,7 +1790,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1805,7 +1809,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1840,12 +1844,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1862,13 +1866,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
CONFIG_DVB_USB_DTV5100=m
CONFIG_DVB_USB_RTL2832U=m
@@ -1898,6 +1902,7 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -1922,9 +1927,9 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
-CONFIG_DVB_HOPPER=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
#
# Supported nGene Adapters
@@ -1944,8 +1949,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -1958,32 +1963,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -1995,14 +2005,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -2017,17 +2028,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2159,7 +2170,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2316,7 +2327,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2330,7 +2341,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2372,7 +2383,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2391,7 +2402,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2760,13 +2771,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 01eb853ebb..7571226928 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -150,7 +150,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -647,9 +647,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1462,7 +1460,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_MAX8903 is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
+CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1563,7 +1561,7 @@ CONFIG_SENSORS_CORETEMP=m
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1631,16 +1629,17 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=y
CONFIG_LIRC=y
CONFIG_RC_MAP=y
@@ -1663,29 +1662,29 @@ CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_DVB=m
@@ -1696,16 +1695,20 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_WM8775=m
#
# RDS decoders
#
+CONFIG_VIDEO_SAA6588=m
#
# Video decoders
@@ -1741,7 +1744,8 @@ CONFIG_VIDEO_CX2341X=m
# Miscelaneous helper chips
#
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
@@ -1759,7 +1763,7 @@ CONFIG_MEDIA_ALTERA_CI=m
# CONFIG_VIDEO_AU0828 is not set
# CONFIG_VIDEO_IVTV is not set
# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
+CONFIG_VIDEO_SAA7164=m
# CONFIG_VIDEO_CAFE_CCIC is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
@@ -1794,12 +1798,12 @@ CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
-# CONFIG_DVB_BUDGET_AV is not set
+CONFIG_DVB_BUDGET_AV=m
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1816,13 +1820,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1852,6 +1856,7 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m
#
# Supported Pluto2 Adapters
@@ -1876,8 +1881,8 @@ CONFIG_SMS_SDIO_DRV=m
#
# Supported Mantis Adapters
#
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
# CONFIG_DVB_HOPPER is not set
#
@@ -1898,8 +1903,8 @@ CONFIG_DVB_DDBRIDGE=m
#
# Multistandard (satellite) frontends
#
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
@@ -1912,32 +1917,37 @@ CONFIG_DVB_TDA18271C2DD=m
#
# DVB-S (satellite) frontends
#
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
CONFIG_DVB_ZL10039=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_STV0288=m
CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
CONFIG_DVB_VES1X93=m
CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
#
# DVB-T (terrestrial) frontends
#
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22702=m
CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
@@ -1950,14 +1960,15 @@ CONFIG_DVB_STV0367=m
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m
#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
@@ -1972,17 +1983,17 @@ CONFIG_DVB_DIB8000=m
#
# Digital terrestrial only tuners/PLL
#
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
#
# Tools to develop new frontends
@@ -2107,7 +2118,7 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
@@ -2263,7 +2274,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2277,7 +2288,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2319,7 +2330,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2338,7 +2349,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2708,13 +2719,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/Intel/options b/projects/Intel/options
index 2ed3466cba..3bf134c6fd 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -107,6 +107,8 @@
MEDIACENTER="xbmc-pvr"
# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
SKINS="Confluence"
# Default Skin (Confluence)
@@ -120,11 +122,17 @@
# e.g. XBMC_PLUGINS="SABnzbd"
XBMC_PLUGINS=""
+# build and install 'RSXS' Screensaver (yes / no)
+ XBMC_SCR_RSXS="yes"
+
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
-# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
-# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
- NFS_SUPPORT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with XBMC) (yes / no)
+ NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index ef80a35608..95ccbe7cc8 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc4 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -150,7 +150,7 @@ CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -640,9 +640,7 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
#
@@ -1331,7 +1329,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_MAX8903 is not set
CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
+CONFIG_HWMON_VID=y
# CONFIG_HWMON_DEBUG_CHIP is not set
#
@@ -1432,7 +1430,7 @@ CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=y
# CONFIG_SENSORS_APPLESMC is not set
#
@@ -1497,11 +1495,11 @@ CONFIG_MEDIA_SUPPORT=y
# Multimedia core support
#
# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
@@ -1528,33 +1526,33 @@ CONFIG_IR_NUVOTON=y
# CONFIG_IR_WINBOND_CIR is not set
# CONFIG_RC_LOOPBACK is not set
CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
CONFIG_MEDIA_TUNER_MT2060=m
CONFIG_MEDIA_TUNER_MT2266=m
CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
#
# Audio decoders, processors and mixers
@@ -1644,7 +1642,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
#
# Supported USB Adapters
#
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
# CONFIG_DVB_USB_A800 is not set
CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1661,13 +1659,13 @@ CONFIG_DVB_USB_DIB0700=m
# CONFIG_DVB_USB_VP702X is not set
# CONFIG_DVB_USB_GP8PSK is not set
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
-# CONFIG_DVB_USB_TTUSB2 is not set
-# CONFIG_DVB_USB_DTT200U is not set
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
# CONFIG_DVB_USB_OPERA1 is not set
CONFIG_DVB_USB_AF9005=m
CONFIG_DVB_USB_AF9005_REMOTE=m
CONFIG_DVB_USB_DW2102=m
-# CONFIG_DVB_USB_CINERGY_T2 is not set
+CONFIG_DVB_USB_CINERGY_T2=m
CONFIG_DVB_USB_ANYSEE=m
# CONFIG_DVB_USB_DTV5100 is not set
CONFIG_DVB_USB_RTL2832U=m
@@ -1758,6 +1756,8 @@ CONFIG_DVB_STB6000=m
CONFIG_DVB_STV0299=m
CONFIG_DVB_STV6110=m
CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA826X=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_DS3000=m
@@ -1799,6 +1799,7 @@ CONFIG_DVB_TUNER_DIB0090=m
#
# SEC control devices for DVB-S
#
+CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6423=m
#
@@ -1905,16 +1906,16 @@ CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
# CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_MIXER_OSS is not set
# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=y
+CONFIG_SND_HRTIMER=m
CONFIG_SND_DYNAMIC_MINORS=y
# CONFIG_SND_SUPPORT_OLD_API is not set
# CONFIG_SND_VERBOSE_PROCFS is not set
@@ -1971,7 +1972,7 @@ CONFIG_SND_PCI=y
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PREALLOC_SIZE=64
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
@@ -2059,7 +2060,7 @@ CONFIG_HID_EZKEY=y
CONFIG_HID_KYE=y
# CONFIG_HID_UCLOGIC is not set
# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=y
CONFIG_HID_TWINHAN=y
CONFIG_HID_KENSINGTON=y
# CONFIG_HID_LCPOWER is not set
@@ -2073,7 +2074,7 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MONTEREY=y
# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=y
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
@@ -2115,7 +2116,7 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_HCD=m
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2137,7 +2138,7 @@ CONFIG_USB_UHCI_HCD=y
#
# USB Device Class drivers
#
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
@@ -2463,13 +2464,25 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_XATTR is not set
# CONFIG_EXT4_DEBUG is not set
CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
diff --git a/projects/Ultra/options b/projects/Ultra/options
index f1c46c01f9..fd121f25ca 100644
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -107,6 +107,8 @@
MEDIACENTER="xbmc"
# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
SKINS="Confluence"
# Default Skin (Confluence)
@@ -121,11 +123,17 @@
XBMC_PLUGINS=""
# build and install 'RSXS' Screensaver (yes / no)
- XBMC_SCR_RSXS="no"
+ XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
+# build and install 'GOOM' Visualization (yes / no)
+ XBMC_VIS_GOOM="yes"
+
+# build and install PulseAudio support (yes / no)
+ PULSEAUDIO_SUPPORT="no"
+
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
@@ -134,27 +142,40 @@
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
+# build and install with BluRay support (yes / no)
+ BLURAY_SUPPORT="yes"
+
# additional drivers to install:
+# AF9035: Afa Technologies Inc. AF9035A USB DVB Device
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
- ADDITIONAL_DRIVERS="asix-ax887xx"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
+ ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
# build with network support (yes / no)
NETWORK="yes"
-# build with netmount (mounting network drives on boot) support (yes / no)
- NETMOUNT="yes"
-
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
+# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
+ AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
+ AIRTUNES_SUPPORT="yes"
+
# build and install with NFS mount support in XBMC (yes / no)
NFS_SUPPORT="yes"
+# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
+ AFP_SUPPORT="yes"
+
+# build and install Samba Client support (yes / no)
+ SAMBA_CLIENT="yes"
+
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
@@ -178,12 +199,12 @@
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
-# build and install Apple device mount support (via ifuse) (yes / no)
- APPLEMOUNT="yes"
-
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
+# Windowmanager to use (ratpoison / none)
+ WINDOWMANAGER="ratpoison"
+
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
@@ -211,6 +232,9 @@
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no"
+# build and install CEC adapter support (yes / no)
+ CEC_SUPPORT="yes"
+
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
diff --git a/scripts/build b/scripts/build
index 7f530963fc..a7c362740e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -63,7 +63,7 @@ if [ ! -f $STAMP ]; then
if [ -f $PKG_DIR/build ]; then
$PKG_DIR/build $@ >&$VERBOSE_OUT
- if [ "$DEBUG" = no ]; then
+ if [ ! "$DEBUG" = yes ]; then
$STRIP `find $BUILD/$1* -name "*.so"` 2>/dev/null || \
echo "Information: no *.so libs found"
$STRIP `find $BUILD/$1* -name "*.so.[0-9]*"` 2>/dev/null ||\
diff --git a/scripts/image b/scripts/image
index 6485ffaa63..f2ae1a0bd7 100755
--- a/scripts/image
+++ b/scripts/image
@@ -124,9 +124,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
# NTFS 3G support
[ "$NTFS3G" = "yes" ] && $SCRIPTS/install ntfs-3g_ntfsprogs
-# Apple mount (ifuse) support
- [ "$APPLEMOUNT" = "yes" ] && $SCRIPTS/install ifuse
-
# Remote support
[ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote
diff --git a/tools/mkpkg/mkpkg_Mesa-7.11 b/tools/mkpkg/mkpkg_Mesa-7.11
deleted file mode 100755
index 21e01f89f1..0000000000
--- a/tools/mkpkg/mkpkg_Mesa-7.11
+++ /dev/null
@@ -1,43 +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
-################################################################################
-
-echo "getting sources..."
- if [ ! -d Mesa-7.11.git ]; then
- git clone git://anongit.freedesktop.org/mesa/mesa -b 7.11 Mesa-7.11.git
- fi
-
- cd Mesa-7.11.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf Mesa-7.11-$GIT_REV
- cp -R Mesa-7.11.git Mesa-7.11-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf Mesa-7.11-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf Mesa-7.11-$GIT_REV.tar.xz Mesa-7.11-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf Mesa-7.11-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_eglibc-2.12 b/tools/mkpkg/mkpkg_eglibc-2.12
deleted file mode 100755
index 316d223945..0000000000
--- a/tools/mkpkg/mkpkg_eglibc-2.12
+++ /dev/null
@@ -1,45 +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
-################################################################################
-
-echo "getting sources..."
- svn co svn://svn.eglibc.org/branches/eglibc-2_12/libc eglibc-2.12-latest
- svn co svn://svn.eglibc.org/branches/eglibc-2_12/ports eglibc-2.12-latest/ports
- svn co svn://svn.eglibc.org/branches/eglibc-2_12/linuxthreads/linuxthreads eglibc-2.12-latest/linuxthreads
- svn co svn://svn.eglibc.org/branches/eglibc-2_12/linuxthreads/linuxthreads_db eglibc-2.12-latest/linuxthreads_db
-
-echo "getting version..."
- cd eglibc-2.12-latest
- SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
- echo $SVN_REV
- cd ..
-
-echo "copying sources..."
- rm -rf eglibc-2.12-$SVN_REV
- cp -R eglibc-2.12-latest eglibc-2.12-$SVN_REV
-
-echo "cleaning sources..."
- find eglibc-2.12-$SVN_REV -name .svn -exec rm -rf {} ";"
-
-echo "packing sources..."
- tar cvjf eglibc-2.12-$SVN_REV.tar.bz2 eglibc-2.12-$SVN_REV
-
-echo "remove temporary sourcedir..."
- rm -rf eglibc-2.12-$SVN_REV
diff --git a/tools/mkpkg/mkpkg_eglibc-2.13 b/tools/mkpkg/mkpkg_eglibc-2.13
deleted file mode 100755
index 93c64c1293..0000000000
--- a/tools/mkpkg/mkpkg_eglibc-2.13
+++ /dev/null
@@ -1,45 +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
-################################################################################
-
-echo "getting sources..."
- svn co svn://svn.eglibc.org/branches/eglibc-2_13/libc eglibc-2.13-latest
- svn co svn://svn.eglibc.org/branches/eglibc-2_13/ports eglibc-2.13-latest/ports
- svn co svn://svn.eglibc.org/branches/eglibc-2_13/linuxthreads/linuxthreads eglibc-2.13-latest/linuxthreads
- svn co svn://svn.eglibc.org/branches/eglibc-2_13/linuxthreads/linuxthreads_db eglibc-2.13-latest/linuxthreads_db
-
-echo "getting version..."
- cd eglibc-2.13-latest
- SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
- echo $SVN_REV
- cd ..
-
-echo "copying sources..."
- rm -rf eglibc-2.13-$SVN_REV
- cp -R eglibc-2.13-latest eglibc-2.13-$SVN_REV
-
-echo "cleaning sources..."
- find eglibc-2.13-$SVN_REV -name .svn -exec rm -rf {} ";"
-
-echo "packing sources..."
- tar cvjf eglibc-2.13-$SVN_REV.tar.bz2 eglibc-2.13-$SVN_REV
-
-echo "remove temporary sourcedir..."
- rm -rf eglibc-2.13-$SVN_REV
diff --git a/tools/mkpkg/mkpkg_eglibc-localedef-2.12 b/tools/mkpkg/mkpkg_eglibc-2.14
similarity index 67%
rename from tools/mkpkg/mkpkg_eglibc-localedef-2.12
rename to tools/mkpkg/mkpkg_eglibc-2.14
index fc38e970bb..6ba13b3c6c 100755
--- a/tools/mkpkg/mkpkg_eglibc-localedef-2.12
+++ b/tools/mkpkg/mkpkg_eglibc-2.14
@@ -20,23 +20,26 @@
################################################################################
echo "getting sources..."
- svn co svn://svn.eglibc.org/branches/eglibc-2_12/localedef eglibc-localedef-2.12-latest
+ svn co svn://svn.eglibc.org/branches/eglibc-2_14/libc eglibc-2.14-latest
+ svn co svn://svn.eglibc.org/branches/eglibc-2_14/ports eglibc-2.14-latest/ports
+ svn co svn://svn.eglibc.org/branches/eglibc-2_14/linuxthreads/linuxthreads eglibc-2.14-latest/linuxthreads
+ svn co svn://svn.eglibc.org/branches/eglibc-2_14/linuxthreads/linuxthreads_db eglibc-2.14-latest/linuxthreads_db
echo "getting version..."
- cd eglibc-localedef-2.12-latest
+ cd eglibc-2.14-latest
SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
echo $SVN_REV
cd ..
echo "copying sources..."
- rm -rf eglibc-localedef-2.12-$SVN_REV
- cp -R eglibc-localedef-2.12-latest eglibc-localedef-2.12-$SVN_REV
+ rm -rf eglibc-2.14-$SVN_REV
+ cp -R eglibc-2.14-latest eglibc-2.14-$SVN_REV
echo "cleaning sources..."
- find eglibc-localedef-2.12-$SVN_REV -name .svn -exec rm -rf {} ";"
+ find eglibc-2.14-$SVN_REV -name .svn -exec rm -rf {} ";"
echo "packing sources..."
- tar cvjf eglibc-localedef-2.12-$SVN_REV.tar.bz2 eglibc-localedef-2.12-$SVN_REV
+ tar cvJf eglibc-2.14-$SVN_REV.tar.xz eglibc-2.14-$SVN_REV
echo "remove temporary sourcedir..."
- rm -rf eglibc-localedef-2.12-$SVN_REV
+ rm -rf eglibc-2.14-$SVN_REV
diff --git a/tools/mkpkg/mkpkg_airplayer b/tools/mkpkg/mkpkg_libcec
similarity index 80%
rename from tools/mkpkg/mkpkg_airplayer
rename to tools/mkpkg/mkpkg_libcec
index 15a0d71a1e..2e15a5f8e0 100755
--- a/tools/mkpkg/mkpkg_airplayer
+++ b/tools/mkpkg/mkpkg_libcec
@@ -20,24 +20,24 @@
################################################################################
echo "getting sources..."
- if [ ! -d Airplayer.git ]; then
- git clone git://github.com/PascalW/Airplayer.git Airplayer.git
+ if [ ! -d libcec.git ]; then
+ git clone git://github.com/Pulse-Eight/libcec.git -b release libcec.git
fi
- cd Airplayer.git
+ cd libcec.git
git pull
GIT_REV=`git log -n1 --format=%h`
cd ..
echo "copying sources..."
- rm -rf airplayer-$GIT_REV
- cp -R Airplayer.git airplayer-$GIT_REV
+ rm -rf libcec-$GIT_REV
+ cp -R libcec.git libcec-$GIT_REV
echo "cleaning sources..."
- rm -rf airplayer-$GIT_REV/.git
+ rm -rf libcec-$GIT_REV/.git
echo "packing sources..."
- tar cvJf airplayer-$GIT_REV.tar.xz airplayer-$GIT_REV
+ tar cvJf libcec-$GIT_REV.tar.xz libcec-$GIT_REV
echo "remove temporary sourcedir..."
- rm -rf airplayer-$GIT_REV
+ rm -rf libcec-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_shairport b/tools/mkpkg/mkpkg_shairport
deleted file mode 100755
index 161f13e2a2..0000000000
--- a/tools/mkpkg/mkpkg_shairport
+++ /dev/null
@@ -1,43 +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
-################################################################################
-
-echo "getting sources..."
- if [ ! -d shairport.git ]; then
- git clone git://github.com/albertz/shairport.git shairport.git
- fi
-
- cd shairport.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf shairport-$GIT_REV
- cp -R shairport.git shairport-$GIT_REV
-
-echo "cleaning sources..."
- rm -rf shairport-$GIT_REV/.git
-
-echo "packing sources..."
- tar cvJf shairport-$GIT_REV.tar.xz shairport-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf shairport-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_siglaunchd b/tools/mkpkg/mkpkg_siglaunchd
deleted file mode 100755
index 384f40f190..0000000000
--- a/tools/mkpkg/mkpkg_siglaunchd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-echo "getting sources..."
- svn checkout svn://svn.projects.openmoko.org/svnroot/siglaunchd/trunk siglaunchd-latest
-
-echo "getting version..."
- cd siglaunchd-latest
- SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
- echo $SVN_REV
- cd ..
-
-echo "copying sources..."
- rm -rf siglaunchd-$SVN_REV
- cp -R siglaunchd-latest siglaunchd-$SVN_REV
-
-echo "cleaning sources..."
- find siglaunchd-$SVN_REV -name .svn -exec rm -rf {} ";"
-
-echo "packing sources..."
- tar cvjf siglaunchd-$SVN_REV.tar.bz2 siglaunchd-$SVN_REV
-
-echo "remove temporary sourcedir..."
- rm -rf siglaunchd-$SVN_REV
-
diff --git a/tools/mkpkg/mkpkg_simplejson-ap b/tools/mkpkg/mkpkg_simplejson-ap
deleted file mode 100755
index 16ef14a76c..0000000000
--- a/tools/mkpkg/mkpkg_simplejson-ap
+++ /dev/null
@@ -1,34 +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
-################################################################################
-
-echo "getting sources..."
-
- if [ ! -f simplejson-2.1.3.tar.gz ]; then
- wget -O simplejson-2.1.3.tar.gz http://pypi.python.org/packages/source/s/simplejson/simplejson-2.1.3.tar.gz
- fi
-
- tar xzf simplejson-2.1.3.tar.gz
- echo "renaming folder name..."
- mv simplejson-2.1.3 simplejson-ap-2.1.3
- echo "packing sources..."
- tar czf simplejson-ap-2.1.3.tar.gz simplejson-ap-2.1.3
- echo "remove temporary sourcedir..."
- rm -rf simplejson-ap-2.1.3
diff --git a/tools/mkpkg/mkpkg_tornado-ap b/tools/mkpkg/mkpkg_tornado-ap
deleted file mode 100755
index bcb40ecb2f..0000000000
--- a/tools/mkpkg/mkpkg_tornado-ap
+++ /dev/null
@@ -1,34 +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
-################################################################################
-
-echo "getting sources..."
-
- if [ ! -f tornado-1.2.1.tar.gz ]; then
- wget -O tornado-1.2.1.tar.gz https://github.com/downloads/facebook/tornado/tornado-1.2.1.tar.gz
- fi
-
- tar xzf tornado-1.2.1.tar.gz
- echo "renaming folder name..."
- mv tornado-1.2.1 tornado-ap-1.2.1
- echo "packing sources..."
- tar czf tornado-ap-1.2.1.tar.gz tornado-ap-1.2.1
- echo "remove temporary sourcedir..."
- rm -rf tornado-ap-1.2.1
diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc
index 9c6d14ec18..51396a48d7 100755
--- a/tools/mkpkg/mkpkg_xbmc
+++ b/tools/mkpkg/mkpkg_xbmc
@@ -47,6 +47,8 @@ echo "cleaning sources..."
echo "seperating theme..."
rm -rf $PKG_NAME-theme-Confluence-$GIT_REV
mv $PKG_NAME-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$GIT_REV
+# rm -rf $PKG_NAME-theme-Touched-$GIT_REV
+# mv $PKG_NAME-$GIT_REV/addons/skin.touched $PKG_NAME-theme-Touched-$GIT_REV
echo "cleaning sources..."
rm -rf $PKG_NAME-$GIT_REV/visualisations
@@ -70,7 +72,9 @@ echo "cleaning sources..."
echo "packing sources..."
tar cvJf $PKG_NAME-$GIT_REV.tar.xz $PKG_NAME-$GIT_REV
tar cvJf $PKG_NAME-theme-Confluence-$GIT_REV.tar.xz $PKG_NAME-theme-Confluence-$GIT_REV
+# tar cvJf $PKG_NAME-theme-Touched-$GIT_REV.tar.xz $PKG_NAME-theme-Touched-$GIT_REV
echo "remove temporary sourcedir..."
rm -rf $PKG_NAME-$GIT_REV
rm -rf $PKG_NAME-theme-Confluence-$GIT_REV
+# rm -rf $PKG_NAME-theme-Touched-$GIT_REV
diff --git a/tools/mkpkg/mkpkg_xbmc-10.1-dharma b/tools/mkpkg/mkpkg_xbmc-10.1-dharma
deleted file mode 100755
index 49b37be8d3..0000000000
--- a/tools/mkpkg/mkpkg_xbmc-10.1-dharma
+++ /dev/null
@@ -1,78 +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
-################################################################################
-
-PKG_NAME="xbmc"
-PKG_VERSION="10.1-Dharma"
-GIT_REPO="-b Dharma git@github.com:xbmc/xbmc.git"
-DEST_DIR="$PKG_NAME-$PKG_VERSION"
-
-echo "getting sources..."
- if [ ! -d $DEST_DIR-latest ]; then
- git clone $GIT_REPO $DEST_DIR-latest
- fi
-
- cd $DEST_DIR-latest
- git checkout $PKG_VERSION
- git pull
-
-echo "getting version..."
- GIT_REV=`git log -n1 --format=%h`
- echo $GIT_REV
- cd ..
-
-echo "copying sources..."
- rm -rf $PKG_NAME-$PKG_VERSION
- cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION
- echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version
-
-echo "cleaning sources..."
- rm -rf $PKG_NAME-$PKG_VERSION/.git
-
-echo "seperating theme..."
- rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
- mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
-
-echo "cleaning sources..."
- rm -rf $PKG_NAME-$PKG_VERSION/visualisations
- rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
- rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
- rm -rf $PKG_NAME-$PKG_VERSION/project
-
- for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
- "PackageMaker" "Translator" "XBMCLive" "XprPack" \
- "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
- rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
- done
-
- for i in dll a lib so bat; do
- find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
- done
-
- # bundled win32 binaries
- rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
-
-echo "packing sources..."
- tar cvjf $PKG_NAME-$PKG_VERSION.tar.bz2 $PKG_NAME-$PKG_VERSION
- tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION
-
-echo "remove temporary sourcedir..."
- rm -rf $PKG_NAME-$PKG_VERSION
- rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
diff --git a/tools/mkpkg/mkpkg_xbmc-dharma b/tools/mkpkg/mkpkg_xbmc-dharma
deleted file mode 100755
index 58bc2535e5..0000000000
--- a/tools/mkpkg/mkpkg_xbmc-dharma
+++ /dev/null
@@ -1,68 +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
-################################################################################
-
-echo "getting sources..."
- svn co http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma/ xbmc-dharma-latest
-
-echo "getting version..."
- cd xbmc-dharma-latest
- SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
- echo $SVN_REV
- cd ..
-
-echo "copying sources..."
- rm -rf xbmc-dharma-$SVN_REV
- cp -R xbmc-dharma-latest xbmc-dharma-$SVN_REV
- echo "$SVN_REV" > xbmc-dharma-$SVN_REV/svn.version
-
-echo "cleaning sources..."
- find xbmc-dharma-$SVN_REV -name .svn -exec rm -rf {} ";"
-
-echo "seperating theme..."
- rm -rf xbmc-theme-Confluence-$SVN_REV
- mv xbmc-dharma-$SVN_REV/addons/skin.confluence xbmc-dharma-theme-Confluence-$SVN_REV
-
-echo "cleaning sources..."
- rm -rf xbmc-dharma-$SVN_REV/visualisations
- rm -rf xbmc-dharma-$SVN_REV/lib/libSDL-*
- rm -rf xbmc-dharma-$SVN_REV/lib/libcurl-*
- rm -rf xbmc-dharma-$SVN_REV/project
-
- for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
- "PackageMaker" "Translator" "XBMCLive" "XprPack" \
- "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
- rm -rf xbmc-dharma-$SVN_REV/tools/$i
- done
-
- for i in dll a lib so bat; do
- find xbmc-dharma-$SVN_REV -name *.$i -exec rm -rf {} ";"
- done
-
- # bundled win32 binaries
- rm -r xbmc-dharma-$SVN_REV/xbmc/visualizations/XBMCProjectM/win32
-
-echo "packing sources..."
- tar cvjf xbmc-dharma-$SVN_REV.tar.bz2 xbmc-dharma-$SVN_REV
- tar cvjf xbmc-dharma-theme-Confluence-$SVN_REV.tar.bz2 xbmc-dharma-theme-Confluence-$SVN_REV
-
-echo "remove temporary sourcedir..."
- rm -rf xbmc-dharma-$SVN_REV
- rm -rf xbmc-dharma-theme-Confluence-$SVN_REV
diff --git a/tools/mkpkg/mkpkg_xbmc-dharma-final b/tools/mkpkg/mkpkg_xbmc-dharma-final
deleted file mode 100755
index efee527234..0000000000
--- a/tools/mkpkg/mkpkg_xbmc-dharma-final
+++ /dev/null
@@ -1,68 +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
-################################################################################
-
-REV="10.0-Dharma"
-
-echo "getting sources..."
- svn co http://xbmc.svn.sourceforge.net/svnroot/xbmc/tags/$REV xbmc-$REV
-
-echo "getting version..."
- cd xbmc-$REV
- SVN_REV=`LANG=C svn info 2>/dev/null | grep Rev: | sed -e 's/.*\: //'`
- echo $SVN_REV
- cd ..
-
-echo "copying sources..."
- echo "$SVN_REV" > xbmc-$REV/svn.version
-
-echo "cleaning sources..."
- find xbmc-$REV -name .svn -exec rm -rf {} ";"
-
-echo "seperating theme..."
- rm -rf xbmc-theme-Confluence-$REV
- mv xbmc-$REV/addons/skin.confluence xbmc-theme-Confluence-$REV
-
-echo "cleaning sources..."
- rm -rf xbmc-$REV/visualisations
- rm -rf xbmc-$REV/lib/libSDL-*
- rm -rf xbmc-$REV/lib/libcurl-*
- rm -rf xbmc-$REV/project
-
- for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
- "PackageMaker" "Translator" "XBMCLive" "XprPack" \
- "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
- rm -rf xbmc-$REV/tools/$i
- done
-
- for i in dll a lib so bat; do
- find xbmc-$REV -name *.$i -exec rm -rf {} ";"
- done
-
- # bundled win32 binaries
- rm -r xbmc-$REV/xbmc/visualizations/XBMCProjectM/win32
-
-echo "packing sources..."
- tar cvjf xbmc-$REV.tar.bz2 xbmc-$REV
- tar cvjf xbmc-theme-Confluence-$REV.tar.bz2 xbmc-theme-Confluence-$REV
-
-# echo "remove temporary sourcedir..."
-# rm -rf xbmc-$REV
-# rm -rf xbmc-theme-Confluence-$REV