forked from Materdaddy/fpp-vastfmt
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update fpp-vastfmt to get it installing on FPP v2.x Stretch images.
Also removed the jq submodule in favor of using apt-get install.
- Loading branch information
Showing
3 changed files
with
8 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,3 @@ | ||
[submodule "vastfmt"] | ||
path = vastfmt | ||
url = https://github.com/Materdaddy/vastfmt.git | ||
[submodule "jq"] | ||
path = jq | ||
url = https://github.com/stedolan/jq.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,24 @@ | ||
#!/bin/bash | ||
|
||
if [ -n "$(which g++-4.7)" ]; then | ||
CXX=g++-4.7 | ||
else | ||
CXX=g++ | ||
fi | ||
|
||
pushd $(dirname $(which $0)) | ||
|
||
git submodule init | ||
git submodule update | ||
if [ "$CXX" == "g++" ]; then | ||
# We don't support C++11 and need an old version of vastfmt | ||
pushd vastfmt | ||
git reset --hard 91b76c154d967ba22c5dc25831de6b888065ff87 | ||
popd | ||
fi | ||
|
||
# Before building, check that we have libusb-1.0-0-dev | ||
if ! dpkg --get-selections | grep -cq libusb-1.0-0-dev; then | ||
$SUDO apt-get -q -y update | ||
$SUDO apt-get -q -y --reinstall install libusb-1.0-0-dev | ||
sudo apt-get -q -y update | ||
sudo apt-get -q -y --reinstall install libusb-1.0-0-dev | ||
fi | ||
|
||
make -C vastfmt CXX=$CXX | ||
make -C vastfmt | ||
|
||
mkdir -p bin | ||
cp vastfmt/radio bin/rds | ||
|
||
# Get jq going for parsing our json data | ||
pushd jq | ||
autoreconf -i | ||
./configure --disable-maintainer-mode | ||
make src/builtin.inc | ||
make | ||
popd | ||
if ! dpkg --get-selections | grep -cq "^jq"; then | ||
sudo apt-get -q -y update | ||
sudo apt-get -q -y install jq | ||
fi | ||
|
||
popd |
Submodule jq
deleted from
8f115e