[beignet] 01/01: Enable multiarch

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit a4be256b30625db8829a5d752dc71aa4eb61229b
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Thu Feb 26 23:42:32 2015 +0000

    Enable multiarch
---
 debian/beignet-opencl-icd.install     |  2 +-
 debian/beignet-opencl-icd.maintscript |  2 ++
 debian/changelog                      |  1 +
 debian/control                        |  5 ++++-
 debian/patches/Enable-multiarch.patch | 42 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 6 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/debian/beignet-opencl-icd.install b/debian/beignet-opencl-icd.install
index 1c75eb4..035690a 100644
--- a/debian/beignet-opencl-icd.install
+++ b/debian/beignet-opencl-icd.install
@@ -1,2 +1,2 @@
 etc/OpenCL
-usr/lib/beignet
+usr/lib/*/beignet
diff --git a/debian/beignet-opencl-icd.maintscript b/debian/beignet-opencl-icd.maintscript
new file mode 100644
index 0000000..5702ea0
--- /dev/null
+++ b/debian/beignet-opencl-icd.maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/OpenCL/vendors/intel-beignet.icd 1.0.1-3~
+rm_conffile /etc/OpenCL/vendors/intel-beignet.icd 1.0.1-1~ beignet
diff --git a/debian/changelog b/debian/changelog
index 179eef0..3879edb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ beignet (1.0.1-3) experimental; urgency=medium
 
   * Fix two crashes on unsupported hardware.  (Closes: #779213)
   * Fix buffer overflow in error handling.
+  * Enable multiarch.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Thu, 26 Feb 2015 14:39:00 +0000
 
diff --git a/debian/control b/debian/control
index 9b4ba5f..5ca6f39 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
  Andreas Beckmann <anbe at debian.org>,
 Build-Depends:
  debhelper (>= 9),
- cmake,
+ cmake (>= 2.8.5),
  clang-3.5,
  libclang-3.5-dev,
  llvm-3.5-dev,
@@ -29,6 +29,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-opencl/beignet.git
 
 Package: beignet-opencl-icd
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: beignet0.0.1, beignet (<< 1.0.1)
 Replaces: beignet0.0.1, beignet (<< 1.0.1)
@@ -45,6 +46,7 @@ Description: OpenCL library for Intel GPUs
 Package: beignet-dev
 Section: libdevel
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Multi-Arch: same
 Depends:
  beignet-opencl-icd (= ${binary:Version}),
  ocl-icd-opencl-dev,
@@ -59,6 +61,7 @@ Description: OpenCL library for Intel GPUs (development files)
 Package: beignet-opencl-icd-dbg
 Section: debug
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Multi-Arch: same
 Depends:
  beignet-opencl-icd (= ${binary:Version}),
  ${misc:Depends}
diff --git a/debian/patches/Enable-multiarch.patch b/debian/patches/Enable-multiarch.patch
new file mode 100644
index 0000000..61e3688
--- /dev/null
+++ b/debian/patches/Enable-multiarch.patch
@@ -0,0 +1,42 @@
+Description: Enable multiarch
+
+Install to multiarch directory
+Rename intel-beignet.icd to avoid file clash
+
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Forwarded: http://lists.freedesktop.org/archives/beignet/2015-February/005183.html
+
+--- beignet-1.0.1.orig/CMakeLists.txt
++++ beignet-1.0.1/CMakeLists.txt
+@@ -36,15 +36,17 @@ configure_file (
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ INCLUDE (FindPkgConfig)
+-
++INCLUDE (GNUInstallDirs)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
+ if (NOT LIB_INSTALL_DIR)
+-  set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++  set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ endif (NOT LIB_INSTALL_DIR)
+ if (NOT BEIGNET_INSTALL_DIR)
+   set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/")
+ endif (NOT BEIGNET_INSTALL_DIR)
+ 
++set (ICD_FILE_NAME "intel-beignet-${CMAKE_LIBRARY_ARCHITECTURE}.icd")
++
+ # Force Release with debug info
+ if (NOT CMAKE_BUILD_TYPE)
+   set (CMAKE_BUILD_TYPE RelWithDebInfo)
+@@ -172,9 +174,9 @@ IF(OCLIcd_FOUND)
+   MESSAGE(STATUS "Looking for OCL ICD header file - found")
+   configure_file (
+     "intel-beignet.icd.in"
+-    "intel-beignet.icd"
++    "${ICD_FILE_NAME}"
+   )
+-  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/intel-beignet.icd DESTINATION /etc/OpenCL/vendors)
++  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
+ ELSE(OCLIcd_FOUND)
+   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
+ ENDIF(OCLIcd_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index d660eda..fa4d80d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ force-llvm-3.5.patch
 fixcrash-24b2ad.patch
 fixcrash-779213.patch
 fix-buffer-overflow.patch
+Enable-multiarch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git