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

Dfsg #35

Merged
merged 2 commits into from
Aug 31, 2023
Merged

Dfsg #35

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
82 changes: 82 additions & 0 deletions .github/workflows/build-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Build tests

on:
push:
pull_request:

jobs:
build:
strategy:
matrix:
os: ["ubuntu:22.04", "ubuntu:20.04"]

runs-on: ubuntu-latest
container: ${{ matrix.os }}
steps:
- name: Install prerequisite packages
env:
DEBIAN_FRONTEND: noninteractive
run: |
apt-get update --quiet
apt-get install --no-install-recommends --quiet --yes \
automake \
build-essential \
cmake \
libdrm-dev \
libexpat-dev \
libgstreamer1.0-dev \
libgstreamer-plugins-base1.0-dev \
libtool \
pkg-config

- uses: actions/checkout@v3
with:
repository: intel/ipu6-camera-bins
ref: dfsg
path: bins

- name: Install from intel/ipu6-camera-bins
run: |
cd "${GITHUB_WORKSPACE}/bins"

cat README.md | \
awk 'BEGIN { \
FS="/"; \
} \
/^```/ { \
getline; \
if ($1 == "# Runtime files") { \
while ($1 != "```") { \
print $0; \
getline; \
} \
} \
}' | \
sed 's,ipu6-camera-bins/,./,' | \
sh -x

- uses: actions/checkout@v3
with:
repository: intel/ipu6-camera-hal
ref: dfsg
path: hal

- name: Install from intel/ipu6-camera-hal
run: |
cd "${GITHUB_WORKSPACE}/hal"

mkdir -p build && cd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../src/hal/hal_adaptor
make -j$(nproc) install

- uses: actions/checkout@v3
with:
path: icamerasrc

- name: Install from intel/icamerasrc
env:
CHROME_SLIM_CAMHAL: ON
run: |
cd "${GITHUB_WORKSPACE}/icamerasrc"

./autogen.sh && make -j$(nproc) install
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export PKG_CONFIG_PATH="/usr/lib/x86_64-linux-gnu/pkgconfig"
# only for yocto
export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
./autogen.sh
./configure --with-haladaptor=yes
make -j8
# binary install
sudo make install
Expand Down
26 changes: 6 additions & 20 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ AC_ARG_WITH([androidstubs],
[],
[with_androidstubs=no])

AC_ARG_WITH([haladaptor],
AC_HELP_STRING([--with-haladaptor], [Link hal adaptor library [default=no]]))

AC_ARG_VAR([DEFAULT_CAMERA],
[the default camera ID])

Expand Down Expand Up @@ -169,23 +166,12 @@ PKG_CHECK_MODULES(GST, [
])
])

if test "x$with_haladaptor" == "xyes"; then
echo Building with hal_adaptor
PKG_CHECK_MODULES(CAMHAL, [hal_adaptor], [
AC_SUBST(CAMHAL_CFLAGS)
AC_SUBST(CAMHAL_LIBS)
], [
AC_MSG_ERROR([Cannot find hal_adaptor pkgconfig])
])
else
echo Building with libcamhal
PKG_CHECK_MODULES(CAMHAL, [libcamhal], [
AC_SUBST(CAMHAL_CFLAGS)
AC_SUBST(CAMHAL_LIBS)
], [
AC_MSG_ERROR([Cannot find libcamhal pkgconfig])
])
fi
PKG_CHECK_MODULES(CAMHAL, [libcamhal], [
AC_SUBST(CAMHAL_CFLAGS)
AC_SUBST(CAMHAL_LIBS)
], [
AC_MSG_ERROR([Cannot find libcamhal pkgconfig])
])

PKG_CHECK_MODULES(LIBDRM, [libdrm libdrm_intel], [
AC_SUBST(LIBDRM_CFLAGS)
Expand Down