[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/
Date: Sat, 26 Aug 2017 13:41:23 +0000 (UTC)	[thread overview]
Message-ID: <1503754858.904d190b4714c2d7a2ca9637f45d817a13e69125.aballier@gentoo> (raw)

commit:     904d190b4714c2d7a2ca9637f45d817a13e69125
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 13:40:52 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 13:40:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904d190b

media-video/ffmpeg: Backport upstream patches to build with openjpeg 2.2, bugs #628302 and #627562

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-video/ffmpeg/ffmpeg-3.2.6.ebuild             |   2 +
 media-video/ffmpeg/ffmpeg-3.2.7.ebuild             |   2 +
 media-video/ffmpeg/ffmpeg-3.3.3.ebuild             |   2 +
 media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch | 106 +++++++++++++++++++++
 media-video/ffmpeg/files/openjpeg22.patch          | 106 +++++++++++++++++++++
 5 files changed, 218 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 0969268ce8f..74d37e876a7 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -287,6 +287,8 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}

diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index d7e03bf5fdf..15961769e9c 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -287,6 +287,8 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}

diff --git a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
index fb789614634..a6548ccc453 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
@@ -307,6 +307,8 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+PATCHES=( "${FILESDIR}/openjpeg22.patch" )
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}

diff --git a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
new file mode 100644
index 00000000000..0ee648641be
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
@@ -0,0 +1,106 @@
+commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
+Author: Reino17 <rwijnsma@xs4all.nl>
+Date:   Fri Jun 23 23:49:31 2017 +0200
+
+    Add support for LibOpenJPEG v2.2/git
+    
+    Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
+
+Index: ffmpeg-3.2.7/configure
+===================================================================
+--- ffmpeg-3.2.7.orig/configure
++++ ffmpeg-3.2.7/configure
+@@ -1831,6 +1831,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
+@@ -5721,7 +5722,9 @@ enabled libopencv         && { check_hea
+                                  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_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg       && { { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++                               check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
++                               { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+                                { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+                                { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+Index: ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
+===================================================================
+--- ffmpeg-3.2.7.orig/libavcodec/libopenjpegdec.c
++++ ffmpeg-3.2.7/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(AVCo
+     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);
+Index: ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
+===================================================================
+--- ffmpeg-3.2.7.orig/libavcodec/libopenjpegenc.c
++++ ffmpeg-3.2.7/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
+@@ -306,7 +308,7 @@ static av_cold int libopenjpeg_encode_in
+ 
+     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;
+@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo
+     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/media-video/ffmpeg/files/openjpeg22.patch b/media-video/ffmpeg/files/openjpeg22.patch
new file mode 100644
index 00000000000..a458c15208a
--- /dev/null
+++ b/media-video/ffmpeg/files/openjpeg22.patch
@@ -0,0 +1,106 @@
+commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
+Author: Reino17 <rwijnsma@xs4all.nl>
+Date:   Fri Jun 23 23:49:31 2017 +0200
+
+    Add support for LibOpenJPEG v2.2/git
+    
+    Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
+
+Index: ffmpeg-3.3.3/configure
+===================================================================
+--- ffmpeg-3.3.3.orig/configure
++++ ffmpeg-3.3.3/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_hea
+                                  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; } ||
+Index: ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
+===================================================================
+--- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c
++++ ffmpeg-3.3.3/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(AVCo
+     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);
+Index: ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
+===================================================================
+--- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c
++++ ffmpeg-3.3.3/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_in
+ 
+     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(AVCo
+     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);

next             reply	other threads:[~2017-08-26 13:41 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-26 13:41 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-28  4:27 [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/ Ionen Wolkens
2025-02-04 16:54 Sam James
2025-01-06  2:16 Sam James
2024-11-25 20:42 Sam James
2024-09-26  7:17 Joonas Niilola
2024-07-20  4:09 Sam James
2024-07-20  4:09 Sam James
2024-05-02  5:21 Sam James
2024-04-10  1:47 Sam James
2024-03-12  3:37 Sam James
2024-03-09 22:17 James Le Cuirot
2024-02-29  5:44 Sam James
2024-02-17 14:53 James Le Cuirot
2024-02-06  4:02 Sam James
2024-02-06  4:00 Sam James
2024-01-24 10:58 Sam James
2023-12-18  4:51 Sam James
2023-07-24  2:00 Sam James
2023-05-31 18:43 Sam James
2023-04-23  7:05 Sam James
2023-02-13 22:43 Craig Andrews
2022-07-21  2:53 Matt Turner
2022-03-26 14:20 Joonas Niilola
2020-12-25  2:35 Sam James
2019-09-02 12:00 Alexis Ballier
2019-07-07 18:58 Thomas Deutschmann
2019-02-13 15:19 Alexis Ballier
2018-11-15 16:37 Craig Andrews
2018-07-19 11:08 Alexis Ballier
2018-07-17  7:33 Alexis Ballier
2018-01-18 22:01 James Le Cuirot
2017-08-27 19:23 James Le Cuirot
2017-02-07  9:46 Alexis Ballier
2016-12-24 10:33 Alexis Ballier
2016-09-29 16:33 Alexis Ballier
2015-11-12 11:46 Alexis Ballier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0969268ce8 dfblob:74d37e876a dfblob:d7e03bf5fd
dfblob:15961769e9 dfblob:fb78961463 dfblob:a6548ccc45 dfblob:0ee648641b
dfblob:a458c15208 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1503754858.904d190b4714c2d7a2ca9637f45d817a13e69125.aballier@gentoo \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox