Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer
Modified Files:
ChangeLog autogen.sh configure.ac
Log Message:
Added libavcodec input plugin (yeah, this means you will finally be able to listen to
your mp3s using eplayer)
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ChangeLog 23 Oct 2003 17:01:48 -0000 1.12
+++ ChangeLog 24 Oct 2003 11:38:48 -0000 1.13
@@ -1,4 +1,7 @@
-$Id: ChangeLog,v 1.12 2003/10/23 17:01:48 tsauerbeck Exp $
+$Id: ChangeLog,v 1.13 2003/10/24 11:38:48 tsauerbeck Exp $
+
+2003-10-24 Tilman Sauerbeck <[EMAIL PROTECTED]>
+ * src/input/avcodec: Added libavcodec input plugin
2003-10-23 Tilman Sauerbeck <[EMAIL PROTECTED]>
* src/input: Added a input plugin system
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- autogen.sh 21 Oct 2003 17:53:38 -0000 1.3
+++ autogen.sh 24 Oct 2003 11:38:48 -0000 1.4
@@ -1,12 +1,14 @@
#!/bin/sh
-## Script to bootstrap the build enviroment
-
rm -rf autom4te.cache
rm -f aclocal.m4
-aclocal $ACLOCAL_FLAGS -I m4
-autoheader
-autoconf
-libtoolize --automake
-automake --add-missing --copy --gnu
+echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \
+&& echo "Running autoheader..."; autoheader \
+&& echo "Running autoconf..."; autoconf \
+&& echo "Running libtoolize..."; libtoolize --automake \
+&& echo "Running automake..."; automake --add-missing --copy --gnu
+
+echo
+echo "Bootstrap complete, now run ./configure"
+echo
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.ac 23 Oct 2003 17:01:49 -0000 1.7
+++ configure.ac 24 Oct 2003 11:38:48 -0000 1.8
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.7 2003/10/23 17:01:49 tsauerbeck Exp $
+dnl $Id: configure.ac,v 1.8 2003/10/24 11:38:48 tsauerbeck Exp $
AC_INIT(src/eplayer.c)
@@ -31,6 +31,18 @@
CFLAGS=`echo "$CFLAGS -g -Wall" | sed s/" -s"//`
])
+AC_PATH_GENERIC(ecore, , ,
+ AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
+
+AC_PATH_GENERIC(evas, , ,
+ AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
+
+AC_PATH_GENERIC(edje, , ,
+ AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
+
+AC_PATH_GENERIC(esmart, , ,
+ AC_MSG_ERROR(Cannot find esmart: Is esmart-config in path?))
+
dnl Check for libdl
tmp=$LIBS
AC_CHECK_HEADERS(dlfcn.h, , AC_MSG_ERROR(Cannot find dlfcn.h))
@@ -56,17 +68,22 @@
LIBS=$tmp
AM_CONDITIONAL(HAVE_VORBIS, test "$have_vorbis" = "yes")
-AC_PATH_GENERIC(ecore, , ,
- AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
-
-AC_PATH_GENERIC(evas, , ,
- AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
+dnl Check for libavcodec
+tmp=$LIBS
-AC_PATH_GENERIC(edje, , ,
- AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
+AC_CHECK_LIB(avcodec, avcodec_init,
+ [
+ have_avcodec="yes"
+
+ AVCODEC_CFLAGS="-I/usr/include/ffmpeg"
+ AVCODEC_LIBS="-lavcodec"
+
+ AC_SUBST(AVCODEC_CFLAGS)
+ AC_SUBST(AVCODEC_LIBS)
+ ], have_avcodec="no")
-AC_PATH_GENERIC(esmart, , ,
- AC_MSG_ERROR(Cannot find esmart: Is esmart-config in path?))
+LIBS=$tmp
+AM_CONDITIONAL(HAVE_AVCODEC, test "$have_avcodec" = "yes")
dnl Check for OSS
AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, [have_oss="yes"; break],
have_oss="no")
@@ -79,7 +96,7 @@
dnl Check for Solaris audio stuff
AC_CHECK_HEADER(sys/audioio.h, have_solaris="yes", have_solaris="no")
AM_CONDITIONAL(HAVE_SOLARIS, test "$have_solaris" = "yes")
-
+
AC_OUTPUT([
Makefile
data/Makefile
@@ -89,6 +106,7 @@
m4/Makefile
src/Makefile
src/input/Makefile
+src/input/avcodec/Makefile
src/input/vorbis/Makefile
src/output/Makefile
src/output/alsa/Makefile
@@ -102,6 +120,7 @@
echo
echo "Input Plugins"
echo
+echo "AVCodec.......: $have_avcodec"
echo "Ogg Vorbis....: $have_vorbis"
echo
echo
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
