dnl Check the operating system
dnl
HAVE_WIN64="0"
+HAVE_IOS="0"
+HAVE_OSX="0"
YASMFLAGS=""
case "${host}" in
VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
+ AC_EGREP_CPP(yes,
+ [#import <TargetConditionals.h>
+ #if TARGET_OS_IPHONE
+ yes
+ #endif],
+ [HAVE_IOS="1"],
+ [HAVE_OSX="1"])
+
dnl Allow binaries created on Lion to run on earlier releases
AC_EGREP_CPP(yes,
[#import <Cocoa/Cocoa.h>
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
+AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1")
+AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1")
AC_SUBST(YASMFLAGS)
AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
- AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}"/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [
+ AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}"/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404], [
AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.])
])
fi
AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
+dnl
+dnl Addons manager storage and repositories modules
+dnl
+AC_ARG_ENABLE(addonmanagermodules,
+ [AS_HELP_STRING([--disable-addonmanagermodules],
+ [disable the addons manager modules (default enabled)])])
+if test "${enable_addonmanagermodules}" != "no"
+then
+ AC_DEFINE(ENABLE_ADDONMANAGERMODULES, 1, [Define if you want the addons manager modules])
+fi
+AM_CONDITIONAL([ENABLE_ADDONMANAGERMODULES], [test "${enable_addonmanagermodules}" != "no"])
+
+
dnl
dnl Input plugins
dnl
dnl ogg demux plugin
dnl
PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
+PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [
+ AC_DEFINE(HAVE_LIBVORBIS, 1, [Define to 1 if you have the libvorbis])
+],[])
+PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto], [${LIBVORBIS_CFLAGS}], [${LIBVORBIS_LIBS}])
if test "${enable_sout}" != "no"; then
PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto])
dnl Check for libshout
AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [
AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.])
])
-have_avcodec_vaapi="no"
-AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" = "yes"], [
- PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
- CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
- AC_CHECK_HEADERS(libavcodec/vaapi.h, [
- AC_MSG_NOTICE([VAAPI acceleration activated])
- have_avcodec_vaapi="yes"
- ],[
- AS_IF([test -n "${enable_libva}"], [
- AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
- ], [
- AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
- ])
- ])
- VLC_RESTORE_FLAGS
- ],[
+
+have_vaapi="no"
+have_vaapi_drm="no"
+have_vaapi_x11="no"
+AS_IF([test "${enable_libva}" != "no"], [
+ PKG_CHECK_EXISTS([libva], [
+ have_vaapi="yes"
+ ], [
AS_IF([test -n "${enable_libva}"], [
AC_MSG_ERROR([${LIBVA_PKG_ERRORS}.])
], [
AC_MSG_WARN([${LIBVA_PKG_ERRORS}.])
])
])
+ PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm], [
+ have_vaapi_drm="yes"
+ ], [
+ AC_MSG_WARN([${LIBVA_DRM_PKG_ERRORS}.])
+ ])
+ PKG_CHECK_MODULES(LIBVA_X11, [libva-x11], [
+ have_vaapi_x11="yes"
+ ], [
+ AC_MSG_WARN([${LIBVA_X11_PKG_ERRORS}.])
+ ])
+])
+AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"])
+AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"])
+
+have_avcodec_vaapi="no"
+AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
+ VLC_SAVE_FLAGS
+ CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+ CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
+ AC_CHECK_HEADERS([libavcodec/vaapi.h], [
+ AC_MSG_NOTICE([VAAPI acceleration activated])
+ have_avcodec_vaapi="yes"
+ ],[
+ AS_IF([test -n "${enable_libva}"], [
+ AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
+ ], [
+ AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
+ ])
+ ])
+ VLC_RESTORE_FLAGS
])
AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"])
])
fi
-
-dnl
-dnl Mac Vout
-AC_ARG_ENABLE(macosx-vout,
- [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)])
-if test "x${enable_macosx_vout}" != "xno" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes")
-then
- VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,Cocoa])
- VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,OpenGL])
- VLC_ADD_PLUGIN([vout_macosx])
-fi
-
-dnl
-dnl Mac CoreGraphics Layer Vout
-AC_ARG_ENABLE(coregraphicslayer-vout,
- [ --enable-coregraphicslayer-vout CoreGraphics layered video output module (default disabled)])
-if test "${enable_coregraphicslayer_vout}" = "yes"; then
- VLC_ADD_LIBS([vout_coregraphicslayer],[-Wl,-framework,Cocoa])
- VLC_ADD_LIBS([vout_coregraphicslayer],[-Wl,-framework,QuartzCore])
- VLC_ADD_PLUGIN([vout_coregraphicslayer])
-fi
-
dnl
dnl freetype module
dnl
fi
fi
-
-dnl
-dnl iOS ES2 vout module
-dnl
-AC_ARG_ENABLE(ios-vout2,
- [ --enable-ios-vout2 iOS video output module (default disabled)])
-if test "${enable_ios_vout2}" = "yes"
-then
- VLC_ADD_PLUGIN([vout_ios2])
- VLC_ADD_LIBS([vout_ios2], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit])
-fi
-
-
dnl
dnl Windows DirectX module
dnl
])
AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"])
-dnl
-dnl CoreAudio plugin
-dnl
-AC_ARG_ENABLE(macosx-audio,
- [ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)])
-if test "x${enable_macosx_audio}" != "xno" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
-then
- AC_CHECK_HEADER([CoreAudio/CoreAudio.h],
- [ VLC_ADD_PLUGIN([auhal])
- ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
-fi
-
-dnl
-dnl iOS CoreAudio plugin
-dnl
-AC_ARG_ENABLE(ios-audio,
- [ --enable-ios-audio Audio module for iOS (default disabled)])
-if test "${enable_ios_audio}" = "yes"
-then
- AC_CHECK_HEADER([AudioUnit/AudioUnit.h],
- [ VLC_ADD_PLUGIN([audiounit_ios])
- ], [ AC_MSG_ERROR([cannot find AudioUnit headers]) ])
-fi
-
dnl
dnl AudioQueue plugin
dnl
modules/audio_filter/Makefile
modules/control/Makefile
modules/gui/Makefile
+ modules/gui/ios_dialog_provider/Makefile
modules/gui/macosx/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/macosx_dialog_provider/Makefile
projects / vlc / blobdiff