Date: Mon, 21 Aug 2017 14:19:11 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448475 - head/multimedia/ffmpeg/files Message-ID: <201708211419.v7LEJBjg041951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Aug 21 14:19:11 2017 New Revision: 448475 URL: https://svnweb.freebsd.org/changeset/ports/448475 Log: Fix build with graphics/openjpeg after update to 2.2. Sponsored by: Absolight Added: head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c (contents, props changed) head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c (contents, props changed) Modified: head/multimedia/ffmpeg/files/patch-configure (contents, props changed) Modified: head/multimedia/ffmpeg/files/patch-configure ============================================================================== --- head/multimedia/ffmpeg/files/patch-configure Mon Aug 21 14:11:33 2017 (r448474) +++ head/multimedia/ffmpeg/files/patch-configure Mon Aug 21 14:19:11 2017 (r448475) @@ -1,6 +1,14 @@ ---- configure.orig 2017-04-13 01:55:54 UTC +--- configure.orig 2017-07-29 17:49:29 UTC +++ configure -@@ -3262,12 +3262,7 @@ target_os_default=$(tolower $(uname -s)) +@@ -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 +@@ -3262,12 +3263,7 @@ target_os_default=$(tolower $(uname -s)) host_os=$target_os_default # machine @@ -14,7 +22,21 @@ cpu="generic" intrinsics="none" -@@ -6295,6 +6290,9 @@ elif enabled llvm_gcc; then +@@ -5803,10 +5799,12 @@ enabled libopencore_amrwb && require lib + enabled libopencv && { check_header opencv2/core/core_c.h && + { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader || + require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || +- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } ++ require_pkg_config opencv-core-core 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; } || + check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || ++ { 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.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; } || + { check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || +@@ -6295,6 +6293,9 @@ elif enabled llvm_gcc; then elif enabled clang; then check_cflags -mllvm -stack-alignment=16 check_cflags -mstack-alignment=16 @@ -24,7 +46,7 @@ check_cflags -Qunused-arguments check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes -@@ -6900,7 +6898,7 @@ exec_prefix=\${prefix} +@@ -6900,7 +6901,7 @@ exec_prefix=\${prefix} libdir=$libdir includedir=$incdir @@ -33,7 +55,7 @@ Description: $comment Version: $version Requires: $(enabled shared || echo $requires) -@@ -6914,10 +6912,10 @@ EOF +@@ -6914,10 +6915,10 @@ EOF mkdir -p doc/examples/pc-uninstalled includedir=${source_path} [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." Added: head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c Mon Aug 21 14:19:11 2017 (r448475) @@ -0,0 +1,31 @@ +--- libavcodec/libopenjpegdec.c.orig 2017-07-29 17:49:30 UTC ++++ 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); Added: head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c Mon Aug 21 14:19:11 2017 (r448475) @@ -0,0 +1,38 @@ +--- libavcodec/libopenjpegenc.c.orig 2017-07-29 17:49:30 UTC ++++ libavcodec/libopenjpegenc.c +@@ -32,6 +32,8 @@ + #include "avcodec.h" + #include "internal.h" + ++#if HAVE_OPENJPEG_2_2_OPENJPEG_H ++# include <openjpeg-2.2/openjpeg.h> + #if HAVE_OPENJPEG_2_1_OPENJPEG_H + # include <openjpeg-2.1/openjpeg.h> + #elif HAVE_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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708211419.v7LEJBjg041951>