mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
merging trunk
This commit is contained in:
@@ -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*
|
||||
|
||||
@@ -88,8 +88,10 @@ else
|
||||
mixer 'Analog Rear' 100%
|
||||
mixer 'Analog Center/LFE' 100%
|
||||
|
||||
# ASRock ION 330 (and perhaps others) has 2 IEC958 channels
|
||||
mixer IEC958,1 on
|
||||
|
||||
# asrock ion 330 has Master Front set to 0
|
||||
# ASRock ION 330 has Master Front set to 0
|
||||
mixer 'Master Front' 100%
|
||||
|
||||
fi
|
||||
|
||||
@@ -20,4 +20,4 @@ options snd-hda-intel model=auto
|
||||
|
||||
# fix some Audio Problems with HDMI on ION based Hardware
|
||||
# see: http://xbmc.org/forum/showthread.php?t=69479
|
||||
alias snd-card-0 snd-hda-codec-nvhdmi
|
||||
alias snd-card-0 snd-hda-codec-nvhdmi
|
||||
|
||||
@@ -8,5 +8,6 @@ $SCRIPTS/install alsa-lib
|
||||
$SCRIPTS/install alsa-utils
|
||||
|
||||
mkdir -p $INSTALL/etc/modprobe.d
|
||||
cp $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
|
||||
cp $PKG_DIR/config/audio $INSTALL/etc
|
||||
cp -P $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
|
||||
cp -P $PKG_DIR/config/audio $INSTALL/etc
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
$SCRIPTS/build libiconv
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/install libiconv
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/install gettext
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
|
||||
@@ -1 +0,0 @@
|
||||
http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz
|
||||
@@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/bootchart-1.2.tar.gz
|
||||
http://sources.openelec.tv/svn/bootchart-1.3.tar.gz
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
$SCRIPTS/build gettext
|
||||
$SCRIPTS/build dbus
|
||||
$SCRIPTS/build glib
|
||||
$SCRIPTS/build expat
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
$SCRIPTS/install dbus
|
||||
$SCRIPTS/install glib
|
||||
$SCRIPTS/install expat
|
||||
$SCRIPTS/install gettext
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/.build-target/dbus/.libs/*.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/.build-target/dbus/.libs/*.so* $INSTALL/usr/lib
|
||||
|
||||
@@ -1 +1 @@
|
||||
http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.82.tar.gz
|
||||
http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.86.tar.gz
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
|
||||
cd $PKG_BUILD/gettext-runtime
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--with-included-gettext \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--disable-dependency-tracking \
|
||||
--disable-java \
|
||||
--disable-native-java \
|
||||
--disable-libasprintf
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. config/options
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/gettext-runtime/intl/.libs/libintl.so* $INSTALL/usr/lib
|
||||
cp -PR $PKG_BUILD/gettext-runtime/intl/charset.alias $INSTALL/usr/lib
|
||||
@@ -1,29 +0,0 @@
|
||||
diff -Naur gettext-0.17/gettext-runtime/gnulib-lib/mbchar.h gettext-0.17a/gettext-runtime/gnulib-lib/mbchar.h
|
||||
--- gettext-0.17/gettext-runtime/gnulib-lib/mbchar.h 2007-10-07 22:28:16.000000000 +0200
|
||||
+++ gettext-0.17a/gettext-runtime/gnulib-lib/mbchar.h 2009-05-17 10:09:49.000000000 +0200
|
||||
@@ -147,6 +147,8 @@
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
|
||||
+typedef unsigned int wint_t;
|
||||
+
|
||||
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
|
||||
<wchar.h>.
|
||||
BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
|
||||
diff -Naur gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h gettext-0.17a/gettext-runtime/gnulib-lib/wchar.in.h
|
||||
--- gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2007-10-04 00:23:31.000000000 +0200
|
||||
+++ gettext-0.17a/gettext-runtime/gnulib-lib/wchar.in.h 2009-05-17 10:15:26.000000000 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
/* The include_next requires a split double-inclusion guard. */
|
||||
#if @HAVE_WCHAR_H@
|
||||
# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
|
||||
-#endif
|
||||
+#else
|
||||
|
||||
#ifndef _GL_WCHAR_H
|
||||
#define _GL_WCHAR_H
|
||||
@@ -80,3 +80,4 @@
|
||||
|
||||
#endif /* _GL_WCHAR_H */
|
||||
#endif /* _GL_WCHAR_H */
|
||||
+#endif
|
||||
@@ -1 +0,0 @@
|
||||
http://mirrors.ircam.fr/pub/gnu/gnu/gettext/gettext-0.17.tar.gz
|
||||
@@ -3,7 +3,7 @@
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/build toolchain
|
||||
$SCRIPTS/build libiconv
|
||||
#$SCRIPTS/build libiconv
|
||||
$SCRIPTS/build zlib
|
||||
$SCRIPTS/build glib-host
|
||||
|
||||
@@ -31,11 +31,12 @@ glib_cv_stack_grows='no' \
|
||||
--enable-regex \
|
||||
--with-gnu-ld \
|
||||
--with-threads=posix \
|
||||
--with-libiconv=gnu \
|
||||
--disable-man \
|
||||
--disable-rebuilds \
|
||||
--disable-gtk-doc \
|
||||
|
||||
# --with-libiconv=gnu \
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
. config/options
|
||||
|
||||
$SCRIPTS/install zlib
|
||||
$SCRIPTS/install libiconv
|
||||
#$SCRIPTS/install libiconv
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib
|
||||
rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T
|
||||
rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T
|
||||
|
||||
@@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/libdrm-20100318.tar.bz2
|
||||
http://dri.freedesktop.org/libdrm/libdrm-2.4.20.tar.bz2
|
||||
|
||||
@@ -58,10 +58,10 @@ case "$2" in
|
||||
$SCRIPTS/install plymouth-lite
|
||||
$SCRIPTS/install util-linux-ng
|
||||
|
||||
echo $TARGET_ARCH > $INSTALL/etc/arch
|
||||
echo "OpenELEC" > $INSTALL/etc/distribution
|
||||
echo "$PROJECT.$TARGET_ARCH" > $INSTALL/etc/arch
|
||||
echo "$OPENELEC_VERSION" > $INSTALL/etc/version
|
||||
echo "OpenELEC.tv - Date of build: $BUILD_DATE Build: $BZR_BUILD" > $INSTALL/etc/openelec-release
|
||||
echo "OpenELEC.tv - Date of build: $BUILD_DATE Build: $BZR_BUILD" > $INSTALL/etc/lsb-release
|
||||
|
||||
# Network support
|
||||
[ "$NETWORK" = yes ] && $SCRIPTS/install network
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user