Merge pull request #507 from RealJohnGalt/llvm

Various git updates + hawaii accel

common/shlibs

@@ -902,7 +902,7 @@ libconfuse.so.0 confuse-2.7_1
 libclang.so clang-3.4.2_1
 libclang.so clang-git-20140721_1
 libLLVM-3.4.so libllvm-3.4.2_1
-libLLVM-3.5svn.so libllvm-git-20140721_1
+libLLVM-3.6svn.so libllvm-git-20140816_1
 libisofs.so.6 libisofs-0.6.24_1
 libbfd-2.22.so binutils-2.22_1<2.23_1
 libopcodes-2.22.so binutils-2.22_1<2.23_1

srcpkgs/MesaLib-git/template

@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib-git'.
 pkgname=MesaLib-git
-version=20140725
+version=20140816
-revision=2
+revision=1
 wrksrc="Mesa-git-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -56,7 +56,7 @@ conf_files="/etc/drirc"
 
 do_fetch() {
 	local url="git://anongit.freedesktop.org/mesa/mesa"
-	local sha=654fd3e33f71702aa487b5b5249847bee73d4823
+	local sha=ef130b6050fc91c12a220f19d8bdd659712f7fb9
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${wrksrc}
 	cd ${wrksrc}

srcpkgs/libclc-git/template

@@ -1,6 +1,6 @@
 # Template file for 'libclc-git'
 pkgname=libclc-git
-version=20140723
+version=20140801
 revision=1
 hostmakedepends="git"
 makedepends="python libffi-devel zlib-devel llvm-git clang-git"
@@ -16,7 +16,7 @@ do_fetch() {
 	# Upstream libclc git is http://llvm.org/git/libclc.git, however
 	# we use a minimal git-core for git:// protocol.
 	local url="git://github.com/llvm-mirror/libclc"
-	local sha=a63df067faf8a0ce2267c746aa9af928ae8c927b
+	local sha=5b48f170c8b22168cad67e2d331da4aedb0788bd
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${wrksrc}
 	cd ${wrksrc}

srcpkgs/llvm-git/template

@@ -1,9 +1,9 @@
 # Template file for 'llvm-git'
 pkgname=llvm-git
-version=20140721
+version=20140816
-_llvmsha=3f1ae7f58c02fa72880a9607bdddfbbf75fa7266
+_llvmsha=0ac5626b56ece9e73344cdd7551ff4fbaa0d145a
-_clangsha=95dcc5d2fd3e8965b789de600f7ce0bf179abb20
+_clangsha=0606cf73b4d78373af2619cde703dcf86ff0e30a
-_crtsha=a9c43b32c19449a0e8d3e0f67b072c3c7077347c
+_crtsha=cbaa006aa2428a35c050c28fd5891a409e9c2b5e
 wrksrc="llvm-${version}.src"
 revision=1
 lib32disabled=yes
@@ -11,7 +11,7 @@ configure_args="--disable-expensive-checks --disable-debug-runtime
  --enable-bindings=none --enable-optimize --enable-shared --enable-libffi
  --enable-llvmc-dynamic --disable-assertions --enable-keep-symbols
  --enable-experimental-targets=R600"
-short_desc="Low Level Virtual Machine [3.5-git]"
+short_desc="Low Level Virtual Machine [3.6-git]"
 maintainer="John Galt <johngaltfirstrun@gmail.com>"
 homepage="http://www.llvm.org"
 license="BSD"

srcpkgs/xf86-video-ati/patches/94202cbfbca05a503acdc1cca2f8409d141173af.patch

@@ -0,0 +1,64 @@
+From 94202cbfbca05a503acdc1cca2f8409d141173af Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher@gmail.com>
+Date: Fri, 1 Aug 2014 21:55:40 +0200
+Subject: radeon: enable hawaii accel conditionally (v3)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only if the kernel has the new CP firmware.
+
+v2: check value of ACCEL_WORKING2
+v3 (Andreas Boll):
+ - check for value 2 or 3 of ACCEL_WORKING2
+ - update man page
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v2)
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+diff --git a/man/radeon.man b/man/radeon.man
+index 802f6c2..7dde040 100644
+--- man/radeon.man
++++ man/radeon.man
+@@ -229,8 +229,7 @@ Selects software cursor.  The default is
+ Enables or disables all hardware acceleration.
+ .br
+ The default is
+-.B on
+-except for HAWAII.
++.B on.
+ .TP
+ .BI "Option \*qZaphodHeads\*q \*q" string \*q
+ Specify the RandR output(s) to use with zaphod mode for a particular driver
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
+index a5e77ef..171d919 100644
+--- src/radeon_kms.c
++++ src/radeon_kms.c
+@@ -387,8 +387,12 @@ static Bool RADEONIsAccelWorking(ScrnInfoPtr pScrn)
+         }
+         return FALSE;
+     }
+-    if (tmp)
++    if (info->ChipFamily == CHIP_FAMILY_HAWAII) {
++        if (tmp == 2 || tmp == 3)
++            return TRUE;
++    } else if (tmp) {
+         return TRUE;
++    }
+     return FALSE;
+ }
+ 
+@@ -486,8 +490,7 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
+ 	info->is_fast_fb = TRUE;
+     }
+ 
+-    if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL,
+-			     info->ChipFamily != CHIP_FAMILY_HAWAII) ||
++    if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL, TRUE) ||
+ 	(!RADEONIsAccelWorking(pScrn))) {
+ 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 		   "GPU accel disabled or not working, using shadowfb for KMS\n");
+-- 
+cgit v0.10.2
+

srcpkgs/xf86-video-ati/template

@@ -1,7 +1,7 @@
 # Template build file for 'xf86-video-ati'.
 pkgname=xf86-video-ati
 version=7.4.0
-revision=6
+revision=7
 lib32disabled=yes
 only_for_archs="i686 x86_64"
 build_style=gnu-configure