Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct platform name #48

Merged
merged 3 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
docker: [base]
project: [companion]
new_project: [blueos]
platforms: ["linux/arm/v7,linux/arm/v8,linux/amd64"]
platforms: ["linux/arm/v7,linux/arm64,linux/amd64"]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -133,4 +133,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: BlueOS-base-docker-image.zip
path: '*.tar'
path: '*.tar'
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM python:3.11.7-slim-bullseye AS build_gstreamer
# Build and Pre-Install Gstreamer
COPY ./scripts/build_gst.sh /build_gst.sh
RUN GST_VERSION=1.24.1 \
LIBCAMERA_VERSION=v0.2.0 LIBCAMERA_ENABLED=true \
LIBCAMERA_VERSION=v0.3.0 LIBCAMERA_ENABLED=true \
RPICAM_ENABLED=false \
GST_OMX_ENABLED=false \
./build_gst.sh && rm /build_gst.sh
Expand Down
20 changes: 10 additions & 10 deletions scripts/build_gst.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ LIBCAMERA_ENABLED=${LIBCAMERA_ENABLED:-false} # FIXME: libcamera is failing to
LIBCAMERA_VERSION=${LIBCAMERA_VERSION:-master}
LIBCAMERA_GIT_URL=${LIBCAMERA_GIT_URL:-https://git.libcamera.org/libcamera/libcamera.git}
ARCH=${ARCH:-$(uname -m)}

if [[ $ARCH =~ ^(arm|aarch64) ]]; then ARM=true; else ARM=false; fi

# RPICAM is only supported for arm
RPICAM_ENABLED=${RPICAM_ENABLED:-false}
if [[ $ARCH != arm* ]]; then
RPICAM_ENABLED=false
fi
RPICAM_ENABLED=${RPICAM_ENABLED:-$ARM}

# Here we carefully select what we want to build/install. Even though several
# of the listed options are disabled by default, it is interesting to have
Expand Down Expand Up @@ -73,19 +73,19 @@ if [ $GST_OMX_ENABLED == true ]; then
GST_MESON_OPTIONS+=(
-D omx=enabled
)
if [[ $ARCH == x86_64 ]]; then
GST_MESON_OPTIONS+=(
-D gst-omx:target=generic
)
elif [[ $ARCH == arm* ]]; then
if [[ $ARM == true ]]; then
# To build omx for the "rpi" target, we need to provide the raspberrypi
# IL headers:
USERLAND_PATH=/tmp/userland
GST_MESON_OPTIONS+=(
-D gst-omx:target=rpi
-D gst-omx:header_path=$USERLAND_PATH/interface/vmcs_host/khronos/IL
)
fi
else
GST_MESON_OPTIONS+=(
-D gst-omx:target=generic
)
fi
fi
if [ $LIBCAMERA_ENABLED == true ]; then
GST_MESON_OPTIONS+=(
Expand Down
3 changes: 2 additions & 1 deletion scripts/inspect_gst_plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ PLUGINS=(
ARCH=${ARCH:-$(uname -m)}
GST_OMX_ENABLED=${GST_OMX_ENABLED:-false}
LIBCAMERA_ENABLED=${LIBCAMERA_ENABLED:-false}
if [[ $ARCH == arm* ]]; then
if [[ $ARCH =~ ^(arm|aarch64) ]]; then ARM=true; else ARM=false; fi
if [[ $ARM == true ]]; then
RPICAM_ENABLED=${RPICAM_ENABLED:-false}

if [ $RPICAM_ENABLED == true ] && [ -f /dev/vchiq ]; then
Expand Down
Loading