|
|
@@ -0,0 +1,122 @@
|
|
|
+--- vlc-2.2.4.orig/configure.ac 2016-05-31 18:11:07.000000000 +0200
|
|
|
++++ vlc-2.2.4/configure.ac 2016-09-24 20:38:04.944241100 +0200
|
|
|
+@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
|
|
|
+ AC_CANONICAL_HOST
|
|
|
+ AC_PRESERVE_HELP_ORDER
|
|
|
+
|
|
|
+-AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
|
|
|
++AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
|
|
|
+ AC_CONFIG_HEADERS([config.h])
|
|
|
+
|
|
|
+ # Disable with "./configure --disable-silent-rules" or "make V=1"
|
|
|
+@@ -121,6 +121,7 @@ case "${host_os}" in
|
|
|
+ ;;
|
|
|
+ linux*)
|
|
|
+ SYS=linux
|
|
|
++ AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], [])
|
|
|
+ ;;
|
|
|
+ bsdi*)
|
|
|
+ SYS=bsdi
|
|
|
+@@ -534,7 +535,7 @@ need_libc=false
|
|
|
+
|
|
|
+ dnl Check for usual libc functions
|
|
|
+ AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
|
|
|
+-AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
|
|
|
++AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale strerror_l stricmp strnicmp strptime uselocale])
|
|
|
+ AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
|
|
|
+ AC_CHECK_FUNCS(fdatasync,,
|
|
|
+ [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
|
|
|
+@@ -864,7 +865,7 @@ dnl
|
|
|
+ dnl Compiler warnings
|
|
|
+ dnl
|
|
|
+
|
|
|
+-RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
|
|
|
++RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var])
|
|
|
+ RDC_PROG_CC_FLAGS([-pipe])
|
|
|
+ AC_LANG_PUSH([C++])
|
|
|
+ RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
|
|
|
+@@ -2324,7 +2325,7 @@ AC_ARG_ENABLE(avcodec,
|
|
|
+ AS_IF([test "${enable_avcodec}" != "no"], [
|
|
|
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
|
|
|
+ PKG_CHECK_EXISTS([libavutil < 55],, [
|
|
|
+- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
|
|
|
++ AC_MSG_WARN([libavutil versions 55 and later are not supported.])
|
|
|
+ ])
|
|
|
+ VLC_SAVE_FLAGS
|
|
|
+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
|
|
|
+@@ -2334,7 +2335,7 @@ AS_IF([test "${enable_avcodec}" != "no"]
|
|
|
+ VLC_RESTORE_FLAGS
|
|
|
+ have_avcodec="yes"
|
|
|
+ ],[
|
|
|
+- AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
|
|
|
++ AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
|
|
|
+ ])
|
|
|
+ ], [
|
|
|
+ have_avcodec="no"
|
|
|
+@@ -2383,7 +2384,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
|
|
|
+ case "${avfork}" in
|
|
|
+ ffmpeg)
|
|
|
+ PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
|
|
|
+- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
|
|
|
++ AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.])
|
|
|
+ ])
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -2417,7 +2418,7 @@ AS_IF([test "${enable_dxva2}" != "no"],
|
|
|
+ case "${avfork}" in
|
|
|
+ ffmpeg)
|
|
|
+ PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
|
|
|
+- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
|
|
|
++ AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
|
|
|
+ ])
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -2509,7 +2510,7 @@ AS_IF([test "${enable_avformat}" != "no"
|
|
|
+ ])
|
|
|
+ VLC_RESTORE_FLAGS
|
|
|
+ ],[
|
|
|
+- AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
|
|
|
++ AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
|
|
|
+ ])
|
|
|
+ ])
|
|
|
+ AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"])
|
|
|
+@@ -2538,7 +2539,7 @@ then
|
|
|
+ ])
|
|
|
+ VLC_RESTORE_FLAGS
|
|
|
+ ],[
|
|
|
+- AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
|
|
|
++ AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
|
|
|
+ ])
|
|
|
+ fi
|
|
|
+
|
|
|
+@@ -3181,7 +3182,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
|
|
|
+ libav) av_vdpau_ver="55.26.0" ;;
|
|
|
+ ffmpeg) av_vdpau_ver="55.42.100"
|
|
|
+ PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
|
|
|
+- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
|
|
|
++ AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
|
|
|
+ ])
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
+@@ -4062,16 +4063,17 @@ dnl
|
|
|
+ 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>]
|
Waldemar Brodkorb