Browse Source

Add libacars to flatpak and snap.

chirpmodem-v8.1.0
Jon Beniston 3 weeks ago
parent
commit
b99139381a
  1. 2
      cmake/Modules/FindLibAcars.cmake
  2. 15
      flatpak/org.sdrangel.SDRangel.yaml
  3. 4
      plugins/feature/map/readme.md
  4. 18
      snap/snapcraft.yaml

2
cmake/Modules/FindLibAcars.cmake

@ -21,7 +21,7 @@ IF (NOT LIBACARS_FOUND) @@ -21,7 +21,7 @@ IF (NOT LIBACARS_FOUND)
if (LIBACARS_INCLUDE_DIR AND LIBACARS_LIBRARY)
set(LIBACARS_LIBRARIES ${LIBACARS_LIBRARY} CACHE INTERNAL "libacars libraries")
set(LIBACARS_FOUND TRUE CACHE INTERNAL "libacars found")
message(STATUS "Found libacars: ${INMARSATC_INCLUDE_DIR}, ${INMARSATC_LIBRARIES}")
message(STATUS "Found libacars: ${LIBACARS_INCLUDE_DIR}, ${LIBACARS_LIBRARIES}")
else ()
set(LIBACARS_FOUND FALSE CACHE INTERNAL "libacars found")
message(STATUS "libacars not found.")

15
flatpak/org.sdrangel.SDRangel.yaml

@ -540,6 +540,20 @@ modules: @@ -540,6 +540,20 @@ modules:
url: https://github.com/cropinghigh/inmarsatc.git
commit: cda1242e79981d71cd8608e971c8dbc691942b10
- name: libacars
buildsystem: cmake-ninja
config-opts:
- -Wno-dev
sources:
- type: git
url: https://github.com/szpajder/libacars.git
tag: v2.2.1
commit: 9af09a0121d4ec577339cbd4c7420d7519da48fa
cleanup:
- /bin/decode_acars_apps
- /bin/adsc_get_position
- /bin/cpdlc_get_position
- name: rnnoise
sources:
- type: git
@ -565,6 +579,7 @@ modules: @@ -565,6 +579,7 @@ modules:
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DENABLE_QT6=ON
- -DRX_SAMPLE_24BIT=ON
- -DLIBACARS_DIR=/app
- -Wno-dev
sources:
- type: dir

4
plugins/feature/map/readme.md

@ -229,7 +229,7 @@ Select from: @@ -229,7 +229,7 @@ Select from:
<h3>21: Avionics</h3>
Check to enable individual avionics displays for aircraft selected on the 3D Map.
Check to enable individual avionics displays for aircraft selected on the 3D Map.
<h4>PFD (Primary Flight Display)</h4>
@ -237,7 +237,7 @@ When checked, the aircraft PFD (Primary Flight Display) will be displayed. This @@ -237,7 +237,7 @@ When checked, the aircraft PFD (Primary Flight Display) will be displayed. This
This is used for displaying ADS-B and Mode S data for an aircraft, such as speed, attitude, altitude, vertical rate, heading, track and QNH setting.
It can display whether the autopilot is enganged (CMD or AP1+2) and selected alitutude and heading, as well as lateral and vertical navigation modes, such as LNAV/NAV, VNAV/CLB/ALT, LOC and G/S.
The flight director is simulated, rather than being based on ADS-B data, as it the rad alt (radio altimeter).
In the bottom left hand corner it will display the aircrafts callsign and type, if known.
In the bottom left hand corner it will display the aircrafts callsign and type, if known.
The PFD can be moved by left clicking on it and dragging it. It can be resized by left clicking and dragging in the bottom right corner.

18
snap/snapcraft.yaml

@ -169,7 +169,7 @@ parts: @@ -169,7 +169,7 @@ parts:
override-pull: |
craftctl default
craftctl set version="$(git describe --tags --abbrev=0 | sed 's/v//')"
after: [apt, mbelib, serialdv, dsdcc, codec2, sgp4, cspice, inmarsatc, cm265cc, fdkaac, airspy, rtlsdr, pluto, bladerf, hackrf, limesuite, airspyhf, uhd, uhdfpga, soapysdr, soapyremote]
after: [apt, mbelib, serialdv, dsdcc, codec2, sgp4, cspice, inmarsatc, libacars, cm265cc, fdkaac, airspy, rtlsdr, pluto, bladerf, hackrf, limesuite, airspyhf, uhd, uhdfpga, soapysdr, soapyremote]
cmake-parameters:
- -DDEBUG_OUTPUT=OFF
- -DBUILD_TYPE=RELEASE
@ -197,6 +197,7 @@ parts: @@ -197,6 +197,7 @@ parts:
- -DSGP4_DIR=$CRAFT_STAGE/opt/install/sdrangel
- -DCSPICE_DIR=$CRAFT_STAGE/opt/install/sdrangel
- -DINMARSATC_DIR=$CRAFT_STAGE/opt/install/sdrangel
- -DLIBACARS_DIR=$CRAFT_STAGE/opt/install/sdrangel
- -DLIBSIGMF_DIR=$CRAFT_STAGE/opt/install/sdrangel
- -DFDKAAC_DIR=$CRAFT_STAGE/opt/install/sdrangel
- -DARCH_OPT=nehalem
@ -503,6 +504,21 @@ parts: @@ -503,6 +504,21 @@ parts:
cmake-parameters:
- -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
libacars:
plugin: cmake
source: https://github.com/szpajder/libacars.git
source-type: git
source-tag: v2.2.1
build-packages:
- zlib1g-dev
- libxml2-dev
cmake-parameters:
- -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel
prime:
- -opt/install/sdrangel/bin/decode_acars_apps
- -opt/install/sdrangel/bin/adsc_get_position
- -opt/install/sdrangel/bin/cpdlc_get_position
cm265cc:
plugin: cmake
source: https://github.com/f4exb/cm256cc.git

Loading…
Cancel
Save