search for: with_gtk

...aries.m4 index 4ae0576..fee265b 100644 --- a/m4/guestfs_misc_libraries.m4 +++ b/m4/guestfs_misc_libraries.m4 @@ -85,29 +85,31 @@ AC_ARG_WITH([gtk], AC_MSG_RESULT([not set, will check for installed Gtk])] ) -if test "x$GTK_LIBS" = "x" && \ - ( test "x$with_gtk" = "x3" || test "x$with_gtk" = "xcheck" ) ; then +if test "x$with_gtk" = "x3"; then PKG_CHECK_MODULES([GTK], [gtk+-3.0], [ - AC_SUBST([GTK_CFLAGS]) - AC_SUBST([GTK_LIBS]) GTK_VERSION=3 - AC_SUBST([GTK_VERSION]...

...the build without gtk In particular, this should fix docs. It might break make dist with gtk disabled, but I don't care right now diff --git a/Makefile.am b/Makefile.am index 25bbed2..c90dd0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,15 @@ -SUBDIRS= \ - libswfdec \ +if WITH_GTK +GTK_SUBDIRS = \ libswfdec-gtk \ - player \ doc \ + player +else +GTK_SUBDIRS = +endif + +SUBDIRS= \ + libswfdec \ + $(GTK_SUBDIRS) \ test ACLOCAL_FLAGS = -I m4 diff --git a/doc/Makefile.am b/doc/Makefile.am index 5ce6db0..38ef71f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -110,...

...the build without gtk In particular, this should fix docs. It might break make dist with gtk disabled, but I don't care right now diff --git a/Makefile.am b/Makefile.am index 25bbed2..c90dd0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,15 @@ -SUBDIRS= \ - libswfdec \ +if WITH_GTK +GTK_SUBDIRS = \ libswfdec-gtk \ - player \ doc \ + player +else +GTK_SUBDIRS = +endif + +SUBDIRS= \ + libswfdec \ + $(GTK_SUBDIRS) \ test ACLOCAL_FLAGS = -I m4 diff --git a/doc/Makefile.am b/doc/Makefile.am index 5ce6db0..38ef71f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -110,...

...[AC_MSG_WARN([gtk2 not found, virt-p2v will be disabled])]) +dnl Check for Gtk 2 or 3 library, used by virt-p2v. +AC_MSG_CHECKING([for --with-gtk option]) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=2|3|check|no], + [prefer Gtk version 2 or 3. @<:@default=check@:>@])], + [with_gtk="$withval" + AC_MSG_RESULT([$withval])], + [with_gtk="check" + AC_MSG_RESULT([not set, will check for installed Gtk])] +) + +if test "x$GTK_LIBS" = "x" && \ + ( test "x$with_gtk" = "x3" || test "x$with_gtk&qu...

This version of the Gtk 2/3 patch gets alignment and padding mostly right. I still can't work out how to vertically align labels in the middle of a cell in a GtkGrid. The GtkTextView in the final dialog is still broken. Rich.

... and a small initial patch which makes it easier to test virt-p2v without having to start up a virtual machine. There is still a bug in Gtk 3 where the GtkTextView on the final (running) dialog ignores gtk_widget_set_size_request and so the window appears just a single pixel high. Rich.

This is basically the same as what I posted earlier today. The main difference is I split out the GDK thread sychronization (removal of) changes from the other Gtk 2/3 changes, which should make it a bit easier to review. Gtk 3 is still not quite perfect. Apart from the problem with the GtkTextView noted before, there are also vertical alignment and padding problems with labels in GtkGrid

...cons/48x48/Makefile +data/icons/scalable/Makefile data/swfdec.pc data/swfdec-gtk.pc doc/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 6479fe5..f545daf 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = icons + pkgconfigdir = $(libdir)/pkgconfig if WITH_GTK pkgconfig_DATA = swfdec- at SWFDEC_MAJORMINOR@.pc swfdec-gtk- at SWFDEC_MAJORMINOR@.pc diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am new file mode 100644 index 0000000..cae3af2 --- /dev/null +++ b/data/icons/22x22/Makefile.am @@ -0,0 +1,2 @@ +icondir = $(datadir)/icons/h...

...: Wed Oct 31 19:08:43 2007 +0200 Add test/crashfinder program that simply runs Flash files to find crashes diff --git a/test/Makefile.am b/test/Makefile.am index 8f74f60..1aca7fa 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,11 +3,15 @@ SUBDIRS = image sound trace various if WITH_GTK noinst_LTLIBRARIES = libswfedit.la -noinst_PROGRAMS = swfdec-extract dump swfedit swfscript +noinst_PROGRAMS = swfdec-extract dump swfedit swfscript crashfinder else -noinst_PROGRAMS = swfdec-extract dump +noinst_PROGRAMS = swfdec-extract dump crashfinder endif +crashfinder_CFLAGS = $(GLOBAL_C...

...t easier to plug new backends - add a "none" backend when alsa isn't available diff --git a/configure.ac b/configure.ac index eb69535..e02adfd 100644 --- a/configure.ac +++ b/configure.ac @@ -86,13 +86,40 @@ if test "$HAVE_GTK" = "no"; then fi AM_CONDITIONAL(WITH_GTK,[test "$HAVE_GTK" != "no"]) -PKG_CHECK_MODULES(ALSA, alsa >= 1.0, HAVE_ALSA=yes, HAVE_ALSA=no) -AC_SUBST(ALSA_LIBS) -AC_SUBST(ALSA_CFLAGS) -if test "$HAVE_ALSA" = "no"; then - AC_MSG_WARN([cannot find alsa, player will be disabled]) +dnl +dnl audio back...

...power saving (sleep, suspend, etc) during P2V +conversions. + =item zip =item unzip diff --git a/m4/guestfs_misc_libraries.m4 b/m4/guestfs_misc_libraries.m4 index fee265b..82864f9 100644 --- a/m4/guestfs_misc_libraries.m4 +++ b/m4/guestfs_misc_libraries.m4 @@ -103,6 +103,15 @@ elif test "x$with_gtk" = "xcheck"; then ]) fi +dnl DBus is an optional dependency of virt-p2v. +PKG_CHECK_MODULES([DBUS], [dbus-1], [ + AC_SUBST([DBUS_CFLAGS]) + AC_SUBST([DBUS_LIBS]) + AC_DEFINE([HAVE_DBUS],[1],[DBus found at compile time.]) +],[ + AC_MSG_WARN([DBus not found, virt-p2...

Hi, as it was already discussed on this list, here it is my attempt in splitting virt-p2v in an own repository. Sadly there are things that must be copied from libguestfs, as it cannot be avoided. The approach taken was to run a script (will send separately) to just get the "p2v" subdirectory with its history as own repository, and then add in few followup commits all the bits needed

...+0100 add swfscript - a tool to batch-modify scripts of existing SWF files diff --git a/test/Makefile.am b/test/Makefile.am index b55bf0f..e31046b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = image sound trace various noinst_LTLIBRARIES = libswfedit.la if WITH_GTK -noinst_PROGRAMS = swfdec-extract dump parse swfedit +noinst_PROGRAMS = swfdec-extract dump parse swfedit swfscript else noinst_PROGRAMS = swfdec-extract dump parse endif @@ -24,6 +24,10 @@ swfedit_CFLAGS = $(GLOBAL_CFLAGS) $(SWF_ swfedit_LDFLAGS = $(SWF_LIBS) $(GTK_LIBS) swfedit_LDADD = libs...

...9,7 +119,7 @@ if test "$enable_gtk" = "yes"; then AC_MSG_ERROR([Couldn't find a suitable Gtk version. You need at least version $GTK_VER]) fi else - AC_MSG_WARN([*** Gtk support was not enabled. ***]) + AC_MSG_NOTICE([Gtk support was not enabled.]) fi AM_CONDITIONAL(WITH_GTK, [test "x$HAVE_GTK" = xyes]) commit fb8cd3ca0a393dca4b9f5f278d16fdbeaec954eb Author: Benjamin Otte <otte at gnome.org> Date: Fri Oct 26 08:48:55 2007 +0200 Don't scare people about disabled dependencies diff --git a/configure.ac b/configure.ac index 97d474b..2dc0eed 10...

...bswfdec-gtk/.gitignore +++ b/libswfdec-gtk/.gitignore @@ -11,3 +11,4 @@ Makefile.in *.lo *.loT +swfdec_playback.c diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am index e69de29..c9756be 100644 --- a/libswfdec-gtk/Makefile.am +++ b/libswfdec-gtk/Makefile.am @@ -0,0 +1,35 @@ +if WITH_GTK + +# this workaround is needed or autotools don't generate the .deps/*.Plo files correctly +swfdec_playback.c: swfdec_playback_$(AUDIO_TYPE).c Makefile + cmp -s $(srcdir)/swfdec_playback_$(AUDIO_TYPE).c swfdec_playback.c \ + || cp $(srcdir)/swfdec_playback_$(AUDIO_TYPE).c swfdec_playback.c + +B...

...; Date: Tue Feb 6 12:20:07 2007 +0100 Merge branch 'master' into interpreter diff --cc test/Makefile.am index 33a647c,e0957af..00c8203 @@@ -1,10 -1,6 +1,10 @@@ - SUBDIRS = sound trace various + SUBDIRS = image sound trace various -noinst_PROGRAMS = swfdec-extract dump parse +if WITH_GTK +noinst_PROGRAMS = swfdec-extract dump parse swfedit +else +noinst_PROGRAMS = swfdec-extract dump parse +endif dump_CFLAGS = $(GLOBAL_CFLAGS) $(SWF_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) -DXP_UNIX -I$(top_builddir)/libswfdec/js dump_LDFLAGS = $(SWF_LIBS) $(CAIRO_LIBS) $(PANGO_LIBS) dif...

...in Otte <otte at gnome.org> Date: Sun Aug 26 19:24:08 2007 +0200 This test is completely useless now diff --git a/test/Makefile.am b/test/Makefile.am index f0a0409..8f74f60 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,17 +3,14 @@ SUBDIRS = image sound trace various if WITH_GTK noinst_LTLIBRARIES = libswfedit.la -noinst_PROGRAMS = swfdec-extract dump parse swfedit swfscript +noinst_PROGRAMS = swfdec-extract dump swfedit swfscript else -noinst_PROGRAMS = swfdec-extract dump parse +noinst_PROGRAMS = swfdec-extract dump endif dump_CFLAGS = $(GLOBAL_CFLAGS) $(SWFDEC_CF...

...t easier to plug new backends - add a "none" backend when alsa isn't available diff --git a/configure.ac b/configure.ac index eb69535..e02adfd 100644 --- a/configure.ac +++ b/configure.ac @@ -86,13 +86,40 @@ if test "$HAVE_GTK" = "no"; then fi AM_CONDITIONAL(WITH_GTK,[test "$HAVE_GTK" != "no"]) -PKG_CHECK_MODULES(ALSA, alsa >= 1.0, HAVE_ALSA=yes, HAVE_ALSA=no) -AC_SUBST(ALSA_LIBS) -AC_SUBST(ALSA_CFLAGS) -if test "$HAVE_ALSA" = "no"; then - AC_MSG_WARN([cannot find alsa, player will be disabled]) +dnl +dnl audio back...

...to allow creating broken files for testing purposes when it's done diff --git a/test/Makefile.am b/test/Makefile.am index 01c4f45..d168cfd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,10 @@ SUBDIRS = sound trace various -noinst_PROGRAMS = swfdec-extract dump parse +if WITH_GTK +noinst_PROGRAMS = swfdec-extract dump parse swfedit +else +noinst_PROGRAMS = swfdec-extract dump parse +endif dump_CFLAGS = $(GLOBAL_CFLAGS) $(SWF_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) -DXP_UNIX -I$(top_builddir)/libswfdec/js dump_LDFLAGS = $(SWF_LIBS) $(CAIRO_LIBS) $(PANGO_LIBS) @@ -11,3 +...

...ile.am b/Makefile.am index 4a20c24..a9cb6fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,8 @@ EXTRA_DIST=depcomp \ gtk-doc.make \ swfdec.spec \ m4/as-compiler-flag.m4 \ - m4/ax_create_stdint_h.m4 + m4/ax_create_stdint_h.m4 \ + m4/gtk-doc.m4 pkgconfigdir = $(libdir)/pkgconfig if WITH_GTK diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 new file mode 100644 index 0000000..bfdfa1d --- /dev/null +++ b/m4/gtk-doc.m4 @@ -0,0 +1,39 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTO...