[khronos-opencl-headers] 86/94: switch to OpenCL API 2.0

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository khronos-opencl-headers.

commit e5effd84e0698bd3997d588f1b509494e19bbb9d
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Oct 20 15:32:10 2014 +0000

    switch to OpenCL API 2.0
    
    git-svn-id: svn://svn.debian.org/svn/pkg-nvidia/packages/khronos-opencl-headers/trunk@5088 b6a4b1ba-b714-0410-8a2d-fc0b36c6496e
---
 debian/changelog                    |  8 ++++++++
 debian/copyright                    |  4 ++--
 debian/opencl-headers.README.Debian | 14 --------------
 debian/opencl-headers.install       |  2 +-
 debian/rules                        |  4 ++--
 debian/t/Makefile                   |  4 +++-
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cc35ca..72f1896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+khronos-opencl-headers (2.0~svn26078-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+    - OpenCL API 2.0.  (Closes: #762943)
+    - cl.hpp is gone.
+
+ -- Andreas Beckmann <anbe at debian.org>  Mon, 20 Oct 2014 17:17:32 +0200
+
 khronos-opencl-headers (1.2-svn26009-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/copyright b/debian/copyright
index 92cf5d9..8db5e57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: The Khronos Group Inc. <http://www.khronos.org/>
 Source: http://www.khronos.org/registry/cl/
 
 Files: *
-Copyright: (c) 2008-2012 The Khronos Group Inc.
+Copyright: (c) 2008-2013 The Khronos Group Inc.
 License: other-MIT-style-KHRONOS
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and/or associated documentation files (the
@@ -26,7 +26,7 @@ License: other-MIT-style-KHRONOS
  MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
 Files: debian/*
-Copyright: © 2010-2013 Andreas Beckmann <anbe at debian.org>
+Copyright: © 2010-2014 Andreas Beckmann <anbe at debian.org>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
diff --git a/debian/opencl-headers.README.Debian b/debian/opencl-headers.README.Debian
deleted file mode 100644
index ffcd7d7..0000000
--- a/debian/opencl-headers.README.Debian
+++ /dev/null
@@ -1,14 +0,0 @@
-opencl-headers for Debian
--------------------------
-
-This package contains the OpenCL API headers as published by The Khronos
-Group Inc.  These headers are free.  There is no OpenCL library included
-because no free OpenCL implementation (that I know of) exists at the moment.
-
-Non-free OpenCL implementations are available from e.g. NVIDIA (packaged in
-Debian as nvidia-libopencl1 and nvidia-opencl-icd) or AMD/ATI.
-
-The OpenCL specifications can be freely downloaded from
-<http://www.khronos.org/registry/cl/> but cannot be redistributed.
-
- -- Andreas Beckmann <debian at abeckmann.de>  Wed, 29 Sep 2010 10:00:57 +0200
diff --git a/debian/opencl-headers.install b/debian/opencl-headers.install
index a04db7f..c7106c3 100644
--- a/debian/opencl-headers.install
+++ b/debian/opencl-headers.install
@@ -1,3 +1,3 @@
 opencl.h	usr/include/CL/
 cl*.h		usr/include/CL/
-cl*.hpp		usr/include/CL/
+#cl*.hpp		usr/include/CL/
diff --git a/debian/rules b/debian/rules
index 3270bda..2a5db11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 package	 = khronos-opencl-headers
-api	 = 1.2
+api	 = 2.0
 
 %:
 	dh $@
@@ -13,7 +13,7 @@ override_dh_auto_clean:
 	$(MAKE) -C debian/t clean
 
 
-version		 = $(api)-svn$(REVISION)
+version		 = $(api)~svn$(REVISION)
 src_dir		 = $(package)-$(version).orig
 src_file	 = $(package)_$(version).orig.tar.gz
 svn_url		 = https://cvs.khronos.org/svn/repos/registry/trunk/public/cl/api/$(api)
diff --git a/debian/t/Makefile b/debian/t/Makefile
index f19ebbc..cd49b7f 100644
--- a/debian/t/Makefile
+++ b/debian/t/Makefile
@@ -3,9 +3,11 @@ CXXFLAGS	+= -I. $(OPENCLFLAGS) -msse2 -msse
 
 check:
 	$(MAKE) compile_opencl_h
+	$(MAKE) compile_opencl_h OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_2_0_APIS
 	$(MAKE) compile_opencl_h OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_1_APIS
 	$(MAKE) compile_opencl_h OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_0_APIS
 	$(MAKE) compile_cl_hpp
+	$(MAKE) compile_cl_hpp OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_2_0_APIS
 	$(MAKE) compile_cl_hpp OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_1_APIS
 	$(MAKE) compile_cl_hpp OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_0_APIS
 
@@ -14,7 +16,7 @@ compile_opencl_h:
 	$(CXX) $(CXXFLAGS) -c opencl_h.cpp
 
 compile_cl_hpp:
-	$(CXX) $(CXXFLAGS) -c cl_hpp.cpp
+	: $(CXX) $(CXXFLAGS) -c cl_hpp.cpp
 
 clean:
 	$(RM) *.o

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