Try this maybe my last change did not check in. I'll revert the lib
name as soon as you get a build.
Mike
On Tue, 29 Mar 2005 15:56:01 +0200, Denis Oliver Kropp <[EMAIL PROTECTED]>
wrote:
> Quoting Mike Emmel:
> > Well I could change the name back later.
> >
> > I do get a clean build and I've done a clean checkout from the cvs trees.
> > Note you also need the latest cairodfb also ...
> >
> > Whats the error you get ?
>
> Making all in gtk
> make[2]: Entering directory /home/dok/cvs/gnome/gtk+/gtk'
> make all-recursive
> make[3]: Entering directory /home/dok/cvs/gnome/gtk+/gtk'
> Making all in stock-icons
> make[4]: Entering directory /home/dok/cvs/gnome/gtk+/gtk/stock-icons'
> make[4]: Nothing to be done for ll'.
> make[4]: Leaving directory /home/dok/cvs/gnome/gtk+/gtk/stock-icons'
> Making all in theme-bits
> make[4]: Entering directory /home/dok/cvs/gnome/gtk+/gtk/theme-bits'
> make[4]: Nothing to be done for ll'.
> make[4]: Leaving directory /home/dok/cvs/gnome/gtk+/gtk/theme-bits'
> Making all in xdgmime
> make[4]: Entering directory /home/dok/cvs/gnome/gtk+/gtk/xdgmime'
> make[4]: Nothing to be done for ll'.
> make[4]: Leaving directory /home/dok/cvs/gnome/gtk+/gtk/xdgmime'
> make[4]: Entering directory /home/dok/cvs/gnome/gtk+/gtk'
> make[4]: *** No rule to make target `libgtk-gdk-directfb-2.0.la', needed by
> `all-am'. Stop.
> make[4]: Leaving directory /home/dok/cvs/gnome/gtk+/gtk'
> make[3]: *** [all-recursive] Error 1
> make[3]: Leaving directory /home/dok/cvs/gnome/gtk+/gtk'
> make[2]: *** [all] Error 2
> make[2]: Leaving directory /home/dok/cvs/gnome/gtk+/gtk'
>
> --
> Best regards,
> Denis Oliver Kropp
>
> .------------------------------------------.
> | DirectFB - Hardware accelerated graphics |
> | http://www.directfb.org/ |
> "------------------------------------------"
>
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.432
diff -u -w -r1.432 configure.in
--- configure.in 24 Mar 2005 15:14:12 -0000 1.432
+++ configure.in 28 Mar 2005 05:15:14 -0000
@@ -217,13 +217,13 @@
gdktarget=x11
fi
-AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/gdk-directfb/win32]] select non-default GDK target],
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
case $gdktarget in
- x11|linux-fb|win32) ;;
- *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);;
+ x11|linux-fb|gdk-directfb|win32) ;;
+ *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, gdk-directfb or win32.]);;
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -1004,7 +1004,7 @@
FREETYPE_LIBS=
FREETYPE_CFLAGS=
-if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then
+if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" || test "x$gdktarget" = "xgdk-directfb" ; then
#
# Checks for FreeType
#
@@ -1367,33 +1367,34 @@
AC_MSG_ERROR([Using linux-fb backend but freetype was not found])
fi
- ft2_libs="`$PKG_CONFIG --libs pangoft2`"
- case "$ft2_libs" in
- *-lfreetype*) pango_omitted_ft2_deps=no ;;
- *) pango_omitted_ft2_deps=yes ;;
- esac
-
- CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
-
- if test x$enable_shadowfb = xyes ; then
- AC_DEFINE(ENABLE_SHADOW_FB)
+ AM_CONDITIONAL(USE_LINUX_FB, true)
+else
+ AM_CONDITIONAL(USE_LINUX_FB, false)
+ AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
fi
- if test x$enable_fbmanager = xyes ; then
- AC_DEFINE(ENABLE_FB_MANAGER)
- AM_CONDITIONAL(ENABLE_FB_MANAGER, true)
+if test "x$gdktarget" = "xgdk-directfb"; then
+ DIRECTFB_REQUIRED_VERSION=0.9.21
+ AC_MSG_CHECKING(for DirectFB)
+
+ if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
+ AC_MSG_RESULT(found)
else
- AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
+ AC_MSG_ERROR([
+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest
+*** version of DirectFB is always available from http://www.directfb.org/.
+ ])
fi
- if test $pango_omitted_ft2_deps = yes ; then
- GDK_EXTRA_LIBS="$FREETYPE_LIBS $GDK_EXTRA_LIBS"
+ if $have_freetype ; then
+ :
+ else
+ AC_MSG_ERROR([Using directfb backend but freetype was not found])
fi
- AM_CONDITIONAL(USE_LINUX_FB, true)
+ AM_CONDITIONAL(USE_DIRECTFB, true)
else
- AM_CONDITIONAL(USE_LINUX_FB, false)
- AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
+ AM_CONDITIONAL(USE_DIRECTFB, false)
fi
#
@@ -1412,6 +1413,8 @@
PANGO_PACKAGES="pangowin32 pangocairo"
elif test "x$gdktarget" = "xlinux-fb"; then
PANGO_PACKAGES="pangoft2 pangocairo"
+elif test "x$gdktarget" = "xgdk-directfb"; then
+ PANGO_PACKAGES="directfb pango pangocairo"
else
PANGO_PACKAGES="pango pangocairo"
fi
@@ -1682,6 +1685,7 @@
gdk/win32/rc/Makefile
gdk/win32/rc/gdk.rc
gdk/linux-fb/Makefile
+gdk/gdk-directfb/Makefile
gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
Index: gdk/gdk.symbols
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdk.symbols,v
retrieving revision 1.11
diff -u -w -r1.11 gdk.symbols
--- gdk/gdk.symbols 17 Mar 2005 01:54:38 -0000 1.11
+++ gdk/gdk.symbols 28 Mar 2005 05:15:15 -0000
@@ -317,10 +317,10 @@
#if IN_FILE(__GDK_COLOR_X11_C__)
gdk_colormap_new
gdk_colormap_get_type G_GNUC_CONST
+#ifndef GDK_DISABLE_DEPRECATED
gdk_colormap_change
gdk_colors_alloc
gdk_colors_free
-#ifndef GDK_DISABLE_DEPRECATED
gdk_colormap_get_system_size
gdk_color_change
#endif
@@ -508,6 +508,8 @@
gdk_drawable_ref
gdk_drawable_unref
gdk_draw_string
+gdk_draw_text
+gdk_draw_text_wc
#endif
gdk_drawable_get_depth
gdk_drawable_get_display
@@ -531,8 +533,6 @@
gdk_draw_polygon
gdk_draw_rectangle
gdk_draw_segments
-gdk_draw_text
-gdk_draw_text_wc
gdk_draw_trapezoids
#endif
#endif
Index: gdk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/Makefile.am,v
retrieving revision 1.115
diff -u -w -r1.115 Makefile.am
--- gdk/Makefile.am 16 Mar 2005 03:17:26 -0000 1.115
+++ gdk/Makefile.am 28 Mar 2005 05:15:15 -0000
@@ -1,7 +1,7 @@
## Makefile.am for gtk+/gdk
SUBDIRS = $(gdktarget)
-DIST_SUBDIRS = linux-fb win32 x11
+DIST_SUBDIRS = gdk-directfb linux-fb win32 x11
EXTRA_DIST = \
gdkconfig.h.win32 \
@@ -128,6 +128,11 @@
gdkenumtypes.c \
gdkmarshalers.h
+libgdk_gdk_directfb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_gdk_directfb_2_0_la_LIBADD = gdk-directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+libgdk_gdk_directfb_2_0_la_LDFLAGS = $(LDADD)
+
libgdk_x11_2_0_la_SOURCES = $(common_sources)
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
@@ -192,7 +197,7 @@
lib_LTLIBRARIES = $(gdktargetlib)
-EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la
+EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-gdk-directfb-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la
MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
gdkmarshalers.h gdkmarshalers.c
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.269
diff -u -w -r1.269 Makefile.am
--- gtk/Makefile.am 20 Mar 2005 07:01:21 -0000 1.269
+++ gtk/Makefile.am 28 Mar 2005 05:15:15 -0000
@@ -658,20 +658,23 @@
libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources)
libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
+libgtk_gdk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_gdk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_x11_2_0_la_LIBADD = $(libadd)
libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
libgtk_win32_2_0_la_LIBADD = $(libadd) $(gtk_win32res_lo)
libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
+libgtk_gdk_directfb_2_0_la_LIBADD = $(libadd)
if USE_WIN32
libgtk_target_ldflags = $(gtk_win32_symbols) -lole32 -lwsock32
endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-gdk-directfb-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
Index: docs/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/docs/Makefile.am,v
retrieving revision 1.27
diff -u -w -r1.27 Makefile.am
--- docs/Makefile.am 23 Aug 2004 21:22:55 -0000 1.27
+++ docs/Makefile.am 28 Mar 2005 05:15:15 -0000
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = tutorial faq reference tools
+SUBDIRS = tutorial faq reference
EXTRA_DIST = \
defsformat.txt \
_______________________________________________
directfb-dev mailing list
[email protected]
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
