2e340beb61
Since we bumped FreeRDP, vlc no longer builds:
http://autobuild.buildroot.org/results/8d9/8d91e3ffccee753135e9d0faa2b1ae00875606c9/
http://autobuild.buildroot.org/results/e1f/e1f6526d1a4ac2c95998793efea2188faa708e29/
Fix that by bumping vlc to 2.2.0, as vlc-2.1.6will never support this
new version of FreeRDP.
Add dependency on kernel headers >= 3.7, because it needs DTV_STREAM_ID.
I stumbled on this whith a toolchain using headers forom 3.5, but only
tested with a toolchain with headers from 3.9, so there might be other
dependencies I missed on 3.8 or even 3.9. Let's wait for build failures
to find out...
There are quite a bunch of new --enable/disable options, so I've tried
to catter for all the changes. Most notably, there's no longer a flag to
enable.disable GL, it is now always auto-detected. Also, I've added
flags for GLES which we were missing so far, so we had to rely on the
build order to detect those dependencies (which was OK becasue libgles
sorts before vlc). Finally, SVG now has two flags to enable different
parts of SVG support, but they both depend on the same library, so
enable both.
There are new support for some features, like acceleration on RPI, but
that can well wait for further patches when someone is interested ;-) ,
vdpau HW accelearation on NVidia (we have a package for that, but not
able to test, so not added), vpx support (we have a libvpx package,
but I had no time to test), x262 and x265 support for which we're
currently lacking the packaging, and a few other exotic stuff...
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From 88bf3313850bc7f0e6db21daee2b8d8e607b7bb4 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Martin <s.martin49@gmail.com>
|
|
Date: Sat, 8 Feb 2014 14:33:27 +0100
|
|
Subject: [PATCH] configure.ac: add check for libgcrypt-config program
|
|
|
|
This allows to override the default libgcrypt-config location (which is
|
|
useful when cross-compiling), instead of using the one from the host
|
|
system.
|
|
|
|
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
|
[yann.morin.1998@free.fr: adapt from 2.1.6 to 2.2.0; fix quoting in
|
|
AC_PATH_PROG]
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
---
|
|
configure.ac | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 02fb8aa..5a2267b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4020,16 +4020,17 @@
|
|
AC_ARG_ENABLE(libgcrypt,
|
|
[ --disable-libgcrypt gcrypt support (default enabled)])
|
|
AS_IF([test "${enable_libgcrypt}" != "no"], [
|
|
+ AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config])
|
|
AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
|
|
- libgcrypt-config --version >/dev/null || \
|
|
+ ${GCRYPT_CONFIG} --version >/dev/null || \
|
|
AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
|
|
AC_CHECK_LIB(gcrypt, gcry_control, [
|
|
have_libgcrypt="yes"
|
|
- GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
|
|
- GCRYPT_LIBS="`libgcrypt-config --libs`"
|
|
+ GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`"
|
|
+ GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`"
|
|
], [
|
|
AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.])
|
|
- ], [`libgcrypt-config --libs`])
|
|
+ ], [`${GCRYPT_CONFIG} --libs`])
|
|
], [
|
|
AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
|
|
], [#include <gcrypt.h>]
|