Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New packages: SDRPlusPlus and airspyhf
@ 2022-07-23  8:27 classabbyamp
  2022-07-25 20:32 ` [PR REVIEW] " paper42
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: classabbyamp @ 2022-07-23  8:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 769 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages new/SDRPlusPlus
https://github.com/void-linux/void-packages/pull/38202

New packages: SDRPlusPlus and airspyhf
- New package: airspyhf-1.6.8
    closes #38198
- New package: SDRPlusPlus-1.0.4
    closes #38200

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**



A patch file from https://github.com/void-linux/void-packages/pull/38202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/SDRPlusPlus-38202.patch --]
[-- Type: text/x-diff, Size: 3853 bytes --]

From 11b822af5473452f41659a7b6cd19b9e23c62db3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:08:18 -0400
Subject: [PATCH 1/2] New package: airspyhf-1.6.8

closes #38198
---
 common/shlibs             |  1 +
 srcpkgs/airspyhf/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/libairspyhf       |  1 +
 srcpkgs/libairspyhf-devel |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/airspyhf/template
 create mode 120000 srcpkgs/libairspyhf
 create mode 120000 srcpkgs/libairspyhf-devel

diff --git a/common/shlibs b/common/shlibs
index c0b708dd7a3d..5c9bbf5c30a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4175,3 +4175,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libqtspell-qt5.so.1 qtspell-1.0.1_1
+libairspyhf.so.0 libairspyhf-1.6.8_1
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
new file mode 100644
index 000000000000..dc306e6d3333
--- /dev/null
+++ b/srcpkgs/airspyhf/template
@@ -0,0 +1,37 @@
+# Template file for 'airspyhf'
+pkgname=airspyhf
+version=1.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libusb-devel"
+short_desc="Usermode driver and tools for Airspy HF+"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="BSD-3-Clause"
+homepage="https://github.com/airspy/airspyhf"
+distfiles="https://github.com/airspy/airspyhf/archive/refs/tags/${version}.tar.gz"
+checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
+
+post_install() {
+	vlicense LICENSE
+}
+
+libairspyhf_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
+		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
+	}
+}
+
+libairspyhf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libairspyhf b/srcpkgs/libairspyhf
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file
diff --git a/srcpkgs/libairspyhf-devel b/srcpkgs/libairspyhf-devel
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf-devel
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file

From afc4be65a9273097b63e23fa261d3d8021cf74f1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:22:58 -0400
Subject: [PATCH 2/2] New package: SDRPlusPlus-1.0.4

closes #38200
---
 srcpkgs/SDRPlusPlus/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/SDRPlusPlus/template

diff --git a/srcpkgs/SDRPlusPlus/template b/srcpkgs/SDRPlusPlus/template
new file mode 100644
index 000000000000..9651aeca246f
--- /dev/null
+++ b/srcpkgs/SDRPlusPlus/template
@@ -0,0 +1,16 @@
+# Template file for 'SDRPlusPlus'
+pkgname=SDRPlusPlus
+version=1.0.4
+revision=1
+build_style=cmake
+configure_args="-DOPT_BUILD_PLUTOSDR_SOURCE=0"
+hostmakedepends="pkg-config"
+makedepends="fftw-devel glfw-devel volk-devel libzstd-devel glew-devel libusb-devel
+ librtlsdr-devel SoapySDR-devel libairspy-devel libairspyhf-devel libhackrf-devel
+ rtaudio-devel alsa-lib-devel pulseaudio-devel jack-devel"
+short_desc="Open source SDR software"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only"
+homepage="https://github.com/AlexandreRouma/SDRPlusPlus"
+distfiles="https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/tags/${version}.tar.gz"
+checksum=251256de6725ceb4f9fb2823c7ad825068ad16cf9b5fb894259b173aae5a69ea

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
@ 2022-07-25 20:32 ` paper42
  2022-07-25 20:34 ` paper42
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-07-25 20:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38202#discussion_r929274043

Comment:
The pkgconfig file mentions libusb in Cflags, but not in Requires, do you know if that's a bug upstream?
```
Cflags: -I${includedir}/libairspyhf/ -I/usr/include/libusb-1.0
```

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
  2022-07-25 20:32 ` [PR REVIEW] " paper42
@ 2022-07-25 20:34 ` paper42
  2022-07-25 22:37 ` classabbyamp
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-07-25 20:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38202#discussion_r929275272

Comment:
I think it would be more readable to only install files in pkg_install of subpackages and do all the changes in the main package.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
  2022-07-25 20:32 ` [PR REVIEW] " paper42
  2022-07-25 20:34 ` paper42
@ 2022-07-25 22:37 ` classabbyamp
  2022-07-25 22:39 ` [PR PATCH] [Updated] " classabbyamp
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-07-25 22:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38202#discussion_r929363094

Comment:
doesn't seem to be reported anywhere. The `.pc.in` file doesn't have a requires line either.

```
$ xbps-query -R --cat /usr/lib/pkgconfig/libairspy.pc libairspy-devel
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: AirSpy Library
Description: C Utility Library
Version: 1.0
Cflags: -I${includedir}/libairspy/ -I/usr/include/libusb-1.0
Libs: -L${libdir} -lairspy
Libs.private: 
```
the other library from airspy has the same thing pretty much

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (2 preceding siblings ...)
  2022-07-25 22:37 ` classabbyamp
@ 2022-07-25 22:39 ` classabbyamp
  2022-07-28  5:12 ` classabbyamp
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-07-25 22:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages new/SDRPlusPlus
https://github.com/void-linux/void-packages/pull/38202

New packages: SDRPlusPlus and airspyhf
- New package: airspyhf-1.6.8
    closes #38198
- New package: SDRPlusPlus-1.0.4
    closes #38200

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  tested by requester, see #38200

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**



A patch file from https://github.com/void-linux/void-packages/pull/38202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/SDRPlusPlus-38202.patch --]
[-- Type: text/x-diff, Size: 4534 bytes --]

From 11b822af5473452f41659a7b6cd19b9e23c62db3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:08:18 -0400
Subject: [PATCH 1/2] New package: airspyhf-1.6.8

closes #38198
---
 common/shlibs             |  1 +
 srcpkgs/airspyhf/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/libairspyhf       |  1 +
 srcpkgs/libairspyhf-devel |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/airspyhf/template
 create mode 120000 srcpkgs/libairspyhf
 create mode 120000 srcpkgs/libairspyhf-devel

diff --git a/common/shlibs b/common/shlibs
index c0b708dd7a3d..5c9bbf5c30a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4175,3 +4175,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libqtspell-qt5.so.1 qtspell-1.0.1_1
+libairspyhf.so.0 libairspyhf-1.6.8_1
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
new file mode 100644
index 000000000000..dc306e6d3333
--- /dev/null
+++ b/srcpkgs/airspyhf/template
@@ -0,0 +1,37 @@
+# Template file for 'airspyhf'
+pkgname=airspyhf
+version=1.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libusb-devel"
+short_desc="Usermode driver and tools for Airspy HF+"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="BSD-3-Clause"
+homepage="https://github.com/airspy/airspyhf"
+distfiles="https://github.com/airspy/airspyhf/archive/refs/tags/${version}.tar.gz"
+checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
+
+post_install() {
+	vlicense LICENSE
+}
+
+libairspyhf_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
+		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
+	}
+}
+
+libairspyhf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libairspyhf b/srcpkgs/libairspyhf
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file
diff --git a/srcpkgs/libairspyhf-devel b/srcpkgs/libairspyhf-devel
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf-devel
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file

From d71ce419cf8ccefacaca51fd816dba1bada54953 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:22:58 -0400
Subject: [PATCH 2/2] New package: SDRPlusPlus-1.0.4

closes #38200
---
 srcpkgs/SDRPlusPlus/template | 16 ++++++++++++++++
 srcpkgs/airspyhf/template    |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/SDRPlusPlus/template

diff --git a/srcpkgs/SDRPlusPlus/template b/srcpkgs/SDRPlusPlus/template
new file mode 100644
index 000000000000..9651aeca246f
--- /dev/null
+++ b/srcpkgs/SDRPlusPlus/template
@@ -0,0 +1,16 @@
+# Template file for 'SDRPlusPlus'
+pkgname=SDRPlusPlus
+version=1.0.4
+revision=1
+build_style=cmake
+configure_args="-DOPT_BUILD_PLUTOSDR_SOURCE=0"
+hostmakedepends="pkg-config"
+makedepends="fftw-devel glfw-devel volk-devel libzstd-devel glew-devel libusb-devel
+ librtlsdr-devel SoapySDR-devel libairspy-devel libairspyhf-devel libhackrf-devel
+ rtaudio-devel alsa-lib-devel pulseaudio-devel jack-devel"
+short_desc="Open source SDR software"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only"
+homepage="https://github.com/AlexandreRouma/SDRPlusPlus"
+distfiles="https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/tags/${version}.tar.gz"
+checksum=251256de6725ceb4f9fb2823c7ad825068ad16cf9b5fb894259b173aae5a69ea
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
index dc306e6d3333..e5be006613cd 100644
--- a/srcpkgs/airspyhf/template
+++ b/srcpkgs/airspyhf/template
@@ -14,13 +14,13 @@ checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
 
 post_install() {
 	vlicense LICENSE
+	vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
 }
 
 libairspyhf_package() {
 	short_desc+=" - library"
 	pkg_install() {
 		vmove usr/lib/*.so.*
-		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
 		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
 	}
 }

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (3 preceding siblings ...)
  2022-07-25 22:39 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-07-28  5:12 ` classabbyamp
  2022-07-28  5:14 ` [PR REVIEW] " classabbyamp
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-07-28  5:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages new/SDRPlusPlus
https://github.com/void-linux/void-packages/pull/38202

New packages: SDRPlusPlus and airspyhf
- New package: airspyhf-1.6.8
    closes #38198
- New package: SDRPlusPlus-1.0.4
    closes #38200

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  tested by requester, see #38200

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**



A patch file from https://github.com/void-linux/void-packages/pull/38202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/SDRPlusPlus-38202.patch --]
[-- Type: text/x-diff, Size: 6167 bytes --]

From f2e95195bbf2f656c05377aac0f5ae9ee0182487 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:08:18 -0400
Subject: [PATCH 1/2] New package: airspyhf-1.6.8

closes #38198
---
 common/shlibs                                 |  1 +
 .../airspyhf/patches/fix-libm-linking.patch   | 28 ++++++++++++++
 srcpkgs/airspyhf/template                     | 37 +++++++++++++++++++
 srcpkgs/libairspyhf                           |  1 +
 srcpkgs/libairspyhf-devel                     |  1 +
 5 files changed, 68 insertions(+)
 create mode 100644 srcpkgs/airspyhf/patches/fix-libm-linking.patch
 create mode 100644 srcpkgs/airspyhf/template
 create mode 120000 srcpkgs/libairspyhf
 create mode 120000 srcpkgs/libairspyhf-devel

diff --git a/common/shlibs b/common/shlibs
index 38fb7b934ab0..21beabfaead8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4178,3 +4178,4 @@ libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libqtspell-qt5.so.1 qtspell-1.0.1_1
 libopensmtpd.so.0 libopensmtpd-0.7_1
+libairspyhf.so.0 libairspyhf-1.6.8_1
diff --git a/srcpkgs/airspyhf/patches/fix-libm-linking.patch b/srcpkgs/airspyhf/patches/fix-libm-linking.patch
new file mode 100644
index 000000000000..73f888ffd4be
--- /dev/null
+++ b/srcpkgs/airspyhf/patches/fix-libm-linking.patch
@@ -0,0 +1,28 @@
+https://github.com/airspy/airspyhf/pull/35
+https://build.opensuse.org/package/view_file/openSUSE:Factory/airspyhf/airspyhf-fix-libm-linking.patch
+
+diff --git a/libairspyhf/src/CMakeLists.txt b/libairspyhf/src/CMakeLists.txt
+index 9d8d483..da1f966 100644
+--- a/libairspyhf/src/CMakeLists.txt
++++ b/libairspyhf/src/CMakeLists.txt
+@@ -58,7 +58,7 @@ set_target_properties(airspyhf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ set_target_properties(airspyhf-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ 
+ # Dependencies
+-target_link_libraries(airspyhf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(airspyhf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
+ 
+ # For cygwin just force UNIX OFF and WIN32 ON
+ if( ${CYGWIN} )
+
+diff --git a/libairspyhf/libairspyhf.pc.in b/libairspyhf/libairspyhf.pc.in
+index fcf040b..ca5214f 100644
+--- a/libairspyhf/libairspyhf.pc.in
++++ b/libairspyhf/libairspyhf.pc.in
+@@ -7,5 +7,5 @@ Name: AirSpy HF+ Library
+ Description: C Utility Library
+ Version: @VERSION@
+ Cflags: -I${includedir}/libairspyhf/ @AIRSPYHF_PC_CFLAGS@
+-Libs: -L${libdir} -lairspyhf
++Libs: -L${libdir} -lairspyhf -lm
+ Libs.private: @AIRSPYHF_PC_LIBS@
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
new file mode 100644
index 000000000000..dc306e6d3333
--- /dev/null
+++ b/srcpkgs/airspyhf/template
@@ -0,0 +1,37 @@
+# Template file for 'airspyhf'
+pkgname=airspyhf
+version=1.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libusb-devel"
+short_desc="Usermode driver and tools for Airspy HF+"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="BSD-3-Clause"
+homepage="https://github.com/airspy/airspyhf"
+distfiles="https://github.com/airspy/airspyhf/archive/refs/tags/${version}.tar.gz"
+checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
+
+post_install() {
+	vlicense LICENSE
+}
+
+libairspyhf_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
+		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
+	}
+}
+
+libairspyhf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libairspyhf b/srcpkgs/libairspyhf
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file
diff --git a/srcpkgs/libairspyhf-devel b/srcpkgs/libairspyhf-devel
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf-devel
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file

From 6b15c48c148b4ac969182675bcb7e3a8479aa0e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:22:58 -0400
Subject: [PATCH 2/2] New package: SDRPlusPlus-1.0.4

closes #38200
---
 srcpkgs/SDRPlusPlus/template | 16 ++++++++++++++++
 srcpkgs/airspyhf/template    |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/SDRPlusPlus/template

diff --git a/srcpkgs/SDRPlusPlus/template b/srcpkgs/SDRPlusPlus/template
new file mode 100644
index 000000000000..9651aeca246f
--- /dev/null
+++ b/srcpkgs/SDRPlusPlus/template
@@ -0,0 +1,16 @@
+# Template file for 'SDRPlusPlus'
+pkgname=SDRPlusPlus
+version=1.0.4
+revision=1
+build_style=cmake
+configure_args="-DOPT_BUILD_PLUTOSDR_SOURCE=0"
+hostmakedepends="pkg-config"
+makedepends="fftw-devel glfw-devel volk-devel libzstd-devel glew-devel libusb-devel
+ librtlsdr-devel SoapySDR-devel libairspy-devel libairspyhf-devel libhackrf-devel
+ rtaudio-devel alsa-lib-devel pulseaudio-devel jack-devel"
+short_desc="Open source SDR software"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only"
+homepage="https://github.com/AlexandreRouma/SDRPlusPlus"
+distfiles="https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/tags/${version}.tar.gz"
+checksum=251256de6725ceb4f9fb2823c7ad825068ad16cf9b5fb894259b173aae5a69ea
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
index dc306e6d3333..e5be006613cd 100644
--- a/srcpkgs/airspyhf/template
+++ b/srcpkgs/airspyhf/template
@@ -14,13 +14,13 @@ checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
 
 post_install() {
 	vlicense LICENSE
+	vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
 }
 
 libairspyhf_package() {
 	short_desc+=" - library"
 	pkg_install() {
 		vmove usr/lib/*.so.*
-		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
 		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
 	}
 }

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (4 preceding siblings ...)
  2022-07-28  5:12 ` classabbyamp
@ 2022-07-28  5:14 ` classabbyamp
  2022-07-28  5:16 ` classabbyamp
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-07-28  5:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38202#discussion_r931788432

Comment:
I checked repology to see if any other distros had a patch for this, but I didn't find anything. I did find one useful patch though, which I've added.

Will report the libusb thing upstream

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (5 preceding siblings ...)
  2022-07-28  5:14 ` [PR REVIEW] " classabbyamp
@ 2022-07-28  5:16 ` classabbyamp
  2022-10-27  2:13 ` github-actions
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-07-28  5:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38202#discussion_r931788432

Comment:
I checked repology to see if any other distros had a patch for this, but I didn't find anything. I did find one useful patch though, which I've added.

Will report the libusb thing upstream (airspy/airspyhf#38)

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (6 preceding siblings ...)
  2022-07-28  5:16 ` classabbyamp
@ 2022-10-27  2:13 ` github-actions
  2022-11-24  8:05 ` [PR PATCH] [Updated] " classabbyamp
  2022-11-24  8:17 ` [PR PATCH] [Merged]: " classabbyamp
  9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2022-10-27  2:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/38202#issuecomment-1292872307

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (7 preceding siblings ...)
  2022-10-27  2:13 ` github-actions
@ 2022-11-24  8:05 ` classabbyamp
  2022-11-24  8:17 ` [PR PATCH] [Merged]: " classabbyamp
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-11-24  8:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages new/SDRPlusPlus
https://github.com/void-linux/void-packages/pull/38202

New packages: SDRPlusPlus and airspyhf
- New package: airspyhf-1.6.8
    closes #38198
- New package: SDRPlusPlus-1.0.4
    closes #38200

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  tested by requester, see #38200

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**



A patch file from https://github.com/void-linux/void-packages/pull/38202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/SDRPlusPlus-38202.patch --]
[-- Type: text/x-diff, Size: 6206 bytes --]

From d57c4b22df0826e6b318370175a0e97e4268fc7c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:08:18 -0400
Subject: [PATCH 1/2] New package: airspyhf-1.6.8

closes #38198
---
 common/shlibs                                 |  1 +
 .../airspyhf/patches/fix-libm-linking.patch   | 28 ++++++++++++++
 srcpkgs/airspyhf/template                     | 37 +++++++++++++++++++
 srcpkgs/libairspyhf                           |  1 +
 srcpkgs/libairspyhf-devel                     |  1 +
 5 files changed, 68 insertions(+)
 create mode 100644 srcpkgs/airspyhf/patches/fix-libm-linking.patch
 create mode 100644 srcpkgs/airspyhf/template
 create mode 120000 srcpkgs/libairspyhf
 create mode 120000 srcpkgs/libairspyhf-devel

diff --git a/common/shlibs b/common/shlibs
index 6acbb4097f0b..61f21bc3b94e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4201,3 +4201,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libairspyhf.so.0 libairspyhf-1.6.8_1
diff --git a/srcpkgs/airspyhf/patches/fix-libm-linking.patch b/srcpkgs/airspyhf/patches/fix-libm-linking.patch
new file mode 100644
index 000000000000..73f888ffd4be
--- /dev/null
+++ b/srcpkgs/airspyhf/patches/fix-libm-linking.patch
@@ -0,0 +1,28 @@
+https://github.com/airspy/airspyhf/pull/35
+https://build.opensuse.org/package/view_file/openSUSE:Factory/airspyhf/airspyhf-fix-libm-linking.patch
+
+diff --git a/libairspyhf/src/CMakeLists.txt b/libairspyhf/src/CMakeLists.txt
+index 9d8d483..da1f966 100644
+--- a/libairspyhf/src/CMakeLists.txt
++++ b/libairspyhf/src/CMakeLists.txt
+@@ -58,7 +58,7 @@ set_target_properties(airspyhf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ set_target_properties(airspyhf-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ 
+ # Dependencies
+-target_link_libraries(airspyhf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(airspyhf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
+ 
+ # For cygwin just force UNIX OFF and WIN32 ON
+ if( ${CYGWIN} )
+
+diff --git a/libairspyhf/libairspyhf.pc.in b/libairspyhf/libairspyhf.pc.in
+index fcf040b..ca5214f 100644
+--- a/libairspyhf/libairspyhf.pc.in
++++ b/libairspyhf/libairspyhf.pc.in
+@@ -7,5 +7,5 @@ Name: AirSpy HF+ Library
+ Description: C Utility Library
+ Version: @VERSION@
+ Cflags: -I${includedir}/libairspyhf/ @AIRSPYHF_PC_CFLAGS@
+-Libs: -L${libdir} -lairspyhf
++Libs: -L${libdir} -lairspyhf -lm
+ Libs.private: @AIRSPYHF_PC_LIBS@
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
new file mode 100644
index 000000000000..dc306e6d3333
--- /dev/null
+++ b/srcpkgs/airspyhf/template
@@ -0,0 +1,37 @@
+# Template file for 'airspyhf'
+pkgname=airspyhf
+version=1.6.8
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libusb-devel"
+short_desc="Usermode driver and tools for Airspy HF+"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="BSD-3-Clause"
+homepage="https://github.com/airspy/airspyhf"
+distfiles="https://github.com/airspy/airspyhf/archive/refs/tags/${version}.tar.gz"
+checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
+
+post_install() {
+	vlicense LICENSE
+}
+
+libairspyhf_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
+		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
+	}
+}
+
+libairspyhf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libairspyhf b/srcpkgs/libairspyhf
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file
diff --git a/srcpkgs/libairspyhf-devel b/srcpkgs/libairspyhf-devel
new file mode 120000
index 000000000000..9a1c1cdae341
--- /dev/null
+++ b/srcpkgs/libairspyhf-devel
@@ -0,0 +1 @@
+airspyhf
\ No newline at end of file

From f51213b429561764284a64e2d29dffe881de719f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 23 Jul 2022 04:22:58 -0400
Subject: [PATCH 2/2] New package: SDRPlusPlus-1.0.4

closes #38200
---
 srcpkgs/SDRPlusPlus/template | 16 ++++++++++++++++
 srcpkgs/airspyhf/template    |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/SDRPlusPlus/template

diff --git a/srcpkgs/SDRPlusPlus/template b/srcpkgs/SDRPlusPlus/template
new file mode 100644
index 000000000000..9651aeca246f
--- /dev/null
+++ b/srcpkgs/SDRPlusPlus/template
@@ -0,0 +1,16 @@
+# Template file for 'SDRPlusPlus'
+pkgname=SDRPlusPlus
+version=1.0.4
+revision=1
+build_style=cmake
+configure_args="-DOPT_BUILD_PLUTOSDR_SOURCE=0"
+hostmakedepends="pkg-config"
+makedepends="fftw-devel glfw-devel volk-devel libzstd-devel glew-devel libusb-devel
+ librtlsdr-devel SoapySDR-devel libairspy-devel libairspyhf-devel libhackrf-devel
+ rtaudio-devel alsa-lib-devel pulseaudio-devel jack-devel"
+short_desc="Open source SDR software"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-only"
+homepage="https://github.com/AlexandreRouma/SDRPlusPlus"
+distfiles="https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/tags/${version}.tar.gz"
+checksum=251256de6725ceb4f9fb2823c7ad825068ad16cf9b5fb894259b173aae5a69ea
diff --git a/srcpkgs/airspyhf/template b/srcpkgs/airspyhf/template
index dc306e6d3333..e5be006613cd 100644
--- a/srcpkgs/airspyhf/template
+++ b/srcpkgs/airspyhf/template
@@ -14,13 +14,13 @@ checksum=cd1e5ae89e09b813b096ae4a328e352c9432a582e03fd7da86760ba60efa77ab
 
 post_install() {
 	vlicense LICENSE
+	vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
 }
 
 libairspyhf_package() {
 	short_desc+=" - library"
 	pkg_install() {
 		vmove usr/lib/*.so.*
-		vsed -e 's/GROUP="plugdev"/\0, TAG+="uaccess"/' -i tools/52-airspyhf.rules
 		vinstall tools/52-airspyhf.rules 644 usr/lib/udev/rules.d/
 	}
 }

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: New packages: SDRPlusPlus and airspyhf
  2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
                   ` (8 preceding siblings ...)
  2022-11-24  8:05 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-11-24  8:17 ` classabbyamp
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-11-24  8:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 644 bytes --]

There's a merged pull request on the void-packages repository

New packages: SDRPlusPlus and airspyhf
https://github.com/void-linux/void-packages/pull/38202

Description:
- New package: airspyhf-1.6.8
    closes #38198
- New package: SDRPlusPlus-1.0.4
    closes #38200

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  tested by requester, see #38200

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**



^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-11-24  8:17 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-23  8:27 [PR PATCH] New packages: SDRPlusPlus and airspyhf classabbyamp
2022-07-25 20:32 ` [PR REVIEW] " paper42
2022-07-25 20:34 ` paper42
2022-07-25 22:37 ` classabbyamp
2022-07-25 22:39 ` [PR PATCH] [Updated] " classabbyamp
2022-07-28  5:12 ` classabbyamp
2022-07-28  5:14 ` [PR REVIEW] " classabbyamp
2022-07-28  5:16 ` classabbyamp
2022-10-27  2:13 ` github-actions
2022-11-24  8:05 ` [PR PATCH] [Updated] " classabbyamp
2022-11-24  8:17 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).