haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libsigrok: enable C++ bindings

Browse Source
This commit is contained in:
Adrien Destugues
2019-01-11 22:56:24 +01:00
parent b056b290f0
commit 93f89f0d9e
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sci-libs/libsigrok/libsigrok-0.5.1.recipe
View File

@@ -12,7 +12,7 @@ different frontends.
HOMEPAGE="https://sigrok.org"
COPYRIGHT="2011-2018 sigrok contributors"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="3"
SOURCE_URI="http://sigrok.org/download/source/libsigrok/libsigrok-$portVersion.tar.gz"
CHECKSUM_SHA256="e40fde7af98d29e922e9d3cbe0a6c0569889153fc31e47b8b1afe4d846292b9c"
PATCHES="libsigrok-$portVersion.patchset"
@@ -23,6 +23,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
lisigrok$secondaryArchSuffix = $portVersion
lib:libsigrok$secondaryArchSuffix = 4.1.0 compat >= 4
lib:libsigrokcxx$secondaryArchSuffix = 4.1.0 compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -31,14 +32,24 @@ REQUIRES="
lib:libz$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libglibmm$secondaryArchSuffix
lib:libsigc_3.0$secondaryArchSuffix
lib:libusb_1.0$secondaryArchSuffix
"
PROVIDES_devel="
lisigrok${secondaryArchSuffix}_devel = $portVersion
devel:libsigrok$secondaryArchSuffix = 4.1.0 compat >= 4
devel:libsigrokcxx$secondaryArchSuffix = 4.1.0 compat >= 4
"
REQUIRES_devel="
devel:libglibmm$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libftdi1$secondaryArchSuffix
devel:libzip$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libusb_1.0$secondaryArchSuffix
@@ -72,7 +83,9 @@ INSTALL()
{
make install
prepareInstalledDevelLib libsigrok
prepareInstalledDevelLibs libsigrok libsigrokcxx
rm $developLibDir/*.la
fixPkgconfig
packageEntries devel $developDir
}

34
sci-libs/libsigrok/patches/libsigrok-0.5.1.patchset
View File

@@ -56,3 +56,37 @@ index bb55ebc..eb53159 100644
--
2.19.1
From 9ef867a20fd8178572f73c474cb39c38b50a03d8 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 11 Jan 2019 21:46:00 +0100
Subject: Fix C++ bindings build
diff --git a/Makefile.am b/Makefile.am
index 148de0f..f8718d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -701,6 +701,7 @@ bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS) $(SR_EXTRA_CXX_LIBS)
bindings_cxx_libsigrokcxx_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
+bindings_cxx_libsigrokcxx_la_CXXFLAGS = `pkg-config --cflags glibmm-2.58`
bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
bindings_cxx_libsigrokcxx_la_include_HEADERS = \
diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
index ba34631..c25fe8e 100644
--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
@@ -83,6 +83,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
#include <vector>
#include <map>
#include <set>
+#include <functional>
namespace sigrok
{
--
2.19.1