search for: swfdec_majorminor

...t; Date: Mon Dec 3 16:46:24 2007 +0100 fix non-srcdir builds from autogen'd sources diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index aad0e05..d5cf0da 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -14,7 +14,8 @@ endif lib_LTLIBRARIES = libswfdec- at SWFDEC_MAJORMINOR@.la -libswfdec_ at SWFDEC_MAJORMINOR@_la_SOURCES = \ +# these are files that must be in SRCDIR +libswfdec_source_files = \ swfdec_accessibility.c \ swfdec_as_array.c \ swfdec_as_boolean.c \ @@ -76,7 +77,6 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_SOURCES = \ swfdec_text_renderer.c \ swfdec...

...d5d173cbe1d5f1d87c2 Author: Benjamin Otte <otte at gnome.org> Date: Fri Oct 19 22:23:21 2007 +0200 update icon cache after install diff --git a/data/Makefile.am b/data/Makefile.am index f545daf..a4f0296 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -15,3 +15,16 @@ swfdec- at SWFDEC_MAJORMINOR@.pc: swfdec.pc swfdec-gtk- at SWFDEC_MAJORMINOR@.pc: swfdec-gtk.pc cp swfdec-gtk.pc swfdec-gtk- at SWFDEC_MAJORMINOR@.pc +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache + +update-icon-cache...

configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8b3f9aca00a0d0447ba95a5ac86c56eb5894b8a8 Author: Benjamin Otte <otte at gnome.org> Date: Thu Nov 15 12:00:38 2007 +0100 back to development diff --git a/configure.ac b/configure.ac index 514f515..96ffeed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.58])

...;otte@gnome.org> Date: Mon Mar 26 21:15:32 2007 +0200 install headers into the right directory diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index 93b6897..eb16f88 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -27,7 +27,7 @@ libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_LDF -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ $(GTK_LIBS) $(SWFDEC_LIBS) $(AUDIO_LIBS) -libswfdec_@SWFDEC_MAJORMINOR@includedir = $(includedir)/swfdec-@SWFDEC_MAJORMINOR@/libswfdec +libswfdec_@SWFDEC_MAJORMINOR@includedir = $(includedir)/swfdec-@S...

...21 16:52:57 2007 +0200 We cann g_thread_init() here, so require gthread diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index 5aa9af5..b04b40f 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -22,12 +22,12 @@ noinst_HEADERS = \ libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_CFLAGS = \ -I$(top_srcdir) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \ - $(AUDIO_CFLAGS) $(HTTP_CFLAGS) \ + $(AUDIO_CFLAGS) $(HTTP_CFLAGS) $(GTHREAD_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec-Gtk\" libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ -version-info $(SWFDEC_LIBVERSI...

...007 +0200 remove outdated cruft from makefiles diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index e5dec9e..5aa9af5 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -8,8 +8,6 @@ CLEANFILES = swfdec_playback.c lib_LTLIBRARIES = libswfdec-gtk- at SWFDEC_MAJORMINOR@.la -js_cflags = -I$(srcdir)/js/ -I$(top_builddir)/libswfdec/js -DXP_UNIX -DDEBUG - libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_SOURCES = \ swfdec_playback.c \ swfdec_source.c \ @@ -23,9 +21,9 @@ noinst_HEADERS = \ swfdec_source.h libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_CFLAGS = \ - -I$(top...

...58]) -AC_INIT( swfdec-gnome, [0.5.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=swfdec] ) +AC_INIT( swfdec-gnome, [0.5.5.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=swfdec] ) AM_INIT_AUTOMAKE(1.6) AC_CONFIG_SRCDIR([config.h.in]) @@ -44,7 +44,7 @@ dnl Required versions SWFDEC_MAJORMINOR=0.5 AC_SUBST(SWFDEC_MAJORMINOR) -SWFDEC_REQUIRED=0.5.4.1 +SWFDEC_REQUIRED=0.5.5.1 GTK_REQUIRED=2.12.0 commit 9b654df1a7362637c840ac08868d6ca3fe52ba20 Author: Benjamin Otte <otte at gnome.org> Date: Mon Dec 17 21:19:55 2007 +0100 update NEWS diff --git a/NEWS b/NEWS index b475994...

...cutables correctly GLIB_GENMARSHAL=glib-genmarshal AC_SUBST(GLIB_GENMARSHAL) diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index b04b40f..5aa9af5 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -22,12 +22,12 @@ noinst_HEADERS = \ libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_CFLAGS = \ -I$(top_srcdir) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \ - $(AUDIO_CFLAGS) $(HTTP_CFLAGS) $(GTHREAD_CFLAGS) \ + $(AUDIO_CFLAGS) $(HTTP_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec-Gtk\" libswfdec_gtk_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ -version-info $(SWFDEC_LIBVERSI...

...--git a/swfdec-gtk.pc.in b/swfdec-gtk.pc.in index 37e507b..39eb02e 100644 --- a/swfdec-gtk.pc.in +++ b/swfdec-gtk.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@/swfdec-@SWFDEC_M Name: swfdec-gtk Description: Support for playing Flash files in Gtk using Swfdec Version: @VERSION@ -Requires: swfdec-@SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >= @GTK_REQUIRES@ +Requires: swfdec-@SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >= @GTK_VER@ Libs: -L${libdir} -lswfdec-gtk-@SWFDEC_MAJORMINOR@ Cflags: -I${includedir} diff --git a/swfdec.pc.in b/swfdec.pc.in index 2dfcd95..2e0e0d4 100644 --- a/swfdec.pc.i...

...ren't clear on it. diff --git a/configure.ac b/configure.ac index 49a3f73..6c74a5d 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ dnl Check for essential libraries first: dnl ==================================== SWFDEC_REQUIRES=0.5.3.1 -PKG_CHECK_MODULES(SWFDEC, swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES, HAVE_SWFDEC=yes, HAVE_SWFDEC=no) +PKG_CHECK_MODULES(SWFDEC, gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES, HAVE_SWFDEC=yes, HAVE_SWFDEC=no) if test "$HAVE_SWFDEC" = "no"; then AC_MSG_ERROR([cannot find swfdec-$SWFDEC_MAJORMINOR $SWFDEC_REQU...

...i.fi> Date: Tue Sep 4 13:51:05 2007 +0300 Move swfdec_as_array.h from noinst_headers to public_headers (oops) diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index 17c524d..5eaca4e 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -130,6 +130,7 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_LDFLAGS public_headers = \ swfdec.h \ + swfdec_as_array.h \ swfdec_as_context.h \ swfdec_as_debugger.h \ swfdec_as_frame.h \ @@ -152,7 +153,6 @@ libswfdec_ at SWFDEC_MAJORMINOR@includedir libswfdec_ at SWFDEC_MAJORMINOR@include_HEADERS = $(public_headers) swfdec_enums.h noinst_H...

...dex 3550a5c..fdf2a31 100644 --- a/configure.ac +++ b/configure.ac @@ -226,13 +226,13 @@ AM_CONDITIONAL(HAVE_GNOMEVFS, [test "x$H AC_SUBST(GLOBAL_CFLAGS) AC_SUBST(GLOBAL_CFLAGS) -SWFDEC_CFLAGS="-I\$(top_srcdir) $GLIB_CFLAGS" -SWFDEC_LIBS="\$(top_builddir)/libswfdec/libswfdec-$SWFDEC_MAJORMINOR.la $GLIB_LIBS -lz" +SWFDEC_CFLAGS="-I\$(top_srcdir) $GLIB_CFLAGS $CAIRO_CFLAGS" +SWFDEC_LIBS="\$(top_builddir)/libswfdec/libswfdec-$SWFDEC_MAJORMINOR.la $GLIB_LIBS $CAIRO_LIBS -lz" AC_SUBST(SWFDEC_LIBS) AC_SUBST(SWFDEC_CFLAGS) -SWFDEC_GTK_CFLAGS="$SWFDEC_CFLAGS&quo...

...r: Benjamin Otte <otte@gnome.org> Date: Mon Mar 26 18:55:39 2007 +0200 add a default header diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index b787c6e..93b6897 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -29,6 +29,7 @@ libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_LDF $(GTK_LIBS) $(SWFDEC_LIBS) $(AUDIO_LIBS) libswfdec_@SWFDEC_MAJORMINOR@includedir = $(includedir)/swfdec-@SWFDEC_MAJORMINOR@/libswfdec libswfdec_@SWFDEC_MAJORMINOR@include_HEADERS = \ + swfdec-gtk.h \ swfdec_gtk_player.h \ swfdec_gtk_widget.h diff --git a/libswfdec-gtk/swfdec-gtk.h...

...git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index f7be47f..0ad15c5 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -10,6 +10,9 @@ endif if HAVE_FFMPEG CODECS += swfdec_codec_ffmpeg.c endif +if HAVE_GST +CODECS += swfdec_codec_gst.c +endif lib_LTLIBRARIES = libswfdec-@SWFDEC_MAJORMINOR@.la @@ -86,13 +89,14 @@ libswfdec_@SWFDEC_MAJORMINOR@_la_SOURCES libswfdec_@SWFDEC_MAJORMINOR@_la_CFLAGS = \ $(GLOBAL_CFLAGS) $(CAIRO_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \ - -I$(srcdir)/jpeg/ $(js_cflags) $(LIBOIL_CFLAGS) $(FFMPEG_CFLAGS) \ + -I$(srcdir)/jpeg/ $(js_cflags) $(LIBOIL_CFLAGS...

...nl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL) #ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index b3e81ac..a4219ea 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -95,6 +95,7 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_CFLAGS $(GST_CFLAGS) $(FFMPEG_CFLAGS) $(MAD_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec\" libswfdec_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ + $(SYMBOLIC_LDFLAGS) \ -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ $(CAIRO_LIBS) $(GLIB_LIBS) $(PANGO_LI...

...i -SWFDEC_LIBVERSION="0:0:0" +SWFDEC_LIBVERSION="1:0:0" AC_SUBST(SWFDEC_LIBVERSION) AM_PROG_LIBTOOL diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index f6235a1..08e39de 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -78,6 +78,7 @@ libswfdec_@SWFDEC_MAJORMINOR@_la_CFLAGS -I$(srcdir)/jpeg/ $(js_cflags) $(LIBOIL_CFLAGS) $(FFMPEG_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec\" libswfdec_@SWFDEC_MAJORMINOR@_la_LDFLAGS = \ + -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ $(CAIRO_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(M...

...nl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL) #ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index b3e81ac..a4219ea 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -95,6 +95,7 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_CFLAGS $(GST_CFLAGS) $(FFMPEG_CFLAGS) $(MAD_CFLAGS) \ -DG_LOG_DOMAIN=\"Swfdec\" libswfdec_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \ + $(SYMBOLIC_LDFLAGS) \ -version-info $(SWFDEC_LIBVERSION) \ -export-symbols-regex '^(swfdec_.*)' \ $(CAIRO_LIBS) $(GLIB_LIBS) $(PANGO_LI...

...all diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index be8455c..b46bcc0 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = jpeg js - -DIST_SUBDIRS = jpeg js +SUBDIRS = jpeg CODECS = @@ -13,9 +11,20 @@ endif lib_LTLIBRARIES = libswfdec-@SWFDEC_MAJORMINOR@.la -js_cflags = -I$(srcdir)/js/ -I./js -DXP_UNIX -DDEBUG +foofiles = \ + swfdec_js.c \ + swfdec_js_color.c \ + swfdec_js_connection.c \ + swfdec_js_global.c \ + swfdec_js_mouse.c \ + swfdec_js_movie.c \ + swfdec_js_net_stream.c \ + swfdec_js_sound.c \ + swfdec_js_video.c \ + swfdec_js_xml.c l...

...<otte at gnome.org> Date: Wed Aug 1 19:39:48 2007 +0200 export the file loader so subclassing gets possible diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index 2476e54..f1973eb 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -65,6 +65,7 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_SOURCES swfdec_edittext_movie.c \ swfdec_enums.c \ swfdec_event.c \ + swfdec_file_loader.c \ swfdec_flv_decoder.c \ swfdec_font.c \ swfdec_graphic.c \ @@ -128,6 +129,7 @@ public_headers = \ swfdec_as_types.h \ swfdec_audio.h \ swfdec_buffer.h \ + swfdec_file_loader.h \ swfde...

...+0200 hook up Video object code This should be the last leftover code from 0.4 diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index f944d94..14e50fb 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -19,14 +19,6 @@ endif lib_LTLIBRARIES = libswfdec- at SWFDEC_MAJORMINOR@.la -foofiles = \ - swfdec_js.c \ - swfdec_js_global.c \ - swfdec_js_mouse.c \ - swfdec_js_movie.c \ - swfdec_js_sound.c \ - swfdec_js_video.c - libswfdec_ at SWFDEC_MAJORMINOR@_la_SOURCES = \ swfdec_as_array.c \ swfdec_as_context.c \ @@ -78,6 +70,7 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_SOU...