Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
ffmpeg: Fix +universal build with openjp2
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
- Loading branch information
Showing
2 changed files
with
15 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- configure.orig 2017-02-12 21:06:32.000000000 -0800 | ||
+++ configure 2017-02-12 21:07:13.000000000 -0800 | ||
@@ -5721,8 +5721,8 @@ 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; } || | ||
- check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || | ||
+enabled libopenjpeg && { check_lib2 openjpeg-2.1/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.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; } || | ||
{ check_lib2 openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || |