diff options
Diffstat (limited to 'package/vlc/patches/patch-configure_ac')
| -rw-r--r-- | package/vlc/patches/patch-configure_ac | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package/vlc/patches/patch-configure_ac b/package/vlc/patches/patch-configure_ac index dcae06228..ff67e1512 100644 --- a/package/vlc/patches/patch-configure_ac +++ b/package/vlc/patches/patch-configure_ac @@ -1,5 +1,5 @@ ---- 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 +--- vlc-2.2.6.orig/configure.ac 2017-05-24 12:40:16.000000000 +0200 ++++ vlc-2.2.6/configure.ac 2017-06-06 22:52:45.841013479 +0200 @@ -24,7 +24,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_PRESERVE_HELP_ORDER @@ -17,7 +17,7 @@ ;; bsdi*) SYS=bsdi -@@ -534,7 +535,7 @@ need_libc=false +@@ -537,7 +538,7 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include <time.h>]) @@ -26,7 +26,7 @@ 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 +@@ -867,7 +868,7 @@ dnl dnl Compiler warnings dnl @@ -35,7 +35,7 @@ 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, +@@ -2318,7 +2319,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],, [ @@ -44,7 +44,7 @@ ]) VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" -@@ -2334,7 +2335,7 @@ AS_IF([test "${enable_avcodec}" != "no"] +@@ -2328,7 +2329,7 @@ AS_IF([test "${enable_avcodec}" != "no"] VLC_RESTORE_FLAGS have_avcodec="yes" ],[ @@ -53,7 +53,7 @@ ]) ], [ have_avcodec="no" -@@ -2383,7 +2384,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a " +@@ -2377,7 +2378,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a " case "${avfork}" in ffmpeg) PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ @@ -62,7 +62,7 @@ ]) ;; esac -@@ -2417,7 +2418,7 @@ AS_IF([test "${enable_dxva2}" != "no"], +@@ -2411,7 +2412,7 @@ AS_IF([test "${enable_dxva2}" != "no"], case "${avfork}" in ffmpeg) PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ @@ -71,7 +71,7 @@ ]) ;; esac -@@ -2509,7 +2510,7 @@ AS_IF([test "${enable_avformat}" != "no" +@@ -2503,7 +2504,7 @@ AS_IF([test "${enable_avformat}" != "no" ]) VLC_RESTORE_FLAGS ],[ @@ -80,7 +80,7 @@ ]) ]) AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"]) -@@ -2538,7 +2539,7 @@ then +@@ -2532,7 +2533,7 @@ then ]) VLC_RESTORE_FLAGS ],[ @@ -89,7 +89,7 @@ ]) fi -@@ -3181,7 +3182,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a " +@@ -3175,7 +3176,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], [ @@ -98,7 +98,7 @@ ]) ;; esac -@@ -4062,16 +4063,17 @@ dnl +@@ -4056,16 +4057,17 @@ dnl AC_ARG_ENABLE(libgcrypt, [ --disable-libgcrypt gcrypt support (default enabled)]) AS_IF([test "${enable_libgcrypt}" != "no"], [ |