From ba2362a7b244b8f1a226607260367ba43f72d3c1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 9 Jul 2012 17:37:19 +0200
Subject: [PATCH] xf86-video-fglrx: prepare driver to support installation of
 different driver versions together - part 2

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/driver/xf86-video-fglrx/build          | 8 ++++----
 packages/x11/xserver/xorg-server/scripts/xorg_start | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build
index 76b5ab5368..26fcc1f46f 100755
--- a/packages/x11/driver/xf86-video-fglrx/build
+++ b/packages/x11/driver/xf86-video-fglrx/build
@@ -57,9 +57,9 @@ cd $ROOT/$PKG_BUILD
   cd $INSTALL_DIR/
   for etc in `find etc -type f`; do
     mkdir -p $ROOT/$PKG_BUILD/.install/`dirname $etc`
-      ln -sf /usr/lib/fglrx/$etc $ROOT/$PKG_BUILD/.install/$etc
+      ln -sf /var/run/fglrx/$etc $ROOT/$PKG_BUILD/.install/$etc
   done
-  ln -sf /usr/lib/fglrx/etc/ati/amdpcsdb $ROOT/$PKG_BUILD/.install/etc/ati/amdpcsdb
+  ln -sf /var/run/fglrx/etc/ati/amdpcsdb $ROOT/$PKG_BUILD/.install/etc/ati/amdpcsdb
 )
 
 # ATI config
@@ -70,7 +70,7 @@ cd $ROOT/$PKG_BUILD
   cd $INSTALL_DIR/
   for bin in `find bin -type f`; do
     mkdir -p $ROOT/$PKG_BUILD/.install/usr/`dirname $bin`
-      ln -sf /usr/lib/fglrx/$bin $ROOT/$PKG_BUILD/.install/usr/$bin
+      ln -sf /var/run/fglrx/$bin $ROOT/$PKG_BUILD/.install/usr/$bin
   done
 )
 
@@ -122,6 +122,6 @@ fi
   cd $INSTALL_DIR/
   for lib in `find lib -type f`; do
     mkdir -p $ROOT/$PKG_BUILD/.install/usr/`dirname $lib`
-      ln -sf /usr/lib/fglrx/$lib $ROOT/$PKG_BUILD/.install/usr/$lib
+      ln -sf /var/run/fglrx/$lib $ROOT/$PKG_BUILD/.install/usr/$lib
   done
 )
diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index ced552a45d..095e55d4da 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -78,6 +78,8 @@ if [ "$RUNLEVEL" = openelec ]; then
     ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
     XORG_ARGS="$XORG_ARGS -ignoreABI"
   elif [ "${xorg_driver}" = "fglrx" ]; then
+    mkdir -p /var/run
+    ln -sf /usr/lib/fglrx /var/run/fglrx
     ln -sf /usr/lib/libGL_fglrx.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_fglrx.so /var/lib/libglx.so
   else