[SCM] libav/experimental: configure: Always use -DOPJ_STATIC when checking for openjpeg

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:20 UTC 2014


The following commit has been merged in the experimental branch:
commit 0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Sat Mar 22 20:16:44 2014 +0100

    configure: Always use -DOPJ_STATIC when checking for openjpeg
    
    Unbreaks windows systems not providing pkgconf files.
    
    Reported-By: Rafaël Carré <funman at videolan.org>

diff --git a/configure b/configure
index f26374a..b80d389 100755
--- a/configure
+++ b/configure
@@ -4022,8 +4022,8 @@ enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set
 enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
 enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
 enabled libopencv         && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
-enabled libopenjpeg       && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } ||
-                               { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } }
+enabled libopenjpeg       && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC; } ||
+                               { require_pkg_config libopenjpeg1 openjpeg.h opj_version -DOPJ_STATIC; } }
 enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
 enabled libpulse          && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
 enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list