[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac backend/Makefile.a...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac backend/Makefile.a... |
Date: |
Wed, 26 Jul 2006 00:21:40 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/07/26 00:21:40
Modified files:
. : ChangeLog configure.ac
backend : Makefile.am sound_handler_gst.cpp
Log message:
* configure.ac, backend/Makefile.am: add --enable-sound option
to select between SDL or GSTREAMER
* backend/sound_handler_gst.cpp: don't use broken HAVE_GST_GST_H
macro, rather trust builder and use what's specified in
--enable-sound
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.521&r2=1.522
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -b -r1.521 -r1.522
--- ChangeLog 25 Jul 2006 23:05:12 -0000 1.521
+++ ChangeLog 26 Jul 2006 00:21:39 -0000 1.522
@@ -1,3 +1,11 @@
+2006-07-26 Sandro Santilli <address@hidden>
+
+ * configure.ac, backend/Makefile.am: add --enable-sound option
+ to select between SDL or GSTREAMER
+ * backend/sound_handler_gst.cpp: don't use broken HAVE_GST_GST_H
+ macro, rather trust builder and use what's specified in
+ --enable-sound
+
2006-07-26 Bastiaan Jacques <address@hidden>
* backend/sound_handler_gst.cpp: When reallocating, don't forget to
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- configure.ac 25 Jul 2006 22:46:36 -0000 1.90
+++ configure.ac 26 Jul 2006 00:21:39 -0000 1.91
@@ -190,6 +190,35 @@
fi
AM_CONDITIONAL(USE_RENDERER_CAIRO, test x$renderer = xcairo)
+dnl --------------------------------------------------------
+dnl Select sound streamer
+dnl --------------------------------------------------------
+
+AC_ARG_ENABLE(
+ sound,
+ [ --enable-sound=handler Specify sound handler:
+ GST
+ SDL ],
+ [case "${enableval}" in
+ GST|gst) sound_handler=gst ;;
+ sdl|SDL) sound_handler=sdl ;;
+ *) AC_MSG_ERROR([invalid sound handler ${enableval} given]) ;;
+ esac],
+ [sound_handler=sdl]
+)
+case "${sound_handler}" in
+ gst) AC_DEFINE([SOUND_GST], [1], [Use GSTREAMER for sound]) ;;
+ sdl) AC_DEFINE([SOUND_SDL], [1], [Use SDL-mixer for sound]) ;;
+ *)
+esac
+
+AM_CONDITIONAL(USE_SOUND_GST, test x$sound_handler = xgst)
+AM_CONDITIONAL(USE_SOUND_SDL, test x$sound_handler = xsdl)
+
+dnl --------------------------------------------------------
+dnl ...
+dnl --------------------------------------------------------
+
dnl Use the Dom parser from libxml2, not the xmlReader one
dnl The default is to use the Dom parser
AC_ARG_ENABLE(dom, [ --enable-dom Enable support for Dom parser],
@@ -522,6 +551,7 @@
echo " Renderer engine: "$renderer
echo " GUI: "$gui
+echo " Sound handler: "$sound_handler
echo ""
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- backend/Makefile.am 25 Jul 2006 12:43:48 -0000 1.27
+++ backend/Makefile.am 26 Jul 2006 00:21:40 -0000 1.28
@@ -85,10 +85,16 @@
RENDER_SOURCES = render_handler_ogl.cpp
endif
+if USE_SOUND_GST
+SOUND_SOURCES = sound_handler_gst.cpp
+endif
+if USE_SOUND_SDL
+SOUND_SOURCES = sound_handler_sdl.cpp
+endif
+
libgnashbackend_la_SOURCES = \
$(RENDER_SOURCES) \
- sound_handler_sdl.cpp \
- sound_handler_gst.cpp
+ $(SOUND_SOURCES)
# gnash_SOURCES = gnash.cpp
# gnash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- backend/sound_handler_gst.cpp 25 Jul 2006 23:05:12 -0000 1.5
+++ backend/sound_handler_gst.cpp 26 Jul 2006 00:21:40 -0000 1.6
@@ -31,7 +31,12 @@
#include "config.h"
#endif
-#ifdef HAVE_GST_GST_H
+// Assume people running --enable-sound=gst know what they are doing
+// (HAVE_GST_GST_H seems broken atm, specifically when an older glib
+// install is around)
+//
+//#ifdef HAVE_GST_GST_H
+#ifdef SOUND_GST
#include "gnash.h"
#include "container.h"
#include "log.h"