Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

This commit is contained in:
Stephan Raue 2011-07-21 06:51:45 +02:00
commit 58b3300541
7 changed files with 62 additions and 33 deletions

View File

@ -84,6 +84,8 @@ else
mixer 0 Speaker 100%
mixer 0 'Internal Speaker' 0% mute
mixer 0 Playback 100%
mixer 1 Headphone 100%
mixer 1 Speaker 100%
mixer 0 Center 100%
mixer 0 LFE 100%

View File

@ -113,7 +113,7 @@ EOF
#
# Always sync to vblank
if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "RADEON" ] ; then
if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF
<videoscreen>
<vsync>2</vsync>

View File

@ -27,3 +27,11 @@
XBMC_HOME="/usr/share/xbmc"
export XBMC_HOME
GPUDEVICE=$(lspci -n | grep 0300)
GPUTYPE="OTHER"
[ "$(echo $GPUDEVICE | grep 8086)" ] && GPUTYPE="INTEL" # 8086 == INTEL
[ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA" # 10de == NVIDIA
[ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD" # 1002 == AMD
export GPUTYPE

View File

@ -23,7 +23,7 @@
TEMP="0"
if [ -f /usr/bin/sensors ]; then
TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp1_input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'`
TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp._input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'`
fi
echo "${TEMP} C"

View File

@ -3,41 +3,12 @@ Section "Device"
Driver "fglrx"
Option "HWCursor" "false"
Option "VideoOverlay" "off"
Option "OpenGLOverlay" "off"
Option "TexturedVideo" "on"
Option "TexturedVideoSync" "on"
Option "XAANoOffscreenPixmaps" "True"
Option "AllowGLXWithComposite" "True"
Option "AIGLX" "on"
Option "no_accel" "no" # XAA Beschleunigung on(no)/off(yes)
Option "AccelMethod" "XAA" # 2D-Hardware-Acceleration XAA, EXA
Option "FSAAEnable" "on" # Antialiasing
Option "FSAAScale" "6" # 0,2,4,6
Option "EnablePageFlip" "true"
Option "no_dri" "no"
Option "TripleBuffer" "true"
Option "UseInternalAGPGART" "yes"
Option "Textured2D" "True"
Option "TexturedXrender" "True"
EndSection
Section "ServerFlags"
Option "AIGLX" "1"
EndSection
Section "DRI"
Mode 0666
EndSection
Section "Extensions"
# For Textured2d and Textured XRender
Option "RENDER" "1"
Option "XVideo" "1"
Option "Composite" "1"
Option "Damage" "1"
EndSection
Section "Screen"
Identifier "screen"
Device "fglrx"

View File

@ -0,0 +1,48 @@
Section "Device"
Identifier "fglrx"
Driver "fglrx"
Option "HWCursor" "false"
Option "VideoOverlay" "off"
Option "OpenGLOverlay" "off"
Option "TexturedVideo" "on"
Option "TexturedVideoSync" "on"
Option "XAANoOffscreenPixmaps" "True"
Option "AllowGLXWithComposite" "True"
Option "AIGLX" "on"
Option "no_accel" "no" # XAA Beschleunigung on(no)/off(yes)
Option "AccelMethod" "XAA" # 2D-Hardware-Acceleration XAA, EXA
Option "FSAAEnable" "on" # Antialiasing
Option "FSAAScale" "6" # 0,2,4,6
Option "EnablePageFlip" "true"
Option "no_dri" "no"
Option "TripleBuffer" "true"
Option "UseInternalAGPGART" "yes"
Option "Textured2D" "True"
Option "TexturedXrender" "True"
EndSection
Section "ServerFlags"
Option "AIGLX" "1"
EndSection
Section "DRI"
Mode 0666
EndSection
Section "Extensions"
# For Textured2d and Textured XRender
Option "RENDER" "1"
Option "XVideo" "1"
Option "Composite" "1"
Option "Damage" "1"
EndSection
Section "Screen"
Identifier "screen"
Device "fglrx"
DefaultDepth 24
SubSection "Display"
Depth 24
EndSubSection
EndSection

View File

@ -64,8 +64,8 @@ mkdir -p $INSTALL/etc/X11
mkdir -p $INSTALL/etc/ati
cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati
# cp $PKG_DIR/config/amdpcsdb.default $INSTALL/etc/ati/amdpcsdb
cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf
# cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf
touch $INSTALL/usr/config/fglrx.conf
ln -sf /storage/.config/fglrx.conf $INSTALL/etc/ati/amdpcsdb
cp $PKG_BUILD/common/etc/ati/control $INSTALL/etc/ati
cp $PKG_BUILD/common/etc/ati/signature $INSTALL/etc/ati