Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Jun 2024 10:59:33 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2f10e6c4cce2 - main - misc/iio-oscilloscope: update 0.14 =?utf-8?Q?=E2=86=92?= 0.17
Message-ID:  <202406231059.45NAxXuj066194@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2f10e6c4cce2e7ff2ff1b94ac0f297d2603ab11c

commit 2f10e6c4cce2e7ff2ff1b94ac0f297d2603ab11c
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-06-23 10:12:32 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-06-23 10:12:32 +0000

    misc/iio-oscilloscope: update 0.14 → 0.17
    
    Reported by:    portscout
---
 misc/iio-oscilloscope/Makefile                   |  8 +++----
 misc/iio-oscilloscope/distinfo                   |  6 +++---
 misc/iio-oscilloscope/files/patch-CMakeLists.txt | 14 ++++++++++++
 misc/iio-oscilloscope/pkg-plist                  | 27 ++++++++++++------------
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/misc/iio-oscilloscope/Makefile b/misc/iio-oscilloscope/Makefile
index a44d17491556..c667fed9bdee 100644
--- a/misc/iio-oscilloscope/Makefile
+++ b/misc/iio-oscilloscope/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	iio-oscilloscope
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.14
+DISTVERSION=	0.17
 DISTVERSIONSUFFIX=	-master
-PORTREVISION=	4
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,8 +11,6 @@ WWW=		https://wiki.analog.com/resources/tools-software/linux-software/iio_oscill
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		uses depracated GTK functions, see https://github.com/analogdevicesinc/iio-oscilloscope/issues/441
-
 LIB_DEPENDS=	libad9361.so:misc/libad9361-iio \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
@@ -25,12 +22,13 @@ LIB_DEPENDS=	libad9361.so:misc/libad9361-iio \
 		libmatio.so:math/matio
 
 USES=		cmake compiler:c11 gnome localbase:ldflags pkgconfig
-USE_GNOME=	atk cairo gdkpixbuf2 gtk20 libxml2 pango
+USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 pango
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	analogdevicesinc
 
+CFLAGS+=	`pkg-config --cflags gtkdatabox` # workaround for https://github.com/analogdevicesinc/iio-oscilloscope/issues/499
 LDFLAGS+=	-lm -lexecinfo
 
 .include <bsd.port.mk>
diff --git a/misc/iio-oscilloscope/distinfo b/misc/iio-oscilloscope/distinfo
index 672b9d4428a3..da0905861fce 100644
--- a/misc/iio-oscilloscope/distinfo
+++ b/misc/iio-oscilloscope/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615054259
-SHA256 (analogdevicesinc-iio-oscilloscope-v0.14-master_GH0.tar.gz) = 878668317631f78cd9526c8d95855aec0b27aa8e4b554dad7517c26b6fc9c76c
-SIZE (analogdevicesinc-iio-oscilloscope-v0.14-master_GH0.tar.gz) = 40703562
+TIMESTAMP = 1719135848
+SHA256 (analogdevicesinc-iio-oscilloscope-v0.17-master_GH0.tar.gz) = add4e46b3bf59365deadcfbf5544fdb967e9ee7d67e136b8e56a3956289da6ce
+SIZE (analogdevicesinc-iio-oscilloscope-v0.17-master_GH0.tar.gz) = 40759619
diff --git a/misc/iio-oscilloscope/files/patch-CMakeLists.txt b/misc/iio-oscilloscope/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a31b016e2f00
--- /dev/null
+++ b/misc/iio-oscilloscope/files/patch-CMakeLists.txt
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig	2023-12-04 15:03:14 UTC
++++ CMakeLists.txt
+@@ -86,10 +86,9 @@ add_definitions(-D_GNU_SOURCE
+ 	${GIT_VERSION}
+ 	${GIT_COMMIT_TIMESTAMP}
+ 	-DGTK_DISABLE_DEPRECATED
+-	-D_POSIX_C_SOURCE=200809L
+ )
+ 
+-add_compile_options(-Wall -Wextra -Werror
++add_compile_options(-Wall -Wextra
+ 	-Wno-unused-parameter
+ 	-Wno-error=unused-but-set-variable
+ 	-Wno-error=unused-function
diff --git a/misc/iio-oscilloscope/pkg-plist b/misc/iio-oscilloscope/pkg-plist
index dd3f5a9cf209..41768eed8295 100644
--- a/misc/iio-oscilloscope/pkg-plist
+++ b/misc/iio-oscilloscope/pkg-plist
@@ -1,12 +1,11 @@
 bin/osc
-bin/osc-v
 lib/libosc.so
 lib/libosc.so.0
-lib/libosc.so.v
+lib/libosc.so.0.8
 lib/osc/AD5628_1.so
-lib/osc/AD7303.so
 lib/osc/ad6676.so
 lib/osc/ad9081.so
+lib/osc/ad9084.so
 lib/osc/ad9371.so
 lib/osc/ad9371_adv.so
 lib/osc/ad9739a.so
@@ -29,7 +28,6 @@ lib/osc/block_diagrams/fmcomms2.svg
 lib/osc/cf_axi_tdd.so
 lib/osc/cn0357.so
 lib/osc/cn0508.so
-lib/osc/cn0511.so
 lib/osc/cn0540.so
 lib/osc/daq2.so
 lib/osc/debug.so
@@ -75,18 +73,18 @@ lib/osc/filters/ad9371_5/profile_TxBW100_ORxBW100_RxBW50.txt
 lib/osc/filters/ad9371_5/profile_TxBW200_ORxBW200_RxBW100.txt
 lib/osc/filters/ad9371_5/profile_TxBW50_ORxBW50_RxBW25.txt
 lib/osc/filters/ad9371_5/profile_TxBW50_ORxBW50_RxBW50.txt
-lib/osc/filters/adrv9002/lte_10_lvds_nco_api_39_0_7.json
-lib/osc/filters/adrv9002/lte_10_lvds_nco_api_39_0_7.stream
-lib/osc/filters/adrv9002/lte_1_4_cmos_fdd_api_39_0_7.json
-lib/osc/filters/adrv9002/lte_1_4_cmos_fdd_api_39_0_7.stream
-lib/osc/filters/adrv9002/lte_20_lvds_api_39_0_7.json
-lib/osc/filters/adrv9002/lte_20_lvds_api_39_0_7.stream
-lib/osc/filters/adrv9002/lte_40_lvds_api_39_0_7.json
-lib/osc/filters/adrv9002/lte_40_lvds_api_39_0_7.stream
+lib/osc/filters/adrv9002/lte_10_lvds_nco_api_68_8_1.json
+lib/osc/filters/adrv9002/lte_10_lvds_nco_api_68_8_1.stream
+lib/osc/filters/adrv9002/lte_20_lvds_api_68_8_1.json
+lib/osc/filters/adrv9002/lte_20_lvds_api_68_8_1.stream
+lib/osc/filters/adrv9002/lte_40_lvds_api_68_8_1.json
+lib/osc/filters/adrv9002/lte_40_lvds_api_68_8_1.stream
+lib/osc/filters/adrv9002/lte_5_cmos_api_68_8_1.json
+lib/osc/filters/adrv9002/lte_5_cmos_api_68_8_1.stream
 lib/osc/filters/adrv9009/Tx_BW100_IR122p88_Rx_BW100_OR122p88_ORx_BW100_OR122p88_DC245p76.txt
 lib/osc/filters/adrv9009/Tx_BW200_IR245p76_Rx_BW100_OR122p88_ORx_BW200_OR245p76_DC245p76.txt
 lib/osc/filters/adrv9009/Tx_BW200_IR245p76_Rx_BW200_OR245p76_ORx_BW200_OR245p76_DC245p76.txt
-lib/osc/filters/adrv9009/Tx_BW400_IR491p52_Rx_BW200_OR245p76_ORx_BW400_OR491p52_DC245p76.txt
+lib/osc/filters/adrv9009/Tx_BW400_IR491p52_Rx_BW100_OR122p88_ORx_BW400_OR491p52_DC245p76.txt
 lib/osc/fmcadc3.so
 lib/osc/fmcomms1.so
 lib/osc/fmcomms11.so
@@ -168,12 +166,14 @@ lib/osc/xmls/adi_regmap_adc_v10.xml
 lib/osc/xmls/adi_regmap_adc_v9.xml
 lib/osc/xmls/adi_regmap_dac.xml
 lib/osc/xmls/adi_regmap_dac_v9.xml
+lib/osc/xmw.so
 share/osc/glade/AD5628_1.glade
 share/osc/glade/AD7303.glade
 share/osc/glade/ADIlogo.png
 share/osc/glade/IIOlogo.png
 share/osc/glade/ad6676.glade
 share/osc/glade/ad9081.glade
+share/osc/glade/ad9084.glade
 share/osc/glade/ad9371.glade
 share/osc/glade/ad9371_adv.glade
 share/osc/glade/ad9739a.glade
@@ -218,6 +218,7 @@ share/osc/glade/sine.png
 share/osc/glade/spectrum_analyzer.glade
 share/osc/glade/square.png
 share/osc/glade/triangle.png
+share/osc/glade/xmw.glade
 share/osc/icons/ADIlogo.png
 share/osc/icons/IIOlogo.png
 share/osc/icons/ch_color_icon.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406231059.45NAxXuj066194>