From patchwork Thu Jul 30 19:21:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 502257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 227981402B9 for ; Fri, 31 Jul 2015 05:21:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0B1E631DD2; Thu, 30 Jul 2015 19:21:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 83OqRz7usqoT; Thu, 30 Jul 2015 19:21:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 01FED33A7C; Thu, 30 Jul 2015 19:21:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 401801C04C4 for ; Thu, 30 Jul 2015 19:21:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3C1BC33A7C for ; Thu, 30 Jul 2015 19:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NNoSE4-2LgEy for ; Thu, 30 Jul 2015 19:21:34 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx02.posteo.de (mx02.posteo.de [89.146.194.165]) by silver.osuosl.org (Postfix) with ESMTPS id 1FD3D31DD2 for ; Thu, 30 Jul 2015 19:21:34 +0000 (UTC) Received: from dovecot04.posteo.de (unknown [185.67.36.27]) by mx02.posteo.de (Postfix) with ESMTPS id 6F56325A3DE7 for ; Thu, 30 Jul 2015 21:21:31 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot04.posteo.de (Postfix) with ESMTPSA id 3mj1nR0FrYzFpWR for ; Thu, 30 Jul 2015 21:21:31 +0200 (CEST) Received: from nzxt.fritz.box (nzxt.localdomain [192.168.178.46]) (Authenticated sender: joerg.krause@embedded.rocks) by embedded.rocks (Postfix) with ESMTPSA id 71296980384; Thu, 30 Jul 2015 21:21:30 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Thu, 30 Jul 2015 21:21:28 +0200 Message-Id: <1438284088-20483-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libserial: bump to version 0.6.0rc2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also: * Update patch #1 * Remove patch #2, fixed upstream * add new dependency to boost * use hashes from sourceforge Signed-off-by: Jörg Krause --- .../libserial/0001-disable-python-bindings.patch | 21 +++++++++++---------- .../libserial/0002-add-missing-header-include.patch | 15 --------------- package/libserial/Config.in | 8 ++++++-- package/libserial/libserial.hash | 5 +++-- package/libserial/libserial.mk | 3 ++- 5 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 package/libserial/0002-add-missing-header-include.patch diff --git a/package/libserial/0001-disable-python-bindings.patch b/package/libserial/0001-disable-python-bindings.patch index 54b5cb6..1f2f5ed 100644 --- a/package/libserial/0001-disable-python-bindings.patch +++ b/package/libserial/0001-disable-python-bindings.patch @@ -1,25 +1,26 @@ Disable build of Python bindings, which requires the sipconfig module. Signed-off-by: Simon Dawson +Signed-off-by: Jörg Krause -diff -Nurp a/Makefile.am b/Makefile.am ---- a/Makefile.am 2008-11-12 01:27:31.000000000 +0000 -+++ b/Makefile.am 2013-04-16 09:41:13.476002178 +0100 +diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am +--- libserial-0.6.0rc2.orig/Makefile.am 2014-06-05 18:37:25.000000000 +0200 ++++ libserial-0.6.0rc2/Makefile.am 2015-07-30 20:59:28.828429011 +0200 @@ -1,4 +1,4 @@ -SUBDIRS=src doc examples sip +SUBDIRS=src doc examples + ACLOCAL_AMFLAGS=-I m4 EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc - -diff -Nurp a/Makefile.in b/Makefile.in ---- a/Makefile.in 2008-11-12 01:28:14.000000000 +0000 -+++ b/Makefile.in 2013-04-16 09:41:05.628013626 +0100 -@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in +--- libserial-0.6.0rc2.orig/Makefile.in 2014-06-05 18:40:09.000000000 +0200 ++++ libserial-0.6.0rc2/Makefile.in 2015-07-30 21:00:09.215188376 +0200 +@@ -348,7 +348,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = src doc examples sip +SUBDIRS = src doc examples + ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libserial.pc diff --git a/package/libserial/0002-add-missing-header-include.patch b/package/libserial/0002-add-missing-header-include.patch deleted file mode 100644 index a022637..0000000 --- a/package/libserial/0002-add-missing-header-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add a missing header include, to fix a build error. - -Signed-off-by: Simon Dawson - -diff -Nurp a/src/SerialPort.cpp b/src/SerialPort.cpp ---- a/src/SerialPort.cpp 2008-11-12 01:27:30.000000000 +0000 -+++ b/src/SerialPort.cpp 2013-04-23 15:43:41.537495852 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/package/libserial/Config.in b/package/libserial/Config.in index 22adb72..4fb1acb 100644 --- a/package/libserial/Config.in +++ b/package/libserial/Config.in @@ -1,11 +1,15 @@ config BR2_PACKAGE_LIBSERIAL bool "libserial" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS # boost + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR # boost + select boost help Simplified serial port programming in C++ under POSIX operating systems. http://libserial.sourceforge.net/ -comment "libserial needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libserial needs a toolchain w/ C++, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/libserial/libserial.hash b/package/libserial/libserial.hash index 26f65e5..024d657 100644 --- a/package/libserial/libserial.hash +++ b/package/libserial/libserial.hash @@ -1,2 +1,3 @@ -# Locally computed: -sha256 60d8aebf5f262c12baf94ce61d61198fc9b79da2432c735c200decd08ead1fb4 libserial-0.6.0rc1.tar.gz +# From http://sourceforge.net/projects/libserial/files/libserial/0.6.0rc2/ +sha1 e09113be3ba595135e95e853003ff96feea0da63 libserial-0.6.0rc2.tar.gz +md5 7787679b22901e4810bc53ecccdf8266 libserial-0.6.0rc2.tar.gz diff --git a/package/libserial/libserial.mk b/package/libserial/libserial.mk index d2c928b..11f1874 100644 --- a/package/libserial/libserial.mk +++ b/package/libserial/libserial.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBSERIAL_VERSION = 0.6.0rc1 +LIBSERIAL_VERSION = 0.6.0rc2 LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial LIBSERIAL_INSTALL_STAGING = YES LIBSERIAL_LICENSE = GPLv2+ LIBSERIAL_LICENSE_FILES = COPYING +LIBSERIAL_DEPENDENCIES = boost LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no