From f00a04121bd90a5dd5028f2903e221aa3fcd4480 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Jul 2011 18:50:27 +0200 Subject: [PATCH 1/6] xbmc: fix script to show cpu temperature Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/scripts/cputemp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/scripts/cputemp b/packages/mediacenter/xbmc/scripts/cputemp index 51a9292ab0..a9e7950a8b 100755 --- a/packages/mediacenter/xbmc/scripts/cputemp +++ b/packages/mediacenter/xbmc/scripts/cputemp @@ -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" From 154b6436ce14dbe254022a198d93ad3b84eabf83 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Jul 2011 23:09:19 +0200 Subject: [PATCH 2/6] xbmc: add gpu type detection Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/profile.d/xbmc.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/mediacenter/xbmc/profile.d/xbmc.conf b/packages/mediacenter/xbmc/profile.d/xbmc.conf index 84c1a778a6..0495a2733e 100644 --- a/packages/mediacenter/xbmc/profile.d/xbmc.conf +++ b/packages/mediacenter/xbmc/profile.d/xbmc.conf @@ -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 \ No newline at end of file From 337db88f6534f283ff3d20f4dcf1d820091f3234 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Jul 2011 23:11:16 +0200 Subject: [PATCH 3/6] xbmc: enable vsync with AMD gpu types per default Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/init.d/92_setup-xbmc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc index 459c761722..b67bde73bb 100644 --- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc +++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc @@ -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 2 From 7940b61ac3e5a3a515c1d67ff99b50b40ec94cbf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Jul 2011 23:38:27 +0200 Subject: [PATCH 4/6] xf86-video-fglrx: simplyfing xorg.conf Signed-off-by: Stephan Raue --- .../xf86-video-fglrx/config/xorg-fglrx.conf | 29 ----------- .../config/xorg-fglrx.conf.bk | 48 +++++++++++++++++++ 2 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf.bk 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 619e623074..e2ea855dc6 100644 --- a/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf +++ b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf @@ -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" diff --git a/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf.bk b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf.bk new file mode 100644 index 0000000000..619e623074 --- /dev/null +++ b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf.bk @@ -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 From dcc86ffe8973635b2bbc5c6ee7d5cba527bd76bb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Jul 2011 23:39:17 +0200 Subject: [PATCH 5/6] xf86-video-fglrx: dont install preconfigured fglrx.conf Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-fglrx/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install index 5ceddca06e..6e71aba180 100755 --- a/packages/x11/driver/xf86-video-fglrx/install +++ b/packages/x11/driver/xf86-video-fglrx/install @@ -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 From 614b6dd15bf3c626a0619330805472e1461969f9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Jul 2011 00:29:34 +0200 Subject: [PATCH 6/6] alsa-utils: enable speaker and headphones on soundcard #1 too Signed-off-by: Stephan Raue --- packages/audio/alsa-utils/scripts/soundconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/audio/alsa-utils/scripts/soundconfig b/packages/audio/alsa-utils/scripts/soundconfig index c8dc095c14..4c3c9fa3f6 100755 --- a/packages/audio/alsa-utils/scripts/soundconfig +++ b/packages/audio/alsa-utils/scripts/soundconfig @@ -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%