patch-configure_ac 5.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122
  1. --- vlc-2.2.6.orig/configure.ac 2017-05-24 12:40:16.000000000 +0200
  2. +++ vlc-2.2.6/configure.ac 2017-06-06 22:52:45.841013479 +0200
  3. @@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
  4. AC_CANONICAL_HOST
  5. AC_PRESERVE_HELP_ORDER
  6. -AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
  7. +AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects)
  8. AC_CONFIG_HEADERS([config.h])
  9. # Disable with "./configure --disable-silent-rules" or "make V=1"
  10. @@ -121,6 +121,7 @@ case "${host_os}" in
  11. ;;
  12. linux*)
  13. SYS=linux
  14. + AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], [])
  15. ;;
  16. bsdi*)
  17. SYS=bsdi
  18. @@ -537,7 +538,7 @@ need_libc=false
  19. dnl Check for usual libc functions
  20. AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
  21. -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])
  22. +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])
  23. 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])
  24. AC_CHECK_FUNCS(fdatasync,,
  25. [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
  26. @@ -867,7 +868,7 @@ dnl
  27. dnl Compiler warnings
  28. dnl
  29. -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])
  30. +RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var])
  31. RDC_PROG_CC_FLAGS([-pipe])
  32. AC_LANG_PUSH([C++])
  33. RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
  34. @@ -2318,7 +2319,7 @@ AC_ARG_ENABLE(avcodec,
  35. AS_IF([test "${enable_avcodec}" != "no"], [
  36. PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
  37. PKG_CHECK_EXISTS([libavutil < 55],, [
  38. - AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
  39. + AC_MSG_WARN([libavutil versions 55 and later are not supported.])
  40. ])
  41. VLC_SAVE_FLAGS
  42. CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
  43. @@ -2328,7 +2329,7 @@ AS_IF([test "${enable_avcodec}" != "no"]
  44. VLC_RESTORE_FLAGS
  45. have_avcodec="yes"
  46. ],[
  47. - AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
  48. + AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.])
  49. ])
  50. ], [
  51. have_avcodec="no"
  52. @@ -2377,7 +2378,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
  53. case "${avfork}" in
  54. ffmpeg)
  55. PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
  56. - AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
  57. + AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.])
  58. ])
  59. ;;
  60. esac
  61. @@ -2411,7 +2412,7 @@ AS_IF([test "${enable_dxva2}" != "no"],
  62. case "${avfork}" in
  63. ffmpeg)
  64. PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
  65. - AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
  66. + AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
  67. ])
  68. ;;
  69. esac
  70. @@ -2503,7 +2504,7 @@ AS_IF([test "${enable_avformat}" != "no"
  71. ])
  72. VLC_RESTORE_FLAGS
  73. ],[
  74. - AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
  75. + AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.])
  76. ])
  77. ])
  78. AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"])
  79. @@ -2532,7 +2533,7 @@ then
  80. ])
  81. VLC_RESTORE_FLAGS
  82. ],[
  83. - AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
  84. + AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.])
  85. ])
  86. fi
  87. @@ -3175,7 +3176,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
  88. libav) av_vdpau_ver="55.26.0" ;;
  89. ffmpeg) av_vdpau_ver="55.42.100"
  90. PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
  91. - AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
  92. + AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
  93. ])
  94. ;;
  95. esac
  96. @@ -4056,16 +4057,17 @@ dnl
  97. AC_ARG_ENABLE(libgcrypt,
  98. [ --disable-libgcrypt gcrypt support (default enabled)])
  99. AS_IF([test "${enable_libgcrypt}" != "no"], [
  100. + AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config])
  101. AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
  102. - libgcrypt-config --version >/dev/null || \
  103. + ${GCRYPT_CONFIG} --version >/dev/null || \
  104. AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found])
  105. AC_CHECK_LIB(gcrypt, gcry_control, [
  106. have_libgcrypt="yes"
  107. - GCRYPT_CFLAGS="`libgcrypt-config --cflags`"
  108. - GCRYPT_LIBS="`libgcrypt-config --libs`"
  109. + GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`"
  110. + GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`"
  111. ], [
  112. AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.])
  113. - ], [`libgcrypt-config --libs`])
  114. + ], [`${GCRYPT_CONFIG} --libs`])
  115. ], [
  116. AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.])
  117. ], [#include <gcrypt.h>]