Skip to content

Commit

Permalink
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
jeremyhu committed Feb 13, 2017
1 parent 99a8d90 commit 01fbb95
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 2 additions & 1 deletion multimedia/ffmpeg/Portfile
Expand Up @@ -92,7 +92,8 @@ depends_lib port:lame \
port:xz \
port:zlib

patchfiles patch-libavcodec-audiotoolboxenc.c.diff
patchfiles patch-libavcodec-audiotoolboxenc.c.diff \
patch-configure-no-static-libopenjpeg.diff

#
# enable auto configure of asm optimizations
Expand Down
13 changes: 13 additions & 0 deletions multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff
@@ -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; } ||

0 comments on commit 01fbb95

Please sign in to comment.