fix: move ofxPiMapper native build to setup.sh (OF Makefile doesn't support cross-compile)

This commit is contained in:
Timothy Hofland
2026-03-15 18:02:52 +01:00
parent 7617034320
commit 242dfb267a
2 changed files with 108 additions and 130 deletions

View File

@ -14,10 +14,6 @@ set -e
REPO_URL="${1:-}"
REPO_DIR="${2:-$(pwd)/mapper}"
OF_VERSION="0.12.1"
OF_DIR="$REPO_DIR/.build/openFrameworks"
OF_FILE="of_v${OF_VERSION}_linuxaarch64_release.tar.gz"
OF_URL="https://github.com/openframeworks/openFrameworks/releases/download/${OF_VERSION}/${OF_FILE}"
BIN_OUT="$REPO_DIR/bin"
if [ -z "$REPO_URL" ]; then
@ -69,132 +65,22 @@ npm install --package-lock=false
NODE_OPTIONS="--max-old-space-size=512" npm run build
echo "Frontend built → $REPO_DIR/frontend/dist/"
# ── 3. Download OpenFrameworks (aarch64 pre-built release) ───────────────────
# ── 3. Commit and push frontend artifact back to repo ───────────────────────
echo ""
echo "=== Downloading OpenFrameworks ${OF_VERSION} (aarch64) ==="
mkdir -p "$REPO_DIR/.build"
if [ ! -d "$OF_DIR" ]; then
cd "$REPO_DIR/.build"
if [ ! -f "$OF_FILE" ]; then
wget "$OF_URL" || curl -L -O "$OF_URL"
fi
tar -xzf "$OF_FILE"
mv of_v${OF_VERSION}_linux*_release openFrameworks
rm -f "$OF_FILE"
echo "OpenFrameworks extracted to $OF_DIR"
else
echo "OpenFrameworks already present, skipping download."
fi
# ── 4. Clone & patch ofxPiMapper ────────────────────────────────────────────
echo ""
echo "=== Cloning ofxPiMapper ==="
ADDON_DIR="$OF_DIR/addons/ofxPiMapper"
rm -rf "$ADDON_DIR"
git clone --depth 1 https://github.com/kr15h/ofxPiMapper.git "$ADDON_DIR"
cd "$ADDON_DIR"
echo "Applying compatibility patches..."
# 4a. OscControl.cpp highlight patch
OSC_FILE=$(find src -name "OscControl.cpp" | head -n 1)
if [ -n "$OSC_FILE" ]; then
echo "Patching $OSC_FILE..."
sed -i '/if (m.getAddress() == "\/ofxPiMapper\/surface\/select"){/r /dev/stdin' "$OSC_FILE" <<'EOF_PATCH'
if (m.getAddress() == "/ofxPiMapper/surface/highlight"){
int surfaceIndex = m.getArgAsInt32(0);
mapper->getSurfaceManager()->selectSurface(surfaceIndex);
return;
}
EOF_PATCH
fi
# 4b. C++11 compatibility header
cat <<'EOF_COMPAT' > src/cpp11_compat.h
#ifndef OFXPIMAPPER_CPP11_COMPAT_H
#define OFXPIMAPPER_CPP11_COMPAT_H
#include <memory>
#include <utility>
#include <vector>
#include <string>
#include <algorithm>
#if __cplusplus < 201402L
namespace std {
template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args&&... args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
}
#endif
using std::unique_ptr;
using std::make_unique;
using std::vector;
using std::string;
#endif
EOF_COMPAT
# 4c. Inject compat header into the main addon header
sed -i '1i #include "cpp11_compat.h"' src/ofxPiMapper.h
# 4d. Qualify unique_ptr / make_unique calls
find src -type f \( -name "*.h" -o -name "*.cpp" \) \
-exec sed -i 's/\([^:a-zA-Z0-9]\)unique_ptr\b/\1std::unique_ptr/g' {} + \
-exec sed -i 's/\([^:a-zA-Z0-9]\)make_unique\b/\1std::make_unique/g' {} +
# 4e. Ensure <memory> is included where needed
for f in $(grep -l "unique_ptr" src/*.h 2>/dev/null || true); do
grep -q "<memory>" "$f" || sed -i '1i #include <memory>' "$f"
done
# ── 5. Cross-compile ofxPiMapper for aarch64 ────────────────────────────────
echo ""
echo "=== Compiling ofxPiMapper (aarch64 target) ==="
cd "$ADDON_DIR/example_basic"
CROSS_CC="aarch64-linux-gnu-gcc"
CROSS_CXX="aarch64-linux-gnu-g++"
CROSS_AR="aarch64-linux-gnu-ar"
CROSS_LD="aarch64-linux-gnu-ld"
if ! command -v "$CROSS_CXX" > /dev/null 2>&1; then
echo "ERROR: Cross-compiler $CROSS_CXX not found. Install gcc-aarch64-linux-gnu."
exit 1
fi
GLOBAL_FLAGS="-Wno-error -Wno-reorder -Wno-sign-compare -Wno-delete-non-virtual-dtor -std=c++11 -O0 -fno-tree-vrp"
make clean 2>/dev/null || true
env \
CC="$CROSS_CC" CXX="$CROSS_CXX" AR="$CROSS_AR" LD="$CROSS_LD" \
make -j1 \
PLATFORM_CFLAGS="$GLOBAL_FLAGS -I$ADDON_DIR/src" \
USER_CFLAGS="$GLOBAL_FLAGS" \
USER_CPPFLAGS="-std=c++11" \
OF_PROJECT_OPTIMIZATION_FLAGS="-O0"
# ── 6. Copy artifact to repo/bin/ ──────────────────────────────────────────
echo ""
echo "=== Collecting artifacts ==="
mkdir -p "$BIN_OUT"
cp bin/example_basic "$BIN_OUT/ofxPiMapper"
chmod +x "$BIN_OUT/ofxPiMapper"
# ── 7. Commit and push artifacts back to repo ───────────────────────────────
echo ""
echo "=== Pushing artifacts to remote ==="
echo "=== Pushing frontend/dist to remote ==="
cd "$REPO_DIR"
git config user.email "build-bot@mpvj" 2>/dev/null || true
git config user.name "MPVJ Build Bot" 2>/dev/null || true
git add frontend/dist/ bin/ofxPiMapper
git commit -m "ci: add pre-built artifacts (frontend/dist + bin/ofxPiMapper)" || echo "(nothing new to commit)"
git add frontend/dist/
git commit -m "ci: add pre-built frontend/dist" || echo "(nothing new to commit)"
git push
echo ""
echo "============================================"
echo " BUILD COMPLETE + PUSHED"
echo "============================================"
echo " Frontend: $REPO_DIR/frontend/dist/"
echo " ofxPiMapper: $BIN_OUT/ofxPiMapper (aarch64)"
echo " Frontend: $REPO_DIR/frontend/dist/"
echo ""
echo " Run setup.sh on the Pi to deploy."
echo " ofxPiMapper will be compiled natively on"
echo " the Pi when you run setup.sh."
echo "============================================"