* [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages
@ 2010-02-07 18:07 llandwerlin at gmail.com
2010-02-07 18:07 ` [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com
` (13 more replies)
0 siblings, 14 replies; 28+ messages in thread
From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw)
To: buildroot
This series of patchs is probably for the next buildroot release (post
2010.02), some of these patchs depends on previous patchs I submitted
here :
http://lists.busybox.net/pipermail/buildroot/2010-February/031868.html
It's available from :
git://git.potipota.net/buildroot various-bumps
Regards,
--
Lionel Landwerlin
^ permalink raw reply [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-09 11:31 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 02/14] package: added pre-configure hooks llandwerlin at gmail.com ` (12 subsequent siblings) 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/Makefile.autotools.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 96ea453..89b2382 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -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" \ -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages 2010-02-07 18:07 ` [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com @ 2010-02-09 11:31 ` Thomas Petazzoni 0 siblings, 0 replies; 28+ messages in thread From: Thomas Petazzoni @ 2010-02-09 11:31 UTC (permalink / raw) To: buildroot On Sun, 7 Feb 2010 19:07:43 +0100 llandwerlin at gmail.com wrote: > From: Lionel Landwerlin <llandwerlin@gmail.com> > > Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/Makefile.autotools.in | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/package/Makefile.autotools.in > b/package/Makefile.autotools.in index 96ea453..89b2382 100644 > --- a/package/Makefile.autotools.in > +++ b/package/Makefile.autotools.in > @@ -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" \ -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 02/14] package: added pre-configure hooks 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-09 11:32 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 03/14] directfb: bump to 1.4.3 llandwerlin at gmail.com ` (11 subsequent siblings) 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/Makefile.package.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index d02706d..79d3a13 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -141,6 +141,7 @@ $(BUILD_DIR)/%/.stamp_patched: # Configure $(BUILD_DIR)/%/.stamp_configured: @$(call MESSAGE,"Configuring") + $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ @@ -281,6 +282,7 @@ $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned # new-style hooks $(2)_POST_EXTRACT_HOOKS ?= $(2)_POST_PATCH_HOOKS ?= +$(2)_PRE_CONFIGURE_HOOKS ?= $(2)_POST_CONFIGURE_HOOKS ?= $(2)_POST_BUILD_HOOKS ?= $(2)_POST_INSTALL_HOOKS ?= -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 02/14] package: added pre-configure hooks 2010-02-07 18:07 ` [Buildroot] [PATCH 02/14] package: added pre-configure hooks llandwerlin at gmail.com @ 2010-02-09 11:32 ` Thomas Petazzoni 0 siblings, 0 replies; 28+ messages in thread From: Thomas Petazzoni @ 2010-02-09 11:32 UTC (permalink / raw) To: buildroot Hi Lionel, Aren't POST_PATCH hooks sufficient ? Thomas On Sun, 7 Feb 2010 19:07:44 +0100 llandwerlin at gmail.com wrote: > From: Lionel Landwerlin <llandwerlin@gmail.com> > > Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> > --- > package/Makefile.package.in | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/package/Makefile.package.in b/package/Makefile.package.in > index d02706d..79d3a13 100644 > --- a/package/Makefile.package.in > +++ b/package/Makefile.package.in > @@ -141,6 +141,7 @@ $(BUILD_DIR)/%/.stamp_patched: > # Configure > $(BUILD_DIR)/%/.stamp_configured: > @$(call MESSAGE,"Configuring") > + $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call > $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) > $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call > $(hook))$(sep)) $(Q)touch $@ > @@ -281,6 +282,7 @@ $(2)_TARGET_DIRCLEAN = > $$($(2)_DIR)/.stamp_dircleaned # new-style hooks > $(2)_POST_EXTRACT_HOOKS ?= > $(2)_POST_PATCH_HOOKS ?= > +$(2)_PRE_CONFIGURE_HOOKS ?= > $(2)_POST_CONFIGURE_HOOKS ?= > $(2)_POST_BUILD_HOOKS ?= > $(2)_POST_INSTALL_HOOKS ?= -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 03/14] directfb: bump to 1.4.3 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 02/14] package: added pre-configure hooks llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-08 13:47 ` Paulius Zaleckas 2010-02-07 18:07 ` [Buildroot] [PATCH 04/14] package: added lirc llandwerlin at gmail.com ` (10 subsequent siblings) 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- ...rectfb-gfxcard-fix-build-error-with-debug.patch | 33 -------------------- package/directfb/directfb.mk | 2 +- 2 files changed, 1 insertions(+), 34 deletions(-) delete mode 100644 package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch diff --git a/package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch b/package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch deleted file mode 100644 index 2c1d459..0000000 --- a/package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fab69ff2e063f0b6a4b13139f100ff01aa4cae84 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <jacmet@sunsite.dk> -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 <jacmet@sunsite.dk> ---- - 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 - diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index a4ee3bc..2f095ee 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -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 -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 03/14] directfb: bump to 1.4.3 2010-02-07 18:07 ` [Buildroot] [PATCH 03/14] directfb: bump to 1.4.3 llandwerlin at gmail.com @ 2010-02-08 13:47 ` Paulius Zaleckas 0 siblings, 0 replies; 28+ messages in thread From: Paulius Zaleckas @ 2010-02-08 13:47 UTC (permalink / raw) To: buildroot On 02/07/2010 08:07 PM, llandwerlin at gmail.com wrote: > From: Lionel Landwerlin<llandwerlin@gmail.com> > > Signed-off-by: Lionel Landwerlin<llandwerlin@gmail.com> Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 04/14] package: added lirc 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (2 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 03/14] directfb: bump to 1.4.3 llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-09 11:37 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 05/14] directfb: added support for lirc llandwerlin at gmail.com ` (9 subsequent siblings) 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/Config.in | 1 + package/lirc/Config.in | 37 +++++++++++++++++++++++++++++++++++++ package/lirc/S70lircd | 24 ++++++++++++++++++++++++ package/lirc/lirc.mk | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 0 deletions(-) create mode 100644 package/lirc/Config.in create mode 100644 package/lirc/S70lircd create mode 100644 package/lirc/lirc.mk diff --git a/package/Config.in b/package/Config.in index e673631..bf0767a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -252,6 +252,7 @@ source "package/iostat/Config.in" source "package/libaio/Config.in" source "package/libraw1394/Config.in" source "package/libusb/Config.in" +source "package/lirc/Config.in" source "package/lm-sensors/Config.in" source "package/lvm2/Config.in" source "package/mdadm/Config.in" diff --git a/package/lirc/Config.in b/package/lirc/Config.in new file mode 100644 index 0000000..112d00d --- /dev/null +++ b/package/lirc/Config.in @@ -0,0 +1,37 @@ +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_ALL + + help + Select the drivers to build in lirc. There is 3 choices, all + of them, one of them, none of them. By selecting 'one of + them', you will have to select which one in the next item. + + 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 + diff --git a/package/lirc/S70lircd b/package/lirc/S70lircd new file mode 100644 index 0000000..770bef5 --- /dev/null +++ b/package/lirc/S70lircd @@ -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 diff --git a/package/lirc/lirc.mk b/package/lirc/lirc.mk new file mode 100644 index 0000000..d19f5cd --- /dev/null +++ b/package/lirc/lirc.mk @@ -0,0 +1,39 @@ +############################################################# +# +# 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_INSTALL_TARGET = 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)) -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 04/14] package: added lirc 2010-02-07 18:07 ` [Buildroot] [PATCH 04/14] package: added lirc llandwerlin at gmail.com @ 2010-02-09 11:37 ` Thomas Petazzoni 2010-02-09 11:54 ` Lionel Landwerlin 0 siblings, 1 reply; 28+ messages in thread From: Thomas Petazzoni @ 2010-02-09 11:37 UTC (permalink / raw) To: buildroot On Sun, 7 Feb 2010 19:07:46 +0100 llandwerlin at gmail.com wrote: > +if BR2_PACKAGE_LIRC > + > +choice > + prompt "lirc drivers" > + default BR2_PACKAGE_LIRC_ALL > + > + help > + Select the drivers to build in lirc. There is 3 choices, > all > + of them, one of them, none of them. By selecting 'one of > + them', you will have to select which one in the next item. I'm not sure the help text actually matches what has been implemented : > + > + 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 > + > --- /dev/null > +++ b/package/lirc/lirc.mk > @@ -0,0 +1,39 @@ > +############################################################# > +# > +# 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 What is the policy regarding installation to the $(STAGING_DIR) directory for applications ? Some of them say FOO_INSTALL_STAGING=NO, some others FOO_INSTALL_STAGING=YES. In my opinion, installation into the $(STAGING_DIR) should be mandatory, since we want to keep unstripped version of the binaries + documentation, etc. > +LIRC_INSTALL_TARGET = YES This is the default behaviour so it can be removed. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 04/14] package: added lirc 2010-02-09 11:37 ` Thomas Petazzoni @ 2010-02-09 11:54 ` Lionel Landwerlin 2010-02-09 12:37 ` Thomas Petazzoni 0 siblings, 1 reply; 28+ messages in thread From: Lionel Landwerlin @ 2010-02-09 11:54 UTC (permalink / raw) To: buildroot On Tue, Feb 9, 2010 at 12:37 PM, Thomas Petazzoni < thomas.petazzoni@free-electrons.com> wrote: > On Sun, 7 Feb 2010 19:07:46 +0100 > llandwerlin at gmail.com wrote: > > > +if BR2_PACKAGE_LIRC > > + > > +choice > > + prompt "lirc drivers" > > + default BR2_PACKAGE_LIRC_ALL > > + > > + help > > + Select the drivers to build in lirc. There is 3 choices, > > all > > + of them, one of them, none of them. By selecting 'one of > > + them', you will have to select which one in the next item. > > I'm not sure the help text actually matches what has been implemented : > Oops... a residual of the first try... > > + > > + 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 > > + > > > --- /dev/null > > +++ b/package/lirc/lirc.mk > > @@ -0,0 +1,39 @@ > > +############################################################# > > +# > > +# 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 > > What is the policy regarding installation to the $(STAGING_DIR) > directory for applications ? Some of them say FOO_INSTALL_STAGING=NO, > some others FOO_INSTALL_STAGING=YES. > I usually install libraries in staging, not binaries. Why do you need unstripped binaries ? Are you doing remote debug using the staging directory ? > > In my opinion, installation into the $(STAGING_DIR) should be > mandatory, since we want to keep unstripped version of the binaries + > documentation, etc. > > > +LIRC_INSTALL_TARGET = YES > > This is the default behaviour so it can be removed. > Will do ! Thx for reviewing. > > Thomas > -- > Thomas Petazzoni, Free Electrons > Kernel, drivers, real-time and embedded Linux > development, consulting, training and support. > http://free-electrons.com > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100209/41a52985/attachment.htm> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 04/14] package: added lirc 2010-02-09 11:54 ` Lionel Landwerlin @ 2010-02-09 12:37 ` Thomas Petazzoni 2010-02-09 12:53 ` Lionel Landwerlin 0 siblings, 1 reply; 28+ messages in thread From: Thomas Petazzoni @ 2010-02-09 12:37 UTC (permalink / raw) To: buildroot On Tue, 9 Feb 2010 12:54:45 +0100 Lionel Landwerlin <llandwerlin@gmail.com> wrote: > > What is the policy regarding installation to the $(STAGING_DIR) > > directory for applications ? Some of them say > > FOO_INSTALL_STAGING=NO, some others FOO_INSTALL_STAGING=YES. > > I usually install libraries in staging, not binaries. So in this case, lirc contains only applications, so it shouldn't be installed to STAGING, no ? > Why do you need unstripped binaries ? Are you doing remote debug > using the staging directory ? Yes, this is also what the staging directory is for. In the future, we will try if compiling by default all libraries/applications with debugging symbols in the $(STAGING_DIR) is doable. Thanks! Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 04/14] package: added lirc 2010-02-09 12:37 ` Thomas Petazzoni @ 2010-02-09 12:53 ` Lionel Landwerlin 0 siblings, 0 replies; 28+ messages in thread From: Lionel Landwerlin @ 2010-02-09 12:53 UTC (permalink / raw) To: buildroot On Tue, Feb 9, 2010 at 1:37 PM, Thomas Petazzoni < thomas.petazzoni@free-electrons.com> wrote: > On Tue, 9 Feb 2010 12:54:45 +0100 > Lionel Landwerlin <llandwerlin@gmail.com> wrote: > > > > What is the policy regarding installation to the $(STAGING_DIR) > > > directory for applications ? Some of them say > > > FOO_INSTALL_STAGING=NO, some others FOO_INSTALL_STAGING=YES. > > > > I usually install libraries in staging, not binaries. > > So in this case, lirc contains only applications, so it shouldn't be > installed to STAGING, no ? > There is liblirc_client.so in /usr/lib > > > Why do you need unstripped binaries ? Are you doing remote debug > > using the staging directory ? > > Yes, this is also what the staging directory is for. In the future, we > will try if compiling by default all libraries/applications with > debugging symbols in the $(STAGING_DIR) is doable. > > Thanks! > > Thomas > -- > Thomas Petazzoni, Free Electrons > Kernel, drivers, real-time and embedded Linux > development, consulting, training and support. > http://free-electrons.com > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100209/1b166dc9/attachment.htm> ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 05/14] directfb: added support for lirc 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (3 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 04/14] package: added lirc llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-09 12:38 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 06/14] pixman: bump to 0.16.4 llandwerlin at gmail.com ` (8 subsequent siblings) 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/directfb/Config.in | 5 +++++ package/directfb/directfb.mk | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index 7c41cdf..6c78597 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -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 diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 2f095ee..a065a22 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -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 -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 05/14] directfb: added support for lirc 2010-02-07 18:07 ` [Buildroot] [PATCH 05/14] directfb: added support for lirc llandwerlin at gmail.com @ 2010-02-09 12:38 ` Thomas Petazzoni 0 siblings, 0 replies; 28+ messages in thread From: Thomas Petazzoni @ 2010-02-09 12:38 UTC (permalink / raw) To: buildroot On Sun, 7 Feb 2010 19:07:47 +0100 llandwerlin at gmail.com wrote: > From: Lionel Landwerlin <llandwerlin@gmail.com> > > Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/directfb/Config.in | 5 +++++ > package/directfb/directfb.mk | 4 ++++ > 2 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/package/directfb/Config.in b/package/directfb/Config.in > index 7c41cdf..6c78597 100644 > --- a/package/directfb/Config.in > +++ b/package/directfb/Config.in > @@ -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 > diff --git a/package/directfb/directfb.mk > b/package/directfb/directfb.mk index 2f095ee..a065a22 100644 > --- a/package/directfb/directfb.mk > +++ b/package/directfb/directfb.mk > @@ -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 -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 06/14] pixman: bump to 0.16.4 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (4 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 05/14] directfb: added support for lirc llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 07/14] cairo: Bump to 1.8.8 llandwerlin at gmail.com ` (7 subsequent siblings) 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/pixman/pixman-0.10.0-no-tests.patch | 11 ----------- package/pixman/pixman.mk | 6 ++++-- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch deleted file mode 100644 index fbd0d26..0000000 --- a/package/pixman/pixman-0.10.0-no-tests.patch +++ /dev/null @@ -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 diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 9507bbf..95cd28d 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -3,11 +3,13 @@ # pixman # ################################################################################ -PIXMAN_VERSION = 0.10.0 +PIXMAN_VERSION = 0.16.4 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)) -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 07/14] cairo: Bump to 1.8.8 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (5 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 06/14] pixman: bump to 0.16.4 llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 08/14] systat: bump to 9.0.6 llandwerlin at gmail.com ` (6 subsequent siblings) 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/cairo/cairo-1.6.4-directfb-all.patch | 1012 -------------------------- package/cairo/cairo-1.8.8-directfb.patch | 39 + package/cairo/cairo.mk | 4 +- 3 files changed, 41 insertions(+), 1014 deletions(-) delete mode 100644 package/cairo/cairo-1.6.4-directfb-all.patch create mode 100644 package/cairo/cairo-1.8.8-directfb.patch diff --git a/package/cairo/cairo-1.6.4-directfb-all.patch b/package/cairo/cairo-1.6.4-directfb-all.patch deleted file mode 100644 index c71031f..0000000 --- a/package/cairo/cairo-1.6.4-directfb-all.patch +++ /dev/null @@ -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 <mike.emmel@gmail.com> - * Claudio Ciccani <klan@users.sf.net> - */ -- -+ -+//#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, ®ion, 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, ®ion); -+ 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; diff --git a/package/cairo/cairo-1.8.8-directfb.patch b/package/cairo/cairo-1.8.8-directfb.patch new file mode 100644 index 0000000..12a51ec --- /dev/null +++ b/package/cairo/cairo-1.8.8-directfb.patch @@ -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; + } diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 0ca99aa..1ece38a 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -3,10 +3,10 @@ # cairo # ############################################################# -CAIRO_VERSION = 1.6.4 +CAIRO_VERSION = 1.8.8 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 -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 08/14] systat: bump to 9.0.6 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (6 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 07/14] cairo: Bump to 1.8.8 llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 09/14] automake: bump to 1.11 llandwerlin at gmail.com ` (5 subsequent siblings) 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/sysstat/sysstat.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 324580e..44bf600 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -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 -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 09/14] automake: bump to 1.11 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (7 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 08/14] systat: bump to 9.0.6 llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 10/14] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com ` (4 subsequent siblings) 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/automake/automake.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 65db386..27208bc 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -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 -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 10/14] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (8 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 09/14] automake: bump to 1.11 llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 11/14] target: Added ttyAS[0-3] devices llandwerlin at gmail.com ` (3 subsequent siblings) 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/libtool/libtool.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index bbabbb0..4278029 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -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 -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 11/14] target: Added ttyAS[0-3] devices 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (9 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 10/14] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 12/14] openssh: added empty login option llandwerlin at gmail.com ` (2 subsequent siblings) 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Some set top boxes use /dev/ttyAS[0-3] devices to output traces. Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- target/generic/Config.in | 16 ++++++++++++++++ target/generic/device_table.txt | 9 +++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/target/generic/Config.in b/target/generic/Config.in index 54ff1d6..c995341 100644 --- a/target/generic/Config.in +++ b/target/generic/Config.in @@ -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" diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt index c054000..bdaec77 100644 --- a/target/generic/device_table.txt +++ b/target/generic/device_table.txt @@ -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 - - - - - -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 12/14] openssh: added empty login option 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (10 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 11/14] target: Added ttyAS[0-3] devices llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 14/14] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com 13 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- package/openssh/Config.in | 4 ++++ package/openssh/openssh.mk | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index 0c3d993..fb5daf8 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -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 diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 9a06d12..b499075 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -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): -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 13/14] target: added BR2_KARCH option 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (11 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 12/14] openssh: added empty login option llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 18:46 ` Bernhard Reutner-Fischer 2010-02-07 18:07 ` [Buildroot] [PATCH 14/14] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> For packages building kernel modules (ie linux-fusion), it is required to give the ARCH=some_arch argument to make so the kernel's makefile are aware of the target architecture. We didn't had the value to fill the ARCH variable. BR2_KARCH variable is computed using the BR2_ARCH variable. Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- target/Config.in.arch | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/target/Config.in.arch b/target/Config.in.arch index 1e3c78c..91d827f 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -140,7 +140,7 @@ choice default BR2_mips_1 if BR2_mipsel help Specific CPU variant to use - + 64bit cabable: 3, 4, 64, 64r2 non-64bit capable: 1, 2, 32, 32r2 @@ -539,6 +539,24 @@ config BR2_ARCH default "x86_64" if BR2_x86_64_barcelona default "xtensa" if BR2_xtensa +config BR2_KARCH + string + default "alpha" if BR2_alpha + default "arm" if BR2_arm || BR2_armeb + default "avr32" if BR2_avr32 + default "cris" if BR2_cris + default "i386" if BR2_x86_i386 || BR2_x86_i486 || BR2_x86_i586 || BR2_x86_pentium_mmx || BR2_x86_geode || BR2_x86_i686 || BR2_x86_pentium2 || BR2_x86_pentium3 || BR2_x86_pentium4 || BR2_x86_pentium_m || BR2_x86_pentiumpro || BR2_x86_nocona || BR2_x86_core2 + default "ia64" if BR2_ia64 + default "m68k" if BR2_m68k + default "mips" if BR2_mips || BR2_mipsel + default "nios2" if BR2_nios2 + default "powerpc" if BR2_powerpc + default "sh" if BR2_sh2a_nofpueb || BR2_sh2eb || BR2_sh3 || BR2_sh3eb || BR2_sh4 || BR2_sh4eb + default "sh64" if BR2_sh64 + default "sparc" if BR2_sparc + default "sparc64" if BR2_sparc64 + default "x86_64" if BR2_x86_64 || BR2_x86_64_generic || BR2_x86_64_nocona || BR2_x86_64_core2 || BR2_x86_64_opteron || BR2_x86_64_opteron_sse3 || BR2_x86_64_barcelona + default "xtensa" if BR2_xtensa config BR2_ENDIAN string -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 13/14] target: added BR2_KARCH option 2010-02-07 18:07 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option llandwerlin at gmail.com @ 2010-02-07 18:46 ` Bernhard Reutner-Fischer 2010-02-07 21:18 ` Lionel Landwerlin ` (2 more replies) 0 siblings, 3 replies; 28+ messages in thread From: Bernhard Reutner-Fischer @ 2010-02-07 18:46 UTC (permalink / raw) To: buildroot On Sun, Feb 07, 2010 at 07:07:55PM +0100, llandwerlin at gmail.com wrote: >From: Lionel Landwerlin <llandwerlin@gmail.com> > >For packages building kernel modules (ie linux-fusion), it is required >to give the ARCH=some_arch argument to make so the kernel's makefile >are aware of the target architecture. We didn't had the value to fill >the ARCH variable. BR2_KARCH variable is computed using the BR2_ARCH >variable. There is/was KERNEL_ARCH in there since ages. ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 13/14] target: added BR2_KARCH option 2010-02-07 18:46 ` Bernhard Reutner-Fischer @ 2010-02-07 21:18 ` Lionel Landwerlin 2010-02-07 23:52 ` [Buildroot] [PATCH] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com 2010-02-07 23:55 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option Lionel Landwerlin 2 siblings, 0 replies; 28+ messages in thread From: Lionel Landwerlin @ 2010-02-07 21:18 UTC (permalink / raw) To: buildroot Le dimanche 07 f?vrier 2010 ? 19:46 +0100, Bernhard Reutner-Fischer a ?crit : > On Sun, Feb 07, 2010 at 07:07:55PM +0100, llandwerlin at gmail.com wrote: > >From: Lionel Landwerlin <llandwerlin@gmail.com> > > > >For packages building kernel modules (ie linux-fusion), it is required > >to give the ARCH=some_arch argument to make so the kernel's makefile > >are aware of the target architecture. We didn't had the value to fill > >the ARCH variable. BR2_KARCH variable is computed using the BR2_ARCH > >variable. > > There is/was KERNEL_ARCH in there since ages. Oops... Didn't find it in config file... -- Lionel Landwerlin ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH] linux-fusion: bump to 8.1.1 2010-02-07 18:46 ` Bernhard Reutner-Fischer 2010-02-07 21:18 ` Lionel Landwerlin @ 2010-02-07 23:52 ` llandwerlin at gmail.com 2010-02-07 23:55 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option Lionel Landwerlin 2 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 23:52 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- .../linux-fusion-8.0.2-cross-compile.patch | 100 -------------------- package/linux-fusion/linux-fusion.mk | 70 +++++--------- 2 files changed, 24 insertions(+), 146 deletions(-) delete mode 100644 package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch diff --git a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch b/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch deleted file mode 100644 index 443ddf3..0000000 --- a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch +++ /dev/null @@ -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: diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 058e965..abce465 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -3,77 +3,55 @@ # linux-fusion # ############################################################# -LINUX_FUSION_VERSION = 8.0.2 +LINUX_FUSION_VERSION = 8.1.1 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz -LINUX_FUSION_SITE = http://www.directfb.org/downloads/Core/ -LINUX_FUSION_AUTORECONF = NO +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. # Retrieve REAL kernel version from file. -LINUX_FOR_FUSION=`cat $(BUILD_DIR)/.linux-version` +LINUX_FOR_FUSION=$(LINUX_VERSION) +# `cat $(BUILD_DIR)/.linux-version` +LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d -LINUX_FUSION_DIR:=$(BUILD_DIR)/linux-fusion-$(LINUX_FUSION_VERSION) -LINUX_FUSION_ETC_DIR:=$(TARGET_DIR)/etc/udev/rules.d +LINUX_FUSION_CAT=$(ZCAT) -LINUX_FUSION_CAT:=$(ZCAT) - -LINUX_FUSION_MAKE_OPTS:= KERNEL_VERSION=$(LINUX_FOR_FUSION) +LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += SYSROOT=$(STAGING_DIR) -LINUX_FUSION_MAKE_OPTS += ARCH=$(BR2_ARCH) +LINUX_FUSION_MAKE_OPTS += ARCH=$(KERNEL_ARCH) LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS) LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += DESTDIR=$(BUILD_DIR)/root LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR) -#LINUX_FUSION_MAKE_OPTS += +#LINUX_FUSION_MAKE_OPTS += #LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION) -$(DL_DIR)/$(LINUX_FUSION_SOURCE): - $(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE)) - -$(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE) - $(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LINUX_FUSION_DIR) package/linux-fusion/ linux-fusion\*.patch - touch $@ -$(LINUX_FUSION_DIR)/.install: $(LINUX_FUSION_DIR)/.unpacked +define LINUX_FUSION_INSTALL_STAGING_CMDS mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_FOR_FUSION)/source/include/linux - echo "LINUX=$(LINUX26_VERSION)" $(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(LINUX_FUSION_MAKE_OPTS) \ - -C $(LINUX_FUSION_DIR) install - rm -f $(TARGET_DIR)/usr/include/linux/fusion.h + INSTALL_MOD_PATH=$(STAGING_DIR) \ + -C $(@D) headers_install +endef + +define LINUX_FUSION_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(LINUX_FUSION_MAKE_OPTS) \ + INSTALL_MOD_PATH=$(TARGET_DIR) \ + -C $(@D) install mkdir -p $(LINUX_FUSION_ETC_DIR) cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR) - touch $@ - - -linux-fusion-source: $(DL_DIR)/$(LINUX_FUSION_SOURCE) +endef -linux-fusion-unpacked: $(LINUX_FUSION_DIR)/.unpacked - -linux-fusion: linux26 $(LINUX_FUSION_DIR)/.install - -linux-fusion-clean: - -$(MAKE) -C $(LINUX_FUSION_DIR) clean - rm -f $(STAGING_DIR)/usr/include/linux/fusion.h - rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_FOR_FUSION)/drivers/char/fusion - rm -f $(LINUX_FUSION_DIR)/.install - -linux-fusion-dirclean: - rm -rf $(LINUX_FUSION_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_LINUX_FUSION),y) -TARGETS+=linux-fusion -endif +define LINUX_FUSION_UNINSTALL_TARGET_UDEV + rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules +endef +$(eval $(call GENTARGETS,package,linux-fusion)) -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 13/14] target: added BR2_KARCH option 2010-02-07 18:46 ` Bernhard Reutner-Fischer 2010-02-07 21:18 ` Lionel Landwerlin 2010-02-07 23:52 ` [Buildroot] [PATCH] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com @ 2010-02-07 23:55 ` Lionel Landwerlin 2 siblings, 0 replies; 28+ messages in thread From: Lionel Landwerlin @ 2010-02-07 23:55 UTC (permalink / raw) To: buildroot Le dimanche 07 f?vrier 2010 ? 19:46 +0100, Bernhard Reutner-Fischer a ?crit : > On Sun, Feb 07, 2010 at 07:07:55PM +0100, llandwerlin at gmail.com wrote: > >From: Lionel Landwerlin <llandwerlin@gmail.com> > > > >For packages building kernel modules (ie linux-fusion), it is required > >to give the ARCH=some_arch argument to make so the kernel's makefile > >are aware of the target architecture. We didn't had the value to fill > >the ARCH variable. BR2_KARCH variable is computed using the BR2_ARCH > >variable. > > There is/was KERNEL_ARCH in there since ages. Thx for pointed this, and let's forget this patch... linux-fusion bump patch updated. -- Lionel Landwerlin ^ permalink raw reply [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH 14/14] linux-fusion: bump to 8.1.1 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com ` (12 preceding siblings ...) 2010-02-07 18:07 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option llandwerlin at gmail.com @ 2010-02-07 18:07 ` llandwerlin at gmail.com 2010-02-07 23:53 ` [Buildroot] [PATCH] " llandwerlin at gmail.com 13 siblings, 1 reply; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 18:07 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- .../linux-fusion-8.0.2-cross-compile.patch | 100 -------------------- package/linux-fusion/linux-fusion.mk | 70 +++++--------- 2 files changed, 24 insertions(+), 146 deletions(-) delete mode 100644 package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch diff --git a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch b/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch deleted file mode 100644 index 443ddf3..0000000 --- a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch +++ /dev/null @@ -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: diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 058e965..34e572b 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -3,77 +3,55 @@ # linux-fusion # ############################################################# -LINUX_FUSION_VERSION = 8.0.2 +LINUX_FUSION_VERSION = 8.1.1 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz -LINUX_FUSION_SITE = http://www.directfb.org/downloads/Core/ -LINUX_FUSION_AUTORECONF = NO +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. # Retrieve REAL kernel version from file. -LINUX_FOR_FUSION=`cat $(BUILD_DIR)/.linux-version` +LINUX_FOR_FUSION=$(LINUX_VERSION) +# `cat $(BUILD_DIR)/.linux-version` +LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d -LINUX_FUSION_DIR:=$(BUILD_DIR)/linux-fusion-$(LINUX_FUSION_VERSION) -LINUX_FUSION_ETC_DIR:=$(TARGET_DIR)/etc/udev/rules.d +LINUX_FUSION_CAT=$(ZCAT) -LINUX_FUSION_CAT:=$(ZCAT) - -LINUX_FUSION_MAKE_OPTS:= KERNEL_VERSION=$(LINUX_FOR_FUSION) +LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += SYSROOT=$(STAGING_DIR) -LINUX_FUSION_MAKE_OPTS += ARCH=$(BR2_ARCH) +LINUX_FUSION_MAKE_OPTS += ARCH=$(BR2_KARCH) LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS) LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += DESTDIR=$(BUILD_DIR)/root LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR) -#LINUX_FUSION_MAKE_OPTS += +#LINUX_FUSION_MAKE_OPTS += #LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION) -$(DL_DIR)/$(LINUX_FUSION_SOURCE): - $(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE)) - -$(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE) - $(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LINUX_FUSION_DIR) package/linux-fusion/ linux-fusion\*.patch - touch $@ -$(LINUX_FUSION_DIR)/.install: $(LINUX_FUSION_DIR)/.unpacked +define LINUX_FUSION_INSTALL_STAGING_CMDS mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_FOR_FUSION)/source/include/linux - echo "LINUX=$(LINUX26_VERSION)" $(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(LINUX_FUSION_MAKE_OPTS) \ - -C $(LINUX_FUSION_DIR) install - rm -f $(TARGET_DIR)/usr/include/linux/fusion.h + INSTALL_MOD_PATH=$(STAGING_DIR) \ + -C $(@D) headers_install +endef + +define LINUX_FUSION_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(LINUX_FUSION_MAKE_OPTS) \ + INSTALL_MOD_PATH=$(TARGET_DIR) \ + -C $(@D) install mkdir -p $(LINUX_FUSION_ETC_DIR) cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR) - touch $@ - - -linux-fusion-source: $(DL_DIR)/$(LINUX_FUSION_SOURCE) +endef -linux-fusion-unpacked: $(LINUX_FUSION_DIR)/.unpacked - -linux-fusion: linux26 $(LINUX_FUSION_DIR)/.install - -linux-fusion-clean: - -$(MAKE) -C $(LINUX_FUSION_DIR) clean - rm -f $(STAGING_DIR)/usr/include/linux/fusion.h - rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_FOR_FUSION)/drivers/char/fusion - rm -f $(LINUX_FUSION_DIR)/.install - -linux-fusion-dirclean: - rm -rf $(LINUX_FUSION_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_LINUX_FUSION),y) -TARGETS+=linux-fusion -endif +define LINUX_FUSION_UNINSTALL_TARGET_UDEV + rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules +endef +$(eval $(call GENTARGETS,package,linux-fusion)) -- 1.6.6 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Buildroot] [PATCH] linux-fusion: bump to 8.1.1 2010-02-07 18:07 ` [Buildroot] [PATCH 14/14] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com @ 2010-02-07 23:53 ` llandwerlin at gmail.com 0 siblings, 0 replies; 28+ messages in thread From: llandwerlin at gmail.com @ 2010-02-07 23:53 UTC (permalink / raw) To: buildroot From: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> --- .../linux-fusion-8.0.2-cross-compile.patch | 100 -------------------- package/linux-fusion/linux-fusion.mk | 70 +++++--------- 2 files changed, 24 insertions(+), 146 deletions(-) delete mode 100644 package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch diff --git a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch b/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch deleted file mode 100644 index 443ddf3..0000000 --- a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch +++ /dev/null @@ -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: diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 058e965..abce465 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -3,77 +3,55 @@ # linux-fusion # ############################################################# -LINUX_FUSION_VERSION = 8.0.2 +LINUX_FUSION_VERSION = 8.1.1 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz -LINUX_FUSION_SITE = http://www.directfb.org/downloads/Core/ -LINUX_FUSION_AUTORECONF = NO +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. # Retrieve REAL kernel version from file. -LINUX_FOR_FUSION=`cat $(BUILD_DIR)/.linux-version` +LINUX_FOR_FUSION=$(LINUX_VERSION) +# `cat $(BUILD_DIR)/.linux-version` +LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d -LINUX_FUSION_DIR:=$(BUILD_DIR)/linux-fusion-$(LINUX_FUSION_VERSION) -LINUX_FUSION_ETC_DIR:=$(TARGET_DIR)/etc/udev/rules.d +LINUX_FUSION_CAT=$(ZCAT) -LINUX_FUSION_CAT:=$(ZCAT) - -LINUX_FUSION_MAKE_OPTS:= KERNEL_VERSION=$(LINUX_FOR_FUSION) +LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += SYSROOT=$(STAGING_DIR) -LINUX_FUSION_MAKE_OPTS += ARCH=$(BR2_ARCH) +LINUX_FUSION_MAKE_OPTS += ARCH=$(KERNEL_ARCH) LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS) LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION) LINUX_FUSION_MAKE_OPTS += DESTDIR=$(BUILD_DIR)/root LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR) -#LINUX_FUSION_MAKE_OPTS += +#LINUX_FUSION_MAKE_OPTS += #LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION) -$(DL_DIR)/$(LINUX_FUSION_SOURCE): - $(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE)) - -$(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE) - $(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LINUX_FUSION_DIR) package/linux-fusion/ linux-fusion\*.patch - touch $@ -$(LINUX_FUSION_DIR)/.install: $(LINUX_FUSION_DIR)/.unpacked +define LINUX_FUSION_INSTALL_STAGING_CMDS mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_FOR_FUSION)/source/include/linux - echo "LINUX=$(LINUX26_VERSION)" $(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(LINUX_FUSION_MAKE_OPTS) \ - -C $(LINUX_FUSION_DIR) install - rm -f $(TARGET_DIR)/usr/include/linux/fusion.h + INSTALL_MOD_PATH=$(STAGING_DIR) \ + -C $(@D) headers_install +endef + +define LINUX_FUSION_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(LINUX_FUSION_MAKE_OPTS) \ + INSTALL_MOD_PATH=$(TARGET_DIR) \ + -C $(@D) install mkdir -p $(LINUX_FUSION_ETC_DIR) cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR) - touch $@ - - -linux-fusion-source: $(DL_DIR)/$(LINUX_FUSION_SOURCE) +endef -linux-fusion-unpacked: $(LINUX_FUSION_DIR)/.unpacked - -linux-fusion: linux26 $(LINUX_FUSION_DIR)/.install - -linux-fusion-clean: - -$(MAKE) -C $(LINUX_FUSION_DIR) clean - rm -f $(STAGING_DIR)/usr/include/linux/fusion.h - rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_FOR_FUSION)/drivers/char/fusion - rm -f $(LINUX_FUSION_DIR)/.install - -linux-fusion-dirclean: - rm -rf $(LINUX_FUSION_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_LINUX_FUSION),y) -TARGETS+=linux-fusion -endif +define LINUX_FUSION_UNINSTALL_TARGET_UDEV + rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules +endef +$(eval $(call GENTARGETS,package,linux-fusion)) -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
end of thread, other threads:[~2010-02-09 12:53 UTC | newest] Thread overview: 28+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-02-07 18:07 [Buildroot] [PATCH 00/14] Pull-request: Bumps & new packages llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 01/14] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com 2010-02-09 11:31 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 02/14] package: added pre-configure hooks llandwerlin at gmail.com 2010-02-09 11:32 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 03/14] directfb: bump to 1.4.3 llandwerlin at gmail.com 2010-02-08 13:47 ` Paulius Zaleckas 2010-02-07 18:07 ` [Buildroot] [PATCH 04/14] package: added lirc llandwerlin at gmail.com 2010-02-09 11:37 ` Thomas Petazzoni 2010-02-09 11:54 ` Lionel Landwerlin 2010-02-09 12:37 ` Thomas Petazzoni 2010-02-09 12:53 ` Lionel Landwerlin 2010-02-07 18:07 ` [Buildroot] [PATCH 05/14] directfb: added support for lirc llandwerlin at gmail.com 2010-02-09 12:38 ` Thomas Petazzoni 2010-02-07 18:07 ` [Buildroot] [PATCH 06/14] pixman: bump to 0.16.4 llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 07/14] cairo: Bump to 1.8.8 llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 08/14] systat: bump to 9.0.6 llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 09/14] automake: bump to 1.11 llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 10/14] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 11/14] target: Added ttyAS[0-3] devices llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 12/14] openssh: added empty login option llandwerlin at gmail.com 2010-02-07 18:07 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option llandwerlin at gmail.com 2010-02-07 18:46 ` Bernhard Reutner-Fischer 2010-02-07 21:18 ` Lionel Landwerlin 2010-02-07 23:52 ` [Buildroot] [PATCH] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com 2010-02-07 23:55 ` [Buildroot] [PATCH 13/14] target: added BR2_KARCH option Lionel Landwerlin 2010-02-07 18:07 ` [Buildroot] [PATCH 14/14] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com 2010-02-07 23:53 ` [Buildroot] [PATCH] " llandwerlin at gmail.com
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox