From 20067e6fe00865a52ed721f66345b7eea1e7488b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 26 Sep 2013 07:57:41 +0200 Subject: [PATCH] xbmc: remove fglrx and xvba support Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/package.mk | 16 +--------------- packages/mediacenter/xbmc/scripts/gputemp | 11 ----------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 84e97b7cc2..0eb20f2f5d 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -320,20 +320,6 @@ else XBMC_VAAPI="--disable-vaapi" fi -if [ "$XVBA" = yes ]; then - get_graphicdrivers - for drv in $GRAPHIC_DRIVERS; do - if [ "$drv" = "fglrx" ]; then - PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx" - elif [ "$drv" = "fglrx-legacy" ]; then - PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx-legacy" - fi - done - XBMC_XVBA="--enable-xvba" -else - XBMC_XVBA="--disable-xvba" -fi - if [ "$CRYSTALHD" = yes ]; then PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET crystalhd" PKG_DEPENDS="$PKG_DEPENDS crystalhd" @@ -366,7 +352,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \ $XBMC_VDPAU \ $XBMC_VAAPI \ $XBMC_CRYSTALHD \ - $XBMC_XVBA \ + --disable-xvba \ --disable-vdadecoder \ --disable-vtbdecoder \ --disable-tegra \ diff --git a/packages/mediacenter/xbmc/scripts/gputemp b/packages/mediacenter/xbmc/scripts/gputemp index 6b312d00b4..0701b112e3 100755 --- a/packages/mediacenter/xbmc/scripts/gputemp +++ b/packages/mediacenter/xbmc/scripts/gputemp @@ -26,15 +26,4 @@ if lspci -n | grep 0300 | grep -q 10de; then [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,,,g'` fi -if lspci -n | grep 0300 | grep -q 1002; then - if [ -f /storage/.config/xorg.conf ]; then - XORG="/storage/.config/xorg.conf" - elif [ -f /etc/X11/xorg-fglrx-legacy.conf ]; then - XORG="/etc/X11/xorg-fglrx-legacy.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"