package/openjpeg: bump version to 2.3.0

Removed patch 0003, applied upstream:
https://github.com/uclouvain/openjpeg/commit/
51a1dcaa6ed5713520dca36fc58cd9240c08b7ca

Renamed patch 0004.

Signed-off-by Bernd Kuhls <[email protected]>

---
 ...MakeLists.txt-Don-t-require-a-C-compiler.patch} |  0
 .../0003-avoid-malloc-poisoning-issue.patch        | 54
----------------------
 package/openjpeg/openjpeg.hash                     |  2 +-
 package/openjpeg/openjpeg.mk                       |  2 +-
 4 files changed, 2 insertions(+), 56 deletions(-)
 rename package/openjpeg/{0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch
=> 0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch} (100%)
 delete mode 100644 package/openjpeg/0003-avoid-

malloc-poisoning-issue.patch

package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch renamed from package/openjpeg/0004-CMakeLists.txt-Don-t-require- +0 -0

similarity index 100%
rename from package/openjpeg/0004-CMakeLists.txt-Don-t-require-

a-C-compiler.patch
rename to package/openjpeg/0003-CMakeLists.txt-Don-t-require- a-C-compiler.patch

package/openjpeg/0003-avoid-malloc-poisoning-issue.patch deleted +0 -4

deleted file mode 100644
index 8463e20d6d..0000000000
@@ -1,54 +0,0 @@
-From 51a1dcaa6ed5713520dca36fc58cd9240c08b7ca Mon Sep 17 00:00:00 2001
-From: Even Rouault <[email protected]>
-Date: Thu, 7 Sep 2017 17:52:59 +0200
-Subject: [PATCH] Avoid malloc poisoning issue when including <pthread.h>

of
- uclibc (#1013)

package/openjpeg/0003-avoid-malloc-poisoning-issue.patch deleted +0 -34

-
-Signed-off-by: Olivier Schonken <[email protected]>
----
- 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)
- {

package/openjpeg/0003-avoid-malloc-poisoning-issue.patch deleted +0 -10

-     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;

package/openjpeg/openjpeg. renamed from package/openjpeg/openjpeg.hash +0 -0

hash
index 0e51aaec5e..dd3cf26cf0 100644

package/openjpeg/openjpeg.hash +0 -1

@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b

openjpeg-2.2.0.tar.gz
+sha256 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a openjpeg-2.3.0.tar.gz

package/openjpeg/openjpeg.mk +1 -1

index eff012f762..df85168b80 100644
@@ -4,7 +4,7 @@
 #
 ############################################################
 ####################
 
-OPENJPEG_VERSION = 2.2.0
+OPENJPEG_VERSION = 2.3.0
 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
 OPENJPEG_LICENSE = BSD-2-Clause

OPENJPEG_LICENSE_FILES = LICENSE
--
2.11.0

Removed patch 0003, applied upstream:
https://github.com/uclouvain/openjpeg/commit/51a1dcaa6ed5713520dca36fc58cd9240c08b7ca

Renamed patch 0004.

Signed-off-by Bernd Kuhls <[email protected]>

---
 ...MakeLists.txt-Don-t-require-a-C-compiler.patch} |  0
 .../0003-avoid-malloc-poisoning-issue.patch        | 54 ----------------------
 package/openjpeg/openjpeg.hash                     |  2 +-
 package/openjpeg/openjpeg.mk                       |  2 +-
 4 files changed, 2 insertions(+), 56 deletions(-)
 rename package/openjpeg/{0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch => 0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch} (100%)
 delete mode 100644 package/openjpeg/0003-avoid-malloc-poisoning-issue.patch

Removed patch 0003, applied upstream:
https://github.com/uclouvain/openjpeg/commit/51a1dcaa6ed5713520dca36fc58cd9240c08b7ca

Renamed patch 0004.

Signed-off-by Bernd Kuhls <[email protected]>

Hello,

Quoted 2 lines · Bernd Kuhls

Removed patch 0003, applied upstream:
https://github.com/uclouvain/openjpeg/commit/

51a1dcaa6ed5713520dca36fc58cd9240c08b7ca

Quoted 4 lines

Renamed patch 0004.

Signed-off-by Bernd Kuhls <[email protected]>

I'm not sure if it's caused by this patch, but there are some gstreamer/openjpeg issues:

http://autobuild.buildroot.net/results/884/
884956af56f63b2634a1984f5ea416075ed87bc8/build-end.log

Could you have a look?

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Looks like it is looking for openjpeg2.2 headers, should be changed to openjpeg-2.3

make[5]: Entering directory `/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/build/gst1-plugins-bad-1.12.3/ext/srtp'
CC libgstsrtp_la-gstsrtp.lo
In file included from gstopenjpegdec.h:29:0,
from gstopenjpegdec.c:27:
gstopenjpeg.h:42:37: fatal error: openjpeg-2.2/openjpeg.h: No such
file or directory
# include <openjpeg-2.2/openjpeg.h>

Hello,

Quoted 11 lines · Olivier Schonken

Looks like it is looking for openjpeg2.2 headers, should be changed to openjpeg-2.3

make[5]: Entering directory `/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/build/gst1-plugins-bad-1.12.3/ext/srtp'
CC libgstsrtp_la-gstsrtp.lo
In file included from gstopenjpegdec.h:29:0,
from gstopenjpegdec.c:27:
gstopenjpeg.h:42:37: fatal error: openjpeg-2.2/openjpeg.h: No such
file or directory
# include <openjpeg-2.2/openjpeg.h>

Will you send a patch? :-)

Thanks!

Thomas

Hello Thomas, Olivier,

Quoted 16 lines · Thomas Petazzoni

Hello,

Quoted 11 lines · Olivier Schonken

Looks like it is looking for openjpeg2.2 headers, should be changed to openjpeg-2.3

make[5]: Entering directory `/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/build/gst1-plugins-bad-1.12.3/ext/srtp'
CC libgstsrtp_la-gstsrtp.lo
In file included from gstopenjpegdec.h:29:0,
from gstopenjpegdec.c:27:
gstopenjpeg.h:42:37: fatal error: openjpeg-2.2/openjpeg.h: No such
file or directory
# include <openjpeg-2.2/openjpeg.h>

Quoted 1 line

Will you send a patch? :-)

There is a upstream patch handling this error 'gst-plugins-bad: openjpeg:
Support building with openjpeg 2.3' ([1]), maybe worth a try?

Regards,
Peter

[1] https://lists.freedesktop.org/archives/gstreamer-commits/2017-October/103076.html

Quoted 4 lines

Thanks!

Thomas

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 3 lines

There is a upstream patch handling this error 'gst-plugins-bad: openjpeg:
Support building with openjpeg 2.3' ([1]), maybe worth a try?

And the actual ones are
- 'gst-plugins-bad: Revert "openjpeg: Support building with openjpeg 2.3"' ([2])
- 'gst-plugins-bad: openjpeg: Remove compatibility with openjpeg 2.0' ([3])
- 'gst-plugins-bad: openjpeg: Support building with openjpeg 2.3, simpler' ([4])

Regards,
Peter

[2] https://lists.freedesktop.org/archives/gstreamer-commits/2017-October/103157.html
[3] https://lists.freedesktop.org/archives/gstreamer-commits/2017-October/103158.html
[4] https://lists.freedesktop.org/archives/gstreamer-commits/2017-October/103159.html