From efb9151ef1cba84a0746d616ed3598bcbab8224e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 11 Jan 2021 15:18:08 -0500 Subject: [PATCH] gst-omx: unify rpi build options, fix linker paths --- srcpkgs/gst-omx/template | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template index a4d2fad7609..2a77a4a8e27 100644 --- a/srcpkgs/gst-omx/template +++ b/srcpkgs/gst-omx/template @@ -1,9 +1,10 @@ # Template file for 'gst-omx' pkgname=gst-omx version=1.16.2 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-examples" +configure_args="--disable-examples + $(vopt_if rpi --with-omx-target=rpi --with-omx-target=generic)" hostmakedepends="pkg-config python glib-devel" makedepends="gst-plugins-base1-devel" short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)" @@ -13,15 +14,15 @@ homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" checksum=11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439 +build_options="rpi" + case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*|aarch64*|ppc*) - # XXX bellagio target - configure_args+=" --with-omx-target=generic" - ;; - armv[67]*) - configure_args+=" --with-omx-target=rpi" - makedepends+=" rpi-firmware rpi-userland-devel" - export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig" - CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL" - ;; + armv[67]*) build_options_default="rpi" ;; esac + +if [ "$build_option_rpi" ]; then + makedepends+=" rpi-firmware rpi-userland-devel" + export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig" + CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL" + LDFLAGS="-Wl,-rpath=/opt/vc/lib" +fi