Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31b23ac13c32c4c4a0044f4ee9bdac853b2aa039)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31b23ac13c32c4c4a0044f4ee9bdac853b2aa039)
  • Date: Mon, 16 Oct 2017 08:22:05 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

video/ffmpeg/DEPENDS | 5 -
video/ffmpeg/DETAILS | 4 -
video/ffmpeg/HISTORY | 6 ++
video/ffmpeg/PRE_BUILD | 5 -
video/ffmpeg/ffmpeg-openjpeg-2.2.patch | 98
---------------------------------
5 files changed, 9 insertions(+), 109 deletions(-)

New commits:
commit 31b23ac13c32c4c4a0044f4ee9bdac853b2aa039
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ffmpeg: => 3.4

diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 0bf7705..70dbb61 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -140,11 +140,6 @@ else
"for dirac encoder support via libdirac"
fi &&

-optional_depends schroedinger \
- "--enable-libschroedinger" \
- "" \
- "for dirac encoder/decoder support via libschroedinger" &&
-
optional_depends libvdpau \
"--enable-vdpau" \
"--disable-vdpau" \
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 4ac0f6e..75aef7f 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,8 +1,8 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=3.3.4
+ VERSION=3.4
SECURITY_PATCH=19
- PATCHLEVEL=1
+# PATCHLEVEL=1
else
VERSION=0.7.16
SECURITY_PATCH=11
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 6101e5a..fbad4d4 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,9 @@
+2017-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4
+ * DEPENDS: remove schroedinger
+ * ffmpeg-openjpeg-2.2.patch: not needed
+ * PRE_BUILD: adjust
+
2017-10-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add optional dependency on x265
* DETAILS: PATCHLEVEL++
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 50b7a06..af47999 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -3,10 +3,6 @@ cd $SOURCE_DIRECTORY &&

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 \
@@ -14,3 +10,4 @@ sed -i \
configure &&
#s|\\\$|\$|;
sedit '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined
__WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define
INT64_C(c) c ## LL\n#endif\n#endif' libavcodec/avcodec.h
+fi
diff --git a/video/ffmpeg/ffmpeg-openjpeg-2.2.patch
b/video/ffmpeg/ffmpeg-openjpeg-2.2.patch
deleted file mode 100644
index 8b5022a..0000000
--- a/video/ffmpeg/ffmpeg-openjpeg-2.2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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);



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (31b23ac13c32c4c4a0044f4ee9bdac853b2aa039), Treeve Jelbert, 10/16/2017

Archive powered by MHonArc 2.6.24.

Top of Page