[beignet] 02/12: Drop patches applied upstream
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Wed Mar 18 21:37:45 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 b69b6b6a90a2f2ea9843928c55717e87af9c282d
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Wed Mar 18 08:08:09 2015 +0000
Drop patches applied upstream
---
debian/changelog | 1 +
debian/patches/Enable-multiarch.patch | 42 --------
.../patches/fail-gracefully-cl_mem_allocate.patch | 39 -------
debian/patches/fix-buffer-overflow.patch | 31 ------
.../patches/fix-compiler_fill_image_1d_array.patch | 51 ---------
debian/patches/fixcrash-24b2ad.patch | 33 ------
debian/patches/fixcrash-779213.patch | 116 ---------------------
debian/patches/llvm-search-order.patch | 20 ----
.../patches/remove-unsafe-define-D__-USER-__.patch | 31 ------
debian/patches/series | 8 --
10 files changed, 1 insertion(+), 371 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bce0419..c8fb5f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ beignet (1.0.2-1) UNRELEASED; urgency=medium
[ Rebecca N. Palmer ]
* Enable building on hurd-i386 and x32.
* Fix FTBFS on kfreebsd-*.
+ * Drop patches applied upstream.
-- Andreas Beckmann <anbe at debian.org> Tue, 17 Mar 2015 23:29:43 +0100
diff --git a/debian/patches/Enable-multiarch.patch b/debian/patches/Enable-multiarch.patch
deleted file mode 100644
index 61e3688..0000000
--- a/debian/patches/Enable-multiarch.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/fail-gracefully-cl_mem_allocate.patch b/debian/patches/fail-gracefully-cl_mem_allocate.patch
deleted file mode 100644
index d60490f..0000000
--- a/debian/patches/fail-gracefully-cl_mem_allocate.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Fail, don't abort, on allocation failure
-
-Don't assume the buffer passed to cl_mem_delete is fully set up,
-as it won't be when called from cl_mem_allocate's error handling.
-
-Author: Rebecca Palmer <rebecca_palmer at zoho.com>
-
---- a/src/cl_mem.c
-+++ b/src/cl_mem.c
-@@ -1071,16 +1071,19 @@ cl_mem_delete(cl_mem mem)
- }
-
- /* Remove it from the list */
-- assert(mem->ctx);
-- pthread_mutex_lock(&mem->ctx->buffer_lock);
-- if (mem->prev)
-- mem->prev->next = mem->next;
-- if (mem->next)
-- mem->next->prev = mem->prev;
-- if (mem->ctx->buffers == mem)
-- mem->ctx->buffers = mem->next;
-- pthread_mutex_unlock(&mem->ctx->buffer_lock);
-- cl_context_delete(mem->ctx);
-+ if (mem->ctx) {
-+ pthread_mutex_lock(&mem->ctx->buffer_lock);
-+ if (mem->prev)
-+ mem->prev->next = mem->next;
-+ if (mem->next)
-+ mem->next->prev = mem->prev;
-+ if (mem->ctx->buffers == mem)
-+ mem->ctx->buffers = mem->next;
-+ pthread_mutex_unlock(&mem->ctx->buffer_lock);
-+ cl_context_delete(mem->ctx);
-+ } else {
-+ assert((mem->prev == 0) && (mem->next == 0));
-+ }
-
- /* Someone still mapped, unmap */
- if(mem->map_ref > 0) {
diff --git a/debian/patches/fix-buffer-overflow.patch b/debian/patches/fix-buffer-overflow.patch
deleted file mode 100644
index e41fea0..0000000
--- a/debian/patches/fix-buffer-overflow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Correct the error llvm link msg copy
-
-in function genProgramLinkFromLLVM.
-
-Use strncpy to avoid overflow and need return errSize.
-
-Origin: upstream 1c24f07213bcf302ffd6cc751f575dba10f1518d
-Author: Yang Rong <rong.r.yang at intel.com>, Rebecca Palmer <rebecca_palmer at zoho.com>
-
-diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp
-index 6ad5eef..1b296fb 100644
---- a/backend/src/backend/gen_program.cpp
-+++ b/backend/src/backend/gen_program.cpp
-@@ -384,10 +384,9 @@ namespace gbe {
- &errMsg);
- if (errMsg.c_str() != NULL) {
- if (err != NULL && errSize != NULL && stringSize > 0u) {
-- if(errMsg.length() < stringSize )
-- stringSize = errMsg.length();
-- strcpy(err, errMsg.c_str());
-- err[stringSize+1] = '\0';
-+ strncpy(err, errMsg.c_str(), stringSize-1);
-+ err[stringSize-1] = '\0';
-+ *errSize = strlen(err);
- }
- }
- }
---
-cgit v0.10.2
-
-
diff --git a/debian/patches/fix-compiler_fill_image_1d_array.patch b/debian/patches/fix-compiler_fill_image_1d_array.patch
deleted file mode 100644
index 04abf2b..0000000
--- a/debian/patches/fix-compiler_fill_image_1d_array.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix bug in compiler_fill_image_1d_array test setup
-
-This test used memset() to clear a 64x1x8 CLimage array, without taking
-into account that the hardware pads this to 64x2x8.
-Use clEnqueueWriteImage instead.
-
-Origin: upstream
-Author: Junyan He
-
- utests/compiler_fill_image_1d_array.cpp | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/utests/compiler_fill_image_1d_array.cpp b/utests/compiler_fill_image_1d_array.cpp
-index cc7cf0a..67f9643 100644
---- a/utests/compiler_fill_image_1d_array.cpp
-+++ b/utests/compiler_fill_image_1d_array.cpp
-@@ -10,6 +10,11 @@ static void compiler_fill_image_1d_array(void)
- size_t origin[3] = { };
- size_t region[3];
- uint32_t* dst;
-+ uint32_t* src;
-+
-+ region[0] = w;
-+ region[1] = array;
-+ region[2] = 1;
-
- memset(&desc, 0x0, sizeof(cl_image_desc));
- memset(&format, 0x0, sizeof(cl_image_format));
-@@ -26,9 +31,9 @@ static void compiler_fill_image_1d_array(void)
-
- OCL_CREATE_IMAGE(buf[0], 0, &format, &desc, NULL);
-
-- OCL_MAP_BUFFER_GTT(0);
-- memset(buf_data[0], 0, sizeof(uint32_t) * w * array);
-- OCL_UNMAP_BUFFER_GTT(0);
-+ src = (uint32_t*)malloc(w*array*sizeof(uint32_t));
-+ memset(src, 0, sizeof(uint32_t) * w * array);
-+ OCL_WRITE_IMAGE(buf[0], origin, region, src);
-
- // Run the kernel
- OCL_SET_ARG(0, sizeof(cl_mem), &buf[0]);
-@@ -39,9 +44,6 @@ static void compiler_fill_image_1d_array(void)
- OCL_NDRANGE(2);
-
- // Check result
-- region[0] = w;
-- region[1] = array;
-- region[2] = 1;
- dst = (uint32_t*)malloc(w*array*sizeof(uint32_t));
- OCL_READ_IMAGE(buf[0], origin, region, dst);
-
diff --git a/debian/patches/fixcrash-24b2ad.patch b/debian/patches/fixcrash-24b2ad.patch
deleted file mode 100644
index ebd3fc7..0000000
--- a/debian/patches/fixcrash-24b2ad.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fix crash on unsupported hardware
-
-Origin: upstream 24b2adbd958884d5874dc12f456cee9889583967
-Author: Zhigang Gong <zhigang.gong at intel.com>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88957
-diff --git a/src/cl_device_id.c b/src/cl_device_id.c
-index 3032a38..0fd4a69 100644
---- a/src/cl_device_id.c
-+++ b/src/cl_device_id.c
-@@ -395,13 +395,14 @@ brw_gt3_break:
- printf("cl_get_gt_device(): error, unknown device: %x\n", device_id);
- }
-
-+ if (ret == NULL)
-+ return NULL;
-+
- if (!CompilerSupported()) {
-- if (ret != NULL) {
-- ret->compiler_available = CL_FALSE;
-- //ret->linker_available = CL_FALSE;
-- ret->profile = "EMBEDDED_PROFILE";
-- ret->profile_sz = strlen(ret->profile) + 1;
-- }
-+ ret->compiler_available = CL_FALSE;
-+ //ret->linker_available = CL_FALSE;
-+ ret->profile = "EMBEDDED_PROFILE";
-+ ret->profile_sz = strlen(ret->profile) + 1;
- }
-
- #ifdef HAS_USERPTR
---
-cgit v0.10.2
-
diff --git a/debian/patches/fixcrash-779213.patch b/debian/patches/fixcrash-779213.patch
deleted file mode 100644
index cb23aef..0000000
--- a/debian/patches/fixcrash-779213.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Description: fix crash on unsupported hardware
-
-Author: Rebecca Palmer <rebecca_palmer at zoho.com>
-Bug-Debian: https://bugs.debian.org/779213
-diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c
-index 21546d9..e6878b3 100644
---- a/src/intel/intel_driver.c
-+++ b/src/intel/intel_driver.c
-@@ -124,14 +124,15 @@ intel_driver_aub_dump(intel_driver_t *driver)
- }
- }
-
--static void
-+static int
- intel_driver_memman_init(intel_driver_t *driver)
- {
- driver->bufmgr = drm_intel_bufmgr_gem_init(driver->fd, BATCH_SIZE);
-- assert(driver->bufmgr);
-+ if(!driver->bufmgr) return 0;
- drm_intel_bufmgr_gem_enable_reuse(driver->bufmgr);
- driver->device_id = drm_intel_bufmgr_gem_get_devid(driver->bufmgr);
- intel_driver_aub_dump(driver);
-+ return 1;
- }
-
- static void
-@@ -149,14 +150,14 @@ intel_driver_context_destroy(intel_driver_t *driver)
- driver->ctx = NULL;
- }
-
--static void
-+static int
- intel_driver_init(intel_driver_t *driver, int dev_fd)
- {
- driver->fd = dev_fd;
- driver->locked = 0;
- pthread_mutex_init(&driver->ctxmutex, NULL);
-
-- intel_driver_memman_init(driver);
-+ if(!intel_driver_memman_init(driver)) return 0;
- intel_driver_context_init(driver);
-
- #if EMULATE_GEN
-@@ -183,6 +184,7 @@ intel_driver_init(intel_driver_t *driver, int dev_fd)
- else
- driver->gen_ver = 4;
- #endif /* EMULATE_GEN */
-+ return 1;
- }
-
- static cl_int
-@@ -271,19 +273,20 @@ intel_driver_is_active(intel_driver_t *driver) {
- LOCAL int
- intel_driver_init_shared(intel_driver_t *driver, dri_state_t *state)
- {
-+ int ret;
- assert(state);
- if(state->driConnectedFlag != DRI2)
- return 0;
-- intel_driver_init(driver, state->fd);
-+ ret = intel_driver_init(driver, state->fd);
- driver->need_close = 0;
-- return 1;
-+ return ret;
- }
- #endif
-
- LOCAL int
- intel_driver_init_master(intel_driver_t *driver, const char* dev_name)
- {
-- int dev_fd;
-+ int dev_fd, ret;
-
- drm_client_t client;
-
-@@ -296,7 +299,7 @@ intel_driver_init_master(intel_driver_t *driver, const char* dev_name)
-
- // Check that we're authenticated
- memset(&client, 0, sizeof(drm_client_t));
-- int ret = ioctl(dev_fd, DRM_IOCTL_GET_CLIENT, &client);
-+ ret = ioctl(dev_fd, DRM_IOCTL_GET_CLIENT, &client);
- if (ret == -1) {
- fprintf(stderr, "ioctl(dev_fd, DRM_IOCTL_GET_CLIENT, &client) failed: %s\n", strerror(errno));
- close(dev_fd);
-@@ -309,26 +312,26 @@ intel_driver_init_master(intel_driver_t *driver, const char* dev_name)
- return 0;
- }
-
-- intel_driver_init(driver, dev_fd);
-+ ret = intel_driver_init(driver, dev_fd);
- driver->need_close = 1;
-
-- return 1;
-+ return ret;
- }
-
- LOCAL int
- intel_driver_init_render(intel_driver_t *driver, const char* dev_name)
- {
-- int dev_fd;
-+ int dev_fd, ret;
-
- // usually dev_name = "/dev/dri/renderD%d"
- dev_fd = open(dev_name, O_RDWR);
- if (dev_fd == -1)
- return 0;
-
-- intel_driver_init(driver, dev_fd);
-+ ret = intel_driver_init(driver, dev_fd);
- driver->need_close = 1;
-
-- return 1;
-+ return ret;
- }
-
- LOCAL int
diff --git a/debian/patches/llvm-search-order.patch b/debian/patches/llvm-search-order.patch
deleted file mode 100644
index 744905d..0000000
--- a/debian/patches/llvm-search-order.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Andreas Beckmann <anbe at debian.org>
-Description: prefer newer llvm versions over 3.3
-
---- a/CMake/FindLLVM.cmake
-+++ b/CMake/FindLLVM.cmake
-@@ -8,12 +8,12 @@
- # LLVM_FOUND - True if llvm found.
- if (LLVM_INSTALL_DIR)
- find_program(LLVM_CONFIG_EXECUTABLE
-- NAMES llvm-config-33 llvm-config-3.3 llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config
-+ NAMES llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config-33 llvm-config-3.3 llvm-config
- DOC "llvm-config executable"
- PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
- else (LLVM_INSTALL_DIR)
- find_program(LLVM_CONFIG_EXECUTABLE
-- NAMES llvm-config-33 llvm-config-3.3 llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config
-+ NAMES llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config-33 llvm-config-3.3 llvm-config
- DOC "llvm-config executable")
- endif (LLVM_INSTALL_DIR)
-
diff --git a/debian/patches/remove-unsafe-define-D__-USER-__.patch b/debian/patches/remove-unsafe-define-D__-USER-__.patch
deleted file mode 100644
index 72758ec..0000000
--- a/debian/patches/remove-unsafe-define-D__-USER-__.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7da4f53e85091f913b311a3da34761bed94b2f1c Mon Sep 17 00:00:00 2001
-From: Andreas Beckmann <anbe at debian.org>
-Date: Sat, 7 Feb 2015 04:45:32 +0100
-Subject: [PATCH] remove unsafe define -D__$(USER)__
-
-funny things may happen with usernames like
-'asm', 'attribute', 'x86_64', 'i386', and so on
-
-this breaks on usernames with non-alnum chars ('-', '.')
-
-Signed-off-by: Andreas Beckmann <anbe at debian.org>
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01ec1d8..9c398e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,8 +45,6 @@ if (NOT BEIGNET_INSTALL_DIR)
- set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/")
- endif (NOT BEIGNET_INSTALL_DIR)
-
--ADD_DEFINITIONS(-D__$(USER)__)
--
- # Force Release with debug info
- if (NOT CMAKE_BUILD_TYPE)
- set (CMAKE_BUILD_TYPE RelWithDebInfo)
---
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 83d1add..f0399a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,13 +3,5 @@ Debian-compliant-compiler-flags-handling.patch
Utest-requires-deprecated-function-names.patch
Link-against-terminfo.patch
Enable-test-debug.patch
-fix-compiler_fill_image_1d_array.patch
-fail-gracefully-cl_mem_allocate.patch
-llvm-search-order.patch
-remove-unsafe-define-D__-USER-__.patch
force-llvm-3.5.patch
-fixcrash-24b2ad.patch
-fixcrash-779213.patch
-fix-buffer-overflow.patch
-Enable-multiarch.patch
support-kfreebsd.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