From f70414734aa6835ad4e2578af2d21a2b61a59d95 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 7 Sep 2015 18:52:31 +0200 Subject: [PATCH] srcpkgs: rebuild pkgs against rpi-userland. --- srcpkgs/SDL2/template | 4 ++-- srcpkgs/kodi-rpi/template | 4 ++-- srcpkgs/libcec/template | 4 ++-- srcpkgs/omxplayer/template | 13 +++++++------ srcpkgs/retroarch/template | 4 ++-- srcpkgs/vlc/template | 4 ++-- srcpkgs/weston/template | 4 ++-- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 80bbd3aff6e..232f7d02b77 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.0.3 -revision=6 +revision=7 build_style=gnu-configure configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared @@ -34,7 +34,7 @@ if [ "$build_option_gles" ]; then case "$XBPS_TARGET_MACHINE" in armv[67]*) # RaspberryPi, use Videocore IV - makedepends+=" rpi-firmware" + makedepends+=" rpi-userland-devel" CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib" ;; diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index dc54e510afd..4152b11e84c 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,7 +1,7 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi version=15.1 -revision=1 +revision=2 _codename="Isengard" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media (RPi)" @@ -25,7 +25,7 @@ makedepends=" libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel - libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-firmware" + libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel" # The following dependencies are dlopen(3)ed. depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index 21f6223f3f1..b2cdedf8ed5 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,7 +1,7 @@ # Template file for 'libcec' pkgname=libcec version=3.0.1 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake hostmakedepends="cmake pkg-config libtool swig" @@ -23,7 +23,7 @@ fi if [ "$build_option_rpi" ]; then configure_args+=" -DRPI_INCLUDE_DIR=${XBPS_CROSS_BASE}/opt/vc/include" configure_args+=" -DRPI_LIB_DIR=${XBPS_CROSS_BASE}/opt/vc/lib" - makedepends+=" rpi-firmware" + makedepends+=" rpi-userland-devel" fi post_install() { diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 4fb70af69be..28ba13dcdf2 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,21 +1,22 @@ # Template file for 'omxplayer' pkgname=omxplayer -version=20150609 +version=20150907 revision=1 -_commit=4d8ffd13153bfef2966671cb4fb484afeaf792a8 -short_desc="Commandline OMX player for the Raspberry Pi (git ${_gitshort})" +short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Juan RP " license="GPL-2" homepage="https://github.com/popcornmix/omxplayer" + +_commit=4d8ffd13153bfef2966671cb4fb484afeaf792a8 +wrksrc="omxplayer-$_commit" distfiles="$homepage/archive/$_commit.tar.gz" checksum=c6326b158010a873f9b5ca8843a4d3d7f1a2a24d3b4b1e43f433d173f8566314 -wrksrc="omxplayer-$_commit" # XXX only rpi only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" build_style=gnu-makefile -hostmakedepends="pkg-config git" -makedepends="rpi-firmware pcre-devel boost-devel freetype-devel ffmpeg-devel dbus-devel" +hostmakedepends="pkg-config" +makedepends="rpi-userland-devel pcre-devel boost-devel freetype-devel ffmpeg-devel dbus-devel" depends="freefont-ttf" do_build() { diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 52260be1a0a..1f1d56be462 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -2,7 +2,7 @@ pkgname=retroarch reverts="20150203_2" version=1.2.2 -revision=1 +revision=2 wrksrc="RetroArch-$version" conf_files="/etc/retroarch.cfg" build_style=configure @@ -28,7 +28,7 @@ build_options_default="ffmpeg" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) build_options_default+=" opengl pulseaudio sdl2 x11";; - armv[67]*) hostmakedepends+=" rpi-firmware"; makedepends+=" rpi-firmware";; + armv[67]*) hostmakedepends+=" rpi-userland-devel"; makedepends+=" rpi-userland-devel";; esac do_configure() { diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 386d7bb5e3a..2b4d3bae54d 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=2.2.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-live555 --disable-fluidsynth --enable-dvdread @@ -52,7 +52,7 @@ case "$XBPS_TARGET_MACHINE" in # XXX only for rpi build_options_default+=" smb" configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil" - makedepends+=" rpi-firmware" + 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" diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 00577ba4d7b..7e3a1d2f377 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,7 +1,7 @@ # Template file for 'weston'. pkgname=weston version=1.8.0 -revision=2 +revision=3 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. configure_args="--enable-libinput-backend --disable-setuid-install @@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in armv[67]l*) # Assume RPi for now. CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include" LDFLAGS="-Wl,-R/opt/vc/lib" - makedepends+=" rpi-firmware rpi-firmware-pcfiles" + makedepends+=" rpi-userland-devel" # Just enable the RPi compositor. configure_args+=" --disable-drm-compositor --disable-wayland-compositor --disable-simple-egl-clients