On Sat, 30 Apr 2016, Janne Grunau wrote:
---
- explicitly die if OMX_Core.h when omx or omx_rpi is enabled.
This could use another verb to make it more understandable, although it's
not part of the commit message
the dependency through _select is unfortunately only enbaled later
I guess the explicit 'enabled omx' wasn't such a bad idea afterall
- search and add the raspbian include path only if OMX_Core.h wasn't
found
configure | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 628e6ba..11bebb8 100755
--- a/configure
+++ b/configure
@@ -2166,8 +2166,9 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
nvenc_deps_any="dlopen LoadLibrary"
nvenc_extralibs='$ldl'
mmal_deps="interface_mmal_mmal_h mmal_port_connect"
-omx_deps="dlopen pthreads"
+omx_deps="dlopen pthreads OMX_Core_h"
omx_extralibs='$ldl'
+omx_rpi_select="omx"
qsvdec_select="qsv"
qsvenc_select="qsv"
vaapi_encode_deps="vaapi"
@@ -4623,11 +4624,11 @@ enabled libx265 && require_pkg_config x265 x265.h
x265_api_get &&
die "ERROR: libx265 version must be >= 57."; }
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
-enabled omx_rpi && enable omx
-enabled omx && { check_header OMX_Core.h ||
- { ! enabled cross_compile && enabled omx_rpi
&& {
- add_cflags -isystem/opt/vc/include/IL ; }
- check_header OMX_Core.h ; } ||
+# add default raspbian include dir for OpenMAX IL header if needed
+enabled omx_rpi && { check_header OMX_Core.h ||
+ check_header OMX_Core.h -isystem/opt/vc/include/IL
&&
+ check_cflags -isystem/opt/vc/include/IL; }
+enabled_any omx omx_rpi && { check_header OMX_Core.h ||
die "ERROR: OpenMAX IL headers not found"; }
enabled openssl && { check_pkg_config openssl openssl/ssl.h SSL_library_init
&& {
add_cflags $openssl_cflags && add_extralibs
$openssl_libs; }||
--
2.8.1
Ok with me.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
