Skip to contentSkip to conversation

libserial: bump to version 1.0.0

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 libserial: bump to version 1.0.0

- Move site to github
- Add gcc >= 5 dependency for C++14:
https://github.com/crayzeewulf/libserial/commit/cafeffaa60f23012675d908b1e13b89aad3b56b2
- Remove first patch and use --without-python instead
- Remove second patch (patch has been merged in 2015:
https://github.com/crayzeewulf/libserial/commit/47ca0621ccd2100e4ba0d7f4e2a861d14f05f63c)
- Add a new patch to fix build when size_t is an unsigned int
- Use new --disable-tests option
- Update license to BSD-3-Clause and replace COPYING by LICENSE.txt:
https://github.com/crayzeewulf/libserial/commit/3f12abc045aae34a40a6fc9a9b5ed0a1bc6b2049
- Add hash for license file

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Add gcc >= 5 dependency for C++14

 ...cpp-fix-build-when-size_t-is-an-unsigned-.patch | 39 +++++++++++++
 .../libserial/0001-disable-python-bindings.patch   | 26 ---------
 ...n-t-use-high-baudrates-when-not-available.patch | 65 ----------------------
 package/libserial/Config.in                        |  7 ++-
 package/libserial/libserial.hash                   |  6 +-
 package/libserial/libserial.mk                     | 13 +++--
 6 files changed, 55 insertions(+), 101 deletions(-)
 create mode 100644 package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch
 delete mode 100644 package/libserial/0001-disable-python-bindings.patch
 delete mode 100644 package/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch
package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch new file +39 -0
new file mode 100644
index 0000000000..a01da53adb
@@ -0,0 +1,39 @@
+From 2e4cf095afdcf843e93d1bdea9dbd961558f09bd Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 13 Jan 2019 21:01:19 +0100
+Subject: [PATCH] SerialPort.cpp: fix build when size_t is an unsigned int
+
+size_t can be defined as an unsigned int instead of long unsigned int so
+replace 1UL to (size_t)1 when calling max function
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/crayzeewulf/libserial/pull/126]
+---
+ src/SerialPort.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/SerialPort.cpp b/src/SerialPort.cpp
+index e354fcb..75e762e 100644
+--- a/src/SerialPort.cpp
++++ b/src/SerialPort.cpp
+@@ -2208,7 +2208,7 @@ namespace LibSerial
+ 
+         // Local variables.
+         size_t number_of_bytes_read = 0 ;
+-        size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ;
++        size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ;
+         size_t maximum_number_of_bytes = dataBuffer.max_size() ;
+         
+         // Clear the data buffer and reserve enough space in the buffer to store the incoming data.
+@@ -2302,7 +2302,7 @@ namespace LibSerial
+ 
+         // Local variables.
+         size_t number_of_bytes_read = 0 ;
+-        size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ;
++        size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ;
+         size_t maximum_number_of_bytes = dataString.max_size() ;
+         
+         // Clear the data buffer and reserve enough space in the buffer to store the incoming data.
+-- 
+2.14.1
+
package/libserial/0001-disable-python-bindings.patch deleted +0 -26
deleted file mode 100644
index 1f2f5ed7df..0000000000
@@ -1,26 +0,0 @@
-Disable build of Python bindings, which requires the sipconfig module.
-
-Signed-off-by: Simon Dawson <[email protected]>
-Signed-off-by: J?rg Krause <[email protected]>
-
-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 -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
package/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch deleted +0 -65

65 lines not on this page · raw message

package/libserial/Config.in +5 -2
index d492f6b71b..d54ae4d8ac 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBSERIAL
 	bool "libserial"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
 	depends on BR2_USE_WCHAR # boost
 	select BR2_PACKAGE_BOOST
@@ -10,5 +11,7 @@ config BR2_PACKAGE_LIBSERIAL
 
 	  http://libserial.sourceforge.net/
 
-comment "libserial needs a toolchain w/ C++, threads, wchar"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+comment "libserial needs a toolchain w/ C++, gcc >= 5, threads, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
package/libserial/libserial.hash +2 -4
index bca647ae3f..e82809c71b 100644
@@ -1,5 +1,3 @@
-# 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
 # Locally calculated
-sha256 35ee29eb1369d52ffb8658237577692f991eb508320d0abbb71c53e6494a1c23 libserial-0.6.0rc2.tar.gz
+sha256 063142d6bfe08898316e9a6055f2ddeedef56de06f7cfc8dcdfecc6efabf4bdd libserial-v1.0.0.tar.gz
+sha256 c42fdfe17c192cfdb900e22d40ef246db1b473f99165e405eda62b41be27f4bf LICENSE.txt
package/libserial/libserial.mk +9 -4
index b73d4c76cd..8da7d1cddd 100644
@@ -4,13 +4,18 @@
 #
 ################################################################################
 
-LIBSERIAL_VERSION = 0.6.0rc2
-LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
+LIBSERIAL_VERSION = v1.0.0
+LIBSERIAL_SITE = $(call github,crayzeewulf,libserial,$(LIBSERIAL_VERSION))
 LIBSERIAL_INSTALL_STAGING = YES
-LIBSERIAL_LICENSE = GPL-2.0+
-LIBSERIAL_LICENSE_FILES = COPYING
+LIBSERIAL_LICENSE = BSD-3-Clause
+LIBSERIAL_LICENSE_FILES = LICENSE.txt
 LIBSERIAL_DEPENDENCIES = boost
+# From git
+LIBSERIAL_AUTORECONF = YES
 
 LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no
+LIBSERIAL_CONF_OPTS = \
+	--disable-tests \
+	--without-python
 
 $(eval $(autotools-package))
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 1/1 libserial: bump to version 1.0.0

Hello,

Quoted 12 lines · Fabrice Fontaine

- Move site to github
- Add gcc >= 5 dependency for C++14:
https://github.com/crayzeewulf/libserial/commit/cafeffaa60f23012675d908b1e13b89aad3b56b2
- Remove first patch and use --without-python instead
- Remove second patch (patch has been merged in 2015:
https://github.com/crayzeewulf/libserial/commit/47ca0621ccd2100e4ba0d7f4e2a861d14f05f63c)
- Add a new patch to fix build when size_t is an unsigned int
- Use new --disable-tests option
- Update license to BSD-3-Clause and replace COPYING by LICENSE.txt:
https://github.com/crayzeewulf/libserial/commit/3f12abc045aae34a40a6fc9a9b5ed0a1bc6b2049
- Add hash for license file

Quoted 4 lines

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Add gcc >= 5 dependency for C++14

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com