Commit cbecdf6a authored by Thomas Guillem's avatar Thomas Guillem

modules: add Evas video output

parent 99450534
...@@ -93,6 +93,7 @@ Video ouput: ...@@ -93,6 +93,7 @@ Video ouput:
* Renamed the Direct3D output module to Direct3D9 * Renamed the Direct3D output module to Direct3D9
* Added Direct3D11 video mode supporting both Windows desktop and WinRT modes, * Added Direct3D11 video mode supporting both Windows desktop and WinRT modes,
supporting subpicture blending and hardware acceleration supporting subpicture blending and hardware acceleration
* EFL Evas video output
Text renderer: Text renderer:
* CTL support through Harfbuzz in the Freetype module * CTL support through Harfbuzz in the Freetype module
......
...@@ -3463,6 +3463,25 @@ if test "${enable_mmal}" != "no"; then ...@@ -3463,6 +3463,25 @@ if test "${enable_mmal}" != "no"; then
fi fi
AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"])
dnl
dnl evas plugin
dnl
AC_ARG_ENABLE(evas,
[AS_HELP_STRING([--enable-evas],
[use evas output module (default disabled)])])
have_evas="no"
AS_IF([test "${enable_evas}" = "yes"], [
PKG_CHECK_MODULES(EVAS, [evas >= 1.15.99 ecore >= 1.15.99], [
have_evas="yes"
AC_DEFINE([HAVE_EVAS], [1], [Define to 1 if evas is enabled.])
],[
AS_IF([test "x${enable_evas}" != "x"], [
AC_MSG_ERROR([$EVAS_PKG_ERRORS. libevas and libecore 1.15.99 or later required.])
])
])
])
AM_CONDITIONAL([HAVE_EVAS], [test "${have_evas}" = "yes"])
dnl dnl
dnl Audio plugins dnl Audio plugins
dnl dnl
......
...@@ -134,6 +134,7 @@ $Id$ ...@@ -134,6 +134,7 @@ $Id$
* equalizer: a equalizer audio filter * equalizer: a equalizer audio filter
* erase: Logo erase video filter * erase: Logo erase video filter
* es: input module for MPEG ES decapsulation * es: input module for MPEG ES decapsulation
* evas: EFL Evas video output
* export: playlist export module * export: playlist export module
* extract: Extract RGB components video filter * extract: Extract RGB components video filter
* faad: AAC decoder using libfaad2 * faad: AAC decoder using libfaad2
......
...@@ -340,6 +340,16 @@ EXTRA_LTLIBRARIES += libcaca_plugin.la ...@@ -340,6 +340,16 @@ EXTRA_LTLIBRARIES += libcaca_plugin.la
vout_LTLIBRARIES += $(LTLIBcaca) vout_LTLIBRARIES += $(LTLIBcaca)
### EFL Evas video output ###
libevas_plugin_la_SOURCES = video_output/evas.c
libevas_plugin_la_CFLAGS = $(AM_CFLAGS) $(EVAS_CFLAGS)
libevas_plugin_la_LIBADD = $(EVAS_LIBS)
libevas_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
if HAVE_EVAS
vout_LTLIBRARIES += libevas_plugin.la
endif
### Common ### ### Common ###
libvdummy_plugin_la_SOURCES = video_output/vdummy.c libvdummy_plugin_la_SOURCES = video_output/vdummy.c
libvmem_plugin_la_SOURCES = video_output/vmem.c libvmem_plugin_la_SOURCES = video_output/vmem.c
......
This diff is collapsed.
...@@ -1157,6 +1157,7 @@ modules/video_output/caopengllayer.m ...@@ -1157,6 +1157,7 @@ modules/video_output/caopengllayer.m
modules/video_output/decklink.cpp modules/video_output/decklink.cpp
modules/video_output/directfb.c modules/video_output/directfb.c
modules/video_output/drawable.c modules/video_output/drawable.c
modules/video_output/evas.c
modules/video_output/egl.c modules/video_output/egl.c
modules/video_output/fb.c modules/video_output/fb.c
modules/video_output/gl.c modules/video_output/gl.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment