summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2012-12-14 23:38:25 +0000
committerDaniel Willmann <daniel@totalueberwachung.de>2012-12-14 23:38:25 +0000
commit29931c273f9d4c61c63c204373964281e64e7b1c (patch)
tree98723c78ccad52a1585f6d56dea04fbc8844878d
parenteb15fa9e9c87bfe95062ed12be2fb383e0ee9e43 (diff)
efl: Add build system support for ecore_audio
Disabled by default, enable with --enable-audio ALSA support is disabled as it is not there yet. Pulseaudio should work though. Support for .ogg and .wav is there as well (.mp3 is not) Signed-off-by: Daniel Willmann <d.willmann@samsung.com> SVN revision: 81000
-rw-r--r--configure.ac90
-rw-r--r--pc/ecore-audio.pc.in12
-rw-r--r--src/Makefile.am3
-rw-r--r--src/Makefile_Ecore_Audio.am41
-rw-r--r--src/lib/ecore/Ecore.h2
5 files changed, 148 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 92df65c5e5..ae4570a4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ requirements_libs_ecore_win32=""
139requirements_libs_ecore_wince="" 139requirements_libs_ecore_wince=""
140requirements_libs_ecore_x="" 140requirements_libs_ecore_x=""
141requirements_libs_ecore_evas="" 141requirements_libs_ecore_evas=""
142requirements_libs_ecore_audio=""
142requirements_libs_embryo="" 143requirements_libs_embryo=""
143requirements_libs_eio="" 144requirements_libs_eio=""
144#requirements_libs_edje="" 145#requirements_libs_edje=""
@@ -168,6 +169,7 @@ requirements_pc_ecore_win32=""
168requirements_pc_ecore_wince="" 169requirements_pc_ecore_wince=""
169requirements_pc_ecore_x="" 170requirements_pc_ecore_x=""
170requirements_pc_ecore_evas="" 171requirements_pc_ecore_evas=""
172requirements_pc_ecore_audio=""
171requirements_pc_embryo="" 173requirements_pc_embryo=""
172requirements_pc_eio="" 174requirements_pc_eio=""
173#requirements_pc_edje="" 175#requirements_pc_edje=""
@@ -216,6 +218,7 @@ AC_SUBST([requirements_libs_ecore_win32])
216AC_SUBST([requirements_libs_ecore_wince]) 218AC_SUBST([requirements_libs_ecore_wince])
217AC_SUBST([requirements_libs_ecore_x]) 219AC_SUBST([requirements_libs_ecore_x])
218AC_SUBST([requirements_libs_ecore_evas]) 220AC_SUBST([requirements_libs_ecore_evas])
221AC_SUBST([requirements_libs_ecore_audio])
219AC_SUBST([requirements_libs_embryo]) 222AC_SUBST([requirements_libs_embryo])
220AC_SUBST([requirements_libs_eio]) 223AC_SUBST([requirements_libs_eio])
221#AC_SUBST([requirements_libs_edje]) 224#AC_SUBST([requirements_libs_edje])
@@ -245,6 +248,7 @@ AC_SUBST([requirements_pc_ecore_win32])
245AC_SUBST([requirements_pc_ecore_wince]) 248AC_SUBST([requirements_pc_ecore_wince])
246AC_SUBST([requirements_pc_ecore_x]) 249AC_SUBST([requirements_pc_ecore_x])
247AC_SUBST([requirements_pc_ecore_evas]) 250AC_SUBST([requirements_pc_ecore_evas])
251AC_SUBST([requirements_pc_ecore_audio])
248AC_SUBST([requirements_pc_embryo]) 252AC_SUBST([requirements_pc_embryo])
249AC_SUBST([requirements_pc_eio]) 253AC_SUBST([requirements_pc_eio])
250#AC_SUBST([requirements_pc_edje]) 254#AC_SUBST([requirements_pc_edje])
@@ -3120,6 +3124,82 @@ fi
3120 3124
3121#### End of Ecore_Evas 3125#### End of Ecore_Evas
3122 3126
3127#### Ecore_Audio
3128AC_ARG_ENABLE([audio],
3129 [AC_HELP_STRING([--enable-audio], [enable Ecore_Audio])],
3130 [
3131 if test "x${enableval}" = "xyes" ; then
3132 want_ecore_audio="yes"
3133 else
3134 want_ecore_audio="no"
3135 fi
3136 ],
3137 [want_ecore_audio="no"])
3138
3139if test "x${want_ecore_audio}" = "xyes" ; then
3140
3141AC_MSG_NOTICE([Ecore_Audio checks])
3142
3143### Additional options to configure
3144
3145### Default values
3146
3147### Checks for programs
3148
3149### Checks for libraries
3150
3151# Eina, Eo, Eet, Ecore
3152
3153requirements_pc_ecore_audio="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_audio}"
3154
3155use_alsa="no"
3156# ALSA support is not really there yet...uncomment if you want to play around with it
3157#PKG_CHECK_EXISTS([ALSA], [alsa], [
3158# use_alsa="yes"
3159# AC_DEFINE([HAVE_ALSA], [1], [Alsa library])
3160# requirements_pc_ecore_audio="alsa ${requirements_pc_ecore_audio}"
3161# requirements_pc_deps_ecore_audio="alsa ${requirements_pc_deps_ecore_audio}"
3162# ], [use_alsa="no"])
3163
3164have_pulse="no"
3165PKG_CHECK_EXISTS([libpulse],
3166 [
3167 use_pulse="yes"
3168 AC_DEFINE([HAVE_PULSE], [1], [Pulseaudio library])
3169 requirements_pc_ecore_audio="libpulse ${requirements_pc_ecore_audio}"
3170 requirements_pc_deps_ecore_audio="libpulse ${requirements_pc_deps_ecore_audio}"
3171 ], [use_pulse="no"])
3172
3173use_sndfile="no"
3174PKG_CHECK_EXISTS([sndfile], [
3175 use_sndfile="yes"
3176 AC_DEFINE([HAVE_SNDFILE], [1], [libsndfile library])
3177 requirements_pc_ecore_audio="sndfile ${requirements_pc_ecore_audio}"
3178 requirements_pc_deps_ecore_audio="sndfile ${requirements_pc_deps_ecore_audio}"
3179 ], [use_sndfile="no"])
3180
3181PKG_CHECK_MODULES([ECORE_AUDIO], [${requirements_pc_deps_ecore_audio}])
3182
3183ECORE_AUDIO_CFLAGS="${ECORE_AUDIO_CFLAGS}"
3184ECORE_AUDIO_LIBS="${ECORE_AUDIO_LIBS}"
3185requirements_libs_ecore_audio="${requirements_libs_ecore_audio}"
3186
3187### Checks for header files
3188
3189### Checks for types
3190
3191### Checks for structures
3192
3193### Checks for compiler characteristics
3194
3195### Checks for linker characteristics
3196
3197### Checks for library functions
3198
3199fi
3200
3201AM_CONDITIONAL([HAVE_ECORE_AUDIO], [test "x${want_ecore_audio}" = "xyes"])
3202
3123 3203
3124#### Eio 3204#### Eio
3125 3205
@@ -3280,6 +3360,7 @@ pc/ecore-x.pc
3280pc/ecore-evas.pc 3360pc/ecore-evas.pc
3281pc/ecore-imf.pc 3361pc/ecore-imf.pc
3282pc/ecore-imf-evas.pc 3362pc/ecore-imf-evas.pc
3363pc/ecore-audio.pc
3283pc/embryo.pc 3364pc/embryo.pc
3284pc/eio.pc 3365pc/eio.pc
3285$po_makefile_in 3366$po_makefile_in
@@ -3479,6 +3560,15 @@ echo " Ecore_Evas...................: $have_ecore_evas"
3479 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" 3560 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
3480#fi 3561#fi
3481echo 3562echo
3563echo "Ecore Sound system:"
3564echo
3565echo " Ecore_Audio..................: $want_ecore_audio"
3566if test "x${want_ecore_audio}" = "xyes" ; then
3567echo " ALSA.......................: $use_alsa"
3568echo " PulseAudio.................: $use_pulse"
3569echo " SndFile....................: $use_sndfile"
3570fi
3571echo
3482echo "Tests..................: ${_efl_enable_tests}" 3572echo "Tests..................: ${_efl_enable_tests}"
3483if test "x${_efl_enable_tests}" = "xyes"; then 3573if test "x${_efl_enable_tests}" = "xyes"; then
3484echo " Coverage...........: ${_efl_enable_coverage}" 3574echo " Coverage...........: ${_efl_enable_coverage}"
diff --git a/pc/ecore-audio.pc.in b/pc/ecore-audio.pc.in
new file mode 100644
index 0000000000..ced2f83755
--- /dev/null
+++ b/pc/ecore-audio.pc.in
@@ -0,0 +1,12 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-audio
7Description: E core library, audio module
8Requires.private: @requirements_pc_ecore_audio@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_audio
11Libs.private: @requirements_libs_ecore_audio@
12Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index 684f54c132..a9c4f3d74b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,9 @@ include Makefile_Ecore_X.am
53endif 53endif
54include Makefile_Ecore_Imf.am 54include Makefile_Ecore_Imf.am
55include Makefile_Ecore_Evas.am 55include Makefile_Ecore_Evas.am
56if HAVE_ECORE_AUDIO
57include Makefile_Ecore_Audio.am
58endif
56include Makefile_Embryo.am 59include Makefile_Embryo.am
57include Makefile_Eio.am 60include Makefile_Eio.am
58 61
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
new file mode 100644
index 0000000000..7862ad9c73
--- /dev/null
+++ b/src/Makefile_Ecore_Audio.am
@@ -0,0 +1,41 @@
1
2### Library
3
4lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la
5
6installed_ecoreaudiomainheadersdir = $(includedir)/ecore-@VMAJ@
7dist_installed_ecoreaudiomainheaders_DATA = \
8lib/ecore_audio/Ecore_Audio.h
9
10lib_ecore_audio_libecore_audio_la_SOURCES = \
11lib/ecore_audio/ecore_audio.c \
12lib/ecore_audio/ecore_audio_alsa.c \
13lib/ecore_audio/ecore_audio_pulse.c \
14lib/ecore_audio/ecore_audio_sndfile.c \
15lib/ecore_audio/ecore_audio_tone.c \
16lib/ecore_audio/ecore_audio_custom.c \
17lib/ecore_audio/ecore_audio_private.h
18
19lib_ecore_audio_libecore_audio_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \
21-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/eet \
23-I$(top_srcdir)/src/lib/ecore \
24-I$(top_builddir)/src/lib/eina \
25-I$(top_builddir)/src/lib/eo \
26-I$(top_builddir)/src/lib/eet \
27-I$(top_builddir)/src/lib/ecore \
28-DEFL_ECORE_AUDIO_BUILD \
29@EFL_CFLAGS@ \
30@EFL_COV_CFLAGS@ \
31@ECORE_AUDIO_CFLAGS@
32
33lib_ecore_audio_libecore_audio_la_LIBADD = \
34lib/ecore/libecore.la \
35lib/eet/libeet.la \
36lib/eo/libeo.la \
37lib/eina/libeina.la
38
39lib_ecore_audio_libecore_audio_la_LIBADD += @ECORE_AUDIO_LIBS@ @EFL_COV_LIBS@ -lm
40
41lib_ecore_audio_libecore_audio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index d3585fcc31..4dacb7c0db 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -32,6 +32,7 @@
32 @li @link Ecore_X.h Ecore_X - X Windows System wrapper. @endlink 32 @li @link Ecore_X.h Ecore_X - X Windows System wrapper. @endlink
33 @li @ref Ecore_Win32_Group 33 @li @ref Ecore_Win32_Group
34 @li @ref Ecore_WinCE_Group 34 @li @ref Ecore_WinCE_Group
35 @li @ref Ecore_Audio_Group
35 36
36 For more info on Ecore usage, there are these @ref Examples. 37 For more info on Ecore usage, there are these @ref Examples.
37 38
@@ -123,6 +124,7 @@ sudo make install
123 @author Jérémy Zurcher <jeremy@asynk.ch> 124 @author Jérémy Zurcher <jeremy@asynk.ch>
124 @author Vikram Narayanan <vikram186@gmail.com> 125 @author Vikram Narayanan <vikram186@gmail.com>
125 @author Gwanglim Lee <gl77.lee@samsung.com> <gwanglim@gmail.com> 126 @author Gwanglim Lee <gl77.lee@samsung.com> <gwanglim@gmail.com>
127 @author Daniel Willmann <daniel@totalueberwachung.de>
126 128
127 Please contact <enlightenment-devel@lists.sourceforge.net> to get in 129 Please contact <enlightenment-devel@lists.sourceforge.net> to get in
128 contact with the developers and maintainers. 130 contact with the developers and maintainers.