[PR PATCH] [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[PR PATCH] [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages SDL2
https://github.com/void-linux/void-packages/pull/18298

[RFC] SDL2: unify build options on all archs, don't enable rpi for arm*
Currently `rpi-userland-devel` provides the some `pkgconfig` files as `libglvnd-devel`
```
/usr/lib/pkgconfig/glesv2.pc
/usr/lib/pkgconfig/egl.pc
```

Which makes it impossible to build something that depends on `SDL2-devel` and `libglvnd-devel`/`MesaLib-devel` since `rpi-userland-devel` will be pulled in.

Also if I'm not mistaken, the rpi build option is currently nevertheless broken. SDL2 only searches for `libGLESv2.so.2` if `--enable-video-rpi` is not set, and `rpi-userland` is only providing `libGLESv2.so`. The code of SDL does runtime checks whether it is a rpi so enabling it shouldn't break non rpi's. But everything should be less broken as the current state. So if anyone wanna fix the rpi build option feel free to do so.

A patch file from https://github.com/void-linux/void-packages/pull/18298.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-18298.patch --]
[-- Type: text/x-diff, Size: 1321 bytes --]

From e2c9accce07cacb5028b494c8cd3d62338f29121 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 14 Jan 2020 04:07:23 +0100
Subject: [PATCH] SDL2: unify build options on all archs, don't enable rpi for
 arm*

---
 srcpkgs/SDL2/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 8d9aa05cfd6..34158dd8da2 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2'
 pkgname=SDL2
 version=2.0.10
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
  --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
@@ -18,17 +18,11 @@ checksum=b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57
 
 # Package build options
 build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*)
-		build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
-		;;
-	aarch64*)
-		build_options_default="gles opengl pulseaudio sndio x11"
-		;;
 	arm*)
 		build_options+=" rpi"
-		build_options_default="rpi pulseaudio sndio x11"
 		;;
 esac
 

Re: [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/18298#issuecomment-573987827

Comment:
This is untested on `arm*`

Re: [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/18298#issuecomment-575659767

Comment:
The lines `depends+=" libGLES"` and `depends+=" libGL"` are run twice which makes the list of target dependencies repeat them.
I think we should put an `unset depends` somewhere in the template before adding to `depends`.

Re: [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/18298#issuecomment-575659767

Comment:
The lines `depends+=" libGLES"` and `depends+=" libGL"` are run twice which makes the list of target dependencies repeat them.
I think we should put an `unset depends` somewhere (around line 22) in the template before adding to `depends`.

Re: [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/18298#issuecomment-576048950

Comment:
I'm wondering if we even needed these as explicit deps. SDL2 can work without them, and it is more up to the application that is using SDL2 to request and depend on what is needed.

Re: [PR PATCH] [Updated] [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages SDL2
https://github.com/void-linux/void-packages/pull/18298

[RFC] SDL2: unify build options on all archs, don't enable rpi for arm*
Currently `rpi-userland-devel` provides the some `pkgconfig` files as `libglvnd-devel`
```
/usr/lib/pkgconfig/glesv2.pc
/usr/lib/pkgconfig/egl.pc
```

Which makes it impossible to build something that depends on `SDL2-devel` and `libglvnd-devel`/`MesaLib-devel` since `rpi-userland-devel` will be pulled in.

Also if I'm not mistaken, the rpi build option is currently nevertheless broken. SDL2 only searches for `libGLESv2.so.2` if `--enable-video-rpi` is not set, and `rpi-userland` is only providing `libGLESv2.so`. The code of SDL does runtime checks whether it is a rpi so enabling it shouldn't break non rpi's. But everything should be less broken as the current state. So if anyone wanna fix the rpi build option feel free to do so.

A patch file from https://github.com/void-linux/void-packages/pull/18298.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SDL2-18298.patch --]
[-- Type: text/x-diff, Size: 1840 bytes --]

From 9d94b8c9f69b6026c29bd79ed1ce4e5da26e9433 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 14 Jan 2020 04:07:23 +0100
Subject: [PATCH] SDL2: unify build options on all archs, don't enable rpi for
 arm*

---
 srcpkgs/SDL2/template | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 8d9aa05cfd6..4c8172aa3f4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2'
 pkgname=SDL2
 version=2.0.10
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
  --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
@@ -18,17 +18,11 @@ checksum=b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57
 
 # Package build options
 build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc*)
-		build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
-		;;
-	aarch64*)
-		build_options_default="gles opengl pulseaudio sndio x11"
-		;;
 	arm*)
 		build_options+=" rpi"
-		build_options_default="rpi pulseaudio sndio x11"
 		;;
 esac
 
@@ -42,7 +36,6 @@ if [ "$build_option_gles" ]; then
 	configure_args+=" --enable-video-opengles"
 	# libGLESv2.so.2 is dynamically loaded with dlopen.
 	shlib_requires="libGLESv2.so.2"
-	depends+=" libGLES"
 else
 	configure_args+=" --disable-video-opengles"
 fi
@@ -58,7 +51,6 @@ fi
 if [ "$build_option_opengl" ]; then
 	# libGL.so.1 is dynamically loaded with dlopen.
 	shlib_requires+=" libGL.so.1"
-	depends+=" libGL"
 	configure_args+=" --enable-video-opengl"
 else
 	configure_args+=" --disable-video-opengl"

Re: [PR PATCH] [Merged]: [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 952 bytes --]

There's a merged pull request on the void-packages repository

[RFC] SDL2: unify build options on all archs, don't enable rpi for arm*
https://github.com/void-linux/void-packages/pull/18298

Description:
Currently `rpi-userland-devel` provides the some `pkgconfig` files as `libglvnd-devel`
```
/usr/lib/pkgconfig/glesv2.pc
/usr/lib/pkgconfig/egl.pc
```

Which makes it impossible to build something that depends on `SDL2-devel` and `libglvnd-devel`/`MesaLib-devel` since `rpi-userland-devel` will be pulled in.

Also if I'm not mistaken, the rpi build option is currently nevertheless broken. SDL2 only searches for `libGLESv2.so.2` if `--enable-video-rpi` is not set, and `rpi-userland` is only providing `libGLESv2.so`. The code of SDL does runtime checks whether it is a rpi so enabling it shouldn't break non rpi's. But everything should be less broken as the current state. So if anyone wanna fix the rpi build option feel free to do so.

Re: [RFC] SDL2: unify build options on all archs, don't enable rpi for arm*

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/18298#issuecomment-578452932

Comment:
Ok, I somehow missed that shlib_requires does not add `common/shlibs` entries to depends. Went back to adding the unset as you recommended. 855796f23a824e808712268518e2a19d41f3f97e