From 528f17bf3e6f68a15cf8c4611e0374a96bc94ed9 Mon Sep 17 00:00:00 2001 From: John Galt Date: Sun, 17 Aug 2014 00:46:36 -0700 Subject: [PATCH 1/4] llvm-git: update to current master --- common/shlibs | 2 +- srcpkgs/llvm-git/template | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 31335680b98..5f0f71a71c8 100644 --- a/common/shlibs +++ b/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 diff --git a/srcpkgs/llvm-git/template b/srcpkgs/llvm-git/template index f5f14b423f2..b86472d480e 100644 --- a/srcpkgs/llvm-git/template +++ b/srcpkgs/llvm-git/template @@ -1,9 +1,9 @@ # Template file for 'llvm-git' pkgname=llvm-git -version=20140721 -_llvmsha=3f1ae7f58c02fa72880a9607bdddfbbf75fa7266 -_clangsha=95dcc5d2fd3e8965b789de600f7ce0bf179abb20 -_crtsha=a9c43b32c19449a0e8d3e0f67b072c3c7077347c +version=20140816 +_llvmsha=0ac5626b56ece9e73344cdd7551ff4fbaa0d145a +_clangsha=0606cf73b4d78373af2619cde703dcf86ff0e30a +_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 " homepage="http://www.llvm.org" license="BSD" From eb895701089d7c6ee30a3b5d4c388edfb683ae54 Mon Sep 17 00:00:00 2001 From: John Galt Date: Sun, 17 Aug 2014 00:53:05 -0700 Subject: [PATCH 2/4] MesaLib-git: update to current master --- srcpkgs/MesaLib-git/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/MesaLib-git/template b/srcpkgs/MesaLib-git/template index ba4613cb994..5550014af03 100644 --- a/srcpkgs/MesaLib-git/template +++ b/srcpkgs/MesaLib-git/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib-git'. pkgname=MesaLib-git -version=20140725 -revision=2 +version=20140816 +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} From d5623fcd4d10d80001dd0230f77cfd9b37056383 Mon Sep 17 00:00:00 2001 From: John Galt Date: Sun, 17 Aug 2014 00:55:31 -0700 Subject: [PATCH 3/4] libclc-git: update to current master --- srcpkgs/libclc-git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libclc-git/template b/srcpkgs/libclc-git/template index 855f2ec6e02..da0b134eda4 100644 --- a/srcpkgs/libclc-git/template +++ b/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} From cf62424ce78dcdca73e45151d9525f6f7663e91a Mon Sep 17 00:00:00 2001 From: John Galt Date: Sun, 17 Aug 2014 01:14:23 -0700 Subject: [PATCH 4/4] xf86-video-ati: merge "radeon: enable hawaii accel conditionally (v3)" from master Only if the kernel has the new CP firmware (available from linux3.17 package) --- ...2cbfbca05a503acdc1cca2f8409d141173af.patch | 64 +++++++++++++++++++ srcpkgs/xf86-video-ati/template | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xf86-video-ati/patches/94202cbfbca05a503acdc1cca2f8409d141173af.patch diff --git a/srcpkgs/xf86-video-ati/patches/94202cbfbca05a503acdc1cca2f8409d141173af.patch b/srcpkgs/xf86-video-ati/patches/94202cbfbca05a503acdc1cca2f8409d141173af.patch new file mode 100644 index 00000000000..ee2887cd3bf --- /dev/null +++ b/srcpkgs/xf86-video-ati/patches/94202cbfbca05a503acdc1cca2f8409d141173af.patch @@ -0,0 +1,64 @@ +From 94202cbfbca05a503acdc1cca2f8409d141173af Mon Sep 17 00:00:00 2001 +From: Alex Deucher +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 (v2) +Signed-off-by: Alex Deucher +Signed-off-by: Andreas Boll + +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 + diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index 78a359abb71..8b8f53247c5 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/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