From 970ba56ffbd95704b62da0cf96f6952d9a900aaf Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 11 Jan 2021 15:12:23 -0500 Subject: [PATCH] vlc: rebuild against new libupnp --- srcpkgs/vlc/template | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 9d9a8765429..7cb0b4a3c1d 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.11.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread @@ -30,7 +30,7 @@ makedepends=" libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel - libSM-devel libsysfs-devel libtheora-devel libupnp1.8-devel + libSM-devel libsysfs-devel libtheora-devel libupnp-devel libXinerama-devel libXpm-devel libXvMC-devel opus-devel pulseaudio-devel sndio-devel speex-devel taglib-devel wayland-protocols x264-devel xcb-util-devel xcb-util-keysyms-devel live555-devel libdvdread-devel @@ -44,7 +44,7 @@ makedepends=" depends="freefont-ttf hicolor-icon-theme desktop-file-utils" # Package build options -build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio chromecast" +build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast" build_options_default="lua smb v4l2 x265 sndio chromecast" CFLAGS="-fcommon" @@ -60,15 +60,9 @@ case "$XBPS_TARGET_MACHINE" in configure_args+=" --disable-altivec" build_options_default+=" opengl" ;; - armv[67]l*) + armv[67]*) # XXX only for rpi - configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil" - makedepends+=" rpi-userland-devel" - CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include" - CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos" - CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux" - CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm" + build_options_default+=" rpi" ;; esac @@ -76,6 +70,18 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" qt" fi +if [ "$build_option_rpi" ]; then + configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil" + makedepends+=" rpi-userland-devel" + + CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include" + CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos" + CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux" + CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" + + LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm" +fi + pre_configure() { NOCONFIGURE=1 ./bootstrap