diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2014-01-19 00:06:01 +0400 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2014-01-19 00:06:01 +0400 |
| commit | 6aae606725bd6f7ba75c15011f0a0850a6d2acd8 (patch) | |
| tree | 77ae5ec8f8e6df152232ad5e7c0e9d68e91d54a8 /0001-opencl-use-versioned-.so-in-mesa.icd.patch | |
| parent | b6c637d80081a8a021d4b71cc77514d27919c908 (diff) | |
| download | mesa-6aae606725bd6f7ba75c15011f0a0850a6d2acd8.tar.gz mesa-6aae606725bd6f7ba75c15011f0a0850a6d2acd8.tar.xz mesa-6aae606725bd6f7ba75c15011f0a0850a6d2acd8.zip | |
enable OpenCL, r600-llvm
Enable OpenCL (RHBZ #887628)
Enable r600 llvm compiler (RHBZ #1055098)
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to '0001-opencl-use-versioned-.so-in-mesa.icd.patch')
| -rw-r--r-- | 0001-opencl-use-versioned-.so-in-mesa.icd.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/0001-opencl-use-versioned-.so-in-mesa.icd.patch b/0001-opencl-use-versioned-.so-in-mesa.icd.patch new file mode 100644 index 0000000..2875e57 --- /dev/null +++ b/0001-opencl-use-versioned-.so-in-mesa.icd.patch @@ -0,0 +1,71 @@ +From 348caa4b9ab2b00871c8ea73aaf59311f9a853e8 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko <i.gnatenko.brain@gmail.com> +Date: Sun, 12 Jan 2014 02:09:16 +0400 +Subject: [PATCH] opencl: use versioned .so in mesa.icd + +We must have versioned library in mesa.icd, because ICD loader would +fail if the mesa-devel package wasn't installed. + +Reported-by: Fabian Deutsch <fabian.deutsch@gmx.de> +Reference: https://bugs.freedesktop.org/show_bug.cgi?id=73512 +Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> +--- + configure.ac | 3 +++ + src/gallium/targets/opencl/Makefile.am | 2 +- + src/gallium/targets/opencl/mesa.icd | 1 - + src/gallium/targets/opencl/mesa.icd.in | 1 + + 4 files changed, 5 insertions(+), 2 deletions(-) + delete mode 100644 src/gallium/targets/opencl/mesa.icd + create mode 100644 src/gallium/targets/opencl/mesa.icd.in + +diff --git a/configure.ac b/configure.ac +index 4da6c51..c195b1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + dnl Set internal versions + OSMESA_VERSION=8 + AC_SUBST([OSMESA_VERSION]) ++OPENCL_VERSION=1 ++AC_SUBST([OPENCL_VERSION]) + + dnl Versions for external dependencies + LIBDRM_REQUIRED=2.4.24 +@@ -2023,6 +2025,7 @@ AC_CONFIG_FILES([Makefile + src/gallium/targets/egl-static/Makefile + src/gallium/targets/gbm/Makefile + src/gallium/targets/opencl/Makefile ++ src/gallium/targets/opencl/mesa.icd + src/gallium/targets/osmesa/Makefile + src/gallium/targets/osmesa/osmesa.pc + src/gallium/targets/pipe-loader/Makefile +diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am +index 653302c..3b257ca 100644 +--- a/src/gallium/targets/opencl/Makefile.am ++++ b/src/gallium/targets/opencl/Makefile.am +@@ -4,7 +4,7 @@ lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la + + lib@OPENCL_LIBNAME@_la_LDFLAGS = \ + $(LLVM_LDFLAGS) \ +- -version-number 1:0 ++ -version-number @OPENCL_VERSION@:0 + + lib@OPENCL_LIBNAME@_la_LIBADD = \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ +diff --git a/src/gallium/targets/opencl/mesa.icd b/src/gallium/targets/opencl/mesa.icd +deleted file mode 100644 +index 6a6a870..0000000 +--- a/src/gallium/targets/opencl/mesa.icd ++++ /dev/null +@@ -1 +0,0 @@ +-libMesaOpenCL.so +diff --git a/src/gallium/targets/opencl/mesa.icd.in b/src/gallium/targets/opencl/mesa.icd.in +new file mode 100644 +index 0000000..1b77b4e +--- /dev/null ++++ b/src/gallium/targets/opencl/mesa.icd.in +@@ -0,0 +1 @@ ++lib@OPENCL_LIBNAME@.so.@OPENCL_VERSION@ +-- +1.8.4.2 + |