debian/changelog | 13 ++++- debian/control | 10 ++-- debian/patches/clover-Fix-build-against-clang-SVN-r273191.diff | 23 ++++++++++ debian/patches/series | 1 debian/rules | 2 5 files changed, 41 insertions(+), 8 deletions(-)
New commits: commit ad424c3614b766c70ca45bdf1c9189ab44dfd67c Author: Andreas Boll <[email protected]> Date: Wed Sep 7 18:33:35 2016 +0200 control: Bump libclc dependencies. diff --git a/debian/changelog b/debian/changelog index 62acede..d542463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mesa (12.0.2-2) UNRELEASED; urgency=medium * Add clover-Fix-build-against-clang-SVN-r273191.diff to fix build against llvm-3.9. * control, rules: Use llvm/clang 3.9 (Closes: #836913). + * control: Bump libclc dependencies. -- Andreas Boll <[email protected]> Wed, 07 Sep 2016 18:23:39 +0200 diff --git a/debian/control b/debian/control index 0471aeb..7f7c510 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Build-Depends: libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libwayland-dev (>= 1.2.0) [linux-any], libclang-3.9-dev (>= 1:3.9) [amd64 i386 arm64 armhf], - libclc-dev (>= 0.2.0+git20150813) [amd64 i386 arm64 armhf], + libclc-dev (>= 0.2.0+git20160907) [amd64 i386 arm64 armhf], Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git Homepage: http://mesa3d.org/ @@ -482,8 +482,8 @@ Section: libs Architecture: amd64 i386 arm64 armhf Pre-Depends: ${misc:Pre-Depends} Depends: - libclc-r600 (>= 0.2.0+git20150813), - libclc-amdgcn, + libclc-r600 (>= 0.2.0+git20160907), + libclc-amdgcn (>= 0.2.0+git20160907), ocl-icd-libopencl1 | libopencl1, ${shlibs:Depends}, ${misc:Depends}, commit 8896da2ffa751470c26e612126f8f448a616e570 Author: Andreas Boll <[email protected]> Date: Wed Sep 7 18:31:35 2016 +0200 control, rules: Use llvm/clang 3.9 (Closes: #836913). diff --git a/debian/changelog b/debian/changelog index c16f0a5..62acede 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mesa (12.0.2-2) UNRELEASED; urgency=medium * Add clover-Fix-build-against-clang-SVN-r273191.diff to fix build against llvm-3.9. + * control, rules: Use llvm/clang 3.9 (Closes: #836913). -- Andreas Boll <[email protected]> Wed, 07 Sep 2016 18:23:39 +0200 diff --git a/debian/control b/debian/control index 91a0382..0471aeb 100644 --- a/debian/control +++ b/debian/control @@ -43,10 +43,10 @@ Build-Depends: libudev-dev [linux-any], flex, bison, - llvm-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], + llvm-3.9-dev (>= 1:3.9) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libwayland-dev (>= 1.2.0) [linux-any], - libclang-3.8-dev (>= 1:3.8) [amd64 i386 arm64 armhf], + libclang-3.9-dev (>= 1:3.9) [amd64 i386 arm64 armhf], libclc-dev (>= 0.2.0+git20150813) [amd64 i386 arm64 armhf], Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git diff --git a/debian/rules b/debian/rules index 31ae0b4..2fa85c3 100755 --- a/debian/rules +++ b/debian/rules @@ -93,7 +93,7 @@ else ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el)) GALLIUM_DRIVERS += radeonsi confflags_GALLIUM += --enable-gallium-llvm - confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.8 + confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.9 GALLIUM_DRIVERS += swrast else DRI_DRIVERS += swrast commit 0200a5db7f57ffa206243a9e4d0f017382eec73a Author: Andreas Boll <[email protected]> Date: Wed Sep 7 18:29:46 2016 +0200 Add clover-Fix-build-against-clang-SVN-r273191.diff to fix build against llvm-3.9. diff --git a/debian/changelog b/debian/changelog index e1d4f3c..c16f0a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (12.0.2-2) UNRELEASED; urgency=medium + + * Add clover-Fix-build-against-clang-SVN-r273191.diff to fix build + against llvm-3.9. + + -- Andreas Boll <[email protected]> Wed, 07 Sep 2016 18:23:39 +0200 + mesa (12.0.2-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/clover-Fix-build-against-clang-SVN-r273191.diff b/debian/patches/clover-Fix-build-against-clang-SVN-r273191.diff new file mode 100644 index 0000000..d1d90e3 --- /dev/null +++ b/debian/patches/clover-Fix-build-against-clang-SVN-r273191.diff @@ -0,0 +1,23 @@ +commit 82e0bbd01abfb2073519941d9893fa6ac05fb58c +Author: Vedran Miletić <[email protected]> +Date: Tue Jun 21 01:17:49 2016 +0200 + + clover: Fix build against clang SVN >= r273191 + + setLangDefaults() now requires PreprocessorOptions as an argument. + + Reviewed-and-Tested-by: Michel Dänzer <[email protected]> + +diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp +index e2cadda..57eaaaa 100644 +--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp ++++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp +@@ -207,7 +207,7 @@ namespace { + c.getDiagnosticOpts().ShowCarets = false; + c.getInvocation().setLangDefaults(c.getLangOpts(), clang::IK_OpenCL, + #if HAVE_LLVM >= 0x0309 +- llvm::Triple(triple), ++ llvm::Triple(triple), c.getPreprocessorOpts(), + #endif + clang::LangStandard::lang_opencl11); + c.createDiagnostics( diff --git a/debian/patches/series b/debian/patches/series index 9f0749f..3165d09 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 07_gallium-fix-build-failure-on-powerpcspe.diff +clover-Fix-build-against-clang-SVN-r273191.diff commit 2720113ca348a8cc231e56488bb0ae4a5a9be122 Author: Andreas Boll <[email protected]> Date: Tue Sep 6 10:37:59 2016 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 03603b4..e1d4f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (12.0.2-1) UNRELEASED; urgency=medium +mesa (12.0.2-1) unstable; urgency=medium * New upstream release. * rules: Pass -c4 to dpkg-gensymbols through dh_makeshlibs, got @@ -15,7 +15,7 @@ mesa (12.0.2-1) UNRELEASED; urgency=medium * source/local-options: Add more files to extend-diff-ignore option. Fixes 87 patch-system-but-direct-changes-in-diff lintian warnings. - -- Andreas Boll <[email protected]> Tue, 19 Jul 2016 11:04:19 +0200 + -- Andreas Boll <[email protected]> Tue, 06 Sep 2016 10:37:23 +0200 mesa (12.0.1-3) experimental; urgency=medium
