Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,54 +0,0 @@
|
||||
From 51a1dcaa6ed5713520dca36fc58cd9240c08b7ca Mon Sep 17 00:00:00 2001
|
||||
From: Even Rouault <even.rouault@spatialys.com>
|
||||
Date: Thu, 7 Sep 2017 17:52:59 +0200
|
||||
Subject: [PATCH] Avoid malloc poisoning issue when including <pthread.h> of
|
||||
uclibc (#1013)
|
||||
|
||||
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
---
|
||||
src/lib/openjp2/thread.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/lib/openjp2/thread.c b/src/lib/openjp2/thread.c
|
||||
index 8b56aa4d5..af33c2c80 100644
|
||||
--- a/src/lib/openjp2/thread.c
|
||||
+++ b/src/lib/openjp2/thread.c
|
||||
@@ -29,9 +29,6 @@
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
-#include "opj_includes.h"
|
||||
-
|
||||
-#include "thread.h"
|
||||
#include <assert.h>
|
||||
|
||||
#ifdef MUTEX_win32
|
||||
@@ -46,6 +43,8 @@
|
||||
#include <windows.h>
|
||||
#include <process.h>
|
||||
|
||||
+#include "opj_includes.h"
|
||||
+
|
||||
OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
|
||||
{
|
||||
return OPJ_TRUE;
|
||||
@@ -289,6 +288,10 @@ void opj_thread_join(opj_thread_t* thread)
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+/* Moved after all system includes, and in particular pthread.h, so as to */
|
||||
+/* avoid poisoning issuing with malloc() use in pthread.h with ulibc (#1013) */
|
||||
+#include "opj_includes.h"
|
||||
+
|
||||
OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
|
||||
{
|
||||
return OPJ_TRUE;
|
||||
@@ -425,6 +428,8 @@ void opj_thread_join(opj_thread_t* thread)
|
||||
#else
|
||||
/* Stub implementation */
|
||||
|
||||
+#include "opj_includes.h"
|
||||
+
|
||||
OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
|
||||
{
|
||||
return OPJ_FALSE;
|
||||
27
bsp/buildroot/package/openjpeg/0004-install-static-lib.patch
Normal file
27
bsp/buildroot/package/openjpeg/0004-install-static-lib.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
|
||||
From: Even Rouault <even.rouault@spatialys.com>
|
||||
Date: Mon, 9 Oct 2017 11:40:43 +0200
|
||||
Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
|
||||
static-only build lacks the installation target for the library (#1019, fixes
|
||||
regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://github.com/uclouvain/openjpeg/commit/66297f07a43d2770a97c8456d20202f3d051d980
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/lib/openjp2/CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
|
||||
index 0b4520384..f8990ccf0 100644
|
||||
--- a/src/lib/openjp2/CMakeLists.txt
|
||||
+++ b/src/lib/openjp2/CMakeLists.txt
|
||||
@@ -99,6 +99,7 @@ else()
|
||||
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
|
||||
else()
|
||||
add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
|
||||
+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b openjpeg-2.2.0.tar.gz
|
||||
sha256 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a openjpeg-2.3.0.tar.gz
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENJPEG_VERSION = 2.2.0
|
||||
OPENJPEG_VERSION = 2.3.0
|
||||
OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
|
||||
OPENJPEG_LICENSE = BSD-2c
|
||||
OPENJPEG_LICENSE = BSD-2-Clause
|
||||
OPENJPEG_LICENSE_FILES = LICENSE
|
||||
OPENJPEG_INSTALL_STAGING = YES
|
||||
|
||||
@@ -15,4 +15,10 @@ OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
|
||||
OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff)
|
||||
OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LCMS2),lcms2)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
OPENJPEG_CONF_OPTS += -DOPJ_USE_THREAD=ON
|
||||
else
|
||||
OPENJPEG_CONF_OPTS += -DOPJ_USE_THREAD=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user