SDL2_{image,mixer,net}: get rid of 'gles' build option.

SDL2 should be only one required to be interacting with
rpi-userland, those settings are propagated.
This commit is contained in:
Juan RP 2020-01-06 18:47:39 +01:00
parent f9a733fb4f
commit 9d92a2f2e5
3 changed files with 6 additions and 70 deletions

View file

@ -1,7 +1,7 @@
# Template file for 'SDL2_image'
pkgname=SDL2_image
version=2.0.5
revision=1
revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-jpg-shared
--disable-png-shared --disable-webp-shared --disable-tif-shared"
@ -14,27 +14,6 @@ homepage="http://www.libsdl.org/projects/SDL_image/"
distfiles="http://www.libsdl.org/projects/SDL_image/release/${pkgname}-${version}.tar.gz"
checksum=bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0
# Package build options
build_options="gles"
case "$XBPS_TARGET_MACHINE" in
arm*)
# Enable OpenGL/ES on rpi platforms
build_options_default="gles"
;;
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
fi
post_install() {
vlicense COPYING.txt COPYING
}

View file

@ -1,7 +1,7 @@
# Template file for 'SDL2_mixer'
pkgname=SDL2_mixer
version=2.0.4
revision=2
revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
@ -15,27 +15,6 @@ homepage="http://www.libsdl.org/projects/SDL_mixer/"
distfiles="http://www.libsdl.org/projects/SDL_mixer/release/${pkgname}-${version}.tar.gz"
checksum=b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419
# Package build options
build_options="gles"
case "$XBPS_TARGET_MACHINE" in
arm*)
# Enable OpenGL/ES on rpi platforms
build_options_default="gles"
;;
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
fi
pre_configure() {
sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \
-e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
@ -48,7 +27,7 @@ post_install() {
}
SDL2_mixer-devel_package() {
depends="SDL2-devel ${sourcepkg}>=${version}_${revision}"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include

View file

@ -1,46 +1,24 @@
# Template file for 'SDL2_net'
pkgname=SDL2_net
version=2.0.1
revision=2
revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="SDL2-devel"
short_desc="SDL2 networking module"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="BSD"
license="BSD-3-Clause"
homepage="https://www.libsdl.org/projects/SDL_net/"
distfiles="https://www.libsdl.org/projects/SDL_net/release/${pkgname}-${version}.tar.gz"
checksum=15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21
# Package build options
build_options="gles"
case "$XBPS_TARGET_MACHINE" in
arm*)
# Enable OpenGL/ES on rpi platforms
build_options_default="gles"
;;
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
fi
post_install() {
vlicense COPYING.txt
}
SDL2_net-devel_package() {
depends="SDL2-devel ${sourcepkg}>=${version}_${revision}"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include