moved from wiringpi to libgpiod

This commit is contained in:
Devaev Maxim
2020-09-17 20:33:05 +03:00
parent 2ad8871a54
commit 6725083be6
13 changed files with 200 additions and 114 deletions

View File

@@ -9,9 +9,8 @@ pkgdesc="Lightweight and fast MJPG-HTTP streamer"
url="https://github.com/pikvm/ustreamer"
license=(GPL)
arch=(i686 x86_64 armv6h armv7h aarch64)
depends=(libjpeg libevent libutil-linux libbsd)
depends=(libjpeg libevent libutil-linux libbsd libgpiod)
# optional: raspberrypi-firmware for OMX encoder
# optional: wiringpi for GPIO support
makedepends=(gcc make)
source=(${pkgname}::"git+https://github.com/pikvm/ustreamer#commit=v${pkgver}")
md5sums=(SKIP)
@@ -23,9 +22,8 @@ build() {
cp -r $pkgname $pkgname-build
cd $pkgname-build
local _options=""
local _options="WITH_GPIO=1"
[ -e /opt/vc/include/IL/OMX_Core.h ] && _options="$_options WITH_OMX=1"
[ -e /usr/include/wiringPi.h ] && _options="$_options WITH_GPIO=1"
make $_options CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $MAKEFLAGS
}

View File

@@ -8,7 +8,7 @@ RUN apt-get update \
libjpeg8-dev \
libbsd-dev \
libraspberrypi-dev \
wiringpi \
libgpiod-dev \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build/ustreamer/
@@ -27,7 +27,7 @@ RUN apt-get update \
libjpeg8 \
uuid \
libbsd0 \
wiringpi \
libgpiod2 \
&& rm -rf /var/lib/apt/lists/*
RUN ["cross-build-end"]

View File

@@ -6,7 +6,7 @@ RUN apt-get update \
libjpeg8-dev \
libbsd-dev \
libraspberrypi-dev \
wiringpi \
libgpiod-dev \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build/ustreamer/
@@ -22,7 +22,7 @@ RUN apt-get update \
libjpeg8 \
uuid \
libbsd0 \
wiringpi \
libgpiod2 \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /ustreamer

View File

@@ -10,11 +10,12 @@ RUN apt-get update \
libjpeg62-turbo-dev \
uuid-dev \
libbsd-dev \
libgpiod-dev \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build/ustreamer/
COPY . .
RUN make -j5
RUN make -j5 WITH_GPIO=1
FROM debian:buster-slim as run
@@ -26,6 +27,7 @@ RUN apt-get update \
libjpeg62-turbo \
uuid \
libbsd0 \
libgpiod2 \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /ustreamer