[beignet] 06/06: Stop using removed non-DFSG code, and update d/copyright
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Tue May 19 10:12:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
rnpalmer-guest pushed a commit to branch master
in repository beignet.
commit db519d93383b533e634457c77fce21fce9738774
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Tue May 19 10:10:53 2015 +0100
Stop using removed non-DFSG code, and update d/copyright
---
debian/changelog | 3 +-
debian/copyright | 46 ------------------------
debian/patches/drop-structural_analysis.patch | 52 +++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 55 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3a14dc4..6cdb0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-beignet (1.0.3-1) UNRELEASED; urgency=medium
+beignet (1.0.3+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop patches applied upstream, refresh others.
@@ -15,6 +15,7 @@ beignet (1.0.3-1) UNRELEASED; urgency=medium
and document workarounds.
* Make libx11-dev dependency explicit.
* Disable fast atomics, they break too much.
+ * Remove non-DFSG gpuocelot code.
-- Rebecca N. Palmer <rebecca_palmer at zoho.com> Fri, 24 Apr 2015 21:16:12 +0100
diff --git a/debian/copyright b/debian/copyright
index 8354f0c..6cb64b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,10 +27,6 @@ Files: backend/src/llvm/llvm_scalarize.cpp
Copyright: 2010-2014 LunarG, Inc
License: BSD-3-clause
-Files: backend/src/ir/structural_analysis.*
-Copyright: 2011 GEORGIA TECH RESEARCH CORPORATION
-License: gpuocelot
-
Files: include/CL/cl_gl_ext.h include/CL/cl_d3d10.h include/CL/opencl.h include/CL/cl_platform.h include/CL/cl_ext.h include/CL/cl.h include/CL/cl_d3d11.h include/CL/cl.hpp include/CL/cl_gl.h include/CL/cl_egl.h include/CL/cl_dx9_media_sharing.h
Copyright: 2008-2013 The Khronos Group Inc
License: MIT
@@ -111,45 +107,3 @@ License: BSD-3-clause
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-
-License: gpuocelot
- This code is derived from the ControlTree.h and ControlTree.cpp of
- project gpuocelot by Yongjia Zhang.
- The original copyright of gpuocelot appears below in its entirety.
- .
- .
- .
- Copyright 2011
- GEORGIA TECH RESEARCH CORPORATION
- ALL RIGHTS RESERVED
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimers.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimers in the
- documentation and/or other materials provided with the
- distribution.
- Neither the name of GEORGIA TECH RESEARCH CORPORATION nor the
- names of its contributors may be used to endorse or promote
- products derived from this software without specific prior
- written permission.
- .
- THIS SOFTWARE IS PROVIDED BY GEORGIA TECH RESEARCH CORPORATION ''AS IS''
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEORGIA TECH RESEARCH
- CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- You agree that the Software will not be shipped, transferred, exported,
- or re-exported directly into any country prohibited by the United States
- Export Administration Act and the regulations thereunder nor will be
- used for any purpose prohibited by the Act.
diff --git a/debian/patches/drop-structural_analysis.patch b/debian/patches/drop-structural_analysis.patch
new file mode 100644
index 0000000..af8e0be
--- /dev/null
+++ b/debian/patches/drop-structural_analysis.patch
@@ -0,0 +1,52 @@
+Description: Stop using non-DFSG gpuocelot code
+
+backend/src/ir/structural_analysis.* (derived from gpuocelot) have
+been deleted because they are not DFSG-free:
+https://lists.debian.org/debian-legal/2015/05/msg00008.html
+
+Origin: upstream 347116ef2855e73c25dc09c0a8ee1c7f58c46099
+Author: Zhigang Gong <zhigang.gong at intel.com>
+
+diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt
+index a6736ec..45f18d8 100644
+--- a/backend/src/CMakeLists.txt
++++ b/backend/src/CMakeLists.txt
+@@ -66,8 +66,6 @@ set (GBE_SRC
+ ir/lowering.hpp
+ ir/printf.cpp
+ ir/printf.hpp
+- ir/structural_analysis.cpp
+- ir/structural_analysis.hpp
+ ir/immediate.hpp
+ ir/immediate.cpp
+ backend/context.cpp
+diff --git a/backend/src/llvm/llvm_to_gen.cpp b/backend/src/llvm/llvm_to_gen.cpp
+index a4ce4a2..3e11fdb 100644
+--- a/backend/src/llvm/llvm_to_gen.cpp
++++ b/backend/src/llvm/llvm_to_gen.cpp
+@@ -61,7 +61,6 @@
+ #include "sys/cvar.hpp"
+ #include "sys/platform.hpp"
+ #include "ir/unit.hpp"
+-#include "ir/structural_analysis.hpp"
+
+ #include <clang/CodeGen/CodeGenAction.h>
+
+@@ -308,16 +307,6 @@ namespace gbe
+ // Print the code extra optimization passes
+ OUTPUT_BITCODE(AFTER_GEN, mod);
+
+- const ir::Unit::FunctionSet& fs = unit.getFunctionSet();
+- ir::Unit::FunctionSet::const_iterator iter = fs.begin();
+- while(iter != fs.end())
+- {
+- analysis::ControlTree *ct = new analysis::ControlTree(iter->second);
+- ct->analyze();
+- delete ct;
+- iter++;
+- }
+-
+ delete libraryInfo;
+ return true;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 414e8dc..0beb737 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ python3.patch
self-test.patch
disable-broken-fast-atomics.patch
update-docs.patch
+drop-structural_analysis.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-commits
mailing list