Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
configure.in AUTHORS TODO emotion.c.in
Log Message:
emotion can use gstreamer, now
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- configure.in 3 Sep 2005 19:07:24 -0000 1.15
+++ configure.in 2 Oct 2005 07:34:36 -0000 1.16
@@ -130,17 +130,40 @@
)
AC_PATH_GENERIC(xine, 1.0.0,
- [ ],
- [ AC_MSG_ERROR(Xine isn't installed)]
+ [HAVE_XINE="yes"],
+ [HAVE_XINE="no"]
)
xine_plugins=`$XINE_CONFIG --plugindir`
AC_SUBST(xine_plugins)
+dnl gstreamer
+gstreamer_cflags=
+gstreamer_libs=
+
+dnl Gstreamer version requirement
+GST_REQS=0.8.10
+GSTPLUG_REQS=0.8.10
+GST_MAJORMINOR=0.8
+
+PKG_CHECK_MODULES(GST, \
+ gstreamer-$GST_MAJORMINOR >= $GST_REQS,
+ HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no")
+
+AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
+
+if test "${HAVE_XINE}" = "no" && test "${HAVE_GSTREAMER}" = "no" ; then
+ AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
+fi
+
+AM_CONDITIONAL([BUILD_XINE_MODULE], [test "$HAVE_XINE" = yes])
+AM_CONDITIONAL([BUILD_GSTREAMER_MODULE], [test "$HAVE_GSTREAMER" = yes])
+
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_SUBST(dlopen_libs)
-requirements="eet evas ecore edje libxine"
+requirements="eet evas ecore edje libxine gstreamer"
AC_SUBST(requirements)
AC_OUTPUT([
@@ -156,3 +179,31 @@
],[
chmod +x emotion-config
])
+
+
+#####################################################################
+## Info
+
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo " Modules:"
+echo " Xine...............: $HAVE_XINE"
+echo " Gstreamer..........: $HAVE_GSTREAMER"
+echo
+echo " Compilation..........: make"
+echo
+echo " Installation.........: make install"
+echo
+echo " prefix.........: $prefix"
+echo " binaries.......: $bindir"
+echo " libraries......: $libdir"
+echo " headers........: $includedir"
+echo
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- AUTHORS 18 Jun 2004 15:38:01 -0000 1.1
+++ AUTHORS 2 Oct 2005 07:34:36 -0000 1.2
@@ -1,2 +1,3 @@
The Rasterman (Carsten Haitzler) <[EMAIL PROTECTED]>
-
+doursse (Vincent Torri) <[EMAIL PROTECTED]>
+captainigloo
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- TODO 24 Apr 2005 14:23:05 -0000 1.1
+++ TODO 2 Oct 2005 07:34:36 -0000 1.2
@@ -1,2 +1,17 @@
+
+Emotion smart object
+--------------------
+
+
+Xine module
+-----------
+
* Fix seek and get_pos threads delete bugs (infinite loop)
* Add support of visualizations for audio files (Goom...)
+
+
+Gstreamer module
+----------------
+
+* Add gststreamselector to support multiple video and audio streams.
+* Add support of visualizations for audio files (Goom...)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/emotion.c.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion.c.in 18 Jun 2004 15:38:01 -0000 1.1
+++ emotion.c.in 2 Oct 2005 07:34:36 -0000 1.2
@@ -9,7 +9,7 @@
@mainpage Emotion Library Documentation
@image html emotion.png
[EMAIL PROTECTED] 0.0.1
[EMAIL PROTECTED] @VERSION@
@author Carsten Haitzler <[EMAIL PROTECTED]>
@date 2003-2004
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
