merging trunk

This commit is contained in:
Stephan Raue
2010-04-26 18:24:00 +02:00
6 changed files with 48 additions and 11 deletions

View File

@@ -9,10 +9,11 @@ mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib
mkdir -p $INSTALL/usr/share/alsa
sed 's%.*~/\.asoundrc.*%%' $PKG_BUILD/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf
cp -PR $PKG_BUILD/src/conf/smixer.conf $INSTALL/usr/share/alsa
cp -PR $PKG_BUILD/src/conf/*.alisp $INSTALL/usr/share/alsa
cp -rf $PKG_BUILD/src/conf/cards $INSTALL/usr/share/alsa/
cp -rf $PKG_BUILD/src/conf/pcm $INSTALL/usr/share/alsa/
sed 's%~/\.asoundrc%/storage/\.config/asound.conf%' \
$PKG_BUILD/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf
cp -P $PKG_BUILD/src/conf/smixer.conf $INSTALL/usr/share/alsa
cp -P $PKG_BUILD/src/conf/*.alisp $INSTALL/usr/share/alsa
cp -PR $PKG_BUILD/src/conf/cards $INSTALL/usr/share/alsa/
cp -PR $PKG_BUILD/src/conf/pcm $INSTALL/usr/share/alsa/
rm -f $INSTALL/usr/share/alsa/cards/Makefile*
rm -f $INSTALL/usr/share/alsa/pcm/Makefile*

View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29060.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29090.tar.bz2

View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-29060.tar.bz2
http://sources.openelec.tv/svn/xbmc-29090.tar.bz2

View File

@@ -9,7 +9,8 @@ $SCRIPTS/install libdrm
$SCRIPTS/install Mesa
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/src/.libs/*.so*[.0-9] $INSTALL/usr/lib
cp -PR $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libva-*.so*T
mkdir -p $INSTALL/usr/lib/va
# cp -PR $PKG_BUILD/dummy_drv_video/.libs/*.so $INSTALL/usr/lib/va

View File

@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.33-rc8
# Linux kernel version: 2.6.33.2
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -969,6 +969,22 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
CONFIG_INPUT_LIRC=m
# CONFIG_LIRC_BT829 is not set
# CONFIG_LIRC_ENE0100 is not set
# CONFIG_LIRC_I2C is not set
# CONFIG_LIRC_IGORPLUGUSB is not set
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_IT87 is not set
# CONFIG_LIRC_ITE8709 is not set
CONFIG_LIRC_MCEUSB=m
CONFIG_LIRC_NCT667X=m
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_STREAMZAP is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set
# CONFIG_INPUT_MISC is not set
#
@@ -1967,6 +1983,8 @@ CONFIG_CRC32=y
CONFIG_LIBCRC32C=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_LZMA_NEEDED=y
CONFIG_HAS_IOMEM=y

View File

@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.33-rc8
# Linux kernel version: 2.6.33.2
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -954,6 +954,22 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
CONFIG_INPUT_LIRC=m
# CONFIG_LIRC_BT829 is not set
# CONFIG_LIRC_ENE0100 is not set
# CONFIG_LIRC_I2C is not set
# CONFIG_LIRC_IGORPLUGUSB is not set
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_IT87 is not set
# CONFIG_LIRC_ITE8709 is not set
CONFIG_LIRC_MCEUSB=m
CONFIG_LIRC_NCT667X=m
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_STREAMZAP is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set
# CONFIG_INPUT_MISC is not set
#
@@ -1844,7 +1860,6 @@ CONFIG_STAGING=y
# CONFIG_ALTERA_PCIE_CHDMA is not set
# CONFIG_R8187SE is not set
# CONFIG_RTL8192E is not set
# CONFIG_INPUT_MIMIO is not set
# CONFIG_TRANZPORT is not set
#
@@ -2245,6 +2260,8 @@ CONFIG_CRC32=y
CONFIG_LIBCRC32C=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_LZMA_NEEDED=y
CONFIG_HAS_IOMEM=y