[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./configure.ac ./ChangeLog macros/kde.m4 ...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./configure.ac ./ChangeLog macros/kde.m4 ... |
|
Date: |
Fri, 12 May 2006 04:28:11 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/05/12 04:28:11
Modified files:
. : configure.ac ChangeLog
macros : kde.m4
plugin/klash : klash.cpp
server : Makefile.am
Log message:
* configure.ac: Use AC_CONFIG_SRCDIR, and add the version number
to AC_INIT. Define conditional for KDE. Add partial support to use
kde and fltk as configure options to --enable-gui. Comment out
visibility-inlines-hidden as it's unstable on some platforms.
* macros/kde.m4: Define variables for conditional if KDE is
installed.
* plugin/klash/klash.cpp: Add code to replace SDL_GetTicks() so we
don't have an SDL depenancy still.
* server/Makefile.am: Don't have $OPENGL_LIBS in
libgnashserver_la_LIBADD for now, for some reason it makes the
executable not ever render an image when running from the path.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.307&tr2=1.308&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.307 gnash/ChangeLog:1.308
--- gnash/ChangeLog:1.307 Fri May 12 00:18:56 2006
+++ gnash/ChangeLog Fri May 12 04:28:11 2006
@@ -1,3 +1,17 @@
+2006-05-12 Rob Savoye <address@hidden>
+
+ * configure.ac: Use AC_CONFIG_SRCDIR, and add the version number
+ to AC_INIT. Define conditional for KDE. Add partial support to use
+ kde and fltk as configure options to --enable-gui. Comment out
+ visibility-inlines-hidden as it's unstable on some platforms.
+ * macros/kde.m4: Define variables for conditional if KDE is
+ installed.
+ * plugin/klash/klash.cpp: Add code to replace SDL_GetTicks() so we
+ don't have an SDL depenancy still.
+ * server/Makefile.am: Don't have $OPENGL_LIBS in
+ libgnashserver_la_LIBADD for now, for some reason it makes the
+ executable not ever render an image if installed.
+
2006-05-12 Bastiaan Jacques <address@hidden>
* configure.ac: Use GTK as the default GUI.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.73 gnash/configure.ac:1.74
--- gnash/configure.ac:1.73 Fri May 12 00:23:04 2006
+++ gnash/configure.ac Fri May 12 04:28:11 2006
@@ -34,13 +34,14 @@
dnl forward this exception.
AC_PREREQ(2.50)
-AC_INIT(server/gnash.h)
+AC_INIT(gnash, 0.7.1)
+AC_CONFIG_SRCDIR(server/gnash.h)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_TARGET
dnl These are required by automake
-AM_INIT_AUTOMAKE(gnash, 0.7)
+AM_INIT_AUTOMAKE(gnash, 0.7.1)
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
@@ -59,6 +60,7 @@
AC_PATH_KDE
KDE_USE_QT(3)
AM_CONDITIONAL(KLASH, test x$klash = xyes)
+dnl AM_CONDITIONAL(HAS_KDE, test x$kde = xyes)
dnl Add KFLASH support, if specified.
AC_ARG_ENABLE(fork, [ --disable-fork Use a thread instead forking
the standalone player.],
@@ -136,18 +138,24 @@
AC_ARG_ENABLE(
gui,
[ --enable-gui=flavor Specify gui flavor:
- GTK
+ GTK
+dnl KDE
+dnl FLTK
SDL ],
[case "${enableval}" in
gtk|GTK) gui=gtk ;;
- sdl|SDL) gui=sdl ;;
+ sdl|SDL) gui=sdl ;;
+ kde|SDL) gui=kde ;;
+ fltk|SDL) gui=fltk ;;
*) AC_MSG_ERROR([invalid gui ${enableval} given]) ;;
esac],
[gui=gtk]
)
case "${gui}" in
- gtk) AC_DEFINE([GUI_GTK], [1], [Use GTK gui]) ;;
- sdl) AC_DEFINE([GUI_SDL], [1], [Use SDL gui]) ;;
+ gtk) AC_DEFINE([GUI_GTK], [1], [Use GTK gui toolkit]) ;;
+ sdl) AC_DEFINE([GUI_SDL], [1], [Use SDL gui toolkit]) ;;
+ kde) AC_DEFINE([GUI_KDE], [1], [Use KDE gui toolkit]) ;;
+ fltk) AC_DEFINE([GUI_FLTK], [1], [Use FLTK gui toolkit]) ;;
*)
esac
@@ -373,17 +381,17 @@
fi
fi
-if test "$GCC" = "yes"; then
- AC_COMPILE_IFELSE([
- #if __GNUC__ < 4
- #error
- #endif],gccvisibility=yes,)
- if test x"$gccvisibility" = x"yes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
- fi
-fi
-
-
+dnl FIXME: this GCC feature isn't fully debugged yet, so we don't want
+dnl to use it by default.
+dnl if test "$GCC" = "yes"; then
+dnl AC_COMPILE_IFELSE([
+dnl #if __GNUC__ < 4
+dnl #error
+dnl #endif],gccvisibility=yes,)
+dnl if test x"$gccvisibility" = x"yes"; then
+dnl CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+dnl fi
+dnl fi
dnl AC_CONFIG_LINKS(doc/C/images)
plugmk=""
@@ -553,13 +561,13 @@
if test x"$OGG_LIBS" != x; then
if test x"$OGG_CFLAGS" != x; then
- echo " OGG flags are: $OGG_CFLAGS"
+ echo " Ogg flags are: $OGG_CFLAGS"
else
- echo " OGG flags are: default include path"
+ echo " Ogg flags are: default include path"
fi
- echo " OGG libs are: $OGG_LIBS"
+ echo " Ogg libs are: $OGG_LIBS"
else
- echo "ERROR: No OGG Vorbis development package installed!"
+ echo "ERROR: No Ogg Vorbis development package installed!"
nogo=true
fi
Index: gnash/macros/kde.m4
diff -u gnash/macros/kde.m4:1.8 gnash/macros/kde.m4:1.9
--- gnash/macros/kde.m4:1.8 Mon Apr 24 23:05:55 2006
+++ gnash/macros/kde.m4 Fri May 12 04:28:11 2006
@@ -522,6 +522,9 @@
test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z
"$xdg_directorydir" ||
test "x$kde_have_all_paths" != "xyes"; then
kde_have_all_paths=no
+ else
+ AC_DEFINE([HAVE_KDE], ,[Has KDE installed])
+ kde=yes
fi
])
Index: gnash/plugin/klash/klash.cpp
diff -u gnash/plugin/klash/klash.cpp:1.4 gnash/plugin/klash/klash.cpp:1.5
--- gnash/plugin/klash/klash.cpp:1.4 Mon May 8 21:12:24 2006
+++ gnash/plugin/klash/klash.cpp Fri May 12 04:28:11 2006
@@ -43,6 +43,8 @@
#include <cstdlib>
#include <cstdio>
#include <vector>
+#include <sys/time.h>
+#include <time.h>
#include <GL/gl.h>
#include <GL/glu.h>
@@ -260,12 +262,16 @@
assert(tu_types_validate());
float exit_timeout = 0;
- bool do_render = true;
- bool do_sound = false;
- bool do_loop = true;
- bool sdl_abort = true;
- int delay = 31;
+ bool do_render = true;
+ bool do_sound = false;
+ bool do_loop = true;
+ bool sdl_abort = true;
+ int delay = 31;
float tex_lod_bias;
+ struct timeval now;
+ static struct timeval start;
+
+ unsigned int ticks;
// -1.0 tends to look good.
tex_lod_bias = -1.2f;
@@ -495,19 +501,21 @@
// Mouse state.
float speed_scale = 1.0f;
- uint32_t start_ticks = 0;
+ unsigned int start_ticks = 0;
+ gettimeofday(&start, NULL);
if (do_render) {
- start_ticks = SDL_GetTicks();
-
+ gettimeofday(&now, NULL);
+
start_ticks=(now.tv_sec-start.tv_sec)*1000+(now.tv_usec-start.tv_usec)/1000;
}
- uint32_t last_ticks = start_ticks;
+ unsigned int last_ticks = start_ticks;
int frame_counter = 0;
int last_logged_fps = last_ticks;
for (;;) {
uint32_t ticks;
if (do_render) {
- ticks = SDL_GetTicks();
+ gettimeofday(&now, NULL);
+
ticks=(now.tv_sec-start.tv_sec)*1000+(now.tv_usec-start.tv_usec)/1000;
} else {
// Simulate time.
ticks = last_ticks + (uint32_t) (1000.0f / movie_fps);
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.37 gnash/server/Makefile.am:1.38
--- gnash/server/Makefile.am:1.37 Thu May 11 13:22:51 2006
+++ gnash/server/Makefile.am Fri May 12 04:28:11 2006
@@ -157,7 +157,6 @@
swf/TagLoadersTable.cpp \
swf/tag_loaders.cpp \
types.cpp $(MP3_HANDLER)
-libgnashserver_la_LIBADD = libgnashasobjs.la $(MP3_LIBS) $(LIBXML_LIBS)
$(OPENGL_LIBS) $(ZLIB_LIBS)
noinst_HEADERS = $(as_incls) \
action.h \
@@ -218,6 +217,13 @@
swf/tag_loaders.h \
xmlsocket.h
+libgnashserver_la_LIBADD = \
+ libgnashasobjs.la \
+ $(ZLIB_LIBS) \
+ $(LIBXML_LIBS) \
+ $(MP3_LIBS)
+
+# $(OPENGL_LIBS) #
#libserver_la_LDFLAGS = -module -avoid-version -no-undefined
#libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./configure.ac ./ChangeLog macros/kde.m4 ...,
Rob Savoye <=