[Swfdec-commits] 10 commits - AUTHORS configure.ac doc/Makefile.am doc/swfdec.types README
Benjamin Otte
company at kemper.freedesktop.org
Mon Sep 8 03:40:47 PDT 2008
AUTHORS | 14 ++++++++++++++
README | 26 ++++++++++++++------------
configure.ac | 29 ++++++++++++++++++-----------
doc/Makefile.am | 2 +-
doc/swfdec.types | 3 +++
5 files changed, 50 insertions(+), 24 deletions(-)
New commits:
commit 658aae4bd5f28d6be8c4975f051b031e1e7b43cb
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:38:20 2008 +0200
revert cceeaeb5bfd3e74c56d572ae51214071eb80bb8b
It shouldn't be in devel releases
diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt
index 67c6336..bb09427 100644
--- a/doc/swfdec-sections.txt
+++ b/doc/swfdec-sections.txt
@@ -438,7 +438,6 @@ SWFDEC_AS_VALUE_IS_NUMBER
SWFDEC_AS_VALUE_IS_STRING
SWFDEC_AS_VALUE_IS_NULL
SWFDEC_AS_VALUE_IS_OBJECT
-swfdec_as_value_get_object
</SECTION>
<SECTION>
diff --git a/swfdec/swfdec_as_context.c b/swfdec/swfdec_as_context.c
index 0404735..fd15d4b 100644
--- a/swfdec/swfdec_as_context.c
+++ b/swfdec/swfdec_as_context.c
@@ -337,7 +337,7 @@ swfdec_as_value_mark (SwfdecAsValue *value)
g_return_if_fail (SWFDEC_IS_AS_VALUE (value));
if (SWFDEC_AS_VALUE_IS_OBJECT (value)) {
- swfdec_gc_object_mark (value->value.object);
+ swfdec_gc_object_mark (SWFDEC_AS_VALUE_GET_OBJECT (value));
} else if (SWFDEC_AS_VALUE_IS_STRING (value)) {
swfdec_as_string_mark (SWFDEC_AS_VALUE_GET_STRING (value));
}
diff --git a/swfdec/swfdec_as_types.c b/swfdec/swfdec_as_types.c
index bdb85f1..d609d62 100644
--- a/swfdec/swfdec_as_types.c
+++ b/swfdec/swfdec_as_types.c
@@ -706,15 +706,3 @@ swfdec_as_value_to_twips (SwfdecAsContext *context, const SwfdecAsValue *val,
return TRUE;
}
-SwfdecAsObject *
-swfdec_as_value_get_object (const SwfdecAsValue *val)
-{
- SwfdecAsObject *o = val->value.object;
-
- if (SWFDEC_IS_MOVIE (o)) {
- o = SWFDEC_AS_OBJECT (swfdec_movie_resolve (SWFDEC_MOVIE (o)));
- if (o == NULL)
- o = val->value.object;
- }
- return o;
-}
diff --git a/swfdec/swfdec_as_types.h b/swfdec/swfdec_as_types.h
index 0ce9644..44e0e8a 100644
--- a/swfdec/swfdec_as_types.h
+++ b/swfdec/swfdec_as_types.h
@@ -102,12 +102,7 @@ struct _SwfdecAsValue {
#define SWFDEC_AS_VALUE_SET_NULL(val) (val)->type = SWFDEC_AS_TYPE_NULL
#define SWFDEC_AS_VALUE_IS_OBJECT(val) ((val)->type == SWFDEC_AS_TYPE_OBJECT)
-#if 0
#define SWFDEC_AS_VALUE_GET_OBJECT(val) ((val)->value.object)
-#else
-#define SWFDEC_AS_VALUE_GET_OBJECT swfdec_as_value_get_object
-SwfdecAsObject *swfdec_as_value_get_object (const SwfdecAsValue *val);
-#endif
#define SWFDEC_AS_VALUE_SET_OBJECT(val,o) G_STMT_START { \
SwfdecAsValue *__val = (val); \
SwfdecAsObject *__o = (o); \
commit 6264b33da592146e6754fd92733f4d02a88a0c75
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:37:50 2008 +0200
back to breaking
diff --git a/configure.ac b/configure.ac
index 81d00d6..f782c84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ([2.58])
m4_define(swfdec_major, 0)
-m4_define(swfdec_minor, 8)
+m4_define(swfdec_minor, 9)
m4_define(swfdec_micro, 1)
AC_INIT(swfdec,[swfdec_major.swfdec_minor.swfdec_micro])
commit 3eac1a45e6199a59a7691b5abee8a7c6ef466a77
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:36:56 2008 +0200
back to development
diff --git a/configure.ac b/configure.ac
index abca2d3..81d00d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.58])
m4_define(swfdec_major, 0)
m4_define(swfdec_minor, 8)
-m4_define(swfdec_micro, 0)
+m4_define(swfdec_micro, 1)
AC_INIT(swfdec,[swfdec_major.swfdec_minor.swfdec_micro])
SWFDEC_VERSION_MAJOR=swfdec_major
commit f250080ce2cef992d54c5d8738f0acab7f9f54fb
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:35:19 2008 +0200
release 0.8.0
diff --git a/configure.ac b/configure.ac
index 8a6db2d..abca2d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
AC_PREREQ([2.58])
m4_define(swfdec_major, 0)
-m4_define(swfdec_minor, 7)
-m4_define(swfdec_micro, 5)
+m4_define(swfdec_minor, 8)
+m4_define(swfdec_micro, 0)
AC_INIT(swfdec,[swfdec_major.swfdec_minor.swfdec_micro])
SWFDEC_VERSION_MAJOR=swfdec_major
commit 5ff9ae7d126502330f6e6dab05f9afcdea31748c
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:19:28 2008 +0200
update README
Sheesh, we're not unstable. Don't expect crashes please.
diff --git a/README b/README
index a959a41..f9e0632 100644
--- a/README
+++ b/README
@@ -7,11 +7,15 @@ An additional library named swfdec-gtk is provided for easy integration of
Swfdec into Gtk applications. This library is what developers most likely want
to target their applications at. Building this library can be disabled.
-The library is still in heavy development. The intended audience are developers
-or people using it for pretested Flash animations (think embedded here). If you
-use it on unknown content, expect it to have issues and don't be surprised if
-it crashes. If you encounter such a crash however, make sure to file a bug
-immediately.
+Swfdec is intended to be used as a replacement for the default Flash player.
+While it is not yet a 100% complete replacement, a big focus is on stability
+and security. So it is deemed to be suitable for use in production
+applications.
+
+The library however is still in heavy development. Because of that, the
+Programming interface will change between major versions. No guarantees are
+made about the API. However, during stable release cycles, the API and ABI are
+guaranteed to stay stable.
Swfdec contains some applications for testing and debugging the library. These
are available in the player/, test/ and tools/ directories. They are not
@@ -46,9 +50,9 @@ Limitations:
- A few rare object types are not handled at all. They are ignored.
- - SWF files that use Flash generally heavily depend on ActionScript features.
- Support for ActionScript is currently incomplete. Unsupported scripts are
- skipped.
+ - SWF files that use Flash generally heavily depend on ActionScript.
+ Support for ActionScript is currently incomplete. Unsupported functions in
+ scripts are skipped.
- If any known unsupported behaviour is encountered, Swfdec will print a
notice to stderr and try to interpret the file nonetheless. If you
@@ -59,15 +63,13 @@ Limitations:
Dependencies:
- cairo (>= 1.2.0 - >= 1.4.0 recommended) with png support enabled
+ cairo (>= 1.2.0 - >= 1.8.0 recommended) with png support enabled
glib (>= 2.14.0)
liboil (>= 0.3.6)
Pangocairo (>= 1.16.0) - this is provided by Pango
zlib (>= 1.1.4)
- FFMpeg (current SVN - optional, required for various audio and video formats)
- GStreamer (>= 0.10.11 - optional, required for various audio and video formats)
- MAD (>= 0.15.1b - optional, required for MP3 audio format support)
+ GStreamer (>= 0.10.15 - optional, required for various audio and video formats)
GTK+ (>= 2.8.0 - used by swfdec-gtk)
libsoup (>= 2.4.0 - used by swfdec-gtk)
commit 0ee92b241db53a443d4e6945fac4054ea0acf628
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:18:13 2008 +0200
update AUTHORS file
command used:
git log --pretty=format:"%an <%ae>" | sort | uniq
All hail to the git toad!
diff --git a/AUTHORS b/AUTHORS
index 0bb0266..3416ae5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,23 @@
Andreas Henriksson <andreas at fatal.se>
Benjamin Otte <otte at gnome.org>
+Christian Schaller <christian at fluendo.com>
+Chris Wilson <chris at chris-wilson.co.uk>
Cristian Grada <krigenator at gmail.com>
David Schleef <ds at schleef.org>
+Dom Lachowicz <domlachowicz at gmail.com>
+Doug Goldstein <cardoe at gentoo.org>
Eric Anholt <eric at anholt.net>
James Bowes <jbowes at dangerouslyinc.com>
+Jeff Muizelaar <jeff at infidigm.net>
+Johan Dahlin <johan at gnome.org>
+Laszlo (Laca) Peter <laca at sun.com>
+Lúcio Corrêa <lucio.correa at gmail.com>
+Michael Hofmann <mh21 at piware.de>
Nguyá»…n Thái Ngá»c Duy <pclouds at gmail.com>
Pavel Roskin <proski at gnu.org>
Pekka Lampila <pekka.lampila at iki.fi>
+Riccardo Magliocchetti <riccardo at datahost.it>
+Stephane Loeuillet <leroutier at gmail.com>
+Sven Herzberg <herzi at gnome-de.org>
+Uygar Gümüş <uygar.gumus at gmail.com>
+Valery Masiutsin <val.masutin at gmail.com>
commit f9a0f88317f39a80d6d6bbea38060c2afa029d80
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 12:08:59 2008 +0200
fix some values to be computed automatically now that we have VERSION_MAJOR etc
diff --git a/configure.ac b/configure.ac
index 9c3ae29..8a6db2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,17 +15,13 @@ AC_SUBST(SWFDEC_VERSION_MICRO)
AC_SUBST(SWFDEC_VERSION)
-[is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')]
-if test x"$is_dev" = x1 ; then
- SWFDEC_CVS="yes"
-else
- SWFDEC_CVS="no"
-fi
+[SWFDEC_DEVEL=$(echo $SWFDEC_VERSION_MICRO | sed 's/[0-9]*[13579]/yes/')]
+[SWFDEC_SNAPSHOT=$(echo $SWFDEC_VERSION_MINOR | sed 's/[0-9]*[13579]/yes/')]
AM_INIT_AUTOMAKE(1.6)
dnl AC_CANONICAL_TARGET([])
-SWFDEC_MAJORMINOR=0.7
+SWFDEC_MAJORMINOR=$SWFDEC_VERSION_MAJOR.$SWFDEC_VERSION_MINOR
AC_SUBST(SWFDEC_MAJORMINOR)
AM_CONFIG_HEADER(config.h)
@@ -37,7 +33,7 @@ dnl FIXME: I want this but stupid headers don't let me: -Wshadow
dnl FIXME: readd -Wlogical-op when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36513 is solved
AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wold-style-definition -Wdeclaration-after-statement -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wformat-nonliteral -Wformat-security -Wswitch-enum -Wswitch-default -Winit-self -Wmissing-include-dirs -Wundef -Waddress -Waggregate-return -Wmissing-format-attribute -Wno-multichar -Wnested-externs")
dnl if we're in nano >= 1, add -Werror if supported
-if test x$SWFDEC_CVS = xyes ; then
+if test x$SWFDEC_DEVEL = xyes ; then
AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Werror")
DEFAULT_DEBUG_LEVEL="SWFDEC_LEVEL_WARNING"
else
@@ -45,7 +41,18 @@ else
fi
AC_DEFINE_UNQUOTED(SWFDEC_LEVEL_DEFAULT, $DEFAULT_DEBUG_LEVEL, [Default debug level used])
-SWFDEC_LIBVERSION="1:0:0"
+dnl Compute the libversion automatically, so there's no need to think about it
+dnl when bumping versions.
+dnl Note that the libversions are based on Swfdec's current release mechanism
+dnl detailed at
+dnl http://lists.freedesktop.org/archives/swfdec/2008-January/001131.html
+dnl If this ever changes (like when Swfdec gets a stable API), don't forget to
+dnl change this
+if test x"$SWFDEC_SNAPSHOT" = xyes ; then
+ SWFDEC_LIBVERSION="$SWFDEC_MICRO:0:0"
+else
+ SWFDEC_LIBVERSION="0:0:0"
+fi
AC_SUBST(SWFDEC_LIBVERSION)
AM_PROG_LIBTOOL
commit cceeaeb5bfd3e74c56d572ae51214071eb80bb8b
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 11:53:36 2008 +0200
add a very ugly hack to resolve movieclips automatically
I've been using it in various projects, but always been scared to add it
to "upstream" Swfdec, because it should be resolved properly by adding a
SWFDEC_AS_VALUE_TYPE_MOVIE.
However, it increases compatibility quite a bit, so I guess it makes sense
in a stable release.
diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt
index bb09427..67c6336 100644
--- a/doc/swfdec-sections.txt
+++ b/doc/swfdec-sections.txt
@@ -438,6 +438,7 @@ SWFDEC_AS_VALUE_IS_NUMBER
SWFDEC_AS_VALUE_IS_STRING
SWFDEC_AS_VALUE_IS_NULL
SWFDEC_AS_VALUE_IS_OBJECT
+swfdec_as_value_get_object
</SECTION>
<SECTION>
diff --git a/swfdec/swfdec_as_context.c b/swfdec/swfdec_as_context.c
index fd15d4b..0404735 100644
--- a/swfdec/swfdec_as_context.c
+++ b/swfdec/swfdec_as_context.c
@@ -337,7 +337,7 @@ swfdec_as_value_mark (SwfdecAsValue *value)
g_return_if_fail (SWFDEC_IS_AS_VALUE (value));
if (SWFDEC_AS_VALUE_IS_OBJECT (value)) {
- swfdec_gc_object_mark (SWFDEC_AS_VALUE_GET_OBJECT (value));
+ swfdec_gc_object_mark (value->value.object);
} else if (SWFDEC_AS_VALUE_IS_STRING (value)) {
swfdec_as_string_mark (SWFDEC_AS_VALUE_GET_STRING (value));
}
diff --git a/swfdec/swfdec_as_types.c b/swfdec/swfdec_as_types.c
index d609d62..bdb85f1 100644
--- a/swfdec/swfdec_as_types.c
+++ b/swfdec/swfdec_as_types.c
@@ -706,3 +706,15 @@ swfdec_as_value_to_twips (SwfdecAsContext *context, const SwfdecAsValue *val,
return TRUE;
}
+SwfdecAsObject *
+swfdec_as_value_get_object (const SwfdecAsValue *val)
+{
+ SwfdecAsObject *o = val->value.object;
+
+ if (SWFDEC_IS_MOVIE (o)) {
+ o = SWFDEC_AS_OBJECT (swfdec_movie_resolve (SWFDEC_MOVIE (o)));
+ if (o == NULL)
+ o = val->value.object;
+ }
+ return o;
+}
diff --git a/swfdec/swfdec_as_types.h b/swfdec/swfdec_as_types.h
index 44e0e8a..0ce9644 100644
--- a/swfdec/swfdec_as_types.h
+++ b/swfdec/swfdec_as_types.h
@@ -102,7 +102,12 @@ struct _SwfdecAsValue {
#define SWFDEC_AS_VALUE_SET_NULL(val) (val)->type = SWFDEC_AS_TYPE_NULL
#define SWFDEC_AS_VALUE_IS_OBJECT(val) ((val)->type == SWFDEC_AS_TYPE_OBJECT)
+#if 0
#define SWFDEC_AS_VALUE_GET_OBJECT(val) ((val)->value.object)
+#else
+#define SWFDEC_AS_VALUE_GET_OBJECT swfdec_as_value_get_object
+SwfdecAsObject *swfdec_as_value_get_object (const SwfdecAsValue *val);
+#endif
#define SWFDEC_AS_VALUE_SET_OBJECT(val,o) G_STMT_START { \
SwfdecAsValue *__val = (val); \
SwfdecAsObject *__o = (o); \
commit 905ddf4852c9a7e8b29831e54ad935b8d30241f5
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 11:52:38 2008 +0200
update
diff --git a/doc/swfdec.types b/doc/swfdec.types
index 80390fd..2bbfe83 100644
--- a/doc/swfdec.types
+++ b/doc/swfdec.types
@@ -9,9 +9,11 @@ swfdec_as_native_function_get_type
swfdec_as_object_get_type
swfdec_audio_get_type
swfdec_file_loader_get_type
+swfdec_gc_object_get_type
swfdec_loader_get_type
swfdec_player_get_type
swfdec_player_scripting_get_type
+swfdec_renderer_get_type
swfdec_socket_get_type
swfdec_stream_get_type
swfdec_system_get_type
@@ -19,4 +21,5 @@ swfdec_system_get_type
swfdec_gtk_loader_get_type
swfdec_gtk_player_get_type
swfdec_gtk_socket_get_type
+swfdec_gtk_system_get_type
swfdec_gtk_widget_get_type
commit 364b1f5f12e844b1d07ab0ac6793512547a54fec
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Sep 8 11:49:41 2008 +0200
include top_builddir
We're installing a generated header these days
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cf3c9fa..50b2197 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -202,7 +202,7 @@ expand_content_files=
# signals and properties.
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=$(SWFDEC_GTK_CFLAGS) $(CAIRO_CFLAGS)
+INCLUDES=$(SWFDEC_GTK_CFLAGS) $(CAIRO_CFLAGS) -I$(top_builddir)
GTKDOC_LIBS=$(SWFDEC_GTK_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
More information about the Swfdec-commits
mailing list