[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./configure.ac backend/Makefi...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./configure.ac backend/Makefi... |
|
Date: |
Sat, 21 Jan 2006 17:08:40 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/01/21 17:08:40
Modified files:
. : ChangeLog configure.ac
backend : Makefile.am
plugin : Makefile.am
utilities : Makefile.am
Log message:
* configure.ac: Add tests for OGG and Vorbis.
* backend/Makefile.am: Add flags and libs for OGG and Vorbis as
separete flags.
* utilities/Makefile.am: Add flags and libs for OGG and Vorbis as
separete flags.
* plugin/Makefile.am: Add flags and libs for OGG and Vorbis as
separete flags.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.29 gnash/ChangeLog:1.30
--- gnash/ChangeLog:1.29 Sat Jan 21 16:16:17 2006
+++ gnash/ChangeLog Sat Jan 21 17:08:40 2006
@@ -1,10 +1,23 @@
2006-01-21 Rob Savoye <address@hidden>
+ * configure.ac: Add tests for OGG and Vorbis.
+ * backend/Makefile.am: Add flags and libs for OGG and Vorbis as
+ separete flags.
+ * utilities/Makefile.am: Add flags and libs for OGG and Vorbis as
+ separete flags.
+ * plugin/Makefile.am: Add flags and libs for OGG and Vorbis as
+ separete flags.
+
* server/styles.cpp: Don't abort if we read a bad gradient.
* macros/sdl.m4: Store the compilation flags so the compilation
tests works on ppc-linux.
+2006-01-21 Michael Carlson <address@hidden>
+
+ * server/action.cpp: Initial implementation of as_array_object
+ ( get_member, set_member, push, pop, and length )
+
2006-01-20 Rob Savoye <address@hidden>
* backend/Makefile.am: Make the OGL and SDL support a library so
@@ -13,7 +26,7 @@
* macros/sdl.m4: Correct typo so --with-sdl_mixer-lib actually
works. Add /usr/bin/X11 to the default search path for
sdl-config.
- * server/styles.cpp: Print a better error message when a bad
+ * server/styles.cpp: Print a better error message wh.en a bad
gradient value is read before aborting.
2006-01-19 Rob Savoye <address@hidden>
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.5 gnash/backend/Makefile.am:1.6
--- gnash/backend/Makefile.am:1.5 Thu Jan 19 23:50:11 2006
+++ gnash/backend/Makefile.am Sat Jan 21 17:08:40 2006
@@ -24,13 +24,15 @@
AM_LDFLAGS = ../libbase/libbase.la \
../libgeometry/libgeometry.la \
../server/libserver.la \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
- $(LIBXML_LIBS) \
- $(SDL_LIBS) \
- $(SDL_CFLAGS) \
- $(SDL_MIXER_LIBS) \
- $(OPENGL_LIBS)
+ $(JPEG_LIBS) \
+ $(PNG_LIBS) \
+ $(LIBXML_LIBS) \
+ $(SDL_LIBS) \
+ $(SDL_CFLAGS) \
+ $(SDL_MIXER_LIBS) \
+ $(OPENGL_LIBS) \
+ $(OGG_LIBS) \
+ $(VORBIS_LIBS)
INCLUDES = -I.. \
-I$(top_srcdir) \
@@ -39,16 +41,21 @@
-I$(top_srcdir)/libgeometry \
$(SDL_MIXER_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(OPENGL_CFLAGS)
+ $(OPENGL_CFLAGS) \
+ $(OGG_CFLAGS) \
+ $(VORBIS_CFLAGS)
bin_PROGRAMS = gnash
-gnash_SOURCES = \
+lib_LTLIBRARIES = libgbackend.la
+
+libgbackend_la_SOURCES = \
render_handler_ogl.cpp \
- sound_handler_sdl.cpp \
- gnash.cpp
+ sound_handler_sdl.cpp
+
+gnash_SOURCES = gnash.cpp
-gnash_LDADD = $(AM_LDFLAGS)
+gnash_LDADD = $(AM_LDFLAGS) libgbackend.la
# gnash_DEPENDENCIES =
MUDFLAP_OPT = -fmudflap
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.13 gnash/configure.ac:1.14
--- gnash/configure.ac:1.13 Thu Jan 19 23:50:11 2006
+++ gnash/configure.ac Sat Jan 21 17:08:40 2006
@@ -169,6 +169,8 @@
]))
LIBS="$LIBS_SAVE"
+XIPH_PATH_OGG
+XIPH_PATH_VORBIS
AM_PATH_SDL
AM_PATH_SDL_MIXER
AM_PATH_OPENGL
@@ -254,7 +256,7 @@
fi
echo ""
-echo "Configured paths are:"
+echo "Configured paths for ${build} are:"
if test x"$docbook_styles" != x; then
echo " Docbook styles sheets in $docbook_styles"
@@ -275,7 +277,11 @@
fi
if test x"${PNG_LIBS}" != x ; then
- echo " PNG flags are: $PNG_CFLAGS"
+ if test x"${PNG_CFLAGS}" != x ; then
+ echo " PNG flags are: $PNG_CFLAGS"
+ else
+ echo " PNG flags are: default include path"
+ fi
echo " PNG libs are: $PNG_LIBS"
else
echo " ERROR: No PNG library development package installed!"
@@ -283,13 +289,41 @@
fi
if test x"${JPEG_LIBS}" != x ; then
- echo " JPEG flags are: $JPEG_CFLAGS"
+ if test x"${JPEG_CFLAGS}" != x ; then
+ echo " JPEG flags are: $JPEG_CFLAGS"
+ else
+ echo " JPEG flags are: default include path"
+ fi
echo " JPEG libs are: $JPEG_LIBS"
else
echo " ERROR: No JPEG library development package installed!"
nogo=true
fi
+if test x"$OGG_LIBS" != x; then
+ if test x"$OGG_CFLAGS" != x; then
+ echo " OGG flags are: $OGG_CFLAGS"
+ else
+ echo " OGG flags are: default include path"
+ fi
+ echo " OGG libs are: $OGG_LIBS"
+else
+ echo " ERROR: No OGG Vorbis development package installed!"
+ nogo=true
+fi
+
+if test x"$VORBIS_LIBS" != x; then
+ if test x"$VORBIS_CFLAGS" != x; then
+ echo " VORBIS flags are: $VORBIS_CFLAGS"
+ else
+ echo " VORBIS flags are: default include path"
+ fi
+ echo " VORBIS libs are: $VORBIS_LIBS"
+else
+ echo " ERROR: No VORBIS Vorbis development package installed!"
+ nogo=true
+fi
+
if test x"$opengl" = x"yes"; then
if test x"$OPENGL_CFLAGS" != x; then
echo " Opengl flags are: $OPENGL_CFLAGS"
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.2 gnash/plugin/Makefile.am:1.3
--- gnash/plugin/Makefile.am:1.2 Thu Jan 19 23:50:11 2006
+++ gnash/plugin/Makefile.am Sat Jan 21 17:08:40 2006
@@ -24,16 +24,19 @@
plugindir = $(FIREFOX_PLUGINS)
INCLUDES = -I.. \
- -I$(srcdir) \
+ -I$(srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libgeometry \
- -I$(top_srcdir)/server \
+ -I$(top_srcdir)/server \
-I$(srcdir)/mozilla-sdk \
- $(LIBXML_CFLAGS) \
- $(FIREFOX_CFLAGS) \
- $(SDL_CFLAGS) \
- $(SDL_MIXER_CFLAGS) \
- $(X_CFLAGS)
+ $(LIBXML_CFLAGS) \
+ $(FIREFOX_CFLAGS) \
+ $(SDL_CFLAGS) \
+ $(SDL_MIXER_CFLAGS) \
+ $(X_CFLAGS) \
+ $(OGG_CFLAGS) \
+ $(VORBIS_CFLAGS)
+
AM_CXXFLAGS = $(INCLUDES)
# XP_UNIX This needs to get defined for npapi.h on unix platforms.
@@ -42,23 +45,27 @@
AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
AM_LDFLAGS = $(FIREFOX_LIBS) \
$(X_LIBS) -lX11 -lXi -lXmu \
- $(SDL_LIBS) \
- $(SDL_MIXER_LIBS) \
- $(OPENGL_LIBS) \
- $(LIBXML_LIBS) \
- $(JPEG_LIBS) \
- $(PNG_LIBS)
+ $(SDL_LIBS) \
+ $(SDL_MIXER_LIBS) \
+ $(OPENGL_LIBS) \
+ $(LIBXML_LIBS) \
+ $(JPEG_LIBS) \
+ $(PNG_LIBS) \
+ $(OGG_LIBS) \
+ $(VORBIS_LIBS)
+
plugin_LTLIBRARIES = libgnash.la
-noinst_HEADERS = plugin.h
+noinst_HEADERS = plugin.h player.h
-libgnash_la_SOURCES = plugin.cpp
+libgnash_la_SOURCES = plugin.cpp player.cpp
libgnash_la_LIBADD = $(AM_LDFLAGS) \
mozilla-sdk/libmozsdk.la \
../libbase/libbase.la \
../libgeometry/libgeometry.la \
- ../server/libserver.la
+ ../server/libserver.la \
+ ../backend/libgbackend.la
libgnash_la_DEPENDENCIES = mozilla-sdk/libmozsdk.la
Index: gnash/utilities/Makefile.am
diff -u gnash/utilities/Makefile.am:1.2 gnash/utilities/Makefile.am:1.3
--- gnash/utilities/Makefile.am:1.2 Thu Jan 19 23:50:11 2006
+++ gnash/utilities/Makefile.am Sat Jan 21 17:08:40 2006
@@ -29,13 +29,20 @@
$(SDL_MIXER_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
- $(LIBXML_LIBS)
+ $(LIBXML_LIBS) \
+ $(OGG_LIBS) \
+ $(VORBIS_LIBS)
INCLUDES = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
-I$(top_srcdir)/libgeometry \
+ $(LIBXML_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(OGG_CFLAGS) \
+ $(VORBIS_CFLAGS) \
+ $(SDL_CFLAGS) \
$(SDL_MIXER_CFLAGS)
bin_PROGRAMS = gparser gprocessor
- [Gnash-commit] gnash ./ChangeLog ./configure.ac backend/Makefi...,
Rob Savoye <=