Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5a7b65d5ac4e7b516b0bf4b151a0481313d14ccb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (5a7b65d5ac4e7b516b0bf4b151a0481313d14ccb)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5a7b65d5ac4e7b516b0bf4b151a0481313d14ccb)
  • Date: Tue, 29 Aug 2017 09:22:14 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

video/ffmpeg/HISTORY | 3 +
video/ffmpeg/PRE_BUILD | 3 +
video/ffmpeg/ffmpeg-openjpeg-2.2.patch | 98
+++++++++++++++++++++++++++++++++
video/vlc/DETAILS | 2
video/vlc/HISTORY | 3 +
5 files changed, 108 insertions(+), 1 deletion(-)

New commits:
commit 5a7b65d5ac4e7b516b0bf4b151a0481313d14ccb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

vlc: version 3.0.0-git-20170829

commit 55390e42ff54193ca92dc15ca45a48bfa030dcd2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ffmpeg: fix build with openjpeg 2.2

diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 471645a..63866ed 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2017-08-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, ffmpeg-openjpeg-2.2.patch: Fix build with openjpeg-2.2.
+
2017-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix openssl option - nonfree

diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index db36624..50b7a06 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -5,6 +5,9 @@ if [[ $FFMPEG_RELEASE == legacy ]]; then
patch -p0 < "$SPELL_DIRECTORY/freetype.patch"
fi &&

+# version 3.3.3 still needs that for openjpeg 2.2
+patch -p1 < "$SPELL_DIRECTORY/ffmpeg-openjpeg-2.2.patch" &&
+
#fix bad pkg-config files
sed -i \
-e '/^pkg.*{/,/^}/
s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
diff --git a/video/ffmpeg/ffmpeg-openjpeg-2.2.patch
b/video/ffmpeg/ffmpeg-openjpeg-2.2.patch
new file mode 100644
index 0000000..8b5022a
--- /dev/null
+++ b/video/ffmpeg/ffmpeg-openjpeg-2.2.patch
@@ -0,0 +1,98 @@
+diff --git a/configure b/configure
+index 23823e3..93a036e 100755
+--- a/configure
++++ b/configure
+@@ -1875,6 +1875,7 @@ HEADERS_LIST="
+ machine_ioctl_meteor_h
+ malloc_h
+ opencv2_core_core_c_h
++ openjpeg_2_2_openjpeg_h
+ openjpeg_2_1_openjpeg_h
+ openjpeg_2_0_openjpeg_h
+ openjpeg_1_5_openjpeg_h
+@@ -5805,7 +5806,9 @@ enabled libopencv && { check_header
opencv2/core/core_c.h &&
+ require opencv opencv2/core/core_c.h
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+ require_pkg_config opencv opencv/cxcore.h
cvCreateImageHeader; }
+ enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h
WelsGetCodecVersion
+-enabled libopenjpeg && { { check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg && { { check_lib openjpeg-2.2/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++ check_lib openjpeg-2.2/openjpeg.h
opj_version -lopenjp2 ||
++ { check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 ||
+ { check_lib openjpeg-2.0/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ { check_lib openjpeg-1.5/openjpeg.h
opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
+index ce4e2b0..1210123 100644
+--- a/libavcodec/libopenjpegdec.c
++++ b/libavcodec/libopenjpegdec.c
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++# include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ # include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # include <openjpeg-2.0/openjpeg.h>
+@@ -44,7 +46,7 @@
+ # include <openjpeg.h>
+ #endif
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H ||
HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # define OPENJPEG_MAJOR_VERSION 2
+ # define OPJ(x) OPJ_##x
+ #else
+@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCodecContext
*avctx,
+ opj_stream_set_read_function(stream, stream_read);
+ opj_stream_set_skip_function(stream, stream_skip);
+ opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ opj_stream_set_user_data(stream, &reader);
+diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
+index 4a12729..b67e533 100644
+--- a/libavcodec/libopenjpegenc.c
++++ b/libavcodec/libopenjpegenc.c
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++# include <openjpeg-2.2/openjpeg.h>
++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ # include <openjpeg-2.1/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # include <openjpeg-2.0/openjpeg.h>
+@@ -42,7 +44,7 @@
+ # include <openjpeg.h>
+ #endif
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H ||
HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # define OPENJPEG_MAJOR_VERSION 2
+ # define OPJ(x) OPJ_##x
+ #else
+@@ -305,7 +307,7 @@ static av_cold int
libopenjpeg_encode_init(AVCodecContext *avctx)
+
+ opj_set_default_encoder_parameters(&ctx->enc_params);
+
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ switch (ctx->cinema_mode) {
+ case OPJ_CINEMA2K_24:
+ ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCodecContext
*avctx, AVPacket *pkt,
+ opj_stream_set_write_function(stream, stream_write);
+ opj_stream_set_skip_function(stream, stream_skip);
+ opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ opj_stream_set_user_data(stream, &writer);
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index a7ee201..0690551 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,7 +1,7 @@
SPELL=vlc
# Snapshot by sobukus for getting a working vlc build that does work
# with libs we have in the grimoire.
- VERSION=3.0.0-git-20170520
+ VERSION=3.0.0-git-20170829
SOURCE=$SPELL-$VERSION.tar.xz
# Switch back to upstream GPG once 3.0.0 is relased.

SOURCE_HASH=sha512:7a0d93f8582653050cfe54dd749be8610455deb6afb11d73925e3f89ebbec1c2fa94c9a44828d3b89ed9bb2610f03b1d5dfc3d05f8e6efcb36316bf3f1e19536
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 067ebf4..a27f2d2 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2017-08-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Updated snapshot to 3.0.0-git-2017-08-29.
+
2017-05-20 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 3.0.0-git-20170520, a git snapshot that
has a chance to build with our ffmpeg and lua (at least)


  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5a7b65d5ac4e7b516b0bf4b151a0481313d14ccb), Thomas Orgis, 08/29/2017

Archive powered by MHonArc 2.6.24.

Top of Page