Skip to contentSkip to conversation

Pull request for branch for-2013.02/armadeus/new-pkgs

GIT PULL New Samuel Martin 5 participants 20 messages Dec 9, 2012 – Mar 9, 2013

lore
Share & tools
lore
#0 lore raw

Hello,

Here is the first round of package integration from Armadeus [1,2],

This just includes half a doxzen of new packages, nothing scary... and more to come [3]... So, stay tuned! ;-)

Note that:
* openobex: still use the 1.5 release to not break ussp-push. openobex can be updated to version 1.6 once integrated in BR, then ussp-push fixed to linked against it.
* urg: bump to version 0.8.18 from the original patch (which integrate the 0.8.11 release).

Yours,

Samuel

[1] www.armadeus.org
[2] git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[3] http://www.armadeus.com/wiki/index.php?title=Buildroot_Mainline_integration

The following changes since commit 054f97e1f2de337ea0c788d766212a36d6d4e41c:

pkg-infra: add <pkg>-extract and <pkg>-patch targets to OVERRIDE support (2012-12-06 17:13:57 -0800)

are available in the git repository at:

git://github.com/tSed/buildroot.git for-2013.02/armadeus/new-pkgs

for you to fetch changes up to 810b52732660dfae986eb1cdc9cb6a878fd6bd2f:

libcanfestival: new package

Samuel Martin (6):
openobex: new package
ussp-push: new package
urg: new package
flite: new package
qwt: new package
libcanfestival: new package

 package/Config.in                                  |   5 +
 package/libcanfestival/Config.in                   |  90 +++
 .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
 package/libcanfestival/libcanfestival.mk           |  45 ++
 package/multimedia/Config.in                       |   1 +
 package/multimedia/flite/Config.in                 |  11 +
 package/multimedia/flite/flite.mk                  |  57 ++
 package/openobex/Config.in                         |  28 +
 ...penobex-libusb_check_when_cross-compiling.patch |  18 +
 .../openobex-replace_deprecated_functions.patch    |  30 +
 package/openobex/openobex.mk                       |  35 +
 package/qwt/Config.in                              |  17 +
 .../qwt/qwt-5.2.1-change-install-directories.patch |  23 +
 package/qwt/qwt-5.2.1-disable-designer.patch       |  17 +
 package/qwt/qwt.mk                                 |  74 +++
 package/urg/Config.in                              |   9 +
 package/urg/urg.mk                                 |  26 +
 package/ussp-push/Config.in                        |   9 +
 .../ussp-push-fix-build-against-bluez-4.patch      |  15 +
 package/ussp-push/ussp-push.mk                     |  13 +
 20 files changed, 1240 insertions(+)
 create mode 100644 package/libcanfestival/Config.in
 create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
 create mode 100644 package/libcanfestival/libcanfestival.mk
 create mode 100644 package/multimedia/flite/Config.in
 create mode 100644 package/multimedia/flite/flite.mk
 create mode 100644 package/openobex/Config.in
 create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
 create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
 create mode 100644 package/openobex/openobex.mk
 create mode 100644 package/qwt/Config.in
 create mode 100644 package/qwt/qwt-5.2.1-change-install-directories.patch
 create mode 100644 package/qwt/qwt-5.2.1-disable-designer.patch
 create mode 100644 package/qwt/qwt.mk
 create mode 100644 package/urg/Config.in
 create mode 100644 package/urg/urg.mk
 create mode 100644 package/ussp-push/Config.in
 create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
 create mode 100644 package/ussp-push/ussp-push.mk

--
1.8.0.1

#1 lore raw

PATCH 1/1 openobex: new package

Cc Julien Boibessot <[email protected]>
Cc Eric Jarrige <[email protected]>
---
 package/Config.in                                  |  1 +
 package/openobex/Config.in                         | 28 +++++++++++++++++
 ...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++++
 .../openobex-replace_deprecated_functions.patch    | 30 +++++++++++++++++++
 package/openobex/openobex.mk                       | 35 ++++++++++++++++++++++
 5 files changed, 112 insertions(+)
 create mode 100644 package/openobex/Config.in
 create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
 create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
 create mode 100644 package/openobex/openobex.mk
package/Config.in +1 -0
index 74e439e..0855684 100644
@@ -632,6 +632,7 @@ source "package/ntp/Config.in"
 source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
 source "package/openntpd/Config.in"
+source "package/openobex/Config.in"
 source "package/openssh/Config.in"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
package/openobex/Config.in new file +28 -0
new file mode 100644
index 0000000..06f4c7d
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_OPENOBEX
+	bool "openobex"
+	help
+	  Free open source implementation of the Object Exchange (OBEX)
+	  protocol.
+
+	  http://www.openobex.org
+
+if BR2_PACKAGE_OPENOBEX
+config BR2_PACKAGE_OPENOBEX_BLUEZ
+	bool "enable bluez support"
+	select BR2_PACKAGE_BLUEZ_UTILS
+
+config BR2_PACKAGE_OPENOBEX_LIBUSB
+	bool "enable libusb support"
+	select BR2_PACKAGE_LIBUSB
+
+config BR2_PACKAGE_OPENOBEX_APPS
+	bool "install test applications"
+	help
+	  Also install the openobex test applications on target.
+
+config BR2_PACKAGE_OPENOBEX_SYSLOG
+	bool "enable debugging to the system logger"
+
+config BR2_PACKAGE_OPENOBEX_DUMP
+	bool "enable protocol dumping for debugging"
+endif
package/openobex/openobex-libusb_check_when_cross-compiling.patch new file +18 -0
new file mode 100644
index 0000000..7b8056a
@@ -0,0 +1,18 @@
+Fix libusb check when cross-compiling.
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/acinclude.m4
+===================================================================
+--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
++++ openobex-1.5/acinclude.m4	2010-06-16 10:35:33.000000000 +0200
+@@ -158,7 +158,7 @@
+ 		;;
+ 	*)
+ 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++		REQUIRES="libusb"
+ 		;;
+ 	esac
+ 	AC_SUBST(USB_CFLAGS)
package/openobex/openobex-replace_deprecated_functions.patch new file +30 -0
new file mode 100644
index 0000000..17274d3
@@ -0,0 +1,30 @@
+obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
+--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
++++ openobex-1.5/apps/obex_test_cable.c	2010-06-16 11:11:05.000000000 +0200
+@@ -113,9 +113,9 @@
+ 			if(total == sizeof(tmpbuf))
+ 				return -1;
+ 
+-			if( (answer = index(tmpbuf, '\n')) )	{
++			if( (answer = strchr(tmpbuf, '\n')) )	{
+ 				// Remove first line (echo)
+-				if( (answer_end = index(answer+1, '\n')) )	{
++				if( (answer_end = strchr(answer+1, '\n')) )	{
+ 					// Found end of answer
+ 					done = 1;
+ 				}
+@@ -178,7 +178,7 @@
+ 	}
+ 
+ 	tcgetattr(gt->ttyfd, &gt->oldtio);
+-	bzero(&gt->newtio, sizeof(struct termios));
++	memset(&gt->newtio, 0, sizeof(struct termios));
+ 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
+ 	gt->newtio.c_iflag = IGNPAR;
+ 	gt->newtio.c_oflag = 0;
package/openobex/openobex.mk new file +35 -0
new file mode 100644
index 0000000..beac5ff
@@ -0,0 +1,35 @@
+#############################################################
+#
+# openobex
+#
+#############################################################
+OPENOBEX_VERSION = 1.5
+OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
+# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2
+OPENOBEX_LICENSE = GPLv2/LGPLv2.1
+OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
+
+OPENOBEX_AUTORECONF = YES
+OPENOBEX_INSTALL_STAGING = YES
+
+OPENOBEX_CONF_OPT += \
+	$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
+	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
+	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
+	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
+OPENOBEX_DEPENDENCIES += bluez_utils
+OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
+OPENOBEX_DEPENDENCIES += libusb
+OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-usb
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.0.1
#2 lore raw

PATCH 1/1 openobex: new package

Quoted 3 lines · Samuel Martin
Cc Julien Boibessot <[email protected]>
Cc Eric Jarrige <[email protected]>

Tested on Buildroot 2012.11 with a Armadeus APF27 board

Quoted 162 lines

---

package/Config.in                                  |  1 +
package/openobex/Config.in                         | 28 +++++++++++++++++
...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++++
.../openobex-replace_deprecated_functions.patch    | 30 +++++++++++++++++++
package/openobex/openobex.mk                       | 35 ++++++++++++++++++++++
5 files changed, 112 insertions(+)

create mode 100644 package/openobex/Config.in
create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch create mode 100644 package/openobex/openobex.mk

package/Config.in +0 -0
index 74e439e..0855684 100644
@@ -632,6 +632,7 @@ source "package/ntp/Config.in"

source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
+source "package/openobex/Config.in"
source "package/openssh/Config.in"
source "package/openswan/Config.in"
source "package/openvpn/Config.in"

package/openobex/Config.in new file +28 -0
new file mode 100644
index 0000000..06f4c7d
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_OPENOBEX
+	bool "openobex"
+	help
+	  Free open source implementation of the Object Exchange (OBEX)
+	  protocol.
+
+	  http://www.openobex.org
+
+if BR2_PACKAGE_OPENOBEX
+config BR2_PACKAGE_OPENOBEX_BLUEZ
+	bool "enable bluez support"
+	select BR2_PACKAGE_BLUEZ_UTILS
+
+config BR2_PACKAGE_OPENOBEX_LIBUSB
+	bool "enable libusb support"
+	select BR2_PACKAGE_LIBUSB
+
+config BR2_PACKAGE_OPENOBEX_APPS
+	bool "install test applications"
+	help
+	  Also install the openobex test applications on target.
+
+config BR2_PACKAGE_OPENOBEX_SYSLOG
+	bool "enable debugging to the system logger"
+
+config BR2_PACKAGE_OPENOBEX_DUMP
+	bool "enable protocol dumping for debugging"
+endif
package/openobex/openobex-libusb_check_when_cross-compiling.patch new file +18 -0
new file mode 100644
index 0000000..7b8056a
@@ -0,0 +1,18 @@
+Fix libusb check when cross-compiling.
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/acinclude.m4
+===================================================================
+--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
++++ openobex-1.5/acinclude.m4	2010-06-16 10:35:33.000000000 +0200
+@@ -158,7 +158,7 @@
+ 		;;
+ 	*)
+ 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++		REQUIRES="libusb"
+ 		;;
+ 	esac
+ 	AC_SUBST(USB_CFLAGS)
package/openobex/openobex-replace_deprecated_functions.patch new file +30 -0
new file mode 100644
index 0000000..17274d3
@@ -0,0 +1,30 @@
+obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
+--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
++++ openobex-1.5/apps/obex_test_cable.c	2010-06-16 11:11:05.000000000 +0200
+@@ -113,9 +113,9 @@
+ 			if(total == sizeof(tmpbuf))
+ 				return -1;
+ 
+-			if( (answer = index(tmpbuf, '\n')) )	{
++			if( (answer = strchr(tmpbuf, '\n')) )	{
+ 				// Remove first line (echo)
+-				if( (answer_end = index(answer+1, '\n')) )	{
++				if( (answer_end = strchr(answer+1, '\n')) )	{
+ 					// Found end of answer
+ 					done = 1;
+ 				}
+@@ -178,7 +178,7 @@
+ 	}
+ 
+ 	tcgetattr(gt->ttyfd, &gt->oldtio);
+-	bzero(&gt->newtio, sizeof(struct termios));
++	memset(&gt->newtio, 0, sizeof(struct termios));
+ 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
+ 	gt->newtio.c_iflag = IGNPAR;
+ 	gt->newtio.c_oflag = 0;
package/openobex/openobex.mk new file +35 -0
new file mode 100644
index 0000000..beac5ff
@@ -0,0 +1,35 @@
+#############################################################
+#
+# openobex
+#
+#############################################################
+OPENOBEX_VERSION = 1.5
+OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
+# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2
+OPENOBEX_LICENSE = GPLv2/LGPLv2.1
+OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
+
+OPENOBEX_AUTORECONF = YES
+OPENOBEX_INSTALL_STAGING = YES
+
+OPENOBEX_CONF_OPT += \
+	$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
+	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
+	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
+	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
+OPENOBEX_DEPENDENCIES += bluez_utils
+OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
+OPENOBEX_DEPENDENCIES += libusb
+OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-usb
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.0.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121225/33936314/attachment-0001.html>

#3 lore raw

PATCH 1/1 openobex: new package

ping?

Signature · 1 line
Samuel
#4 lore raw

PATCH 1/1 openobex: new package

pong?

Signature · 1 line
Samuel
#5 lore raw

PATCH 1/1 openobex: new package

In reply to Samuel Martin

Dear Samuel Martin,

package/openobex/Config.in line 2

Quoted 8 lines · Samuel Martin
package/openobex/Config.in new file +2 -0
new file mode 100644
index 0000000..06f4c7d
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_OPENOBEX
+	bool "openobex"

Did you test if OpenOBEX really builds with a minimal uClibc toolchain? If you want to save the build time, you can find a pre-compiled minimal uClibc toolchain at
http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2012.11.1-1.tar.bz2.

package/openobex/Config.in line 12

Quoted 4 lines
package/openobex/Config.in new file +4 -0
+if BR2_PACKAGE_OPENOBEX
+config BR2_PACKAGE_OPENOBEX_BLUEZ
+	bool "enable bluez support"
+	select BR2_PACKAGE_BLUEZ_UTILS

Missing dependencies from bluez_utils.

Also ussp-push depends on OpenOBEX and bluez_utils. Maybe it depends on bluez support to be enabled in OpenOBEX as well?

package/openobex/Config.in line 16

Quoted 3 lines
package/openobex/Config.in new file +3 -0
+config BR2_PACKAGE_OPENOBEX_LIBUSB
+	bool "enable libusb support"
+	select BR2_PACKAGE_LIBUSB

Missing dependency from libusb (threads).

package/openobex/Config.in line 28

Quoted 11 lines
package/openobex/Config.in new file +11 -0
+config BR2_PACKAGE_OPENOBEX_APPS
+	bool "install test applications"
+	help
+	  Also install the openobex test applications on target.
+
+config BR2_PACKAGE_OPENOBEX_SYSLOG
+	bool "enable debugging to the system logger"
+
+config BR2_PACKAGE_OPENOBEX_DUMP
+	bool "enable protocol dumping for debugging"
+endif

One empty line before endif (nitpicking).

Quoted 50 lines
package/openobex/openobex-libusb_check_when_cross-compiling.patch new file +18 -0
new file mode 100644
index 0000000..7b8056a
@@ -0,0 +1,18 @@
+Fix libusb check when cross-compiling.
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/acinclude.m4
+===================================================================
+--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
++++ openobex-1.5/acinclude.m4	2010-06-16 10:35:33.000000000 +0200
+@@ -158,7 +158,7 @@
+ 		;;
+ 	*)
+ 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++		REQUIRES="libusb"
+ 		;;
+ 	esac
+ 	AC_SUBST(USB_CFLAGS)
package/openobex/openobex-replace_deprecated_functions.patch new file +20 -0
new file mode 100644
index 0000000..17274d3
@@ -0,0 +1,30 @@
+obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
+--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
++++ openobex-1.5/apps/obex_test_cable.c	2010-06-16 11:11:05.000000000 +0200
+@@ -113,9 +113,9 @@
+ 			if(total == sizeof(tmpbuf))
+ 				return -1;
+ 
+-			if( (answer = index(tmpbuf, '\n')) )	{
++			if( (answer = strchr(tmpbuf, '\n')) )	{
+ 				// Remove first line (echo)
+-				if( (answer_end = index(answer+1, '\n')) )	{
++				if( (answer_end = strchr(answer+1, '\n')) )	{
+ 					// Found end of answer
+ 					done = 1;

package/openobex/openobex-replace_deprecated_functions.patch line 30

Quoted 10 lines
package/openobex/openobex-replace_deprecated_functions.patch new file +10 -0
+ 				}
+@@ -178,7 +178,7 @@
+ 	}
+ 
+ 	tcgetattr(gt->ttyfd, &gt->oldtio);
+-	bzero(&gt->newtio, sizeof(struct termios));
++	memset(&gt->newtio, 0, sizeof(struct termios));
+ 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
+ 	gt->newtio.c_iflag = IGNPAR;
+ 	gt->newtio.c_oflag = 0;

As usual, sending patches upstream would be good.

package/openobex/openobex.mk line 6

Quoted 12 lines
package/openobex/openobex.mk new file +6 -0
new file mode 100644
index 0000000..beac5ff
@@ -0,0 +1,35 @@
+#############################################################
+#
+# openobex
+#
+#############################################################
+OPENOBEX_VERSION = 1.5

One empty line between header and first variable.

package/openobex/openobex.mk line 8

Quoted 2 lines
package/openobex/openobex.mk new file +2 -0
+OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
+# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2

English fixes:

# Libraries seem to be released under LGPLv2.1, while other material is

# under GPLv2

package/openobex/openobex.mk line 9

Quoted 1 line
package/openobex/openobex.mk new file +1 -0
+OPENOBEX_LICENSE = GPLv2/LGPLv2.1

License is apparently GPLv2+ and LGPLv2.1+.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#6 lore raw

PATCH 1/1 ussp-push: new package

In reply to Samuel Martin
---
 package/Config.in                                         |  1 +
 package/ussp-push/Config.in                               |  9 +++++++++
 .../ussp-push/ussp-push-fix-build-against-bluez-4.patch   | 15 +++++++++++++++
 package/ussp-push/ussp-push.mk                            | 13 +++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 package/ussp-push/Config.in
 create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
 create mode 100644 package/ussp-push/ussp-push.mk
package/Config.in +1 -0
index 0855684..c530305 100644
@@ -668,6 +668,7 @@ source "package/ttcp/Config.in"
 source "package/udpcast/Config.in"
 source "package/ulogd/Config.in"
 source "package/ushare/Config.in"
+source "package/ussp-push/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
package/ussp-push/Config.in new file +9 -0
new file mode 100644
index 0000000..324280f
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_USSP_PUSH
+	bool "ussp-push"
+	select BR2_PACKAGE_OPENOBEX
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
+	  BlueTooth stack.
+
+	  http://www.xmailserver.org/ussp-push.html
package/ussp-push/ussp-push-fix-build-against-bluez-4.patch new file +15 -0
new file mode 100644
index 0000000..0694bfb
@@ -0,0 +1,15 @@
+Fix build against bluez4.
+
+Signed-off-by: Samuel Martin <[email protected]>
+
+--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
package/ussp-push/ussp-push.mk new file +13 -0
new file mode 100644
index 0000000..6f322ab
@@ -0,0 +1,13 @@
+#############################################################
+#
+# ussp-push
+#
+#############################################################
+USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+USSP_PUSH_LICENSE = GPLv2
+USSP_PUSH_LICENSE_FILES = COPYING
+
+USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.0.1
#7 lore raw

PATCH 1/1 ussp-push: new package

Quoted 2 lines · Samuel Martin

Tested on Buildroot 2012.11 with a Armadeus APF27 board

Quoted 80 lines

---

package/Config.in                                         |  1 +
package/ussp-push/Config.in                               |  9 +++++++++
.../ussp-push/ussp-push-fix-build-against-bluez-4.patch   | 15 +++++++++++++++
package/ussp-push/ussp-push.mk                            | 13 +++++++++++++
4 files changed, 38 insertions(+)

create mode 100644 package/ussp-push/Config.in
create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch create mode 100644 package/ussp-push/ussp-push.mk

package/Config.in +0 -0
index 0855684..c530305 100644
@@ -668,6 +668,7 @@ source "package/ttcp/Config.in"

source "package/udpcast/Config.in"
source "package/ulogd/Config.in"
source "package/ushare/Config.in"
+source "package/ussp-push/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
source "package/vtun/Config.in"

package/ussp-push/Config.in new file +9 -0
new file mode 100644
index 0000000..324280f
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_USSP_PUSH
+	bool "ussp-push"
+	select BR2_PACKAGE_OPENOBEX
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
+	  BlueTooth stack.
+
+	  http://www.xmailserver.org/ussp-push.html
package/ussp-push/ussp-push-fix-build-against-bluez-4.patch new file +15 -0
new file mode 100644
index 0000000..0694bfb
@@ -0,0 +1,15 @@
+Fix build against bluez4.
+
+Signed-off-by: Samuel Martin <[email protected]>
+
+--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
package/ussp-push/ussp-push.mk new file +13 -0
new file mode 100644
index 0000000..6f322ab
@@ -0,0 +1,13 @@
+#############################################################
+#
+# ussp-push
+#
+#############################################################
+USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+USSP_PUSH_LICENSE = GPLv2
+USSP_PUSH_LICENSE_FILES = COPYING
+
+USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.0.1
#8 lore raw

PATCH 1/1 ussp-push: new package

ping?

Signature · 1 line
Samuel
#9 lore raw

PATCH 1/1 ussp-push: new package

pong?

Signature · 1 line
Samuel
#10 lore raw

PATCH 1/1 ussp-push: new package

In reply to Samuel Martin

Dear Samuel Martin,

package/ussp-push/Config.in line 4

Quoted 2 lines · Samuel Martin
package/ussp-push/Config.in new file +2 -0
+	select BR2_PACKAGE_OPENOBEX
+	select BR2_PACKAGE_BLUEZ_UTILS

bluez utils depends on mmu, wchar, threads and isn't available on avr32. You should carry those dependencies as well.

Quoted 32 lines
package/ussp-push/Config.in new file +5 -0
+	help
+	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
+	  BlueTooth stack.
+
+	  http://www.xmailserver.org/ussp-push.html
package/ussp-push/ussp-push-fix-build-against-bluez-4.patch new file +15 -0
new file mode 100644
index 0000000..0694bfb
@@ -0,0 +1,15 @@
+Fix build against bluez4.
+
+Signed-off-by: Samuel Martin <[email protected]>
+
+--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
package/ussp-push/ussp-push.mk new file +0 -0
new file mode 100644
index 0000000..6f322ab

package/ussp-push/ussp-push.mk line 8

Quoted 8 lines
package/ussp-push/ussp-push.mk new file +8 -0
@@ -0,0 +1,13 @@
+#############################################################
+#
+# ussp-push
+#
+#############################################################
+USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+USSP_PUSH_LICENSE = GPLv2

License is apparently GPLv2+.

package/ussp-push/ussp-push.mk line 13

Quoted 5 lines
package/ussp-push/ussp-push.mk new file +5 -0
+USSP_PUSH_LICENSE_FILES = COPYING
+
+USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+
+$(eval $(autotools-package))

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#11 lore raw

PATCH 1/1 urg: new package

In reply to Samuel Martin
---
 package/Config.in     |  1 +
 package/urg/Config.in |  9 +++++++++
 package/urg/urg.mk    | 26 ++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/urg/Config.in
 create mode 100644 package/urg/urg.mk
package/Config.in +1 -0
index c530305..45ccbcf 100644
@@ -426,6 +426,7 @@ source "package/libv4l/Config.in"
 source "package/mtdev/Config.in"
 source "package/neardal/Config.in"
 source "package/pcsc-lite/Config.in"
+source "package/urg/Config.in"
 endmenu
 
 menu "Javascript"
package/urg/Config.in new file +9 -0
new file mode 100644
index 0000000..9dd13bf
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_URG
+	bool "urg library"
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_NET
+	help
+	  Library to control Hokuyo's URG series sensors.
+	  Requires SDL & SDL_net.
+
+	  http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
package/urg/urg.mk new file +26 -0
new file mode 100644
index 0000000..d5b752a
@@ -0,0 +1,26 @@
+#############################################################
+#
+# urg library
+#
+#############################################################
+URG_VERSION = 0.8.18
+URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+URG_SOURCE = urg-$(URG_VERSION).zip
+URG_LICENSE = LGPLv3
+URG_LICENSE_FILES = COPYING
+
+URG_INSTALL_STAGING = YES
+
+URG_DEPENDENCIES = sdl sdl_net
+
+URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
+
+define URG_EXTRACT_CMDS
+	$(RM) -rf $(URG_DIR)
+	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
+	test -d $(URG_DIR) || \
+		mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
+endef
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.0.1
#12 lore raw

PATCH 1/1 flite: new package

In reply to Samuel Martin
---
 package/multimedia/Config.in       |  1 +
 package/multimedia/flite/Config.in | 11 ++++++++
 package/multimedia/flite/flite.mk  | 57 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 package/multimedia/flite/Config.in
 create mode 100644 package/multimedia/flite/flite.mk
package/multimedia/Config.in +1 -0
index 273d9bc..3ca0531 100644
@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"
 source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
+source "package/multimedia/flite/Config.in"
 source "package/multimedia/ffmpeg/Config.in"
 source "package/multimedia/gstreamer/Config.in"
 source "package/multimedia/gst-ffmpeg/Config.in"
package/multimedia/flite/Config.in new file +11 -0
new file mode 100644
index 0000000..bef989c
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FLITE
+	bool "flite"
+	help
+	  Flite: a small, fast run time synthesis engine.
+	  Flite (festival-lite) is a small, fast run-time synthesis engine
+	  developed at CMU and primarily designed for small embedded machines
+	  and/or large servers. Flite is designed as an alternative synthesis
+	  engine to Festival for voices built using the FestVox suite of voice
+	  building tools.
+
+	  http://www.speech.cs.cmu.edu/flite
package/multimedia/flite/flite.mk new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.8.0.1
#13 lore raw

PATCH 1/1 flite: new package

Quoted 2 lines · Samuel Martin

Tested on Buildroot 2012.11 with a Armadeus APF27 board

Quoted 103 lines

---

package/multimedia/Config.in       |  1 +
package/multimedia/flite/Config.in | 11 ++++++++
package/multimedia/flite/flite.mk  | 57 ++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+)

create mode 100644 package/multimedia/flite/Config.in create mode 100644 package/multimedia/flite/flite.mk

package/multimedia/Config.in +0 -0
index 273d9bc..3ca0531 100644
@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"

source "package/multimedia/bellagio/Config.in"
source "package/multimedia/faad2/Config.in"
source "package/multimedia/flac/Config.in"
+source "package/multimedia/flite/Config.in"
source "package/multimedia/ffmpeg/Config.in"
source "package/multimedia/gstreamer/Config.in"
source "package/multimedia/gst-ffmpeg/Config.in"

package/multimedia/flite/Config.in new file +11 -0
new file mode 100644
index 0000000..bef989c
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FLITE
+	bool "flite"
+	help
+	  Flite: a small, fast run time synthesis engine.
+	  Flite (festival-lite) is a small, fast run-time synthesis engine
+	  developed at CMU and primarily designed for small embedded machines
+	  and/or large servers. Flite is designed as an alternative synthesis
+	  engine to Festival for voices built using the FestVox suite of voice
+	  building tools.
+
+	  http://www.speech.cs.cmu.edu/flite
package/multimedia/flite/flite.mk new file +57 -0
new file mode 100644
index 0000000..c72988f
@@ -0,0 +1,57 @@
+#############################################################
+#
+# flite
+#
+#############################################################
+FLITE_VERSION = 1.4
+FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
+FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
+FLITE_LICENSE = BSD-4c
+FLITE_LICENSE_FILES = COPYING
+
+FLITE_INSTALL_STAGING = YES
+
+# Sadly, Flite does not support parallel build,
+# especially when build its shared libraries.
+FLITE_MAKE = $(MAKE1)
+
+FLITE_CONF_OPT = \
+	$(if $(BR2_PREFER_STATIC_LIB),,--enable-shared)
+
+FLITE_INSTALL_STAGING_OPT = \
+	INSTALLBINDIR=$(STAGING_DIR)/usr/bin \
+	INSTALLLIBDIR=$(STAGING_DIR)/usr/lib \
+	INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite \
+	install
+
+FLITE_INSTALL_TARGET_OPT = \
+	INSTALLBINDIR=$(TARGET_DIR)/usr/bin \
+	INSTALLLIBDIR=$(TARGET_DIR)/usr/lib \
+	INSTALLINCDIR=$(TARGET_DIR)/usr/include/flite \
+	install
+
+# Flite totally screw up their tarball generation, so that:
+#
+#   $ tar tf flite-1.4-release.tar.bz2
+#   ...
+#   flite-1.4-release//install-sh
+#   flite-1.4-release//mkinstalldirs
+#   flite-1.4-release//Exports.def
+#   flite-1.4-release//flite.sln
+#   flite-1.4-release//fliteDll.vcproj
+#   flite-1.4-release/config/Makefile
+#   flite-1.4-release/config/common_make_rules
+#   flite-1.4-release/config/project.mak
+#   flite-1.4-release/config/config.in
+#   flite-1.4-release/config/system.mak.in
+#
+# So, the strip-component trick does not work at all.
+# Let's redefine the extract command.
+define FLITE_EXTRACT_CMDS
+	$(RM) -rf $(FLITE_DIR)
+	$(INFLATE$(suffix $(FLITE_SOURCE))) $(DL_DIR)/$(FLITE_SOURCE) | \
+		$(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	mv $(BUILD_DIR)/$(subst .tar.bz2,,$(FLITE_SOURCE)) $(FLITE_DIR)
+endef
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.0.1

Regards,
Eric Jarrige

#14 lore raw

PATCH 1/1 flite: new package

ping?

Signature · 1 line
Samuel
#15 lore raw

PATCH 1/1 flite: new package

pong?

Signature · 1 line
Samuel
#16 lore raw

PATCH 1/1 qwt: new package

In reply to Samuel Martin
Cc Julien Boibessot <[email protected]>
Cc Eric Jarrige <[email protected]>
---
 package/Config.in                                  |  1 +
 package/qwt/Config.in                              | 17 +++++
 .../qwt/qwt-5.2.1-change-install-directories.patch | 23 +++++++
 package/qwt/qwt-5.2.1-disable-designer.patch       | 17 +++++
 package/qwt/qwt.mk                                 | 74 ++++++++++++++++++++++
 5 files changed, 132 insertions(+)
 create mode 100644 package/qwt/Config.in
 create mode 100644 package/qwt/qwt-5.2.1-change-install-directories.patch
 create mode 100644 package/qwt/qwt-5.2.1-disable-designer.patch
 create mode 100644 package/qwt/qwt.mk
package/Config.in +1 -0
index 45ccbcf..88849d3 100644
@@ -141,6 +141,7 @@ comment "QT libraries and helper libraries"
 source "package/grantlee/Config.in"
 source "package/qextserialport/Config.in"
 source "package/qtuio/Config.in"
+source "package/qwt/Config.in"
 endif
 
 source "package/x11r7/Config.in"
package/qwt/Config.in new file +17 -0
new file mode 100644
index 0000000..15e3925
@@ -0,0 +1,17 @@
+comment "Qwt requires Qt to be installed"
+	depends on !BR2_PACKAGE_QT
+
+config BR2_PACKAGE_QWT
+	bool "Qwt"
+	depends on BR2_PACKAGE_QT
+	help
+	  Qwt for Embedded Linux.
+
+	  http://qwt.sourceforge.net/
+
+config BR2_PACKAGE_QWT_EXAMPLES
+	bool "Examples"
+	depends on BR2_PACKAGE_QWT
+	select BR2_PACKAGE_QT_SVG
+	help
+	  Compile & install the examples.
package/qwt/qwt-5.2.1-change-install-directories.patch new file +23 -0
new file mode 100644
index 0000000..4c28065
@@ -0,0 +1,23 @@
+Change install directories.
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+--- qwt-5.2.1/src/src.pro.orig	2010-09-28 14:40:39.000000000 +0200
++++ qwt-5.2.1/src/src.pro	2010-09-28 14:41:29.000000000 +0200
+@@ -218,9 +218,12 @@
+ }
+ 
+ # Install directives
+-
+-headers.files  = $$HEADERS
+-doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
++
++target.path = /usr/lib
++headers.files  = $$HEADERS
++headers.path = /usr/include/qwt-5.2.1
++doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
++doc.path = /usr/doc/qwt-5.2.1
+ unix {
+     doc.files      += $${QWT_ROOT}/doc/man
+ }
package/qwt/qwt-5.2.1-disable-designer.patch new file +17 -0
new file mode 100644
index 0000000..5d1bbe5
@@ -0,0 +1,17 @@
+Disable QwtDesigner.
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+--- qwt-5.2.1/qwtconfig.pri.orig	2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri	2010-09-28 15:37:02.000000000 +0200
+@@ -115,7 +115,7 @@
+ # Otherwise you have to build it from the designer directory.
+ ######################################################################
+ 
+-CONFIG     += QwtDesigner
++#CONFIG     += QwtDesigner
+ 
+ ######################################################################
+ # If you want to auto build the examples, enable the line below
+
package/qwt/qwt.mk new file +74 -0

74 lines not on this page · raw message

Signature · 1 line
1.8.0.1
#17 lore raw

PATCH 1/1 qwt: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Samuel" == Samuel Martin <[email protected]> writes:

Hi,

A few comments:

Samuel> @@ -141,6 +141,7 @@ comment "QT libraries and helper libraries"

 Samuel>  source "package/grantlee/Config.in"
 Samuel>  source "package/qextserialport/Config.in"
 Samuel>  source "package/qtuio/Config.in"

Samuel> +source "package/qwt/Config.in"
Samuel> endif

Samuel> source "package/x11r7/Config.in"
Samuel> diff --git a/package/qwt/Config.in b/package/qwt/Config.in Samuel> new file mode 100644
Samuel> index 0000000..15e3925
Samuel> --- /dev/null
Samuel> +++ b/package/qwt/Config.in
Samuel> @@ -0,0 +1,17 @@
Samuel> +comment "Qwt requires Qt to be installed"
Samuel> + depends on !BR2_PACKAGE_QT
Samuel> +
Samuel> +config BR2_PACKAGE_QWT
Samuel> + bool "Qwt"

We normally use lower case for package name.

Samuel> + depends on BR2_PACKAGE_QT

The package is already within a BR2_PACKAGE_QT conditional, so you can drop this.

Can this work with any QT configuration? I would guess you would need to select BR2_PACKAGE_QT_GUI_MODULE atleast.

Samuel> + help
Samuel> + Qwt for Embedded Linux.

Everything in buildroot is about embedded Linux. I would prefer if you instead explain what Qwt means - E.G.:

Qt Widgets for Technical Applications

Samuel> +
Samuel> + http://qwt.sourceforge.net/
Samuel> +
Samuel> +config BR2_PACKAGE_QWT_EXAMPLES
Samuel> + bool "Examples"

Lower case as well.

Samuel> + depends on BR2_PACKAGE_QWT
Samuel> + select BR2_PACKAGE_QT_SVG
Samuel> + help
Samuel> + Compile & install the examples.
Samuel> diff --git a/package/qwt/qwt-5.2.1-change-install-directories.patch b/package/qwt/qwt-5.2.1-change-install-directories.patch Samuel> new file mode 100644
Samuel> index 0000000..4c28065
Samuel> --- /dev/null
Samuel> +++ b/package/qwt/qwt-5.2.1-change-install-directories.patch
Samuel> @@ -0,0 +1,23 @@
Samuel> +Change install directories.

Please provide a patch description explaining WHY this is done instead.

Samuel> +
Samuel> +Signed-off-by: Julien Boibessot <[email protected]>
Samuel> +Signed-off-by: Samuel Martin <[email protected]>
Samuel> +
Samuel> +--- qwt-5.2.1/src/src.pro.orig 2010-09-28 14:40:39.000000000 +0200
Samuel> ++++ qwt-5.2.1/src/src.pro 2010-09-28 14:41:29.000000000 +0200
Samuel> +@@ -218,9 +218,12 @@
Samuel> + }
Samuel> +
Samuel> + # Install directives
Samuel> +-
Samuel> +-headers.files = $$HEADERS
Samuel> +-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
Samuel> ++
Samuel> ++target.path = /usr/lib
Samuel> ++headers.files = $$HEADERS
Samuel> ++headers.path = /usr/include/qwt-5.2.1
Samuel> ++doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
Samuel> ++doc.path = /usr/doc/qwt-5.2.1
Samuel> + unix {
Samuel> + doc.files += $${QWT_ROOT}/doc/man
Samuel> + }
Samuel> diff --git a/package/qwt/qwt-5.2.1-disable-designer.patch b/package/qwt/qwt-5.2.1-disable-designer.patch Samuel> new file mode 100644
Samuel> index 0000000..5d1bbe5
Samuel> --- /dev/null
Samuel> +++ b/package/qwt/qwt-5.2.1-disable-designer.patch
Samuel> @@ -0,0 +1,17 @@
Samuel> +Disable QwtDesigner.

Why?

Samuel> +
Samuel> +Signed-off-by: Julien Boibessot <[email protected]> Samuel> +Signed-off-by: Samuel Martin <[email protected]> Samuel> +
Samuel> +--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
Samuel> ++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
Samuel> +@@ -115,7 +115,7 @@
Samuel> + # Otherwise you have to build it from the designer directory. Samuel> + ###################################################################### Samuel> +
Samuel> +-CONFIG += QwtDesigner
Samuel> ++#CONFIG += QwtDesigner
Samuel> +
Samuel> + ###################################################################### Samuel> + # If you want to auto build the examples, enable the line below Samuel> +
Samuel> diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk Samuel> new file mode 100644
Samuel> index 0000000..3d4e7f1
Samuel> --- /dev/null
Samuel> +++ b/package/qwt/qwt.mk
Samuel> @@ -0,0 +1,74 @@
Samuel> +###################################################################### Samuel> +#
Samuel> +# QWT
Samuel> +#
Samuel> +###################################################################### Samuel> +QWT_VERSION = 5.2.1
Samuel> +QWT_SOURCE = qwt-$(QWT_VERSION).zip

Why not use the .tar.bz2 version instead? Upsteam is now up to 5.2.3 (and 6.0) - Any reason to use the old 5.2.1?

Samuel> +QWT_SITE = http://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)

Normally the sf.net URLs are of the downloads.sourceforge.net/.. form.

Samuel> +# Qwt License v1.0 is a LGPL v2.1 with exceptions Samuel> +QWT_LICENSE = QWTv1.0
Samuel> +QWT_LICENSE_FILES = COPYING
Samuel> +
Samuel> +QWT_DEPENDENCIES = qt
Samuel> +
Samuel> +QWT_INSTALL_STAGING = YES
Samuel> +
Samuel> +define QWT_EXTRACT_CMDS
Samuel> + $(RM) -rf $(QWT_DIR)
Samuel> + unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(QWT_SOURCE)
Samuel> + test -d $(QWT_DIR) || \
Samuel> + mv $(BUILD_DIR)/$(subst .zip,,$(QWT_SOURCE)) $(QWT_DIR)
Samuel> +endef

With .tar.bz2 this could be dropped.

Samuel> +
Samuel> +ifeq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
Samuel> +define QWT_CONFIGURE_EXAMPLES
Samuel> + test ! -f $(@D)/examples/Makefile || $(MAKE) -C $(@D)/examples distclean

Hmm, we normally don't do something like this.

Samuel> + cd $(@D)/examples && $(QT_QMAKE)
Samuel> +endef
Samuel> +
Samuel> +define QWT_BUILD_EXAMPLES
Samuel> + $(MAKE) -C $(@D)/examples
Samuel> +endef
Samuel> +
Samuel> +define QWT_INSTALL_STAGING_EXAMPLES
Samuel> + $(INSTALL) -d $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin

Why /usr/local? Please use QWT_VERSION.

Does it ever make sense to install examples into staging?

Samuel> + cp -f $(@D)/examples/bin/* \
Samuel> + $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
Samuel> +endef
Samuel> +
Samuel> +define QWT_INSTALL_TARGET_EXAMPLES
Samuel> + $(INSTALL) -d $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
Samuel> + cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* \
Samuel> + $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin

Same comments. Why nor just install them into TARGET_DIR/usr/bin?

Samuel> +endef
Samuel> +endif
Samuel> +
Samuel> +
Samuel> +define QWT_CONFIGURE_CMDS
Samuel> + test ! -f $(@D)/Makefile || $(MAKE) -C $(@D) distclean

Same comment as for CONFIGURE_EXAMPLES.

Nit: It would be more logical to list these steps in the logical order they are used - E.G. configure -> build -> install.

Samuel> + cd $(@D) && $(QT_QMAKE)
Samuel> + $(QWT_CONFIGURE_EXAMPLES)
Samuel> +endef
Samuel> +
Samuel> +define QWT_BUILD_CMDS
Samuel> + $(MAKE) -C $(@D)
Samuel> + $(QWT_BUILD_EXAMPLES)
Samuel> +endef
Samuel> +
Samuel> +define QWT_INSTALL_STAGING_CMDS
Samuel> + $(MAKE) INSTALL_ROOT=$(STAGING_DIR) -C $(@D) install
Samuel> + $(QWT_INSTALL_STAGING_EXAMPLES)
Samuel> +endef
Samuel> +
Samuel> +define QWT_INSTALL_TARGET_CMDS
Samuel> + cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/

Why not just make install like for staging?

Samuel> + $(QWT_INSTALL_TARGET_EXAMPLES)
Samuel> +endef
Samuel> +
Samuel> +define QWT_CLEAN_CMDS
Samuel> + -$(MAKE) -C $(@D) clean
Samuel> + -rm $(TARGET_DIR)/usr/lib/libqwt.so.*

If we cannot clean completely (E.G. everything else installed into staging), then I prefer just not providing a clean target.

Signature · 1 line
Bye, Peter Korsgaard
#18 lore raw

PATCH 1/1 qwt: new package

Quoted 6 lines · Peter Korsgaard
  Samuel>  +define QWT_CLEAN_CMDS
  Samuel>  +	-$(MAKE) -C $(@D) clean
  Samuel>  +	-rm $(TARGET_DIR)/usr/lib/libqwt.so.*

If we cannot clean completely (E.G. everything else installed into staging), then I prefer just not providing a clean target.

Begging to differ: I think it does make sense to have clean commands
but no uninstall commands. Of course, the definition above should have been split up into a clean and an uninstall.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#19 lore raw

PATCH 1/1 libcanfestival: new package

In reply to Samuel Martin
---
 package/Config.in                                  |   1 +
 package/libcanfestival/Config.in                   |  90 +++
 .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
 package/libcanfestival/libcanfestival.mk           |  45 ++
 4 files changed, 853 insertions(+)
 create mode 100644 package/libcanfestival/Config.in
 create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
 create mode 100644 package/libcanfestival/libcanfestival.mk
package/Config.in +1 -0
index 88849d3..ce78f79 100644
@@ -455,6 +455,7 @@ endmenu
 
 menu "Networking"
 source "package/glib-networking/Config.in"
+source "package/libcanfestival/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
 source "package/libcurl/Config.in"
package/libcanfestival/Config.in new file +90 -0

90 lines not on this page · raw message

package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch new file +717 -0

717 lines not on this page · raw message

package/libcanfestival/libcanfestival.mk new file +45 -0

45 lines not on this page · raw message

Signature · 1 line
1.8.0.1