OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"
LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
- 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,
AC_SUBST(LIBPTHREAD)
dnl Check for headers
-AC_CHECK_HEADERS([search.h])
-AC_CHECK_HEADERS(getopt.h locale.h xlocale.h)
-AC_CHECK_HEADERS([sys/time.h sys/ioctl.h])
-AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h])
-AC_CHECK_HEADERS([net/if.h], [], [],
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- ])
-AC_CHECK_HEADERS([sys/mount.h], [], [],
- [
- #include <sys/param.h>
- ])
-
-if test "${SYS}" != "mingw32"; then
- AC_CHECK_HEADERS(machine/param.h sys/shm.h)
- AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
- AC_CHECK_HEADERS(syslog.h mntent.h)
-fi # end "${SYS}" != "mingw32"
+dnl POSIX
+AC_CHECK_HEADERS([arpa/inet.h net/if.h pthread.h search.h syslog.h sys/shm.h])
+dnl BSD
+AC_CHECK_HEADERS([netinet/udplite.h sys/param.h sys/mount.h])
+dnl GNU/Linux
+AC_CHECK_HEADERS([getopt.h linux/dccp.h linux/magic.h mntent.h sys/eventfd.h])
+dnl MacOS
+AC_CHECK_HEADERS([xlocale.h])
dnl LP64 and LLP64 architectures had better define ssize_t by themselves...
AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight
AC_DEFINE(ssize_t, int)
])
-dnl Check for threads library
-if test "${SYS}" != "mingw32"; then
- AC_CHECK_HEADERS(pthread.h)
-fi # end "${SYS}" != "mingw32"
-
dnl It seems that autoconf detects pkg-config only during the first
dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case,
dnl it is nested within a conditional block, so it was not working right.
VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX])
fi
-dnl
-dnl MMAL codec plugin
-dnl
-AC_ARG_ENABLE(mmal-codec,
- AS_HELP_STRING([--enable-mmal-codec],
- [Multi-Media Abstraction Layer (MMAL) based codec plugin for Raspberry Pi (default enable)]))
-if test "${enable_mmal_codec}" != "no"; then
- VLC_SAVE_FLAGS
- LDFLAGS="${LDFLAGS} -L/opt/vc/lib"
- CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
- AC_CHECK_HEADERS(interface/mmal/mmal.h,
- [ AC_CHECK_LIB(bcm_host, bcm_host_init, [
- VLC_ADD_PLUGIN([mmal_codec])
- VLC_ADD_LDFLAGS([mmal_codec],[ -L/opt/vc/lib ])
- VLC_ADD_CFLAGS([mmal_codec],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
- VLC_ADD_LIBS([mmal_codec],[ -lbcm_host -lmmal ]) ], [
- AS_IF([test "${enable_mmal_codec}" = "yes"],
- [ AC_MSG_ERROR([Cannot find bcm library...]) ],
- [ AC_MSG_WARN([Cannot find bcm library...]) ])
- ],
- [])
- ] , [ AS_IF([test "${enable_mmal_codec}" = "yes"],
- [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ],
- [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ])
- VLC_RESTORE_FLAGS
-fi
-
dnl
dnl CrystalHD codec plugin
dnl
AM_CONDITIONAL([HAVE_AVCODEC_VDPAU], [test "${have_avcodec_vdpau}" = "yes"])
+dnl
+dnl Wayland
+dnl
+AC_ARG_ENABLE(wayland,
+ [AS_HELP_STRING([--enable-wayland], [Wayland support (default auto)])])
+have_wayland="no"
+AS_IF([test "${enable_wayland}" != "no"], [
+ PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= 1.4], [
+ have_wayland="yes"
+ ], [
+ AS_IF([test -n "${enable_wayland}"], [
+ AC_MSG_ERROR([${WAYLAND_CLIENT_PKG_ERRORS}.])
+ ])
+ ])
+])
+AM_CONDITIONAL([HAVE_WAYLAND], [test "${have_wayland}" = "yes"])
+
+
dnl
dnl SDL module
dnl
AM_CONDITIONAL([HAVE_KVA], [test "${have_kva}" = "yes"])
dnl
-dnl MMAL vout plugin
+dnl MMAL plugin
dnl
-AC_ARG_ENABLE(mmal-vout,
- AS_HELP_STRING([--enable-mmal-vout],
- [Multi-Media Abstraction Layer (MMAL) based vout plugin for Raspberry Pi (default enable)]))
-if test "${enable_mmal_vout}" != "no"; then
+AC_ARG_ENABLE(mmal,
+ AS_HELP_STRING([--enable-mmal],
+ [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)]))
+if test "${enable_mmal}" != "no"; then
VLC_SAVE_FLAGS
LDFLAGS="${LDFLAGS} -L/opt/vc/lib"
CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
AC_CHECK_HEADERS(interface/mmal/mmal.h,
[ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [
- VLC_ADD_PLUGIN([mmal_vout])
- VLC_ADD_LDFLAGS([mmal_vout],[ -L/opt/vc/lib ])
- VLC_ADD_CFLAGS([mmal_vout],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
- VLC_ADD_LIBS([mmal_vout],[ -lbcm_host -lmmal ]) ], [
- AS_IF([test "${enable_mmal_vout}" = "yes"],
+ have_mmal="yes"
+ VLC_ADD_PLUGIN([mmal])
+ VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ])
+ VLC_ADD_CFLAGS([mmal],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
+ VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal ]) ], [
+ AS_IF([test "${enable_mmal}" = "yes"],
[ AC_MSG_ERROR([Cannot find bcm library...]) ],
[ AC_MSG_WARN([Cannot find bcm library...]) ])
],
[])
- ] , [ AS_IF([test "${enable_mmal_vout}" = "yes"],
+ ] , [ AS_IF([test "${enable_mmal}" = "yes"],
[ AC_MSG_ERROR([Cannot find development headers for mmal...]) ],
[ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ])
VLC_RESTORE_FLAGS
fi
+AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"])
dnl
dnl Audio plugins
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls GNU TLS TLS/SSL support (default enabled)])
AS_IF([test "${enable_gnutls}" != "no"], [
- PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.11], [
+ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.2.0], [
VLC_ADD_PLUGIN([gnutls])
], [
AS_IF([test -n "${enable_gnutls}"], [
modules/video_output/Makefile
modules/visualization/Makefile
modules/hw/vdpau/Makefile
+ modules/hw/mmal/Makefile
])
AM_COND_IF([HAVE_WIN32], [
projects / vlc / blobdiff