* [PR PATCH] Fix the SDL2 gles stuff on arm*
@ 2020-01-06 17:29 voidlinux-github
2020-01-06 17:32 ` [PR PATCH] [Updated] " voidlinux-github
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
There is a new pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages SDL2-arm
https://github.com/void-linux/void-packages/pull/18076
Fix the SDL2 gles stuff on arm*
There's no need to propagate the gles settings from SDL2.
@pullmoll why did you add those? AFAIK only SDL2 is enough.
A patch file from https://github.com/void-linux/void-packages/pull/18076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-arm-18076.patch --]
[-- Type: text/x-diff, Size: 8180 bytes --]
From f6e4f62e84f5d09b5766567d33064a8917d67f59 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:24:42 +0100
Subject: [PATCH 1/5] 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 <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:25:33 +0100
Subject: [PATCH 2/5] 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 <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:25:54 +0100
Subject: [PATCH 3/5] 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 <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:26:26 +0100
Subject: [PATCH 4/5] 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 <orphan@voidlinux.org>"
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 <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:27:24 +0100
Subject: [PATCH 5/5] 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() {
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
@ 2020-01-06 17:32 ` voidlinux-github
2020-01-06 17:43 ` voidlinux-github
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages SDL2-arm
https://github.com/void-linux/void-packages/pull/18076
Fix the SDL2 gles stuff on arm*
There's no need to propagate the gles settings from SDL2.
@pullmoll why did you add those? AFAIK only SDL2 is enough.
A patch file from https://github.com/void-linux/void-packages/pull/18076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-arm-18076.patch --]
[-- Type: text/x-diff, Size: 9044 bytes --]
From f6e4f62e84f5d09b5766567d33064a8917d67f59 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <orphan@voidlinux.org>"
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 <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
2020-01-06 17:32 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-06 17:43 ` voidlinux-github
2020-01-06 17:49 ` voidlinux-github
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages SDL2-arm
https://github.com/void-linux/void-packages/pull/18076
Fix the SDL2 gles stuff on arm*
There's no need to propagate the gles settings from SDL2.
@pullmoll why did you add those? AFAIK only SDL2 is enough.
A patch file from https://github.com/void-linux/void-packages/pull/18076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-arm-18076.patch --]
[-- Type: text/x-diff, Size: 9044 bytes --]
From f6e4f62e84f5d09b5766567d33064a8917d67f59 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <orphan@voidlinux.org>"
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 <xtraeme@gmail.com>
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 <xtraeme@gmail.com>
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 <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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
2020-01-06 17:32 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-06 17:43 ` voidlinux-github
@ 2020-01-06 17:49 ` voidlinux-github
2020-01-06 17:53 ` voidlinux-github
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages SDL2-arm
https://github.com/void-linux/void-packages/pull/18076
Fix the SDL2 gles stuff on arm*
There's no need to propagate the gles settings from SDL2.
@pullmoll why did you add those? AFAIK only SDL2 is enough.
A patch file from https://github.com/void-linux/void-packages/pull/18076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-arm-18076.patch --]
[-- Type: text/x-diff, Size: 7385 bytes --]
From 6104af2d6d4780bbcc6e3ee334f9b9d2df9c98ee Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:47:09 +0100
Subject: [PATCH 1/3] 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 <orphan@voidlinux.org>"
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 bce917c1332e749b05dcdfdd68542702eae28417 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:47:39 +0100
Subject: [PATCH 2/3] 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.
---
srcpkgs/SDL2_image/template | 23 +----------------------
srcpkgs/SDL2_mixer/template | 25 ++-----------------------
srcpkgs/SDL2_net/template | 28 +++-------------------------
3 files changed, 6 insertions(+), 70 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
}
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
diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template
index cbc619afd6a..206372e2bb6 100644
--- a/srcpkgs/SDL2_net/template
+++ b/srcpkgs/SDL2_net/template
@@ -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
From d7041338f1dae8ccba9d58c0e3c0f63f410237dd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:48:41 +0100
Subject: [PATCH 3/3] rocksndiamonds: use makejobs; unbreak cross
---
srcpkgs/rocksndiamonds/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index e018b0e6d8f..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"
@@ -14,9 +14,6 @@ distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}
checksum=40658f923b9efa9116476abe8427fb65596b2015cf845dd83a4d8c3de1a32e5b
LDFLAGS="-lz"
-case "$XBPS_TARGET_MACHINE" in
- arm*) broken="https://build.voidlinux.org/builders/armv6l-musl_builder/builds/23388/steps/shell_3/logs/stdio";;
-esac
do_build() {
CFLAGS+=" -DTARGET_SDL2"
@@ -24,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() {
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (2 preceding siblings ...)
2020-01-06 17:49 ` voidlinux-github
@ 2020-01-06 17:53 ` voidlinux-github
2020-01-06 17:59 ` voidlinux-github
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by xtraeme against master on the void-packages repository
https://github.com/xtraeme/void-packages SDL2-arm
https://github.com/void-linux/void-packages/pull/18076
Fix the SDL2 gles stuff on arm*
There's no need to propagate the gles settings from SDL2.
@pullmoll why did you add those? AFAIK only SDL2 is enough.
A patch file from https://github.com/void-linux/void-packages/pull/18076.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-arm-18076.patch --]
[-- Type: text/x-diff, Size: 8140 bytes --]
From 6104af2d6d4780bbcc6e3ee334f9b9d2df9c98ee Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:47:09 +0100
Subject: [PATCH 1/4] 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 <orphan@voidlinux.org>"
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 bce917c1332e749b05dcdfdd68542702eae28417 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:47:39 +0100
Subject: [PATCH 2/4] 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.
---
srcpkgs/SDL2_image/template | 23 +----------------------
srcpkgs/SDL2_mixer/template | 25 ++-----------------------
srcpkgs/SDL2_net/template | 28 +++-------------------------
3 files changed, 6 insertions(+), 70 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
}
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
diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template
index cbc619afd6a..206372e2bb6 100644
--- a/srcpkgs/SDL2_net/template
+++ b/srcpkgs/SDL2_net/template
@@ -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
From d7041338f1dae8ccba9d58c0e3c0f63f410237dd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:48:41 +0100
Subject: [PATCH 3/4] rocksndiamonds: use makejobs; unbreak cross
---
srcpkgs/rocksndiamonds/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index e018b0e6d8f..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"
@@ -14,9 +14,6 @@ distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}
checksum=40658f923b9efa9116476abe8427fb65596b2015cf845dd83a4d8c3de1a32e5b
LDFLAGS="-lz"
-case "$XBPS_TARGET_MACHINE" in
- arm*) broken="https://build.voidlinux.org/builders/armv6l-musl_builder/builds/23388/steps/shell_3/logs/stdio";;
-esac
do_build() {
CFLAGS+=" -DTARGET_SDL2"
@@ -24,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 6351fa6e1bd53bf39312b0ecd0483f748efa0b48 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 18:52:46 +0100
Subject: [PATCH 4/4] rockndiamonds: no need to revbump; wasn't cross compiled
before.
---
srcpkgs/rocksndiamonds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 9758c49722c..587380d68f0 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=2
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_net-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (3 preceding siblings ...)
2020-01-06 17:53 ` voidlinux-github
@ 2020-01-06 17:59 ` voidlinux-github
2020-01-06 18:05 ` voidlinux-github
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/18076#issuecomment-571242454
Comment:
@pullmoll please test, should dtrt afaik
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (4 preceding siblings ...)
2020-01-06 17:59 ` voidlinux-github
@ 2020-01-06 18:05 ` voidlinux-github
2020-01-06 18:08 ` voidlinux-github
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18076#issuecomment-571244504
Comment:
@xtraeme I don't remember why it was necessary while I think the `SDL2_...` packages could just not be built before the switch to the libglvnd stuff.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (5 preceding siblings ...)
2020-01-06 18:05 ` voidlinux-github
@ 2020-01-06 18:08 ` voidlinux-github
2020-01-06 18:08 ` voidlinux-github
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/18076#issuecomment-571245482
Comment:
I've got my old rpi3 but no microsd card writer... so can't test
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (6 preceding siblings ...)
2020-01-06 18:08 ` voidlinux-github
@ 2020-01-06 18:08 ` voidlinux-github
2020-01-06 18:12 ` voidlinux-github
2020-01-06 18:13 ` [PR PATCH] [Merged]: " voidlinux-github
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18076#issuecomment-571245755
Comment:
I cannot test arm* either. All hardware is somewhere in a dusty corner and not ready to be powered up.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (7 preceding siblings ...)
2020-01-06 18:08 ` voidlinux-github
@ 2020-01-06 18:12 ` voidlinux-github
2020-01-06 18:13 ` [PR PATCH] [Merged]: " voidlinux-github
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18076#issuecomment-571247494
Comment:
Travis thinks it's okay and I think the same so please merge.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: Fix the SDL2 gles stuff on arm*
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
` (8 preceding siblings ...)
2020-01-06 18:12 ` voidlinux-github
@ 2020-01-06 18:13 ` voidlinux-github
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2020-01-06 18:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
There's a merged pull request on the void-packages repository
Fix the SDL2 gles stuff on arm*
https://github.com/void-linux/void-packages/pull/18076
Description:
There's no need to propagate the gles settings from SDL2.
@pullmoll why did you add those? AFAIK only SDL2 is enough.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-01-06 18:13 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-06 17:29 [PR PATCH] Fix the SDL2 gles stuff on arm* voidlinux-github
2020-01-06 17:32 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-06 17:43 ` voidlinux-github
2020-01-06 17:49 ` voidlinux-github
2020-01-06 17:53 ` voidlinux-github
2020-01-06 17:59 ` voidlinux-github
2020-01-06 18:05 ` voidlinux-github
2020-01-06 18:08 ` voidlinux-github
2020-01-06 18:08 ` voidlinux-github
2020-01-06 18:12 ` voidlinux-github
2020-01-06 18:13 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).