Update to libsigrok-0.5.2 and pulseview-0.4.2.
Disable ruby support; ruby gets picked up but the bindings fail to build. Improve some package COMMENTs. Enable debug packages. requested & tested by jcs@
This commit is contained in:
bentley
parent
c3d878ffa1
commit
8221fdc32b
@ -1,10 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2018/09/19 05:50:36 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
COMMENT = sigrok hardware driver library
|
||||
COMMENT = sigrok serial port communication library
|
||||
|
||||
SIGROK_PROJECT = libserialport
|
||||
SIGROK_VERSION = 0.1.1
|
||||
REVISION = 0
|
||||
|
||||
SHARED_LIBS += serialport 0.0 # 0.0
|
||||
|
||||
DEBUG_PACKAGES = ${BUILD_PACKAGES}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2021/02/23 19:39:11 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
COMMENT = sigrok hardware driver library
|
||||
|
||||
SIGROK_PROJECT = libsigrok
|
||||
SIGROK_VERSION = 0.5.1
|
||||
SIGROK_VERSION = 0.5.2
|
||||
MODPY_EGG_VERSION = ${SIGROK_VERSION}
|
||||
REVISION = 5
|
||||
|
||||
SHARED_LIBS += sigrok 0.1 # 0.0
|
||||
SHARED_LIBS += sigrokcxx 0.1 # 4.0
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} ftdi1 glib-2.0 glibmm-2.4 gmodule-2.0
|
||||
WANTLIB += ${COMPILER_LIBCXX}
|
||||
WANTLIB += ftdi1 glib-2.0 glibmm-2.4 gio-2.0
|
||||
WANTLIB += gobject-2.0 iconv intl m serialport sigc-2.0 usb-1.0
|
||||
WANTLIB += zip
|
||||
|
||||
@ -40,4 +40,8 @@ TEST_DEPENDS = devel/check
|
||||
# (.text+0x52): undefined reference to `main'
|
||||
USE_LIBTOOL = gnu
|
||||
|
||||
CONFIGURE_ARGS = --disable-ruby
|
||||
|
||||
DEBUG_PACKAGES = ${BUILD_PACKAGES}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (libsigrok-0.5.1.tar.gz) = 5A/eevmNKeki6dPL4KbAVpiJFT/DHke4sa/k2EYpK5w=
|
||||
SIZE (libsigrok-0.5.1.tar.gz) = 1664813
|
||||
SHA256 (libsigrok-0.5.2.tar.gz) = TTQfkLYiDT6MslHaz3JsQRZShWEiSPLFLRXfRZChzjw=
|
||||
SIZE (libsigrok-0.5.2.tar.gz) = 1779465
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-Doxyfile,v 1.1 2019/09/30 06:34:50 rsadowski Exp $
|
||||
|
||||
Behavior of FILE_PATTERNS was unintentionally changed in doxygen 1.8.16,
|
||||
this lead to the libsigrok doxygen invocation generating almost no data,
|
||||
and missing all the enums needed for the binding generation, resulting
|
||||
in build failures.
|
||||
|
||||
Workaround this by commenting out `FILE_PATTERNS`.
|
||||
|
||||
Upstream-issue: https://github.com/doxygen/doxygen/issues/7190
|
||||
|
||||
Index: Doxyfile
|
||||
--- Doxyfile.orig
|
||||
+++ Doxyfile
|
||||
@@ -763,7 +763,7 @@ INPUT_ENCODING = UTF-8
|
||||
# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
|
||||
# *.qsf, *.as and *.js.
|
||||
|
||||
-FILE_PATTERNS =
|
||||
+#FILE_PATTERNS =
|
||||
|
||||
# The RECURSIVE tag can be used to specify whether or not subdirectories should
|
||||
# be searched for input files as well.
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.2 2018/11/03 06:31:15 bentley Exp $
|
||||
$OpenBSD: patch-config_h_in,v 1.3 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
Index: config.h.in
|
||||
--- config.h.in.orig
|
||||
+++ config.h.in
|
||||
@@ -376,8 +376,3 @@
|
||||
@@ -412,8 +412,3 @@
|
||||
|
||||
/* Define for large files, on AIX-style hosts. */
|
||||
#undef _LARGE_FILES
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2021/02/23 19:39:11 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
COMMENT = sigrok protocol decoding library
|
||||
REVISION = 0
|
||||
REVISION = 1
|
||||
|
||||
SIGROK_PROJECT = libsigrokdecode
|
||||
SIGROK_VERSION = 0.5.3
|
||||
@ -13,4 +13,6 @@ WANTLIB += glib-2.0 iconv intl m pcre pthread util ${MODPY_WANTLIB}
|
||||
MODULES = lang/python
|
||||
LIB_DEPENDS = devel/glib2
|
||||
|
||||
DEBUG_PACKAGES = ${BUILD_PACKAGES}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2021/01/19 06:51:41 rsadowski Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
COMMENT = command-line frontend for sigrok logic analyzer
|
||||
REVISION = 3
|
||||
COMMENT = graphical frontend for sigrok logic analyzer
|
||||
|
||||
SIGROK_PROJECT = pulseview
|
||||
SIGROK_VERSION = 0.4.1
|
||||
SIGROK_VERSION = 0.4.2
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX}
|
||||
WANTLIB += Qt5Core Qt5Gui Qt5Svg Qt5Widgets boost_filesystem-mt
|
||||
@ -27,8 +26,8 @@ CONFIGURE_ARGS = -DQt5_DIR=${MODQT5_LIBDIR}/cmake/Qt5 \
|
||||
-DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
|
||||
-DDISABLE_WERROR=ON
|
||||
|
||||
FIX_EXTRACT_PERMISSIONS = Yes
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
DEBUG_PACKAGES = ${BUILD_PACKAGES}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (pulseview-0.4.1.tar.gz) = nufOPdFFfGpfXk6cJGmQOh8HC6B36mhTXMKe8d+sby8=
|
||||
SIZE (pulseview-0.4.1.tar.gz) = 1342532
|
||||
SHA256 (pulseview-0.4.2.tar.gz) = 8EL3ej4bNb8wZmMw427Dj6uNJIw2k8N7fjXUAcO/q8s=
|
||||
SIZE (pulseview-0.4.2.tar.gz) = 1399718
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-pv_util_cpp,v 1.1 2021/01/19 06:51:41 rsadowski Exp $
|
||||
$OpenBSD: patch-pv_util_cpp,v 1.2 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
Unbreak Qt5.15 build
|
||||
ae726b70a7ada9a4be5808e00f0c951318479684
|
||||
@ -12,10 +12,10 @@ Index: pv/util.cpp
|
||||
if (sign && !v.is_zero())
|
||||
- ts << forcesign;
|
||||
+ ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign);
|
||||
ts << qSetRealNumberPrecision(precision) << (v * multiplier) << ' '
|
||||
<< prefix << unit;
|
||||
ts << qSetRealNumberPrecision(precision) << (v * multiplier);
|
||||
ts << ' ' << prefix << unit;
|
||||
|
||||
@@ -171,7 +171,7 @@ QString format_value_si(double v, SIPrefix prefix, uns
|
||||
@@ -175,7 +175,7 @@ QString format_value_si(double v, SIPrefix prefix, uns
|
||||
QString s;
|
||||
QTextStream ts(&s);
|
||||
if (sign && (v != 0))
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2018/10/30 08:25:43 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
COMMENT = command-line frontend for sigrok logic analyzer
|
||||
|
||||
SIGROK_PROJECT = sigrok-cli
|
||||
SIGROK_VERSION = 0.7.1
|
||||
REVISION = 0
|
||||
|
||||
WANTLIB += c glib-2.0 intl sigrok sigrokdecode
|
||||
|
||||
@ -13,4 +14,6 @@ LIB_DEPENDS = comms/sigrok/libsigrok \
|
||||
RUN_DEPENDS = devel/desktop-file-utils \
|
||||
x11/gtk+3,-guic
|
||||
|
||||
DEBUG_PACKAGES = ${BUILD_PACKAGES}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2018/09/19 05:50:36 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2021/02/25 07:56:30 bentley Exp $
|
||||
|
||||
COMMENT = example signal/protocal dumps for sigrok
|
||||
COMMENT = example signal/protocol dumps for sigrok
|
||||
|
||||
SIGROK_PROJECT = sigrok-dumps
|
||||
SIGROK_VERSION = 0.1.0
|
||||
REVISION = 0
|
||||
|
||||
CONFIGURE_STYLE =
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user