aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/rtlsdr/CONTROL2
-rw-r--r--ports/rtlsdr/fix-version.patch15
-rw-r--r--ports/rtlsdr/portfile.cmake4
3 files changed, 19 insertions, 2 deletions
diff --git a/ports/rtlsdr/CONTROL b/ports/rtlsdr/CONTROL
index c276dc317..cbd10d653 100644
--- a/ports/rtlsdr/CONTROL
+++ b/ports/rtlsdr/CONTROL
@@ -1,5 +1,5 @@
Source: rtlsdr
-Version: 2020-04-16
+Version: 2020-04-16-1
Homepage: https://osmocom.org/projects/rtl-sdr
Description: rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver
Build-Depends: libusb, pthreads (windows)
diff --git a/ports/rtlsdr/fix-version.patch b/ports/rtlsdr/fix-version.patch
new file mode 100644
index 000000000..854a054ab
--- /dev/null
+++ b/ports/rtlsdr/fix-version.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/modules/Version.cmake b/cmake/modules/Version.cmake
+index 2d4e76d..6acffe2 100644
+--- a/cmake/modules/Version.cmake
++++ b/cmake/modules/Version.cmake
+@@ -39,7 +39,9 @@ if(GIT_FOUND)
+ OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ )
+-else()
++endif()
++
++if ("${GIT_DESCRIBE}" STREQUAL "")
+ set(GIT_DESCRIBE "v${MAJOR_VERSION}.${MINOR_VERSION}.x-xxx-xunknown")
+ endif()
+
diff --git a/ports/rtlsdr/portfile.cmake b/ports/rtlsdr/portfile.cmake
index 925a076f8..fdf484290 100644
--- a/ports/rtlsdr/portfile.cmake
+++ b/ports/rtlsdr/portfile.cmake
@@ -9,7 +9,9 @@ vcpkg_from_github(
REF d794155ba65796a76cd0a436f9709f4601509320
SHA512 21fe10f1dbecca651650f03d1008560930fac439d220c33b4a23acce98d78d8476ff200765eed8cfa6cddde761d45f7ba36c8b5bc3662aa85819172830ea4938
HEAD_REF master
- PATCHES Compile-with-msvc.patch
+ PATCHES
+ Compile-with-msvc.patch
+ fix-version.patch
)
file(