Skip to content

Commit 9d92a2f

Browse files
author
Juan RP
committed
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.
1 parent f9a733f commit 9d92a2f

3 files changed

Lines changed: 6 additions & 70 deletions

File tree

srcpkgs/SDL2_image/template

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'SDL2_image'
22
pkgname=SDL2_image
33
version=2.0.5
4-
revision=1
4+
revision=2
55
build_style=gnu-configure
66
configure_args="--disable-static --disable-jpg-shared
77
--disable-png-shared --disable-webp-shared --disable-tif-shared"
@@ -14,27 +14,6 @@ homepage="http://www.libsdl.org/projects/SDL_image/"
1414
distfiles="http://www.libsdl.org/projects/SDL_image/release/${pkgname}-${version}.tar.gz"
1515
checksum=bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0
1616

17-
# Package build options
18-
build_options="gles"
19-
20-
case "$XBPS_TARGET_MACHINE" in
21-
arm*)
22-
# Enable OpenGL/ES on rpi platforms
23-
build_options_default="gles"
24-
;;
25-
esac
26-
27-
28-
if [ "$build_option_gles" ]; then
29-
case "$XBPS_TARGET_MACHINE" in
30-
armv[67]*)
31-
# RaspberryPi, use Videocore IV
32-
makedepends+=" rpi-userland-devel"
33-
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
34-
;;
35-
esac
36-
fi
37-
3817
post_install() {
3918
vlicense COPYING.txt COPYING
4019
}

srcpkgs/SDL2_mixer/template

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'SDL2_mixer'
22
pkgname=SDL2_mixer
33
version=2.0.4
4-
revision=2
4+
revision=3
55
build_style=gnu-configure
66
hostmakedepends="pkg-config"
77
makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
@@ -15,27 +15,6 @@ homepage="http://www.libsdl.org/projects/SDL_mixer/"
1515
distfiles="http://www.libsdl.org/projects/SDL_mixer/release/${pkgname}-${version}.tar.gz"
1616
checksum=b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419
1717

18-
# Package build options
19-
build_options="gles"
20-
21-
case "$XBPS_TARGET_MACHINE" in
22-
arm*)
23-
# Enable OpenGL/ES on rpi platforms
24-
build_options_default="gles"
25-
;;
26-
esac
27-
28-
29-
if [ "$build_option_gles" ]; then
30-
case "$XBPS_TARGET_MACHINE" in
31-
armv[67]*)
32-
# RaspberryPi, use Videocore IV
33-
makedepends+=" rpi-userland-devel"
34-
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
35-
;;
36-
esac
37-
fi
38-
3918
pre_configure() {
4019
sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \
4120
-e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
@@ -48,7 +27,7 @@ post_install() {
4827
}
4928

5029
SDL2_mixer-devel_package() {
51-
depends="SDL2-devel ${sourcepkg}>=${version}_${revision}"
30+
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
5231
short_desc+=" - development files"
5332
pkg_install() {
5433
vmove usr/include

srcpkgs/SDL2_net/template

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,24 @@
11
# Template file for 'SDL2_net'
22
pkgname=SDL2_net
33
version=2.0.1
4-
revision=2
4+
revision=3
55
build_style=gnu-configure
66
configure_args="--disable-static"
77
hostmakedepends="pkg-config"
88
makedepends="SDL2-devel"
99
short_desc="SDL2 networking module"
1010
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
11-
license="BSD"
11+
license="BSD-3-Clause"
1212
homepage="https://www.libsdl.org/projects/SDL_net/"
1313
distfiles="https://www.libsdl.org/projects/SDL_net/release/${pkgname}-${version}.tar.gz"
1414
checksum=15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21
1515

16-
# Package build options
17-
build_options="gles"
18-
19-
case "$XBPS_TARGET_MACHINE" in
20-
arm*)
21-
# Enable OpenGL/ES on rpi platforms
22-
build_options_default="gles"
23-
;;
24-
esac
25-
26-
27-
if [ "$build_option_gles" ]; then
28-
case "$XBPS_TARGET_MACHINE" in
29-
armv[67]*)
30-
# RaspberryPi, use Videocore IV
31-
makedepends+=" rpi-userland-devel"
32-
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
33-
;;
34-
esac
35-
fi
36-
37-
3816
post_install() {
3917
vlicense COPYING.txt
4018
}
4119

4220
SDL2_net-devel_package() {
43-
depends="SDL2-devel ${sourcepkg}>=${version}_${revision}"
21+
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
4422
short_desc+=" - development files"
4523
pkg_install() {
4624
vmove usr/include

0 commit comments

Comments
 (0)