summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-11-29 12:44:23 +0100
committerDiego Biurrun <diego@biurrun.de>2016-12-03 09:15:01 +0100
commit4a1ef543983b7480e2822f6ac281ba361d1f893d (patch)
tree36b495df0193cdd05a1075419e7e3c1841305f65 /configure
parent2575b1917b2703fae41a4b4901ad85c888374dfd (diff)
build: Drop support for old versions of libdc1394
The libdc1394 API transition was finished close to a decade ago.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 1 insertions, 11 deletions
diff --git a/configure b/configure
index e1f7725eb0..f67accf482 100755
--- a/configure
+++ b/configure
@@ -1671,8 +1671,6 @@ HAVE_LIST="
dos_paths
dxva2_lib
libc_msvcrt
- libdc1394_1
- libdc1394_2
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
sdl
section_data_rel_ro
@@ -4625,6 +4623,7 @@ enabled cuda && check_lib cuda.h cuInit -lcuda
enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
enabled libbs2b && require_pkg_config libbs2b bs2b.h bs2b_open
+enabled libdc1394 && require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdcadec && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec
enabled libfaac && require libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
enabled libfdk_aac && require_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen
@@ -4713,15 +4712,6 @@ enabled openssl && { { check_pkg_config openssl openssl/ssl.h OPENSSL_
enabled gnutls && check_lib gmp.h mpz_export -lgmp && enable gmp
-# libdc1394 check
-if enabled libdc1394; then
- { require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new &&
- enable libdc1394_2; } ||
- { check_lib libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 &&
- enable libdc1394_1; } ||
- die "ERROR: No version of libdc1394 found "
-fi
-
if enabled nvenc; then
check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."
check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" ||