From f6e4f62e84f5d09b5766567d33064a8917d67f59 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 18:24:42 +0100 Subject: [PATCH 1/6] SDL2_image: get rid of gles build option. Should be unncessary because SDL2 takes care of it. --- srcpkgs/SDL2_image/template | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/srcpkgs/SDL2_image/template b/srcpkgs/SDL2_image/template index c70ec712083..07885314de4 100644 --- a/srcpkgs/SDL2_image/template +++ b/srcpkgs/SDL2_image/template @@ -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 } From cd1771082fddeeda6fbe063dfb5808d56299c733 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 18:25:33 +0100 Subject: [PATCH 2/6] SDL2_mixer: get rid of gles build option. Should be unncessary because SDL2 takes care of it. --- srcpkgs/SDL2_mixer/template | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template index 80d654951b9..06a28928419 100644 --- a/srcpkgs/SDL2_mixer/template +++ b/srcpkgs/SDL2_mixer/template @@ -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 From cb87568ec07f060395813b85e00e2482d0cb7f04 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 18:25:54 +0100 Subject: [PATCH 3/6] SDL2_net: get rid of gles build option. Should be unncessary because SDL2 takes care of it. --- srcpkgs/SDL2_net/template | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template index cbc619afd6a..98ff2465067 100644 --- a/srcpkgs/SDL2_net/template +++ b/srcpkgs/SDL2_net/template @@ -1,7 +1,7 @@ # 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" @@ -13,34 +13,12 @@ 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 From 2ea8fc88dad6b06639a7f74d3b235b4356d9fae1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 18:26:26 +0100 Subject: [PATCH 4/6] libwebp: do not depend on freeglut on arm*. On arm* all packages that link against SDL2 use rpi-userland, thus no glvnd. --- srcpkgs/libwebp/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template index a8ff2161763..11c82587639 100644 --- a/srcpkgs/libwebp/template +++ b/srcpkgs/libwebp/template @@ -1,12 +1,12 @@ # Template file for 'libwebp' pkgname=libwebp version=1.0.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --enable-libwebpmux --enable-libwebpdemux --enable-libwebpdecoder" hostmakedepends="pkg-config" -makedepends="giflib-devel libfreeglut-devel libpng-devel tiff-devel" +makedepends="giflib-devel libpng-devel tiff-devel" short_desc="WebP image format" maintainer="Orphaned " license="BSD-3-Clause" @@ -17,6 +17,7 @@ checksum=e20a07865c8697bba00aebccc6f54912d6bc333bb4d604e6b07491c1a226b34f case "$XBPS_TARGET_MACHINE" in armv6*) configure_args+=" --disable-neon";; armv7*) CFLAGS="-mfpu=neon";; + *) makedepends+=" libfreeglut-devel";; esac post_install() { From 04ceb918c56c2df48cb5ae98ca60cef353acd1b0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 18:27:24 +0100 Subject: [PATCH 5/6] rocksndiamonds: get rid of gles build option. SDL2 takes care of this, and use ${makejobs} --- srcpkgs/rocksndiamonds/template | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template index 5e9484663a0..9758c49722c 100644 --- a/srcpkgs/rocksndiamonds/template +++ b/srcpkgs/rocksndiamonds/template @@ -1,7 +1,7 @@ # Template file for 'rocksndiamonds' pkgname=rocksndiamonds version=4.1.4.0 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_net-devel" @@ -13,27 +13,7 @@ homepage="http://www.artsoft.org/rocksndiamonds" distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz" checksum=40658f923b9efa9116476abe8427fb65596b2015cf845dd83a4d8c3de1a32e5b -# Package build options -build_options="gles" - LDFLAGS="-lz" -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 -lz" - ;; - esac -fi do_build() { CFLAGS+=" -DTARGET_SDL2" @@ -41,7 +21,7 @@ do_build() { CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'" CFLAGS+=" $(sdl2-config --cflags)" LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm" - make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" sdl2 + make ${makejobs} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" sdl2 } do_install() { From 26b7f76425120b15ea62ba74508605e06332f858 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Jan 2020 18:32:11 +0100 Subject: [PATCH 6/6] SDL2_net: fix license --- srcpkgs/SDL2_net/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template index 98ff2465067..206372e2bb6 100644 --- a/srcpkgs/SDL2_net/template +++ b/srcpkgs/SDL2_net/template @@ -8,7 +8,7 @@ hostmakedepends="pkg-config" makedepends="SDL2-devel" short_desc="SDL2 networking module" maintainer="Jürgen Buchmüller " -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