directfb/linux-fusion bumps + lirc integration

GIT PULL New llandwerlin at gmail.com 3 participants 12 messages Apr 30, 2010 – May 3, 2010

lore

Share & tools

lore

llandwerlin at gmail.com

author

2010-04-30 00:58 UTC #1 lore raw

PATCH 1/6 directfb: bump to 1.4.3

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>

---
 ...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

package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch deleted +0 ~~-33~~

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

package/directfb/directfb.mk +1 -1

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

Signature · 1 line

1.7.0.4

Peter Korsgaard

2010-05-03 07:25 UTC #2 lore raw

PATCH 1/6 directfb: bump to 1.4.3

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:

llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

llandwerlin at gmail.com

author

2010-04-30 00:58 UTC #3 lore raw

PATCH 2/6 package: added lirc

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>

---
 package/Config.in      |    2 ++
 package/lirc/Config.in |   32 ++++++++++++++++++++++++++++++++
 package/lirc/S70lircd  |   24 ++++++++++++++++++++++++
 package/lirc/lirc.mk   |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 0 deletions(-)
 create mode 100644 package/lirc/Config.in
 create mode 100644 package/lirc/S70lircd
 create mode 100644 package/lirc/lirc.mk

package/Config.in +2 -0

index 6848f9f..c3a713b 100644
@@ -270,6 +270,7 @@ endmenu
 menu "Hardware handling"
 source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
+source "package/lirc/Config.in"
 source "package/tslib/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"

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

package/lirc/Config.in new file +32 -0

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

package/lirc/S70lircd new file +24 -0

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

package/lirc/lirc.mk new file +38 -0

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

Signature · 1 line

1.7.0.4

Peter Korsgaard

2010-05-03 07:24 UTC #4 lore raw

PATCH 2/6 package: added lirc

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:

llandwerlin> From: Lionel Landwerlin <[email protected]>

llandwerlin> +############################################################# llandwerlin> +#
llandwerlin> +# lirc
llandwerlin> +#
llandwerlin> +############################################################# llandwerlin> +
llandwerlin> +LIRC_VERSION = 0.8.6
llandwerlin> +LIRC_SOURCE = lirc-$(LIRC_VERSION).tar.bz2 llandwerlin> +LIRC_SITE = http://prdownloads.sourceforge.net/lirc
llandwerlin> +LIRC_LIBTOOL_PATCH = NO
llandwerlin> +LIRC_INSTALL_STAGING = YES
llandwerlin> +
llandwerlin> +LIRC_CONF_OPT = --without-x
llandwerlin> +
llandwerlin> +ifeq ($(BR2_PACKAGE_LIRC_ALL),y)
llandwerlin> +LIRC_CONF_OPT += --with-driver=all
llandwerlin> +endif

Don't we need to point it to the kernel dir for kernel drivers to be built? And presumably only build after the kernel has been built?

If so, then this option should depend on !BR2_KERNEL_none.

Signature · 1 line

Bye, Peter Korsgaard

llandwerlin at gmail.com

author

2010-04-30 00:58 UTC #5 lore raw

PATCH 3/6 directfb: added support for lirc

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>

---
 package/directfb/Config.in   |    4 ++++
 package/directfb/directfb.mk |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

package/directfb/Config.in +4 -0

index 7c41cdf..8e00f14 100644
@@ -65,6 +65,10 @@ 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
+
 config BR2_PACKAGE_DIRECTFB_PS2MOUSE
 	bool "compile PS2 mouse input driver"
 	default y

package/directfb/directfb.mk +4 -0

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

Signature · 1 line

1.7.0.4

llandwerlin at gmail.com

author

2010-04-30 00:58 UTC #6 lore raw

PATCH 4/6 directfb: added directfb tests installation option

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>

---
 package/directfb/Config.in   |    3 +++
 package/directfb/directfb.mk |    9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

package/directfb/Config.in +3 -0

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

package/directfb/directfb.mk +8 -1

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

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

Signature · 1 line

1.7.0.4

Peter Korsgaard

2010-05-03 07:34 UTC #7 lore raw

PATCH 4/6 directfb: added directfb tests installation option

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:

llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

llandwerlin at gmail.com

author

2010-04-30 00:58 UTC #8 lore raw

PATCH 5/6 directfb: drop forced linux-fusion with multiapp

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Linux-fusion isn't mandatory anymore for directfb to work with multi app. Indeed, directfb has a userspace fusion implementation (still unstable but anyway...).

Signed-off-by Lionel Landwerlin <[email protected]>

---
 package/directfb/Config.in   |    1 -
 package/directfb/directfb.mk |   13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

package/directfb/Config.in +0 -1

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

package/directfb/directfb.mk +8 -5

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

Signature · 1 line

1.7.0.4

llandwerlin at gmail.com

author

2010-04-30 00:58 UTC #9 lore raw

PATCH 6/6 linux-fusion: bump to 8.1.1

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Also convert to generic package infrastructure

Signed-off-by Lionel Landwerlin <[email protected]>

---
 .../linux-fusion-8.0.2-cross-compile.patch         |  100 --------------------
 package/linux-fusion/linux-fusion.mk               |   73 ++++++---------
 2 files changed, 30 insertions(+), 143 deletions(-)
 delete mode 100644 package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch

package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch deleted +0 ~~-100~~

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

package/linux-fusion/linux-fusion.mk +30 ~~-43~~

107 lines not on this page · raw message

Signature · 1 line

1.7.0.4

Peter Korsgaard

2010-05-03 07:34 UTC #10 lore raw

PATCH 6/6 linux-fusion: bump to 8.1.1

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:

llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Also convert to generic package infrastructure

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

Acked-by

2010-05-01 11:15 UTC #11 lore raw

In reply to llandwerlin at gmail.com

Quoted 2 lines · On Fri, 30 Apr 2010 02:58:43 +0200 llandwerlin at gmail.com wrote:

Available at :

           git://git.potipota.net/buildroot 2010.05-directfb-lirc

Acked-by Thomas Petazzoni <[email protected]>

There are a few strange things in the linux-fusion package (no BUILD_CMDS variable, strange relation to the kernel variable), but I think we can merge as it is and improve later if needed.

Regards,

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com