Pull request for various bumps

index a4be8c8..38e57cd 100644
@@ -200,7 +200,7 @@ ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
 	$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
 	for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
-		cp $$$$i $$$$i~; \
+		cp -f $$$$i $$$$i~; \
 		$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
 	done
 endef

index fb22c6c..944fcdb 100644
@@ -23,99 +23,83 @@
 # USA
 
 # TARGETS
-NCURSES_VERSION:=5.6
-NCURSES_SITE:=$(BR2_GNU_MIRROR)/ncurses
-NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)
-NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz
-NCURSES_CAT:=$(ZCAT)
+NCURSES_VERSION = 5.6
+NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
+NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_INSTALL_STAGING = YES
+
+NCURSES_CONF_OPT = \
+	--with-shared \
+	--without-cxx \
+	--without-cxx-binding \
+	--without-ada \
+	--without-progs \
+	--disable-big-core \
+	--without-profile \
+	--disable-rpath \
+	--enable-echo \
+	--enable-const \
+	--enable-overwrite \
+	--enable-broken_linker
 
 ifneq ($(BR2_PACKAGE_NCURSES_TARGET_HEADERS),y)
-NCURSES_WANT_STATIC=--disable-static
+NCURSES_CONF_OPT += --disable-static
 endif
 
-$(DL_DIR)/$(NCURSES_SOURCE):
-	$(call DOWNLOAD,$(NCURSES_SITE),$(NCURSES_SOURCE))
-
-$(NCURSES_DIR)/.patched: $(DL_DIR)/$(NCURSES_SOURCE)
-	$(NCURSES_CAT) $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	#use the local tic and not whatever the build system was going to find.
-	$(SED) 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
-		$(NCURSES_DIR)/misc/run_tic.in
-	toolchain/patch-kernel.sh $(NCURSES_DIR) package/ncurses/ ncurses\*.patch
-	$(CONFIG_UPDATE) $(NCURSES_DIR)
-	touch $@
-
-$(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched
-	(cd $(NCURSES_DIR); rm -rf config.cache; \
-		BUILD_CC="$(HOSTCC)" \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--with-terminfo-dirs=/usr/share/terminfo \
-		--with-default-terminfo-dir=/usr/share/terminfo \
-		--with-shared --without-cxx --without-cxx-binding \
-		--without-ada --without-progs --disable-big-core \
-		$(DISABLE_NLS) $(DISABLE_LARGEFILE) \
-		--without-profile --without-debug --disable-rpath \
-		--enable-echo --enable-const --enable-overwrite \
-		--enable-broken_linker \
-		$(NCURSES_WANT_STATIC) \
-	)
-	touch $@
-
-$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured
-	$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
-		libs panel menu form headers
+ifneq ($(BR2_ENABLE_DEBUG),y)
+NCURSES_CONF_OPT += --without-debug
+endif
 
-$(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
-	$(MAKE1) \
-	    prefix=$(STAGING_DIR)/usr/ \
-	    exec_prefix=$(STAGING_DIR) \
-	    bindir=$(STAGING_DIR)/bin \
-	    sbindir=$(STAGING_DIR)/sbin \
-	    libexecdir=$(STAGING_DIR)/usr/lib \
-	    datadir=$(STAGING_DIR)/usr/share \
-	    sysconfdir=$(STAGING_DIR)/etc \
-	    localstatedir=$(STAGING_DIR)/var \
-	    libdir=$(STAGING_DIR)/usr/lib \
-	    infodir=$(STAGING_DIR)/usr/info \
-	    mandir=$(STAGING_DIR)/usr/man \
-	    includedir=$(STAGING_DIR)/usr/include \
-	    gxx_include_dir=$(STAGING_DIR)/usr/include/c++ \
-	    ticdir=$(STAGING_DIR)/usr/share/terminfo \
-	    -C $(NCURSES_DIR) install
-	chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
+define NCURSES_PATCH_NCURSES_CONFIG
 	$(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
 		$(STAGING_DIR)/bin/ncurses5-config
-	touch -c $@
+endef
+
+NCURSES_POST_BUILD_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
+
+ifeq ($(BR2_HAVE_DEVFILES),y)
+define NCURSES_INSTALL_TARGET_DEVFILES
+	mkdir -p $(TARGET_DIR)/usr/include
+	cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
+	cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
+	cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
+	(cd $(TARGET_DIR)/usr/lib; \
+	 ln -fs libncurses.a libcurses.a; \
+	 ln -fs libncurses.a libtermcap.a; \
+	)
+	(cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
+	rm -f $(TARGET_DIR)/usr/lib/libncurses.so
+	(cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
+endef
+endif
 
-$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
-	mkdir -p $(TARGET_DIR)/usr/lib
-	cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
+define NCURSES_INSTALL_TARGET_PANEL
 	cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
+endef
 endif
+
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM),y)
+define NCURSES_INSTALL_TARGET_FORM
 	cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/usr/lib/
+endef
 endif
+
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_MENU),y)
+define NCURSES_INSTALL_TARGET_MENU
 	cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/
+endef
 endif
+
+define NCURSES_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/lib
+	cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+	$(NCURSES_INSTALL_TARGET_PANEL)
+	$(NCURSES_INSTALL_TARGET_FORM)
+	$(BR2_PACKAGE_NCURSES_TARGET_MENU)
 	ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo
 	mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x

@@ -130,51 +114,8 @@ endif
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a
 	mkdir -p $(TARGET_DIR)/usr/share/terminfo/l
 	cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-	touch -c $@
-
-$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so*
+	$(NCURSES_INSTALL_TARGET_DEVFILES)
+endef # NCURSES_INSTALL_TARGET_CMDS
 
-$(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
-	mkdir -p $(TARGET_DIR)/usr/include
-	cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
-	cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
-	cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
-	(cd $(TARGET_DIR)/usr/lib; \
-	 ln -fs libncurses.a libcurses.a; \
-	 ln -fs libncurses.a libtermcap.a; \
-	)
-	(cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
-	rm -f $(TARGET_DIR)/usr/lib/libncurses.so
-	(cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
-	touch -c $@
-
-ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION) \
-	$(if $(BR2_HAVE_DEVFILES),$(TARGET_DIR)/usr/lib/libncurses.a)
-
-ncurses-unpacked: $(NCURSES_DIR)/.patched
-
-ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
-
-ncurses-clean:
-	rm -f $(STAGING_DIR)/usr/lib/libncurses.so* $(TARGET_DIR)/usr/lib/libncurses.so*
-	rm -rf $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset
-	rm -rf $(STAGING_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/terminfo
-	rm -rf $(TARGET_DIR)/usr/lib/terminfo
-	-$(MAKE) -C $(NCURSES_DIR) clean
-
-ncurses-dirclean:
-	rm -rf $(NCURSES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-TARGETS+=ncurses
-endif
+$(eval $(call AUTOTARGETS,package,ncurses))

index 944fcdb..8413672 100644
@@ -52,10 +52,10 @@ endif
 
 define NCURSES_PATCH_NCURSES_CONFIG
 	$(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
-		$(STAGING_DIR)/bin/ncurses5-config
+		$(STAGING_DIR)/usr/bin/ncurses5-config
 endef
 
-NCURSES_POST_BUILD_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
+NCURSES_POST_STAGING_INSTALL_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
 
 ifeq ($(BR2_HAVE_DEVFILES),y)
 define NCURSES_INSTALL_TARGET_DEVFILES

index aeb6c82..9cb1675 100644
@@ -5,77 +5,75 @@
 #############################################################
 
 LUA_VERSION=5.1.4
-
 LUA_SOURCE=lua-$(LUA_VERSION).tar.gz
-LUA_CAT:=$(ZCAT)
 LUA_SITE=http://www.lua.org/ftp
+LUA_INSTALL_STAGING=YES
+LUA_DEPENDENCIES = readline ncurses
 
-LUA_DIR=$(BUILD_DIR)/lua-$(LUA_VERSION)
-
+#
 LUA_CFLAGS=-DLUA_USE_LINUX
 LUA_MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
 
-$(DL_DIR)/$(LUA_SOURCE):
-	$(call DOWNLOAD,$(LUA_SITE),$(LUA_SOURCE))
-
-$(LUA_DIR)/.unpacked: $(DL_DIR)/$(LUA_SOURCE)
-	$(LUA_CAT) $(DL_DIR)/$(LUA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(LUA_DIR)/.unpacked
-
-$(LUA_DIR)/src/lua: $(LUA_DIR)/.unpacked
-	rm -f $@
+define LUA_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		MYCFLAGS=$(LUA_CFLAGS) \
 		MYLIBS=$(LUA_MYLIBS) \
 		AR="$(TARGET_CROSS)ar rcu" \
-		-C $(LUA_DIR)/src all
-
-$(LUA_DIR)/src/luac: $(LUA_DIR)/src/lua
-
-$(LUA_DIR)/src/liblua.a: $(LUA_DIR)/src/lua
-
-$(STAGING_DIR)/usr/lib/liblua.a: $(LUA_DIR)/src/liblua.a
-	cp -dpf $(LUA_DIR)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
-
-$(STAGING_DIR)/usr/bin/lua: $(LUA_DIR)/src/lua
-	cp -dpf $(LUA_DIR)/src/lua $(STAGING_DIR)/usr/bin/lua
-
-$(STAGING_DIR)/usr/bin/luac: $(LUA_DIR)/src/luac
-	cp -dpf $(LUA_DIR)/src/luac $(STAGING_DIR)/usr/bin/luac
-
-$(TARGET_DIR)/usr/lib/liblua.a: $(STAGING_DIR)/usr/lib/liblua.a
-	cp -dpf $(STAGING_DIR)/usr/lib/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-
-$(TARGET_DIR)/usr/bin/lua: $(STAGING_DIR)/usr/bin/lua
-	cp -dpf $(STAGING_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/lua
-
-$(TARGET_DIR)/usr/bin/luac: $(STAGING_DIR)/usr/bin/luac
-	cp -dpf $(STAGING_DIR)/usr/bin/luac $(TARGET_DIR)/usr/bin/luac
-
-
-lua-bins:	$(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
-
-lua-libs: $(if $(BR2_HAVE_DEVFILES),$(TARGET_DIR)/usr/lib/liblua.a)
-
-lua: readline ncurses lua-bins lua-libs
-
-lua-source: $(DL_DIR)/$(LUA_SOURCE)
-
-lua-clean:
-	rm -f $(STAGING_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
-	rm -f $(STAGING_DIR)/usr/lib/liblua.a
-	rm -f $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
-	rm -f $(TARGET_DIR)/usr/lib/liblua.a
-	-$(MAKE) -C $(LUA_DIR) clean
-
-lua-dirclean:
-	rm -rf $(LUA_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LUA),y)
-TARGETS+=lua
+		-C $(@D)/src all
+endef
+
+define LUA_INSTALL_STAGING_CMDS
+	cat $(@D)/etc/lua.pc | sed -e s/\\/usr\\/local/\\/usr/ > $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
+	$(INSTALL) $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib
+	$(INSTALL) $(@D)/src/lua $(STAGING_DIR)/usr/bin
+	$(INSTALL) $(@D)/src/luac $(STAGING_DIR)/usr/bin
+	$(INSTALL) $(@D)/src/lua.h $(STAGING_DIR)/usr/include
+	$(INSTALL) $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include
+	$(INSTALL) $(@D)/src/lualib.h $(STAGING_DIR)/usr/include
+	$(INSTALL) $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include
+endef
+
+ifeq ($(BR2_HAVE_DEVFILES),y)
+define LUA_INSTALL_TARGET_HEADERS
+	install -D $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc $(TARGET_DIR)/usr/lib/pkgconfig/lua.pc
+	$(INSTALL) $(@D)/src/lua.h $(TARGET_DIR)/usr/include
+	$(INSTALL) $(@D)/src/luaconf.h $(TARGET_DIR)/usr/include
+	$(INSTALL) $(@D)/src/lualib.h $(TARGET_DIR)/usr/include
+	$(INSTALL) $(@D)/src/lauxlib.h $(TARGET_DIR)/usr/include
+endef
 endif
+
+define LUA_INSTALL_TARGET_CMDS
+	$(INSTALL) $(@D)/src/lua $(STAGING_DIR)/usr/bin
+	$(INSTALL) $(@D)/src/luac $(STAGING_DIR)/usr/bin
+	$(INSTALL) -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
+	$(LUA_INSTALL_TARGET_HEADERS)
+endef
+
+LUA_INSTALLED_FILES = \
+	/usr/include/lua.h \
+	/usr/include/luaconf.h \
+	/usr/include/lualib.h \
+	/usr/include/lauxlib.h \
+	/usr/lib/pkgconfig/lua.pc \
+	/usr/bin/lua \
+	/usr/bin/luac \
+	/usr/lib/liblua.a
+
+define LUA_UNINSTALL_STAGING_CMDS
+	for i in $(LUA_INSTALLED_FILES); do \
+		rm -f $(STAGING_DIR)$$i; \
+	done
+endef
+
+define LUA_UNINSTALL_TARGET_CMDS
+	for i in $(LUA_INSTALLED_FILES); do \
+		rm -f $(TARGET_DIR)$$i; \
+	done
+endef
+
+define LUA_CLEAN_CMDS
+	-$(MAKE) $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,lua))

index 983caf3..66cf61d 100644
@@ -205,21 +205,20 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		NM_FOR_TARGET="$(TARGET_NM)" \
 		DEFAULT_ASSEMBLER="$(TARGET_AS)" \
 		DEFAULT_LINKER="$(TARGET_LD)" \
+		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl" \
-		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \
 		STAGING_DIR="$(STAGING_DIR)"
 
 TARGET_CONFIGURE_ENV=\
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CXXFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FCFLAGS="$(TARGET_FCFLAGS)" \
+	FCFLAGS="$(TARGET_FCFLAGS)"
 
 TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
-		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
 HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \

@@ -257,9 +256,11 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
 		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
-		PERLLIB="$(HOST_DIR)/usr/lib/perl"
+		PERLLIB="$(HOST_DIR)/usr/lib/perl" \
+		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
 
 HOST_MAKE_ENV=PATH=$(HOST_PATH) \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \

@@ -267,7 +268,6 @@ HOST_MAKE_ENV=PATH=$(HOST_PATH) \
 		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
 		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
-
 #######################################################################
 # settings we need to pass to configure
 

new file mode 100644
index 0000000..8c88f1c
@@ -0,0 +1,77 @@
+From b515227d0ca1ca61e033645cd2a99e829574c31a Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Tue, 5 Jan 2010 16:24:57 +0100
+Subject: [PATCH] icu: fix compilation with gcc 4.4
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ source/layoutex/ParagraphLayout.cpp |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/source/layoutex/ParagraphLayout.cpp b/source/layoutex/ParagraphLayout.cpp
+index 5b07e54..62c794b 100644
+--- a/source/layoutex/ParagraphLayout.cpp
++++ b/source/layoutex/ParagraphLayout.cpp
+@@ -326,12 +326,12 @@ ParagraphLayout::ParagraphLayout(const LEUnicode chars[], le_int32 count,
+     le_int32  styleCount = sizeof styleRunArrays / sizeof styleRunArrays[0];
+     StyleRuns styleRuns(styleRunArrays, styleCount);
+     LEErrorCode layoutStatus = LE_NO_ERROR;
+-    
++
+     fStyleRunCount = styleRuns.getRuns(NULL, NULL);
+ 
+     fStyleRunLimits = LE_NEW_ARRAY(le_int32, fStyleRunCount);
+     fStyleIndices   = LE_NEW_ARRAY(le_int32, fStyleRunCount * styleCount);
+-    
++
+     styleRuns.getRuns(fStyleRunLimits, fStyleIndices);
+ 
+     // now build a LayoutEngine for each style run...
+@@ -362,7 +362,7 @@ ParagraphLayout::ParagraphLayout(const LEUnicode chars[], le_int32 count,
+     }
+ 
+     // Make big arrays for the glyph widths, glyph-to-char and char-to-glyph maps,
+-    // in logical order. (Both maps need an extra entry for the end of the text.) 
++    // in logical order. (Both maps need an extra entry for the end of the text.)
+     //
+     // For each layout get the positions and convert them into glyph widths, in
+     // logical order. Get the glyph-to-char mapping, offset by starting index in the
+@@ -509,7 +509,7 @@ ParagraphLayout::~ParagraphLayout()
+     }
+ }
+ 
+-    
++
+ le_bool ParagraphLayout::isComplex(const LEUnicode chars[], le_int32 count)
+ {
+     UErrorCode scriptStatus = U_ZERO_ERROR;
+@@ -813,7 +813,7 @@ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
+ 
+     return nullLanguageCode;
+ }
+-#elif
++#else
+ 
+ // TODO - dummy implementation for right now...
+ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
+@@ -943,7 +943,7 @@ void ParagraphLayout::appendRun(ParagraphLayout::Line *line, le_int32 run, le_in
+     // previous run, even though this glyph may be in the middle of the
+     // run.
+     fVisualRunLastX -= fStyleRunInfo[run].positions[leftGlyph * 2];
+- 
++
+     // Make rightGlyph be the glyph just to the right of
+     // the run's glyphs
+     rightGlyph += 1;
+@@ -1057,7 +1057,7 @@ le_int32 ParagraphLayout::Line::getWidth() const
+ 
+     le_int32 glyphCount = lastRun->getGlyphCount();
+     const float *positions = lastRun->getPositions();
+-    
++
+     return (le_int32) positions[glyphCount * 2];
+ }
+ 
+-- 
+1.6.5.7
+

383 lines not on this page · raw message

index 891ddce..8f5d72b 100644
@@ -1,5 +1,5 @@
---- source/tools/genccode/Makefile.in	2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/genccode/Makefile.in	2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/genccode/Makefile.in	2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/genccode/Makefile.in	2008-02-07 14:37:56.000000000 -0500
 @@ -31,7 +31,7 @@ ifneq ($(top_builddir),$(top_srcdir))
  CPPFLAGS += -I$(top_builddir)/common
  endif

@@ -9,8 +9,8 @@
  
  OBJECTS = genccode.o
  
---- source/tools/gencmn/Makefile.in	2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/gencmn/Makefile.in	2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/gencmn/Makefile.in	2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/gencmn/Makefile.in	2008-02-07 14:37:56.000000000 -0500
 @@ -31,7 +31,7 @@ ifneq ($(top_builddir),$(top_srcdir))
  CPPFLAGS += -I$(top_builddir)/common
  endif

@@ -20,8 +20,8 @@
  
  OBJECTS = gencmn.o
 
---- source/tools/genrb/Makefile.in	2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/genrb/Makefile.in	2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/genrb/Makefile.in	2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/genrb/Makefile.in	2008-02-07 14:37:56.000000000 -0500
 @@ -55,7 +55,7 @@ ifneq ($(top_builddir),$(top_srcdir))
  CPPFLAGS += -I$(top_builddir)/common
  endif

@@ -32,8 +32,8 @@
  OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o rbutil.o \
  wrtjava.o rle.o wrtxml.o prscmnts.o
 
---- source/tools/pkgdata/Makefile.in	2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/pkgdata/Makefile.in	2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/pkgdata/Makefile.in	2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/pkgdata/Makefile.in	2008-02-07 14:37:56.000000000 -0500
 @@ -35,7 +35,7 @@ CPPFLAGS += -I$(top_builddir)/common
  endif
  CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil

@@ -43,8 +43,8 @@
  
  OBJECTS = pkgdata.o pkgtypes.o make.o dllmode.o cmnmode.o filemode.o sttcmode.o winmode.o
  
---- source/samples/date/Makefile.in	2007-12-12 13:57:28.000000000 -0500
-+++ source/samples/date/Makefile.in	2008-02-07 14:37:56.000000000 -0500
+--- a/source/samples/date/Makefile.in	2007-12-12 13:57:28.000000000 -0500
++++ b/source/samples/date/Makefile.in	2008-02-07 14:37:56.000000000 -0500
 @@ -21,7 +21,7 @@ CLEANFILES = *~ $(DEPS)
  TARGET = icudate$(EXEEXT)
  

@@ -54,8 +54,8 @@
  
  OBJECTS = uprint.o date.o
  
---- source/samples/cal/Makefile.in	2007-12-12 13:57:28.000000000 -0500
-+++ source/samples/cal/Makefile.in	2008-02-07 14:37:56.000000000 -0500
+--- a/source/samples/cal/Makefile.in	2007-12-12 13:57:28.000000000 -0500
++++ b/source/samples/cal/Makefile.in	2008-02-07 14:37:56.000000000 -0500
 @@ -21,7 +21,7 @@ CLEANFILES = *~ $(DEPS)
  TARGET = icucal$(EXEEXT)
  

684 lines not on this page · raw message

314 lines not on this page · raw message

132 lines not on this page · raw message

index 4493281..235e68c 100644
@@ -56,9 +56,9 @@ copy_toolchain_lib_root = \
 			elif test -f $${LIB_DIR}/$${LIB}; then \
 				$(INSTALL) -D -m0755 $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB}; \
 				case "$${STRIP}" in \
-				(0 | n | no) \
-;; \
 				(*) \
+;; \
+				(y) \
 					$(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}"; \
 ;; \
 				esac; \

index 235e68c..0b6af52 100644
@@ -80,7 +80,8 @@ copy_toolchain_lib_root = \
 copy_toolchain_sysroot = \
 	SYSROOT_DIR="$(strip $1)"; \
 	cp -a $${SYSROOT_DIR}/* $(STAGING_DIR)/ ; \
-	find $(STAGING_DIR) -type d | xargs chmod 755
+	find $(STAGING_DIR) -type d | xargs chmod 755; \
+	rm -rf $(STAGING_DIR)/usr/lib/pkgconfig
 
 #
 # Check the availability of a particular glibc feature. We assume that

index 410606d..508ed56 100755
@@ -5,7 +5,7 @@ TARGET_DIR=$2
 
 echo "Copying development files to target..."
 
-cp -a ${STAGING_DIR}/usr/include ${TARGET_DIR}/usr
+cp -af ${STAGING_DIR}/usr/include ${TARGET_DIR}/usr
 
 for LIBSDIR in /lib /usr/lib; do
 	for WILDCARD in *.a *.la; do

@@ -13,7 +13,7 @@ for LIBSDIR in /lib /usr/lib; do
 			STAGING_STRIPPED=${FILE_PATH##${STAGING_DIR}}
 			EXTENDED_DIR=${STAGING_STRIPPED%/${WILDCARD}}
 			mkdir -p ${TARGET_DIR}${EXTENDED_DIR}
-			cp ${FILE_PATH} ${TARGET_DIR}${STAGING_STRIPPED}
+			cp -fa ${FILE_PATH} ${TARGET_DIR}${STAGING_STRIPPED}
 			#echo ${TARGET_DIR}${STAGING_STRIPPED}
 		done
 	done

index 38e57cd..b7a7103 100644
@@ -108,6 +108,7 @@ define $(2)_CONFIGURE_CMDS
 	        $$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$$(HOST_CFLAGS)" \
 		LDFLAGS="$$(HOST_LDFLAGS)" \
+                $$($$(PKG)_CONF_ENV) \
 		./configure \
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \

index 324580e..2b220d6 100644
@@ -10,7 +10,6 @@ SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
 SYSSTAT_AUTORECONF = NO
 SYSSTAT_LIBTOOL_PATCH = NO
 SYSSTAT_INSTALL_STAGING = NO
-SYSSTAT_INSTALL_TARGET = YES
 
 # Should be --disable-man-group, it might be a little mistake in the
 # configure.in script.

deleted file mode 100644
index 2c1d459..0000000
@@ -1,33 +0,0 @@
-From fab69ff2e063f0b6a4b13139f100ff01aa4cae84 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Fri, 2 Oct 2009 12:20:31 +0200
-Subject: [PATCH] gfxcard: fix build error with --enable-debug
-
-Commit fdc611ea (Added support for colors and multiple layers in a
-glyph implementing outlines) changed dfb_gfxcard_drawglyph() to take
-a layers argument instead of index, but the D_DEBUG_AT call wasn't
-changed to match.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/core/gfxcard.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/gfxcard.c b/src/core/gfxcard.c
-index 127e30e..0020103 100644
---- a/src/core/gfxcard.c
-+++ b/src/core/gfxcard.c
-@@ -2335,8 +2335,8 @@ void dfb_gfxcard_drawglyph( CoreGlyphData **glyph, int x, int y,
-      DFBSurfaceBlendFunction  orig_srcblend;
-      DFBSurfaceBlendFunction  orig_dstblend;
- 
--     D_DEBUG_AT( Core_GraphicsOps, "%s( %u, %d,%d, %p, %p )\n",
--                 __FUNCTION__, index, x, y, font, state );
-+     D_DEBUG_AT( Core_GraphicsOps, "%s( %d,%d, %u, %p, %p )\n",
-+                 __FUNCTION__, x, y, layers, font, state );
- 
-      D_ASSERT( card != NULL );
-      D_ASSERT( card->shared != NULL );
--- 
-1.6.3.3
-

index a4ee3bc..2f095ee 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 DIRECTFB_VERSION_MAJOR:=1.4
-DIRECTFB_VERSION:=1.4.2
+DIRECTFB_VERSION:=1.4.3
 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_AUTORECONF = NO

index 877a87e..582d435 100644
@@ -269,6 +269,7 @@ endmenu
 menu "Hardware handling"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
+source "package/lirc/Config.in"
 source "package/tslib/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"

@@ -429,6 +430,7 @@ endmenu
 menu "Package managers"
 source "package/ipkg/Config.in"
 source "package/portage/Config.in"
+
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rpm/Config.in"
 endif

new file mode 100644
index 0000000..a8a2bb6
@@ -0,0 +1,32 @@
+config BR2_PACKAGE_LIRC
+	bool "lirc"
+	help
+          LIRC is a package that supports receiving and sending IR
+          signals of the most common IR remote controls. It contains a
+          daemon that decodes and sends IR signals, a mouse daemon
+          that translates IR signals to mouse movements and a couple
+          of user programs that allow to control your computer with a
+          remote control.
+
+          A list of supported hardware is available on the main page.
+
+	  http://www.lirc.org/
+
+if BR2_PACKAGE_LIRC
+
+choice
+	prompt "lirc drivers"
+	default BR2_PACKAGE_LIRC_USERSPACE
+
+	config BR2_PACKAGE_LIRC_ALL
+		bool "all"
+
+	config BR2_PACKAGE_LIRC_USERSPACE
+		bool "userspace"
+
+	config BR2_PACKAGE_LIRC_NONE
+		bool "none"
+endchoice
+
+endif # BR2_PACKAGE_LIRC
+

new file mode 100644
index 0000000..770bef5
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+LIRCD=/usr/sbin/lircd
+PID_FILE=/var/run/lircd.pid
+LIRCFLAGS="-o /dev/lircd -P $PID_FILE"
+
+case "$1" in
+    start)
+	echo -n "Starting daemon lircd: "
+        start-stop-daemon --start --quiet --pidfile $PID_FILE --exec $LIRCD -- $LIRCFLAGS
+        echo "done"
+	;;
+    stop)
+	echo -n "Shutting down daemon lircd: "
+	start-stop-daemon --stop --quiet --pidfile $PID_FILE --exec $LIRCD
+        echo "done"
+	;;
+    *)
+        echo "Usage: $0 {start|stop}"
+        exit 1
+	;;
+esac
+
+exit 0

new file mode 100644
index 0000000..12168f3
@@ -0,0 +1,38 @@
+#############################################################
+#
+# lirc
+#
+#############################################################
+
+LIRC_VERSION = 0.8.6
+LIRC_SOURCE = lirc-$(LIRC_VERSION).tar.bz2
+LIRC_SITE = http://prdownloads.sourceforge.net/lirc
+LIRC_LIBTOOL_PATCH = NO
+LIRC_INSTALL_STAGING = YES
+
+LIRC_CONF_OPT = --without-x
+
+ifeq ($(BR2_PACKAGE_LIRC_ALL),y)
+LIRC_CONF_OPT += --with-driver=all
+endif
+ifeq ($(BR2_PACKAGE_LIRC_USERSPACE),y)
+LIRC_CONF_OPT += --with-driver=userspace
+endif
+ifeq ($(BR2_PACKAGE_LIRC_NONE),y)
+LIRC_CONF_OPT += --with-driver=none
+endif
+
+define LIRC_INSTALL_TARGET_SCRIPTS
+	mkdir -p $(TARGET_DIR)/etc/init.d
+	$(INSTALL) -m 0755 package/lirc/S70lircd $(TARGET_DIR)/etc/init.d/
+endef
+
+LIRC_POST_INSTALL_TARGET_HOOKS += LIRC_INSTALL_TARGET_SCRIPTS
+
+define LIRC_UNINSTALL_TARGET_SCRIPTS
+	rm -f $(TARGET_DIR)/etc/init.d/S70lircd
+endef
+
+LIRC_POST_UNINSTALL_TARGET_HOOKS += LIRC_UNINSTALL_TARGET_SCRIPTS
+
+$(eval $(call AUTOTARGETS,package,lirc))

index 7c41cdf..6c78597 100644
@@ -65,6 +65,11 @@ config BR2_PACKAGE_DIRECTFB_KEYBOARD
 	bool "compile keyboard input driver"
 	default y
 
+config BR2_PACKAGE_DIRECTFB_LIRC
+	bool "compile lirc input driver"
+	select BR2_PACKAGE_LIRC
+	default n
+
 config BR2_PACKAGE_DIRECTFB_PS2MOUSE
 	bool "compile PS2 mouse input driver"
 	default y

index 2f095ee..a065a22 100644
@@ -80,6 +80,10 @@ endif
 ifeq ($(BR2_PACKAGE_DIRECTFB_KEYBOARD),y)
 DIRECTFB_INPUT+= keyboard
 endif
+ifeq ($(BR2_PACKAGE_DIRECTFB_KEYBOARD),y)
+DIRECTFB_INPUT+= lirc
+DIRECTFB_DEP+= lirc
+endif
 ifeq ($(BR2_PACKAGE_DIRECTFB_PS2MOUSE),y)
 DIRECTFB_INPUT+= ps2mouse
 endif

index 6c78597..cace1fa 100644
@@ -103,4 +103,7 @@ config BR2_PACKAGE_DIRECTB_DITHER_RGB16
 	  Enable dithering when loading images to RGB16 surfaces.
 	  This increases the data section by 64 KBytes.
 
+config BR2_PACKAGE_DIRECTB_TESTS
+	bool "build directfb tests"
+
 endif # BR2_PACKAGE_DIRECTFB

index a065a22..9b1cecf 100644
@@ -126,6 +126,12 @@ else
 DIRECTFB_DITHER_RGB16:=--with-dither-rgb16=none
 endif
 
+ifeq ($(BR2_PACKAGE_DIRECTB_TESTS),y)
+DIRECTFB_TESTS:=--with-tests
+else
+DIRECTFB_TESTS:=
+endif
+
 DIRECTFB_CONF_OPT = \
 	--localstatedir=/var \
 	--with-gfxdrivers=$(DIRECTFB_GFX) \

@@ -151,7 +157,8 @@ DIRECTFB_CONF_OPT = \
 	--disable-sdl \
 	--disable-vnc \
 	--disable-video4linux \
-	--disable-video4linux2
+	--disable-video4linux2 \
+	$(DIRECTFB_TESTS)
 
 DIRECTFB_DEPENDENCIES = $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION)
 

index cace1fa..cd95da7 100644
@@ -9,7 +9,6 @@ if BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_DIRECTFB_MULTI
 	bool "directfb multi application"
-	select BR2_PACKAGE_LINUX_FUSION
 	help
 	  Enable use of multiple concurrent DirectFB applications
 

index 9b1cecf..3dcad13 100644
@@ -11,14 +11,17 @@ DIRECTFB_AUTORECONF = NO
 DIRECTFB_LIBTOOL_PATCH = NO
 HOST_DIRECTFB_LIBTOOL_PATCH = NO
 DIRECTFB_INSTALL_STAGING = YES
-DIRECTFB_INSTALL_TARGET = YES
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
-DIRECTFB_MULTI:=--enable-multi --enable-fusion
-DIRECTFB_FUSION:=linux-fusion
+DIRECTFB_MULTI = --enable-multi
+ifeq ($(BR2_PACKAGE_LINUX_FUSION),y)
+DIRECTFB_FUSION = linux-fusion
 else
-DIRECTFB_MULTI:=
-DIRECTFB_FUSION:=
+DIRECTFB_FUSION =
+endif
+else
+DIRECTFB_MULTI =
+DIRECTFB_FUSION =
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y)

deleted file mode 100644
index fbd0d26..0000000
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig	2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in	2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER

index 8c7a233..64083fe 100644
@@ -6,8 +6,10 @@
 PIXMAN_VERSION = 0.17.6
 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
 PIXMAN_SITE = http://cairographics.org/releases/
-PIXMAN_AUTORECONF = NO
+PIXMAN_LIBTOOL_PATCH = NO
 PIXMAN_INSTALL_STAGING = YES
 
+PIXMAN_CONF_OPT = --disable-gtk
+
 $(eval $(call AUTOTARGETS,package,pixman))
 $(eval $(call AUTOTARGETS,package,pixman,host))

deleted file mode 100644
index c71031f..0000000
@@ -1,1012 +0,0 @@
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..99849ce
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,13 @@
-+.deps
-+.libs
-+*.o
-+*.la
-+*.lo
-+Makefile
-+boot
-+boot.log
-+config.h
-+config.log
-+config.status
-+libtool
-+stamp-h1
-diff --git a/src/.gitignore b/src/.gitignore
-new file mode 100644
-index 0000000..17146ae
---- /dev/null
-+++ b/src/.gitignore
-@@ -0,0 +1,11 @@
-+cairo-directfb.pc
-+cairo-features.h
-+cairo-ft.pc
-+cairo-no-features.h
-+cairo-pdf.pc
-+cairo-png.pc
-+cairo-ps.pc
-+cairo-svg.pc
-+cairo-xlib-xrender.pc
-+cairo-xlib.pc
-+cairo.pc
-diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
-index f20bf2b..57e3980 100644
---- a/src/cairo-directfb-surface.c
-+++ b/src/cairo-directfb-surface.c
-@@ -34,7 +34,8 @@
-  *    Michael Emmel <[email protected]>
-  *    Claudio Ciccani <[email protected]>
-  */
-- 
-+
-+//#define DIRECT_ENABLE_DEBUG
- 
- #include "cairoint.h"
- #include "cairo-directfb.h"
-@@ -42,6 +43,8 @@
- #include <stdlib.h>
- 
- #include <directfb.h>
-+#include <directfb_util.h>
-+
- #include <direct/types.h>
- #include <direct/debug.h>
- #include <direct/memcpy.h>
-@@ -63,7 +66,7 @@
- /*
-  * CompositeTrapezoids works (without antialiasing).
-  */
--#define DFB_COMPOSITE_TRAPEZOIDS 0
-+#define DFB_COMPOSITE_TRAPEZOIDS 1
- 
- /*
-  * ShowGlyphs works fine.
-@@ -71,7 +74,13 @@
- #define DFB_SHOW_GLYPHS 1
- 
- 
--D_DEBUG_DOMAIN (Cairo_DirectFB, "Cairo/DirectFB", "Cairo DirectFB backend");
-+D_DEBUG_DOMAIN( CairoDFB_Acquire, "CairoDFB/Acquire", "Cairo DirectFB Acquire" );
-+D_DEBUG_DOMAIN( CairoDFB_Clip,    "CairoDFB/Clip",    "Cairo DirectFB Clipping" );
-+D_DEBUG_DOMAIN( CairoDFB_Font,    "CairoDFB/Font",    "Cairo DirectFB Font Rendering" );
-+D_DEBUG_DOMAIN( CairoDFB_Glyphs,  "CairoDFB/Glyphs",  "Cairo DirectFB Font Rendering - Glyphs" );
-+D_DEBUG_DOMAIN( CairoDFB_Render,  "CairoDFB/Render",  "Cairo DirectFB Rendering" );
-+D_DEBUG_DOMAIN( CairoDFB_Surface, "CairoDFB/Surface", "Cairo DirectFB Surface" );
-+D_DEBUG_DOMAIN( CairoDFB_SurfExt, "CairoDFB/SurfExt", "Cairo DirectFB Surface Extents" );
- 
- /*****************************************************************************/
- 
-@@ -89,7 +98,7 @@ typedef struct _cairo_directfb_surface {
-     cairo_surface_t     *color;
-         
-     DFBRegion           *clips;
--    int                  n_clips;
-+    int                  n_clips;       // -1 = don't draw at all
-     
-     int                  width;
-     int                  height;
-@@ -122,7 +131,7 @@ static int _directfb_argb_font = 0;
- 
- 
- #define RUN_CLIPPED( surface, clip, func ) {\
--    if ((surface)->clips) {\
-+    if ((surface)->n_clips) {\
-         int k;\
-         for (k = 0; k < (surface)->n_clips; k++) {\
-             if (clip) {\
-@@ -155,15 +164,15 @@ static int _directfb_argb_font = 0;
- }
- 
- #define TRANSFORM_POINT2X( m, x, y, ret_x, ret_y ) {\
--    double _x = (x);\
--    double _y = (y);\
-+    float _x = (x);\
-+    float _y = (y);\
-     (ret_x) = (_x * (m).xx + (m).x0);\
-     (ret_y) = (_y * (m).yy + (m).y0);\
- }
- 
- #define TRANSFORM_POINT3X( m, x, y, ret_x, ret_y ) {\
--    double _x = (x);\
--    double _y = (y);\
-+    float _x = (x);\
-+    float _y = (y);\
-     (ret_x) = (_x * (m).xx + _y * (m).xy + (m).x0);\
-     (ret_y) = (_x * (m).yx + _y * (m).yy + (m).y0);\
- }
-@@ -291,6 +300,7 @@ _directfb_get_operator (cairo_operator_t         operator,
-             dstblend = DSBF_ONE;
-             break;
-         default:
-+            D_DEBUG_AT (CairoDFB_Render, "=> UNSUPPORTED OPERATOR %d\n", operator);
-             return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
- 
-@@ -312,6 +322,8 @@ _directfb_buffer_surface_create (IDirectFB             *dfb,
-     DFBSurfaceDescription  dsc;
-     DFBResult              ret;
-     
-+    D_DEBUG_AT( CairoDFB_Surface, "%s( %4dx%4d %s )\n", __FUNCTION__, width, height, dfb_pixelformat_name(format) );
-+
-     dsc.flags       = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
-     dsc.width       = width;
-     dsc.height      = height;
-@@ -339,26 +351,24 @@ _directfb_acquire_surface (cairo_directfb_surface_t  *surface,
-     cairo_format_t cairo_format;
-     void *data;
-     int   pitch; 
--        
-+
-     if (surface->format == (cairo_format_t) -1) {
--        DFBSurfaceCapabilities caps;
--        
-         if (intrest_rec) {
-             source_rect.x = intrest_rec->x;
-             source_rect.y = intrest_rec->y;
-             source_rect.w = intrest_rec->width; 
-             source_rect.h = intrest_rec->height; 
-         } else {
--            source_rect.x = 0;
--            source_rect.y = 0;
--            surface->dfbsurface->GetSize (surface->dfbsurface,
--                                          &source_rect.w, &source_rect.h);   
-+            /* Use GetVisibleRectangle() here, because GetSize() might return huge values of a sub surface */
-+            surface->dfbsurface->GetVisibleRectangle (surface->dfbsurface, &source_rect);
-         }
- 
-         if (surface->tmpsurface) {
-             int w, h;
-             surface->tmpsurface->GetSize (surface->tmpsurface, &w, &h);
--            if (w < source_rect.w || h < source_rect.h) {
-+            if (w < source_rect.w || h < source_rect.h ||
-+                ((w*4 > source_rect.w*5 || h*4 > source_rect.h*5) && (w > 32 || h > 32)))
-+            {
-                 surface->tmpsurface->Release (surface->tmpsurface);
-                 surface->tmpsurface = NULL;
-             }
-@@ -366,7 +376,7 @@ _directfb_acquire_surface (cairo_directfb_surface_t  *surface,
-         
-         cairo_format = _cairo_format_from_content (surface->content);
-         if (!surface->tmpsurface) {
--            D_DEBUG_AT (Cairo_DirectFB, "Allocating buffer for surface %p.\n", surface);
-+            D_DEBUG_AT (CairoDFB_Acquire, "  -> Allocating %dx%d buffer\n", source_rect.w, source_rect.h);
-        
-             surface->tmpsurface = 
-                 _directfb_buffer_surface_create (surface->dfb, 
-@@ -377,14 +387,12 @@ _directfb_acquire_surface (cairo_directfb_surface_t  *surface,
-         }
-         buffer = surface->tmpsurface;
-         
--        surface->dfbsurface->GetCapabilities (surface->dfbsurface, &caps);
--        if (caps & DSCAPS_FLIPPING) {
--            DFBRegion region = { .x1 = source_rect.x, .y1 = source_rect.y, 
--                                 .x2 = source_rect.x + source_rect.w - 1,
--                                 .y2 = source_rect.y + source_rect.h - 1 };
--            surface->dfbsurface->Flip (surface->dfbsurface, &region, DSFLIP_BLIT);
--        } 
-+        D_DEBUG_AT( CairoDFB_Render, "  => Blit( 0,0-%4dx%4d <- %4d,%4d )\n",
-+                    source_rect.w, source_rect.h, source_rect.x, source_rect.y );
-+
-+        buffer->SetBlittingFlags (buffer, DSBLIT_NOFX);
-         buffer->Blit (buffer, surface->dfbsurface, &source_rect, 0, 0);
-+        buffer->ReleaseSource (buffer);
-     }
-     else {
-         /*might be a subsurface get the offset*/
-@@ -396,7 +404,7 @@ _directfb_acquire_surface (cairo_directfb_surface_t  *surface,
-     *image_extra = buffer;
-     
-     if (buffer->Lock (buffer, lock_flags, &data, &pitch)) {
--        D_DEBUG_AT (Cairo_DirectFB, "Couldn't lock surface!\n");
-+        D_DEBUG_AT (CairoDFB_Acquire, "Couldn't lock surface!\n");
-         goto ERROR;
-     }
-             
-@@ -443,9 +451,9 @@ _cairo_directfb_surface_create_similar (void            *abstract_src,
-     cairo_directfb_surface_t *surface;
-     cairo_format_t            format;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( src=%p, content=0x%x, width=%d, height=%d).\n",
--                __FUNCTION__, source, content, width, height);
-+    D_DEBUG_AT (CairoDFB_Surface, "%s( src=%p, content=%s%s, width=%d, height=%d)\n", __FUNCTION__, source,
-+                (content & CAIRO_CONTENT_COLOR) ? "COLOR"  : "",
-+                (content & CAIRO_CONTENT_ALPHA) ? "+ALPHA" : "", width, height);
-     
-     width = (width <= 0) ? 1 : width;
-     height = (height<= 0) ? 1 : height;
-@@ -497,8 +505,7 @@ _cairo_directfb_surface_finish (void *data)
- {
-     cairo_directfb_surface_t *surface = (cairo_directfb_surface_t *)data;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p ).\n", __FUNCTION__, surface);
-+    D_DEBUG_AT (CairoDFB_Surface, "%s( surface=%p ).\n", __FUNCTION__, surface);
-         
-     if (surface->clips) {
-         free (surface->clips);
-@@ -534,8 +541,8 @@ _cairo_directfb_surface_acquire_source_image (void                   *abstract_s
- {
-     cairo_directfb_surface_t *surface = abstract_surface;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p ).\n", __FUNCTION__, surface);
-+    D_DEBUG_AT( CairoDFB_Acquire, "%s( %p - %dx%d 0x%x )\n", __FUNCTION__,
-+                surface, surface->width, surface->height, surface->format );
-     
-     return _directfb_acquire_surface (surface, NULL, image_out, 
-                                       NULL, image_extra, DSLF_READ);
-@@ -549,8 +556,7 @@ _cairo_directfb_surface_release_source_image (void                  *abstract_su
-     cairo_directfb_surface_t *surface = abstract_surface;
-     IDirectFBSurface *buffer = image_extra;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p ).\n", __FUNCTION__, surface);
-+    D_DEBUG_AT (CairoDFB_Acquire, "%s( %p )\n", __FUNCTION__, surface);
-     
-     buffer->Unlock (buffer);
-     
-@@ -564,18 +570,58 @@ _cairo_directfb_surface_acquire_dest_image (void                     *abstract_s
-                                             cairo_rectangle_int_t    *image_rect_out,
-                                             void                    **image_extra)
- {
-+    cairo_status_t            status;
-     cairo_directfb_surface_t *surface = abstract_surface;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p, interest_rect={ %d %d %d %d } ).\n", 
--                __FUNCTION__, surface, 
-+    D_DEBUG_AT (CairoDFB_Acquire, 
-+                "%s( %p - %dx%d 0x%x { %u %u %u %u } )\n", 
-+                __FUNCTION__, surface, surface->width, surface->height, surface->format,
-                 interest_rect ? interest_rect->x : 0,
-                 interest_rect ? interest_rect->y : 0,
--                interest_rect ? interest_rect->width : surface->width,
--                interest_rect ? interest_rect->height : surface->height);
-+                interest_rect ? interest_rect->width  : (unsigned) surface->width,
-+                interest_rect ? interest_rect->height : (unsigned) surface->height);
-     
--    return _directfb_acquire_surface (surface, interest_rect, image_out, 
--                                      image_rect_out, image_extra, DSLF_READ | DSLF_WRITE);
-+    status = _directfb_acquire_surface (surface, interest_rect, image_out, 
-+                                        image_rect_out, image_extra, DSLF_READ | DSLF_WRITE);
-+    if (status)
-+        return status;
-+
-+    /* Ensure that the new image has the same clip, if it's the same buffer */
-+    if ((IDirectFBSurface*) *image_extra == surface->dfbsurface &&
-+        surface->clips)
-+    {
-+        cairo_surface_t *s = (cairo_surface_t*) *image_out;
-+
-+        unsigned int clip_serial = _cairo_surface_allocate_clip_serial (s);
-+
-+        cairo_region_t clip_region;
-+
-+        if (surface->n_clips == 1) {
-+            cairo_rectangle_int_t rect = { surface->clips[0].x1, surface->clips[0].y1,
-+                                           surface->clips[0].x2 - surface->clips[0].x1 + 1,
-+                                           surface->clips[0].y2 - surface->clips[0].y1 + 1 };
-+            _cairo_region_init_rect (&clip_region, &rect);
-+        } else {
-+            cairo_box_int_t *boxes = _cairo_malloc_ab (surface->n_clips, sizeof(cairo_box_int_t));
-+            int k;
-+
-+            for (k = 0; k < surface->n_clips; k++) {
-+                boxes[k].p1.x = surface->clips[k].x1;
-+                boxes[k].p1.y = surface->clips[k].y1;
-+                boxes[k].p2.x = surface->clips[k].x2 + 1;
-+                boxes[k].p2.y = surface->clips[k].y2 + 1;
-+            }
-+
-+            _cairo_region_init_boxes (&clip_region, boxes, surface->n_clips);
-+            free (boxes);
-+        }
-+
-+        _cairo_surface_set_clip_region (s, &clip_region, clip_serial);
-+
-+        _cairo_region_fini (&clip_region);
-+    }
-+
-+    return CAIRO_STATUS_SUCCESS;
- }
- 
- static void
-@@ -586,21 +632,31 @@ _cairo_directfb_surface_release_dest_image (void                  *abstract_surf
-                                             void                  *image_extra)
- {
-     cairo_directfb_surface_t *surface = abstract_surface;
--    IDirectFBSurface *buffer = image_extra; 
-+    IDirectFBSurface         *buffer  = image_extra;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p ).\n", __FUNCTION__, surface);
-+    D_DEBUG_AT (CairoDFB_Acquire, 
-+                "%s( %p - %dx%d 0x%x { %u %u %u %u } )\n", 
-+                __FUNCTION__, surface, surface->width, surface->height, surface->format,
-+                interest_rect ? interest_rect->x : 0,
-+                interest_rect ? interest_rect->y : 0,
-+                interest_rect ? interest_rect->width  : (unsigned) surface->width,
-+                interest_rect ? interest_rect->height : (unsigned) surface->height);
-     
-     buffer->Unlock (buffer);
- 
-     if (surface->dfbsurface != buffer) {
--        DFBRegion region = { .x1 = interest_rect->x, .y1 = interest_rect->y,
--                             .x2 = interest_rect->x+interest_rect->width-1,
--                             .y2 = interest_rect->y+interest_rect->height-1 };
--        surface->dfbsurface->SetClip (surface->dfbsurface, &region);
-+        DFBRectangle sr = { 0, 0, image_rect->width, image_rect->height };
-+
-+        D_DEBUG_AT( CairoDFB_Render, "  => Blit( %4d,%4d-%4dx%4d <- 0,0 )\n",
-+                    image_rect->x, image_rect->y, sr.w, sr.h );
-+
-         surface->dfbsurface->SetBlittingFlags (surface->dfbsurface, DSBLIT_NOFX);
--        surface->dfbsurface->Blit (surface->dfbsurface, buffer,
--                                   NULL, image_rect->x, image_rect->y);
-+
-+        RUN_CLIPPED( surface, NULL,
-+                     surface->dfbsurface->Blit (surface->dfbsurface,
-+                                                buffer, &sr, image_rect->x, image_rect->y));
-+
-+        surface->dfbsurface->ReleaseSource (surface->dfbsurface);
-     }
-     
-     cairo_surface_destroy (&image->base);
-@@ -618,13 +674,15 @@ _cairo_directfb_surface_clone_similar (void             *abstract_surface,
-     cairo_directfb_surface_t *surface = abstract_surface;
-     cairo_directfb_surface_t *clone;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p, src=%p ).\n", __FUNCTION__, surface, src);
-+    D_DEBUG_AT (CairoDFB_Surface, "%s( surface=%p, src=%p [%d,%d-%dx%d] )\n",
-+                __FUNCTION__, surface, src, src_x, src_y, width, height);
- 
-     if (src->backend == surface->base.backend) {
-         cairo_surface_reference (src);
-         *clone_out = src;
-          
-+        D_DEBUG_AT (CairoDFB_Surface, "  -> lightweight - referenced :)\n");
-+
-         return CAIRO_STATUS_SUCCESS;
-     }
-     else if (_cairo_surface_is_image (src)) {
-@@ -640,7 +698,8 @@ _cairo_directfb_surface_clone_similar (void             *abstract_surface,
-                             image_src->width, image_src->height);
-         if (!clone)
-             return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--            
-+
-+
-         ret = clone->dfbsurface->Lock (clone->dfbsurface, 
-                                    DSLF_WRITE, (void *)&dst, &pitch);
-         if (ret) {
-@@ -653,6 +712,8 @@ _cairo_directfb_surface_clone_similar (void             *abstract_surface,
-         src += image_src->stride * src_y;
-         
-         if (image_src->format == CAIRO_FORMAT_A1) {
-+            D_DEBUG_AT (CairoDFB_Surface, "  ==> converting A1 -> A8 data\n");
-+
-             /* A1 -> A8 */
-             for (i = 0; i < height; i++) {
-                 for (j = src_x; j < src_x + width; j++)
-@@ -665,10 +726,14 @@ _cairo_directfb_surface_clone_similar (void             *abstract_surface,
-             int len;
-             
-             if (image_src->format == CAIRO_FORMAT_A8) {
-+                D_DEBUG_AT (CairoDFB_Surface, "  ==> copying A8 data\n");
-+
-                 dst += src_x;
-                 src += src_x;
-                 len  = width;
-             } else {
-+                D_DEBUG_AT (CairoDFB_Surface, "  ==> copying ARGB data\n");
-+
-                 dst += src_x * 4;
-                 src += src_x * 4;
-                 len  = width * 4;
-@@ -722,11 +787,17 @@ _directfb_prepare_composite (cairo_directfb_surface_t    *dst,
-             cairo_pattern_t *tmp;
-             int              tmp_x, tmp_y;
-             
--            if (src_pattern->type != CAIRO_PATTERN_TYPE_SOLID ||
--                sblend == DSBF_INVDESTALPHA) /* Doesn't work correctly */
-+            if (src_pattern->type != CAIRO_PATTERN_TYPE_SOLID) { /* Doesn't work correctly */
-+                D_DEBUG_AT (CairoDFB_Render, "=> PATTERN TYPE %d WITH MASK NOT SUPPORTED\n", src_pattern->type);
-                 return CAIRO_INT_STATUS_UNSUPPORTED;
-+            }
-                 
--            D_DEBUG_AT (Cairo_DirectFB, "Replacing src pattern by mask pattern.\n");
-+            if (sblend == DSBF_INVDESTALPHA) { /* Doesn't work correctly */
-+                D_DEBUG_AT (CairoDFB_Render, "=> SOURCE BLEND %d WITH MASK NOT SUPPORTED\n", sblend);
-+                return CAIRO_INT_STATUS_UNSUPPORTED;
-+            }
-+
-+            D_DEBUG_AT (CairoDFB_Render, "-> Replacing src pattern by mask pattern.\n");
-                 
-             tmp = src_pattern;
-             tmp_x = *src_x; tmp_y = *src_y;
-@@ -748,6 +819,10 @@ _directfb_prepare_composite (cairo_directfb_surface_t    *dst,
-         color.r = pattern->color.red_short   >> 8;
-         color.g = pattern->color.green_short >> 8;
-         color.b = pattern->color.blue_short  >> 8;
-+
-+        D_DEBUG_AT (CairoDFB_Render, "-> SOLID MASK (%02x %02x %02x %02x)\n",
-+                    pattern->color.alpha_short >> 8, pattern->color.red_short >> 8,
-+                    pattern->color.green_short >> 8, pattern->color.blue_short >> 8 );
-     } 
-     else {
-         color.a = color.r = color.g = color.b = 0xff;
-@@ -756,6 +831,10 @@ _directfb_prepare_composite (cairo_directfb_surface_t    *dst,
-     if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID) {
-         cairo_solid_pattern_t *pattern = (cairo_solid_pattern_t *)src_pattern;
-          
-+        D_DEBUG_AT (CairoDFB_Render, "-> SOLID PATTERN (%02x %02x %02x %02x)\n",
-+                    pattern->color.alpha_short >> 8, pattern->color.red_short >> 8,
-+                    pattern->color.green_short >> 8, pattern->color.blue_short >> 8 );
-+
-         if (!dst->color) {
-             dst->color = _cairo_directfb_surface_create_similar (dst,
-                                                 CAIRO_CONTENT_COLOR_ALPHA, 1, 1);
-@@ -777,6 +856,8 @@ _directfb_prepare_composite (cairo_directfb_surface_t    *dst,
-         src_attr.y_offset = 0;
-     }
-     else {
-+        D_DEBUG_AT (CairoDFB_Render, "-> PATTERN TYPE %d\n", src_pattern->type );
-+
-         ret = _cairo_pattern_acquire_surface (src_pattern, &dst->base,
-                                               *src_x, *src_y, width, height,
-                                               (cairo_surface_t **)&src, &src_attr);
-@@ -838,6 +919,9 @@ _directfb_finish_composite (cairo_directfb_surface_t   *dst,
- {
-     if (src != dst->color)
-          _cairo_pattern_release_surface (src_pattern, src, src_attr);
-+
-+    if (dst->dfbsurface)
-+         dst->dfbsurface->ReleaseSource( dst->dfbsurface );
- }
- #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */        
- 
-@@ -848,20 +932,38 @@ _directfb_categorize_operation (cairo_surface_attributes_t *src_attr)
-     cairo_matrix_t *m = &src_attr->matrix;
-     
-     if (m->xy != 0 || m->yx != 0 || m->xx < 0 || m->yy < 0) {
--        if (src_attr->extend != CAIRO_EXTEND_NONE)
--            return DFXL_NONE;
-+        D_DEBUG_AT (CairoDFB_Render, "-> NON-RECTANGULAR TRANSFORM\n" );
-+
-+        if (src_attr->extend != CAIRO_EXTEND_NONE) {
-+             D_DEBUG_AT (CairoDFB_Render, "=> EXTEND MODE %d NOT SUPPORTED\n", src_attr->extend );
-+             return DFXL_NONE;
-+        }
-+
-         return DFXL_TEXTRIANGLES;
-     }
-         
-     if (m->xx != 1 || m->yy != 1) {
--        if (src_attr->extend != CAIRO_EXTEND_NONE)
--            return DFXL_NONE;
-+        D_DEBUG_AT (CairoDFB_Render, "-> RECTANGULAR TRANSFORM\n" );
-+
-+        if (src_attr->extend != CAIRO_EXTEND_NONE) {
-+             D_DEBUG_AT (CairoDFB_Render, "=> EXTEND MODE %d NOT SUPPORTED\n", src_attr->extend );
-+
-+             /* TODO: support EXTEND_PAD in special cases */
-+
-+             return DFXL_NONE;
-+        }
-+
-         return DFXL_STRETCHBLIT;
-     }
-      
-+    D_DEBUG_AT (CairoDFB_Render, "-> NO TRANSFORM\n" );
-+
-     if (src_attr->extend != CAIRO_EXTEND_NONE &&
-         src_attr->extend != CAIRO_EXTEND_REPEAT)
-+    {
-+        D_DEBUG_AT (CairoDFB_Render, "=> EXTEND MODE %d NOT SUPPORTED\n", src_attr->extend );
-         return DFXL_NONE;
-+    }
-            
-     return DFXL_BLIT;
- }
-@@ -880,13 +982,13 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-     cairo_directfb_surface_t   *dst = abstract_dst;
-     cairo_directfb_surface_t   *src;
-     cairo_surface_attributes_t  src_attr;
--    DFBAccelerationMask         accel, mask;
-+    DFBAccelerationMask         accel;
-     cairo_int_status_t          ret;
-     
--    D_DEBUG_AT (Cairo_DirectFB,
--                "%s( op=%d, src_pattern=%p, mask_pattern=%p, dst=%p,"
-+    D_DEBUG_AT (CairoDFB_Render,
-+                "%s( op=%d, src=%p, mask=%p, dst=%p,"
-                    " src_x=%d, src_y=%d, mask_x=%d, mask_y=%d, dst_x=%d,"
--                   " dst_y=%d, width=%u, height=%u ).\n",
-+                   " dst_y=%d, width=%u, height=%u )\n",
-                 __FUNCTION__, op, src_pattern, mask_pattern, dst, 
-                 src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-     
-@@ -895,16 +997,12 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-                                        width, height, &src, &src_attr);
-     if (ret)
-         return ret;
--        
-+
-     accel = _directfb_categorize_operation (&src_attr);
--    
--    dst->dfbsurface->GetAccelerationMask (dst->dfbsurface, src->dfbsurface, &mask);
--    if (!(mask & accel)) {
--        D_DEBUG_AT (Cairo_DirectFB, "No acceleration (%08x)!\n", accel);
--        if (accel != DFXL_BLIT) {
--            _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
--            return CAIRO_INT_STATUS_UNSUPPORTED;
--        }
-+    if (!accel) {
-+        D_DEBUG_AT (CairoDFB_Render, "  ====>> UNSUPPORTED!!!\n");
-+        _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
-+        return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
-     
-     src_x += src_attr.x_offset;
-@@ -920,7 +1018,8 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-             sr.h = height;
-         
-             if (src_attr.extend == CAIRO_EXTEND_NONE) {
--                D_DEBUG_AT (Cairo_DirectFB, "Running Blit().\n");
-+                D_DEBUG_AT( CairoDFB_Render, "  ==> Blit( %4d,%4d-%4dx%4d <- %4d,%4d )\n",
-+                            dst_x, dst_y, sr.w, sr.h, sr.x, sr.y );
-         
-                 RUN_CLIPPED( dst, NULL,
-                              dst->dfbsurface->Blit (dst->dfbsurface,
-@@ -934,7 +1033,8 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-                 clip.x2 = dst_x + width  - 1;
-                 clip.y2 = dst_y + height - 1;
-             
--                D_DEBUG_AT (Cairo_DirectFB, "Running TileBlit().\n");
-+                D_DEBUG_AT( CairoDFB_Render, "  ==> TileBlit( %4d,%4d-%4dx%4d <- %4d,%4d-%4dx%4d )\n",
-+                            dst_x, dst_y, width, height, sr.x, sr.y, sr.w, sr.h );
-             
-                 RUN_CLIPPED( dst, &clip,
-                              dst->dfbsurface->TileBlit (dst->dfbsurface, 
-@@ -944,7 +1044,7 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-         
-         case DFXL_STRETCHBLIT: {
-             DFBRectangle sr, dr;
--            double       x1, y1, x2, y2;
-+            float        x1, y1, x2, y2;
-             
-             TRANSFORM_POINT2X (src_attr.matrix, 
-                                src_x, src_y, x1, y1);
-@@ -961,7 +1061,8 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-             dr.w = width;
-             dr.h = height;
-             
--            D_DEBUG_AT (Cairo_DirectFB, "Running StretchBlit().\n");
-+            D_DEBUG_AT( CairoDFB_Render, "  ==> StretchBlit( %4d,%4d-%4dx%4d <- %4d,%4d-%4dx%4d )\n",
-+                        dst_x, dst_y, width, height, sr.x, sr.y, sr.w, sr.h );
- 
-             RUN_CLIPPED (dst, NULL,
-                          dst->dfbsurface->StretchBlit (dst->dfbsurface, 
-@@ -1019,7 +1120,7 @@ _cairo_directfb_surface_composite (cairo_operator_t  op,
-             clip.x2 = dst_x + width  - 1;
-             clip.y2 = dst_y + height - 1;
-         
--            D_DEBUG_AT (Cairo_DirectFB, "Running TextureTriangles().\n");
-+            D_DEBUG_AT (CairoDFB_Render, "  ==> TextureTriangles( ... )\n");
-             
-             RUN_CLIPPED (dst, &clip,
-                          dst->dfbsurface->TextureTriangles (dst->dfbsurface, 
-@@ -1052,8 +1153,7 @@ _cairo_directfb_surface_fill_rectangles (void                  *abstract_surface
-     DFBRectangle              r[n_rects];
-     int                       i;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( dst=%p, op=%d, color=%p, rects=%p, n_rects=%d ).\n",
-+    D_DEBUG_AT (CairoDFB_Render, "%s( dst=%p, op=%d, color=%p, rects=%p, n_rects=%d )\n",
-                 __FUNCTION__, dst, op, color, rects, n_rects);
- 
-     if (_directfb_get_operator (op, &sblend, &dblend))
-@@ -1094,14 +1194,19 @@ _cairo_directfb_surface_fill_rectangles (void                  *abstract_surface
-                                color->green_short >> 8, 
-                                color->blue_short  >> 8, 
-                                color->alpha_short >> 8 );
-+
-+    D_DEBUG_AT( CairoDFB_Render, "  -> %02x %02x %02x %02x\n", color->alpha_short >> 8,
-+                color->red_short >> 8, color->green_short >> 8, color->blue_short >> 8 );
-        
-     for (i = 0; i < n_rects; i++) {
-         r[i].x = rects[i].x;
-         r[i].y = rects[i].y;
-         r[i].w = rects[i].width;
-         r[i].h = rects[i].height;
-+
-+        D_DEBUG_AT( CairoDFB_Render, "  ==> Fill %4d,%4d-%4dx%4d [%d]\n", DFB_RECTANGLE_VALS(&r[i]), i );
-     }
--     
-+
-     RUN_CLIPPED (dst, NULL,
-                  dst->dfbsurface->FillRectangles (dst->dfbsurface, r, n_rects));
-     
-@@ -1128,7 +1233,7 @@ _cairo_directfb_surface_composite_trapezoids (cairo_operator_t   op,
-     cairo_status_t              ret;
-     DFBAccelerationMask         accel;
-     
--    D_DEBUG_AT (Cairo_DirectFB,
-+    D_DEBUG_AT (CairoDFB_Render,
-                 "%s( op=%d, pattern=%p, dst=%p, antialias=%d,"
-                    " src_x=%d, src_y=%d, dst_x=%d, dst_y=%d,"
-                    " width=%u, height=%u, traps=%p, num_traps=%d ).\n",
-@@ -1235,7 +1340,7 @@ _cairo_directfb_surface_composite_trapezoids (cairo_operator_t   op,
-         
- #undef ADD_TRI
-               
--        D_DEBUG_AT (Cairo_DirectFB, "Running TextureTriangles().\n");
-+        D_DEBUG_AT (CairoDFB_Render, "Running TextureTriangles().\n");
-             
-         RUN_CLIPPED (dst, NULL,
-                      dst->dfbsurface->TextureTriangles (dst->dfbsurface, src->dfbsurface, 
-@@ -1256,9 +1361,7 @@ _cairo_directfb_surface_set_clip_region (void           *abstract_surface,
- {
-     cairo_directfb_surface_t *surface = abstract_surface;
-     
--    D_DEBUG_AT (Cairo_DirectFB, 
--                "%s( surface=%p, region=%p ).\n",
--                __FUNCTION__, surface, region);
-+    D_DEBUG_AT (CairoDFB_Clip, "%s( surface=%p, region=%p )\n", __FUNCTION__, surface, region);
-     
-     if (region) {
-         cairo_box_int_t *boxes;
-@@ -1267,15 +1370,33 @@ _cairo_directfb_surface_set_clip_region (void           *abstract_surface,
-         int              i;
- 
-         status = _cairo_region_get_boxes (region, &n_boxes, &boxes);
--        if (status)
--            return status;
-+        if (status) {
-+             D_DEBUG_AT( CairoDFB_Clip, "  -> status %d!\n", status );
-+             return status;
-+        }
-+
-+        if (n_boxes == 0) {
-+             D_DEBUG_AT( CairoDFB_Clip, "  -> EMPTY region (fully clipped)\n" );
-+
-+             if (surface->clips) {
-+                 free (surface->clips);
-+                 surface->clips = NULL;
-+             }
-+
-+             surface->n_clips = -1;
-+
-+             return CAIRO_STATUS_SUCCESS;
-+        }
-+
-+        D_DEBUG_AT( CairoDFB_Clip, "  -> %d box%s\n", n_boxes, (n_boxes > 1) ? "es" : "" );
-         
--        if (surface->n_clips != n_boxes) {
-+        if (surface->n_clips < n_boxes || surface->n_clips - n_boxes > 10) {
-             if (surface->clips)
-                 free (surface->clips);
-             
-             surface->clips = _cairo_malloc_ab (n_boxes, sizeof(DFBRegion));
-             if (!surface->clips) {
-+                D_OOM();
-                 surface->n_clips = 0;
-                 _cairo_region_boxes_fini (region, boxes);
-                 return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-@@ -1287,18 +1408,24 @@ _cairo_directfb_surface_set_clip_region (void           *abstract_surface,
-         for (i = 0; i < n_boxes; i++) {
-             surface->clips[i].x1 = boxes[i].p1.x;
-             surface->clips[i].y1 = boxes[i].p1.y;
--            surface->clips[i].x2 = boxes[i].p2.x;
--            surface->clips[i].y2 = boxes[i].p2.y;
-+            surface->clips[i].x2 = boxes[i].p2.x - 1;
-+            surface->clips[i].y2 = boxes[i].p2.y - 1;
-+
-+            D_DEBUG_AT( CairoDFB_Clip, "  = CLIP %4d,%4d-%4dx%4d [%d]\n",
-+                        DFB_RECTANGLE_VALS_FROM_REGION(&surface->clips[i]), i );
-         }
- 
-         _cairo_region_boxes_fini (region, boxes);
-     }
-     else {
-+        D_DEBUG_AT( CairoDFB_Clip, "  -> NULL region (unclipped)\n" );
-+
-         if (surface->clips) {
-             free (surface->clips);
-             surface->clips = NULL;
--            surface->n_clips = 0;
-         }
-+
-+        surface->n_clips = 0;
-     }
- 
-     return CAIRO_STATUS_SUCCESS;
-@@ -1310,9 +1437,7 @@ _cairo_directfb_abstract_surface_get_extents (void                  *abstract_su
- {
-     cairo_directfb_surface_t *surface = abstract_surface;
-     
--    D_DEBUG_AT (Cairo_DirectFB,
--                "%s( surface=%p, rectangle=%p ).\n",
--                __FUNCTION__, surface, rectangle);
-+    D_DEBUG_AT (CairoDFB_SurfExt, "%s( surface=%p, rectangle=%p )\n", __FUNCTION__, surface, rectangle);
-     
-     if (rectangle) {
-         if (!surface->local) {
-@@ -1323,6 +1448,8 @@ _cairo_directfb_abstract_surface_get_extents (void                  *abstract_su
-         rectangle->y = 0;
-         rectangle->width  = surface->width;
-         rectangle->height = surface->height;
-+
-+        D_DEBUG_AT (CairoDFB_SurfExt, "  -> %dx%d\n", surface->width, surface->height);
-     }
-     
-     return CAIRO_STATUS_SUCCESS;
-@@ -1379,21 +1506,29 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
-     int                          h         = 8;
-     int                          i;
-     
-+    D_DEBUG_AT (CairoDFB_Font, "%s( %p [%d] )\n", __FUNCTION__, glyphs, num_glyphs );
-+
-     if (scaled_font->surface_private) {
-         cache = scaled_font->surface_private;
-         x = cache->x;
-         y = cache->y;
-     }
--    
-+
-+    _cairo_cache_freeze( scaled_font->glyphs );
-+
-     for (i = 0; i < num_glyphs; i++) {
-         cairo_scaled_glyph_t  *scaled_glyph;
-         cairo_image_surface_t *img;
-         
-+        D_DEBUG_AT (CairoDFB_Glyphs, "  -> [%2d] = %4lu\n", i, glyphs[i].index );
-+
-         ret = _cairo_scaled_glyph_lookup (scaled_font, glyphs[i].index,
-                                           CAIRO_SCALED_GLYPH_INFO_SURFACE,
-                                           &scaled_glyph);
--        if (ret)
-+        if (ret) {
-+            _cairo_cache_thaw( scaled_font->glyphs );
-             return ret;
-+        }
-         
-         img = scaled_glyph->surface;
-         switch (img->format) {
-@@ -1402,19 +1537,26 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
-             case CAIRO_FORMAT_ARGB32:
-                 break;
-             default:
--                D_DEBUG_AT (Cairo_DirectFB,
--                            "Unsupported font format %d!\n", img->format);
-+                D_DEBUG_AT (CairoDFB_Glyphs,
-+                            "  -> Unsupported font format %d!\n", img->format);
-+                _cairo_cache_thaw( scaled_font->glyphs );
-                 return CAIRO_INT_STATUS_UNSUPPORTED;
-         }
-         
-         points[n].x = _cairo_lround (glyphs[i].x - img->base.device_transform.x0);
-         points[n].y = _cairo_lround (glyphs[i].y - img->base.device_transform.y0);
-         
-+//        D_DEBUG_AT (CairoDFB_Glyphs, "            (%4d,%4d) [%2d]\n", points[n].x, points[n].y, n );
-+
-         if (points[n].x >= surface->width  ||
-             points[n].y >= surface->height ||
-             points[n].x+img->width  <= 0   ||
-             points[n].y+img->height <= 0)
--            continue;
-+        {
-+             D_DEBUG_AT (CairoDFB_Glyphs,
-+                         "  -> Unsupported font format %d!\n", img->format);
-+             continue;
-+        }
-         
-         if (!scaled_glyph->surface_private) {
-             DFBRectangle *rect;
-@@ -1436,30 +1578,31 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
-             
-             /* Remember glyph location */ 
-             rect = malloc (sizeof(DFBRectangle));
--            if (!rect)
-+            if (!rect) {
-+                _cairo_cache_thaw( scaled_font->glyphs );
-                 return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+            }
-             *rect = rects[n];
-             
-             scaled_glyph->surface_private = rect;
-             chars[num_chars++] = scaled_glyph;
-             
--            /*D_DEBUG_AT (Cairo_DirectFB, 
--                        "Glyph %lu will be loaded at (%d,%d).\n",
--                        glyphs[i].index, rects[n].x, rects[n].y);*/
-+            D_DEBUG_AT (CairoDFB_Glyphs, "  -> loading at %4d,%2d <- rect %p, img %p, entry %p\n",
-+                        rects[n].x, rects[n].y, rect, scaled_glyph->surface, scaled_glyph);
-         }
-         else {
-             rects[n] = *((DFBRectangle *)scaled_glyph->surface_private);
-             
--            /*D_DEBUG_AT (Cairo_DirectFB, 
--                        "Glyph %lu already loaded at (%d,%d).\n",
--                        glyphs[i].index, rects[n].x, rects[n].y);*/
-+            D_DEBUG_AT (CairoDFB_Glyphs, "  -> exists at  %4d,%2d\n", rects[n].x, rects[n].y);
-         }
-             
-         n++;
-     }
-     
--    if (!n)
-+    if (!n) {
-+        _cairo_cache_thaw( scaled_font->glyphs );
-         return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
-     
-     h += y;
-     w = MAX (w, 8);
-@@ -1472,27 +1615,30 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
-             w = MAX (w, cache->width);
-             h = MAX (h, cache->height);
-             
--            D_DEBUG_AT (Cairo_DirectFB,
--                        "Reallocating font cache (%dx%d).\n", w, h);
-+            D_DEBUG_AT (CairoDFB_Font, "  -> Reallocating font cache (%dx%d).\n", w, h);
-             
-             new_cache = _directfb_allocate_font_cache (surface->dfb, w, h);
--            if (!new_cache)
-+            if (!new_cache) {
-+                _cairo_cache_thaw( scaled_font->glyphs );
-                 return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+            }
-             
-             new_cache->dfbsurface->Blit (new_cache->dfbsurface,
-                                          cache->dfbsurface, NULL, 0, 0);
-+            new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
-             
-             _directfb_destroy_font_cache (cache);
-             scaled_font->surface_private = cache = new_cache;
-         }
-     }
-     else {
--        D_DEBUG_AT (Cairo_DirectFB,
--                    "Allocating font cache (%dx%d).\n", w, h);
-+        D_DEBUG_AT (CairoDFB_Font, "  -> Allocating font cache (%dx%d).\n", w, h);
-         
-         cache = _directfb_allocate_font_cache (surface->dfb, w, h);
--        if (!cache)
-+        if (!cache) {
-+            _cairo_cache_thaw( scaled_font->glyphs );
-             return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+        }
-             
-         scaled_font->surface_backend = &cairo_directfb_surface_backend;
-         scaled_font->surface_private = cache;
-@@ -1504,17 +1650,30 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
-     
-         if (cache->dfbsurface->Lock (cache->dfbsurface, 
-                                      DSLF_WRITE, (void *)&data, &pitch))
-+        {
-+            _cairo_cache_thaw( scaled_font->glyphs );
-             return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+        }
-             
-+        D_DEBUG_AT (CairoDFB_Font, "  => %d chars to load, cache %dx%d\n", num_chars, cache->width, cache->height);
-+
-         for (i = 0; i < num_chars; i++) {
-             cairo_image_surface_t *img  = chars[i]->surface;
-             DFBRectangle          *rect = chars[i]->surface_private;
-             unsigned char         *dst  = data;
--            unsigned char         *src  = img->data;
-+            unsigned char         *src;
-             int                    j;
-             
-+            D_DEBUG_AT (CairoDFB_Glyphs, "  -> loading [%2d] <- rect %p, img %p, entry %p\n", i, rect, img, chars[i]);
-+
-+            src = img->data;
-+
-+            D_DEBUG_AT (CairoDFB_Glyphs, "     from %p\n", src);
-+
-             dst += rect->y * pitch + (_directfb_argb_font ? (rect->x<<2) : rect->x);
-                         
-+            D_DEBUG_AT (CairoDFB_Glyphs, "     to %4d,%2d (%p)\n", rect->x, rect->y, dst);
-+
-             if (img->format == CAIRO_FORMAT_A1) {
-                 for (h = rect->h; h; h--) {
-                     if (_directfb_argb_font) {
-@@ -1563,9 +1722,13 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
-         cache->dfbsurface->Unlock (cache->dfbsurface);
-     }
- 
-+    _cairo_cache_thaw( scaled_font->glyphs );
-+
-     cache->x = x;
-     cache->y = y;
-     
-+    D_DEBUG_AT (CairoDFB_Font, "  => cache %d,%d, %p [%d]\n", x, y, cache, n);
-+
-     *ret_cache = cache;
-     *ret_num   = n;
- 
-@@ -1577,7 +1740,7 @@ _cairo_directfb_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
- {
-     cairo_directfb_font_cache_t *cache = scaled_font->surface_private;
-     
--    D_DEBUG_AT (Cairo_DirectFB,
-+    D_DEBUG_AT (CairoDFB_Font,
-                 "%s( scaled_font=%p ).\n", __FUNCTION__, scaled_font);
-     
-     if (cache) {
-@@ -1590,7 +1753,7 @@ static void
- _cairo_directfb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
-                                            cairo_scaled_font_t  *scaled_font)
- {
--     D_DEBUG_AT (Cairo_DirectFB,
-+     D_DEBUG_AT (CairoDFB_Font,
-                  "%s( scaled_glyph=%p, scaled_font=%p ).\n",
-                  __FUNCTION__, scaled_glyph, scaled_font);
- 
-@@ -1619,7 +1782,7 @@ _cairo_directfb_surface_show_glyphs (void                *abstract_dst,
-     DFBPoint                     points[num_glyphs];
-     int                          num;
-     
--    D_DEBUG_AT (Cairo_DirectFB,
-+    D_DEBUG_AT (CairoDFB_Font,
-                 "%s( dst=%p, op=%d, pattern=%p, glyphs=%p, num_glyphs=%d, scaled_font=%p ).\n",
-                 __FUNCTION__, dst, op, pattern, glyphs, num_glyphs, scaled_font);
-                             
-@@ -1660,12 +1823,14 @@ _cairo_directfb_surface_show_glyphs (void                *abstract_dst,
-     dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
-     dst->dfbsurface->SetColor (dst->dfbsurface, color.r, color.g, color.b, color.a);
-     
--    D_DEBUG_AT (Cairo_DirectFB, "Running BatchBlit().\n");
-+    D_DEBUG_AT (CairoDFB_Font, "  ===> BatchBlit()\n");
-         
-     RUN_CLIPPED (dst, NULL,
-                  dst->dfbsurface->BatchBlit (dst->dfbsurface,
-                                          cache->dfbsurface, rects, points, num));
-         
-+    dst->dfbsurface->ReleaseSource (dst->dfbsurface);
-+
-     return CAIRO_STATUS_SUCCESS;
- }
- #endif /* DFB_SHOW_GLYPHS */
-@@ -1758,7 +1923,7 @@ cairo_directfb_surface_backend_init (IDirectFB *dfb)
-         cairo_directfb_surface_backend.scaled_glyph_fini = NULL;
-         cairo_directfb_surface_backend.show_glyphs = NULL;
- #endif
--        D_DEBUG_AT (Cairo_DirectFB, "Acceleration disabled.\n");
-+        D_DEBUG_AT (CairoDFB_Surface, "Acceleration disabled.\n");
-     }
-     else {
-         DFBGraphicsDeviceDescription dsc;
-@@ -1766,19 +1931,19 @@ cairo_directfb_surface_backend_init (IDirectFB *dfb)
-         dfb->GetDeviceDescription (dfb, &dsc);
-     
- #if DFB_COMPOSITE
--        if (!(dsc.acceleration_mask & DFXL_BLIT))
--            cairo_directfb_surface_backend.composite = NULL;
-+//        if (!(dsc.acceleration_mask & DFXL_BLIT))
-+//            cairo_directfb_surface_backend.composite = NULL;
- #endif
- 
- #if DFB_COMPOSITE_TRAPEZOIDS
--        if (!(dsc.acceleration_mask & DFXL_TEXTRIANGLES))
--            cairo_directfb_surface_backend.composite_trapezoids = NULL;
-+//        if (!(dsc.acceleration_mask & DFXL_TEXTRIANGLES))
-+//            cairo_directfb_surface_backend.composite_trapezoids = NULL;
- #endif
-     }
-     
-     if (getenv ("CAIRO_DIRECTFB_ARGB_FONT")) {
-         _directfb_argb_font = 1;
--        D_DEBUG_AT (Cairo_DirectFB, "Using ARGB fonts.\n");
-+        D_DEBUG_AT (CairoDFB_Surface, "Using ARGB fonts.\n");
-     }
- 
-     done = 1;

new file mode 100644
index 0000000..12a51ec
@@ -0,0 +1,39 @@
+diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
+index bb02dbf..65f2d55 100644
+--- a/src/cairo-directfb-surface.c
++++ b/src/cairo-directfb-surface.c
+@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void                  *abstract_surf
+ 		     surface->dfbsurface->Blit (surface->dfbsurface,
+ 						buffer, NULL,
+ 						image_rect->x, image_rect->y));
++
++    surface->dfbsurface->ReleaseSource (surface->dfbsurface);
+     }
+ 
+     cairo_surface_destroy (&image->base);
+@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t   *dst,
+                             cairo_surface_attributes_t *src_attr)
+ {
+     _cairo_pattern_release_surface (src_pattern, src, src_attr);
++
++    if (dst->dfbsurface)
++         dst->dfbsurface->ReleaseSource( dst->dfbsurface );
+ }
+ #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
+ 
+@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
+ 
+ 	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,
+ 					 cache->dfbsurface, NULL, 0, 0);
++        new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
+ 
+ 	    _directfb_destroy_font_cache (cache);
+ 	    scaled_font->surface_private = cache = new_cache;
+@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void                *abstract_dst,
+     RUN_CLIPPED (dst, NULL,
+ 		 dst->dfbsurface->BatchBlit (dst->dfbsurface,
+ 					     cache->dfbsurface, rects, points, num));
++    dst->dfbsurface->ReleaseSource (dst->dfbsurface);
+ 
+     return CAIRO_STATUS_SUCCESS;
+ }

index 0ca99aa..a4513bc 100644
@@ -3,10 +3,10 @@
 # cairo
 #
 #############################################################
-CAIRO_VERSION = 1.6.4
+CAIRO_VERSION = 1.8.10
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
 CAIRO_SITE = http://cairographics.org/releases
-CAIRO_AUTORECONF = NO
+CAIRO_LIBTOOL_PATCH = NO
 CAIRO_INSTALL_STAGING = YES
 CAIRO_INSTALL_TARGET = YES
 

@@ -81,6 +81,7 @@ endif
 
 HOST_CAIRO_DEPENDENCIES = host-pkg-config host-pixman host-fontconfig
 
+HOST_CAIRO_LIBTOOL_PATCH = NO
 HOST_CAIRO_CONF_OPT = \
 		--enable-ps \
 		--enable-pdf \

index a4513bc..d6cfe42 100644
@@ -8,7 +8,6 @@ CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
 CAIRO_SITE = http://cairographics.org/releases
 CAIRO_LIBTOOL_PATCH = NO
 CAIRO_INSTALL_STAGING = YES
-CAIRO_INSTALL_TARGET = YES
 
 CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \

index 2b220d6..99d419c 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SYSSTAT_VERSION = 9.0.5
+SYSSTAT_VERSION = 9.0.6
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
 SYSSTAT_AUTORECONF = NO

index db935a4..e413287 100644
@@ -3,7 +3,7 @@
 # automake
 #
 #############################################################
-AUTOMAKE_VERSION = 1.10
+AUTOMAKE_VERSION = 1.11
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 

index bbabbb0..4278029 100644
@@ -25,3 +25,4 @@ $(eval $(call AUTOTARGETS,package,libtool,host))
 
 # variables used by other packages
 LIBTOOL:=$(HOST_DIR)/usr/bin/libtool
+LIBTOOLIZE:=$(HOST_DIR)/usr/bin/libtoolize

index d82c2c5..81233a5 100644
@@ -17,7 +17,7 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 AUTOCONF_DEPENDENCIES = microperl host-m4
 
 HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
-                    	 ac_cv_prog_gnu_m4_gnu=no
+			ac_cv_prog_gnu_m4_gnu=no
 
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
 

@@ -26,4 +26,5 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
 
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
+AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
 AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"

index 54ff1d6..c995341 100644
@@ -102,6 +102,18 @@ config BR2_TARGET_GENERIC_GETTY_TTYCPM2
 config BR2_TARGET_GENERIC_GETTY_TTYCPM3
 	bool "ttyCPM3"
 	depends on BR2_powerpc
+config BR2_TARGET_GENERIC_GETTY_TTYAS0
+	bool "ttyAS0"
+	depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS1
+	bool "ttyAS1"
+	depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS2
+	bool "ttyAS2"
+	depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS3
+	bool "ttyAS3"
+	depends on BR2_sh
 endchoice
 
 config BR2_TARGET_GENERIC_GETTY_PORT

@@ -134,6 +146,10 @@ config BR2_TARGET_GENERIC_GETTY_PORT
 	default "ttyCPM1"	if BR2_TARGET_GENERIC_GETTY_TTYCPM1
 	default "ttyCPM2"	if BR2_TARGET_GENERIC_GETTY_TTYCPM2
 	default "ttyCPM3"	if BR2_TARGET_GENERIC_GETTY_TTYCPM3
+	default "ttyAS0"	if BR2_TARGET_GENERIC_GETTY_TTYAS0
+	default "ttyAS1"	if BR2_TARGET_GENERIC_GETTY_TTYAS1
+	default "ttyAS2"	if BR2_TARGET_GENERIC_GETTY_TTYAS2
+	default "ttyAS3"	if BR2_TARGET_GENERIC_GETTY_TTYAS3
 
 choice
 	prompt "Baudrate to use"

index c054000..bdaec77 100644
@@ -1,5 +1,5 @@
 # When building a target filesystem, it is desirable to not have to
-# become root and then run 'mknod' a thousand times.  Using a device 
+# become root and then run 'mknod' a thousand times.  Using a device
 # table you can create device nodes and directories "on the fly".
 #
 # This is a sample device table file for use with genext2fs.  You can

@@ -14,17 +14,17 @@
 # I could just use the following two table entries:
 #   /dev/hda    b       640     0       0       3       0       0       0       -
 #   /dev/hda    b       640     0       0       3       1       1       1       15
-# 
+#
 # Device table entries take the form of:
 # <name>    <type>      <mode>  <uid>   <gid>   <major> <minor> <start> <inc>   <count>
-# where name is the file name,  type can be one of: 
+# where name is the file name,  type can be one of:
 #       f       A regular file
 #       d       Directory
 #       c       Character special device file
 #       b       Block special device file
 #       p       Fifo (named pipe)
 # uid is the user id for the target file, gid is the group id for the
-# target file.  The rest of the entries (major, minor, etc) apply only 
+# target file.  The rest of the entries (major, minor, etc) apply only
 # to device special files.
 
 # Have fun

@@ -78,6 +78,7 @@
 /dev/ttyPSC	c	666	0	0	204	148	0	1	4
 /dev/ttyUL	c	666	0	0	204	187	0	1	4
 /dev/ttymxc	c	666	0	0	207	16	0	1	3
+/dev/ttyAS	c	666	0	0	204	40	0	1	4
 
 # Input stuff
 /dev/input		d	755	0	0	-	-	-	-	-

index 0c3d993..fb5daf8 100644
@@ -7,3 +7,7 @@ config BR2_PACKAGE_OPENSSH
 	  tools.  The standard 'ssh', 'sshd', 'scp', and friends.
 
 	  http://www.openssh.com/
+
+config BR2_PACKAGE_OPENSSH_EMPTY_PASSWORDS
+	bool "allow empty passwords"
+        depends on BR2_PACKAGE_OPENSSH

index 9a06d12..b499075 100644
@@ -14,6 +14,14 @@ OPENSSH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 OPENSSH_DEPENDENCIES = zlib openssl
 
+define OPENSSH_CONFIG_EMPTY_PASSWORDS
+	$(SED) "s/^.*PermitEmptyPasswords.*/PermitEmptyPasswords yes/;" $(TARGET_DIR)/etc/sshd_config
+endef
+
+ifeq ($(BR2_PACKAGE_OPENSSH_EMPTY_PASSWORDS),y)
+OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_CONFIG_EMPTY_PASSWORDS
+endif
+
 $(eval $(call AUTOTARGETS,package,openssh))
 
 $(OPENSSH_HOOK_POST_INSTALL):

deleted file mode 100644
index 443ddf3..0000000
@@ -1,100 +0,0 @@
-diff -urN linux-fusion-8.0.2-0rig//linux/drivers/char/fusion/shmpool.c linux-fusion-8.0.2/linux/drivers/char/fusion/shmpool.c
---- linux-fusion-8.0.2-0rig//linux/drivers/char/fusion/shmpool.c	2008-09-29 12:20:44.000000000 +0200
-+++ linux-fusion-8.0.2/linux/drivers/char/fusion/shmpool.c	2009-01-11 17:00:19.000000000 +0100
-@@ -20,6 +20,8 @@
- #include <linux/slab.h>
- #include <linux/smp_lock.h>
- #include <linux/sched.h>
-+#include <asm/page.h>
-+#include <linux/mm.h>
- 
- #include <linux/fusion.h>
- 
-@@ -28,8 +30,6 @@
- #include "list.h"
- #include "shmpool.h"
- 
--
--
- typedef struct {
-      FusionLink         link;
-      unsigned long      next_base;
-diff -urN linux-fusion-8.0.2-0rig//Makefile linux-fusion-8.0.2/Makefile
---- linux-fusion-8.0.2-0rig//Makefile	2008-09-29 12:20:44.000000000 +0200
-+++ linux-fusion-8.0.2/Makefile	2009-01-11 18:07:54.000000000 +0100
-@@ -17,13 +17,15 @@
- 
- 
- DESTDIR ?= $(SYSROOT)
--
-+HEADERDIR ?= $(SYSROOT)
-+# This location is valid for at least 2.6.27.10
-+KERNEL_FUSION_LIB=$(KERNEL_MODLIB)/kernel/drivers/char/fusion
- 
- SUB = linux/drivers/char/fusion
- 
- export CONFIG_FUSION_DEVICE=m
- 
--
-+ARCH=$(ARCH)
- ifeq ($(DEBUG),yes)
-   CPPFLAGS += -DFUSION_DEBUG_SKIRMISH_DEADLOCK
- endif
-@@ -45,25 +47,41 @@
- 	ln -s Makefile-2.$(K_PATCHLEVEL) $(SUB)/Makefile
- ifeq ($(call check-version,2,6,24),1)
- 	$(MAKE) -C $(KERNEL_BUILD) \
--		KCPPFLAGS="$(CPPFLAGS) -I`pwd`/linux/include" \
-+		ARCH=$(ARCH) \
-+		CC=$(CROSS_COMPILE)gcc \
-+		AS=$(CROSS_COMPILE)as \
-+		KCPPFLAGS="$(CPPFLAGS) \
-+			-I`pwd`/linux/include \
-+			-I$(KERNEL_SOURCE)/include \
-+			-I$(KERNEL_SOURCE)/arch/$(ARCH)/include" \
- 		SUBDIRS=`pwd`/$(SUB) modules
- else
- 	$(MAKE) -C $(KERNEL_BUILD) \
--		CPPFLAGS="$(CPPFLAGS) -D__KERNEL__ -I`pwd`/linux/include -I$(KERNEL_BUILD)/include -I$(KERNEL_SOURCE)/include $(AUTOCONF_H)" \
-+		ARCH=$(ARCH) \
-+		CC=$(CROSS_COMPILE)gcc \
-+		AS=$(CROSS_COMPILE)as \
-+		CPPFLAGS="$(CPPFLAGS) \
-+			-I`pwd`/linux/include \
-+			-I$(KERNEL_BUILD)/include \
-+			-I$(KERNEL_SOURCE)/include \
-+			-I$(KERNEL_SOURCE)/arch/$(ARCH)/include \
-+			 $(AUTOCONF_H)" \
- 		SUBDIRS=`pwd`/$(SUB) modules
- endif
- 
--install: all
-+#-D__KERNEL__ 
-+#-DHAVE_LINUX_CONFIG_H \
-+
-+install: all install-header
- 	install -d $(DESTDIR)/usr/include/linux
- 	install -m 644 linux/include/linux/fusion.h $(DESTDIR)/usr/include/linux
--
--	install -d $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+	install -d $(DESTDIR)$(KERNEL_FUSION_LIB)
- 
- ifeq ($(K_PATCHLEVEL),4)
--	install -m 644 $(SUB)/fusion.o $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+	install -m 644 $(SUB)/fusion.o $(DESTDIR)$(KERNEL_FUSION_LIB)
- 	rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.o
- else
--	install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+	install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_FUSION_LIB)
- 	rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.ko
- endif
- ifneq ($(strip $(DESTDIR)),)
-@@ -72,6 +90,8 @@
- 	/sbin/depmod -ae $(KERNEL_VERSION)
- endif
- 
-+install-header:
-+	install -m 644 linux/include/linux/fusion.h $(HEADERDIR)/usr/include/linux
- 
- 
- clean:

101 lines not on this page · raw message

index abce465..4dbf45e 100644
@@ -7,7 +7,6 @@ LINUX_FUSION_VERSION = 8.1.1
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES
-LINUX_FUSION_INSTALL_TARGET = YES
 
 # BR2_LINUX26_VERSION is not really dependable
 # LINUX26_VERSION is not yet set.

index 5bf0a9d..ef36023 100644
@@ -4,85 +4,34 @@
 #
 #############################################################
 
-VALGRIND_VERSION=3.2.3
-VALGRIND_SITE:=http://valgrind.org/downloads/
-VALGRIND_DIR:=$(BUILD_DIR)/valgrind-$(VALGRIND_VERSION)
-VALGRIND_SOURCE:=valgrind-$(VALGRIND_VERSION).tar.bz2
-VALGRIND_CAT:=$(BZCAT)
-
-$(DL_DIR)/$(VALGRIND_SOURCE):
-	$(call DOWNLOAD,$(VALGRIND_SITE),$(VALGRIND_SOURCE))
-
-$(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE)
-	$(VALGRIND_CAT) $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(VALGRIND_DIR)/.unpacked
-
-$(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(VALGRIND_DIR) package/valgrind/ valgrind\*.patch
-	touch $(VALGRIND_DIR)/.patched
-
-$(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched
-	(cd $(VALGRIND_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		$(DISABLE_NLS) \
-		--without-uiout --disable-valgrindmi \
-		--disable-tui --disable-valgrindtk \
-		--without-x --without-included-gettext \
-		--disable-tls \
-	)
-	touch $(VALGRIND_DIR)/.configured
-
-$(VALGRIND_DIR)/coregrind/valgrind: $(VALGRIND_DIR)/.configured
-	$(MAKE) -C $(VALGRIND_DIR)
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/coregrind/valgrind
-	$(MAKE) \
-	    prefix=$(TARGET_DIR)/usr \
-	    exec_prefix=$(TARGET_DIR)/usr \
-	    bindir=$(TARGET_DIR)/usr/bin \
-	    sbindir=$(TARGET_DIR)/usr/sbin \
-	    libexecdir=$(TARGET_DIR)/usr/lib \
-	    datadir=$(TARGET_DIR)/usr/share \
-	    sysconfdir=$(TARGET_DIR)/etc \
-	    sharedstatedir=$(TARGET_DIR)/usr/com \
-	    localstatedir=$(TARGET_DIR)/var \
-	    libdir=$(TARGET_DIR)/usr/lib \
-	    infodir=$(TARGET_DIR)/usr/info \
-	    mandir=$(TARGET_DIR)/usr/man \
-	    includedir=$(TARGET_DIR)/usr/include \
-	    -C $(VALGRIND_DIR) install
+VALGRIND_VERSION = 3.2.3
+VALGRIND_SITE = http://valgrind.org/downloads/
+VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
+
+VALGRIND_CONF_OPT = \
+	--without-uiout \
+	--disable-valgrindmi \
+	--disable-tui \
+	--disable-valgrindtk \
+	--without-x \
+	--without-included-gettext \
+	--disable-tls
+
+define VALGRIND_EXTRA_INSTALL
 	mv $(TARGET_DIR)/usr/bin/valgrind $(TARGET_DIR)/usr/bin/valgrind.bin
 	cp package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/
 	cp package/valgrind/valgrind.sh $(TARGET_DIR)/usr/bin/valgrind
 	chmod a+x $(TARGET_DIR)/usr/bin/valgrind
-	rm -rf $(TARGET_DIR)/usr/share/doc/valgrind
-	touch -c $@
+endef
 
-valgrind: $(TARGET_DIR)/usr/bin/valgrind
+VALGRIND_POST_TARGET_INSTALL_HOOK += VALGRIND_EXTRA_INSTALL
 
-valgrind-source: $(DL_DIR)/$(VALGRIND_SOURCE)
+define VALGRIND_EXTRA_UNINSTALL
+	rm -f $(TARGET_DIR)/usr/bin/valgrind.bin
+	rm -f $(TARGET_DIR)/usr/bin/valgrind/valgrind.sh
+	rm -f $(TARGET_DIR)/usr/lib/valgrind/uclibc.supp
+endef
 
-valgrind-clean:
-	-$(MAKE) -C $(VALGRIND_DIR) clean
-	-rm -f $(TARGET_DIR)/usr/bin/valgrind*
-	rm -rf $(TARGET_DIR)/usr/lib/valgrind
+VALGRIND_POST_UNINSTALL_TARGET_HOOKS += VALGRIND_EXTRA_UNINSTALL
 
-valgrind-dirclean:
-	rm -rf $(VALGRIND_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_VALGRIND),y)
-TARGETS+=valgrind
-endif
+$(eval $(call AUTOTARGETS,package,valgrind))

deleted file mode 100644
index 9ef5708..0000000
@@ -1,27 +0,0 @@
-[PATCH] valgrind: don't enable largefile support unconditionally on uClibc
-
-uClibc can be compiled without largefile support (and errors out if
-_FILE_OFFSET_BITS is set to 64), so don't define it if that combination
-is detected.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- coregrind/m_ume.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: valgrind-3.2.3/coregrind/m_ume.c
-===================================================================
---- valgrind-3.2.3.orig/coregrind/m_ume.c
-+++ valgrind-3.2.3/coregrind/m_ume.c
-@@ -31,7 +31,11 @@
- 
- 
- #define _GNU_SOURCE
-+#include <features.h>
-+/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
- #define _FILE_OFFSET_BITS 64
-+#endif
- 
- // It seems that on SuSE 9.1 (x86) something in <fcntl.h> messes up stuff
- // acquired indirectly from vki-x86-linux.h.  Therefore our headers must be

index ef36023..29d0691 100644
@@ -4,10 +4,15 @@
 #
 #############################################################
 
-VALGRIND_VERSION = 3.2.3
+VALGRIND_VERSION = 3.5.0
 VALGRIND_SITE = http://valgrind.org/downloads/
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
 
+VALGRIND_CONF_ENV = \
+	ac_cv_file__proc_self_fd=yes \
+	ac_cv_file__proc_self_exe=yes \
+	ac_cv_file__proc_self_maps=yes
+
 VALGRIND_CONF_OPT = \
 	--without-uiout \
 	--disable-valgrindmi \

205 lines not on this page · raw message

index 2121f4b..0402f9a 100644
@@ -24,6 +24,8 @@ endif
 
 WEBKIT_CONF_OPT += --disable-video
 
+WEBKIT_CONF_ENV = icu_config=$(STAGING_DIR)/usr/bin/icu-config
+
 define WEBKIT_AUTOGEN_PATCH
 $(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
 $(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh

index 0402f9a..a3ba690 100644
@@ -8,7 +8,6 @@ WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2
 WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/
 
 WEBKIT_INSTALL_STAGING = YES
-WEBKIT_INSTALL_TARGET = YES
 WEBKIT_LIBTOOL_PATCH = NO
 
 WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt	\

index 582d435..5b951a6 100644
@@ -225,6 +225,7 @@ endmenu
 menu "Crypto"
 source "package/beecrypt/Config.in"
 source "package/libgcrypt/Config.in"
+source "package/libgnutls/Config.in"
 source "package/libgpg-error/Config.in"
 source "package/openssl/Config.in"
 endmenu

new file mode 100644
index 0000000..b323912
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBGNUTLS
+	bool "libgnutls"
+        select BR2_PACKAGE_LIBGCRYPT
+	help
+          GNUTLS implements the TLS/SSL (Transport Layer Security aka
+          Secure Sockets Layer) protocol. Gnutls is a GNU project.
+          More up to date information can be found at
+
+          http://www.gnu.org/software/gnutls/

new file mode 100644
index 0000000..34f6384
@@ -0,0 +1,18 @@
+#############################################################
+#
+# libgnutls
+#
+#############################################################
+
+LIBGNUTLS_VERSION = 2.8.6
+LIBGNUTLS_SOURCE = gnutls-$(LIBGNUTLS_VERSION).tar.bz2
+LIBGNUTLS_SITE = http://ftp.gnu.org/pub/gnu/gnutls
+LIBGNUTLS_LIBTOOL_PATCH = NO
+LIBGNUTLS_INSTALL_STAGING = YES
+
+LIBGNUTLS_DEPENDENCIES = libgcrypt
+
+LIBGNUTLS_CONF_OPT = \
+	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
+
+$(eval $(call AUTOTARGETS,package,libgnutls))

index 6bccd11..596a638 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
+        select BR2_PACKAGE_LIBGNUTLS
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
 	  and the GLib main loop, to integrate well with GNOME

index 3829a81..2f16408 100644
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-LIBSOUP_MAJOR_VERSION:=2.26
-LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
-LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
-LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
+LIBSOUP_MAJOR_VERSION = 2.28
+LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).2
+LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2
+LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
 LIBSOUP_AUTORECONF = YES
 LIBSOUP_INSTALL_STAGING = YES
 LIBSOUP_INSTALL_TARGET = YES

@@ -23,9 +23,8 @@ LIBSOUP_CONF_OPT = \
 	--enable-static		\
 	--disable-explicit-deps \
 	--disable-glibtest	\
-	--without-gnome		\
-	--disable-gtk-doc
+	--without-gnome
 
-LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2 libgnutls libgcrypt
 
 $(eval $(call AUTOTARGETS,package,libsoup))

index 2f16408..1cd9b9b 100644
@@ -10,7 +10,6 @@ LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
 LIBSOUP_AUTORECONF = YES
 LIBSOUP_INSTALL_STAGING = YES
-LIBSOUP_INSTALL_TARGET = YES
 
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
 

index 5b951a6..dc90aa9 100644
@@ -256,6 +256,7 @@ source "package/gtk2-themes/Config.in"
 source "package/jpeg/Config.in"
 source "package/libart/Config.in"
 source "package/libdrm/Config.in"
+source "package/libgail/Config.in"
 source "package/libglade/Config.in"
 source "package/libgtk12/Config.in"
 source "package/libgtk2/Config.in"

new file mode 100644
index 0000000..533fb9c
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBGAIL
+	bool "libgail"
+	select BR2_PACKAGE_GTK2
+	help
+	  GAIL provides accessibility support for gtk+ and
+          libgnomecanvas by implementing AtkObjects for widgets in
+          gtk+ and libgnomecanvas. The GAIL library is a GTK+ module.
+          For example, if the module is loaded in a program which
+          calls gtk_widget_get_accessible() for a GtkEntry an instance
+          of GailEntry is returned. This module is normally used with
+          the atk-bridge GTK+ module from at-spi to allow an assistive
+          technology, e.g a screenreader, to query or drive the
+          program.
+
+          http://developer.gnome.org/projects/gap

42 lines not on this page · raw message

new file mode 100644
index 0000000..58ff93d
@@ -0,0 +1,28 @@
+#############################################################
+#
+# libgail
+#
+#############################################################
+LIBGAIL_VERSION_MAJOR = 1.22
+LIBGAIL_VERSION_MINOR = 3
+LIBGAIL_VERSION = $(LIBGAIL_VERSION_MAJOR).$(LIBGAIL_VERSION_MINOR)
+LIBGAIL_SOURCE = gail-$(LIBGAIL_VERSION).tar.bz2
+LIBGAIL_SITE = http://ftp.gnome.org/pub/gnome/sources/gail/$(LIBGAIL_VERSION_MAJOR)
+
+LIBGAIL_AUTORECONF = YES
+LIBGAIL_LIBTOOL_PATCH = NO
+LIBGAIL_INSTALL_STAGING = YES
+LIBGAIL_INSTALL_TARGET = YES
+
+LIBGAIL_CONF_OPT = --enable-shared \
+		--enable-static
+
+ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+LIBGAIL_CONF_OPT += --disable-x
+endif
+
+LIBGAIL_DEPENDENCIES = libgtk2 pango
+
+HOST_LIBGAIL_DEPENDENCIES = host-pkg-config
+
+$(eval $(call AUTOTARGETS,package,libgail))

index 1e732d0..f041ce2 100644
@@ -133,6 +133,7 @@ HOST_LIBGTK2_CONF_OPT = \
 		--disable-glibtest \
 		--without-libtiff \
 		--without-libjpeg \
+		--with-included-loaders=png \
 		--with-gdktarget=none \
 		--disable-cups \
 		--disable-debug

index f122491..a3cb446 100644
@@ -3,8 +3,8 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.22
-LIBGLIB2_VERSION_MINOR = 5
+LIBGLIB2_VERSION_MAJOR = 2.24
+LIBGLIB2_VERSION_MINOR = 0
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)

index e357f49..6f3a3b6 100644
@@ -3,11 +3,13 @@
 # atk
 #
 #############################################################
-ATK_VERSION = 1.22.0
+ATK_VERSION_MAJOR = 1.30
+ATK_VERSION = $(ATK_VERSION_MAJOR).0
 ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
-ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/
+ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
 ATK_INSTALL_STAGING = YES
 ATK_INSTALL_TARGET = YES
+ATK_LIBTOOL_PATCH = NO
 ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \

index 81233a5..1c0cc1d 100644
@@ -27,4 +27,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
 AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"

index e413287..7bd1908 100644
@@ -25,6 +25,6 @@ $(eval $(call AUTOTARGETS,package,automake))
 $(eval $(call AUTOTARGETS,package,automake,host))
 
 # variables used by other packages
-AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
+AUTOMAKE = $(HOST_DIR)/usr/bin/automake
 ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
 ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)

index 38e163e..7721676 100644
@@ -3,9 +3,12 @@
 # pango
 #
 #############################################################
-PANGO_VERSION = 1.20.5
+PANGO_VERSION_MAJOR = 1.28
+PANGO_VERSION_MINOR = 0
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).$(PANGO_VERSION_MINOR)
+
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2
-PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/1.20
+PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_AUTORECONF = YES
 PANGO_INSTALL_STAGING = YES
 PANGO_INSTALL_TARGET = YES

index 10c8b38..5bd5506 100644
@@ -11,6 +11,7 @@ config BR2_PACKAGE_WEBKIT
 	select BR2_PACKAGE_ENCHANT
 	select BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_CAIRO_PNG
+        select BR2_PACKAGE_LIBGAIL
 	help
 	  WebKit is an open source, standards compliant web browser engine.
 

new file mode 100644
index 0000000..6ba69f8
@@ -0,0 +1,25 @@
+From dff75872a4bf38d781ee606df7aa21f5e5cbafaf Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Sun, 28 Mar 2010 23:35:29 +0200
+Subject: [PATCH] Fix automake failure on cxx check
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.ac |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d3a7ea..6ddf18a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,7 @@ esac
+ WEBKIT_INIT
+ AC_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
++AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ # use dolt to speedup the build
+ DOLT
+-- 
+1.7.0.2
+

144 lines not on this page · raw message

index a3ba690..1ed9c82 100644
@@ -3,15 +3,17 @@
 # webkit
 #
 #############################################################
-WEBKIT_VERSION = r44552
-WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2
-WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/
-
+WEBKIT_VERSION = 1.2.0
+WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.gz
+WEBKIT_SITE = http://www.webkitgtk.org
 WEBKIT_INSTALL_STAGING = YES
+WEBKIT_AUTORECONF = YES
 WEBKIT_LIBTOOL_PATCH = NO
 
 WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt	\
-			libgtk2 sqlite enchant libsoup
+			libgtk2 sqlite enchant libsoup libgail
+
+WEBKIT_AUTORECONF_OPT = -Iautotools
 
 ifeq ($(BR2_PACKAGE_WEBKIT_X11),y)
 WEBKIT_CONF_OPT = --with-target=x11

@@ -25,15 +27,4 @@ WEBKIT_CONF_OPT += --disable-video
 
 WEBKIT_CONF_ENV = icu_config=$(STAGING_DIR)/usr/bin/icu-config
 
-define WEBKIT_AUTOGEN_PATCH
-$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
-$(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh
-$(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh
-cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/
-# Don't run the configure step yet
-cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
-endef
-
-WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH
-
 $(eval $(call AUTOTARGETS,package,webkit))