From bfa51a6c7c0a6b989bafd04f69f0c7773398868e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 11 Jan 2021 15:18:08 -0500 Subject: [PATCH] smpeg2: unify rpi build options, fix linker paths --- srcpkgs/smpeg2/template | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/srcpkgs/smpeg2/template b/srcpkgs/smpeg2/template index 763d0137ca7..5bc6ccf5f7c 100644 --- a/srcpkgs/smpeg2/template +++ b/srcpkgs/smpeg2/template @@ -1,7 +1,7 @@ # Template file for 'smpeg2' pkgname=smpeg2 version=2.0.0 -revision=3 +revision=4 build_style=gnu-configure makedepends="SDL2-devel" short_desc="SDL2 MPEG Player Library" @@ -12,24 +12,18 @@ distfiles="https://www.libsdl.org/projects/smpeg/release/smpeg2-${version}.tar.g checksum=979a65b211744a44fa641a9b6e4d64e64a12ff703ae776bafe3c4c4cd85494b3 # Package build options -build_options="gles" +build_options="rpi" case "$XBPS_TARGET_MACHINE" in - arm*) - # Enable OpenGL/ES on rpi platforms - build_options_default="gles" - ;; + # Enable OpenGL/ES on rpi platforms + armv[67]*) build_options_default="rpi" ;; esac -if [ "$build_option_gles" ]; then - case "$XBPS_TARGET_MACHINE" in - armv[67]*) - # RaspberryPi, use Videocore IV - makedepends+=" rpi-userland-devel" - LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host" - ;; - esac +if [ "$build_option_rpi" ]; then + # Use Videocore IV on Raspberry Pi + makedepends+=" rpi-userland-devel" + LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host" fi smpeg2-devel_package() {