Skip to content

Commit

Permalink
Update fpp-vastfmt to get it installing on FPP v2.x Stretch images.
Browse files Browse the repository at this point in the history
Also removed the jq submodule in favor of using apt-get install.
  • Loading branch information
cpinkham committed Dec 14, 2018
1 parent fd01a57 commit 749dc6b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
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
30 changes: 8 additions & 22 deletions fpp_install.sh
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
1 change: 0 additions & 1 deletion jq
Submodule jq deleted from 8f115e

0 comments on commit 749dc6b

Please sign in to comment.