* Re: [PR REVIEW] mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
@ 2021-04-12 13:41 ` ericonr
2021-04-12 15:55 ` st3r4g
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-04-12 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#discussion_r611638723
Comment:
Shouldn't use a leading slash in paths for `vmove`.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
2021-04-12 13:41 ` [PR REVIEW] " ericonr
@ 2021-04-12 15:55 ` st3r4g
2021-04-12 15:57 ` st3r4g
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: st3r4g @ 2021-04-12 15:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#issuecomment-817926266
Comment:
> Is there a direct reason for it? Does it make a difference for any packages we build?
I think it's good to optimize the build time of some packages, such as wayland compositors. The `MesaLib-devel` makedep could be reduced to`libglvnd-devel` + `libgbm-devel`. See https://github.com/void-linux/void-packages/issues/23243
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
2021-04-12 13:41 ` [PR REVIEW] " ericonr
2021-04-12 15:55 ` st3r4g
@ 2021-04-12 15:57 ` st3r4g
2021-04-12 16:20 ` [PR PATCH] [Updated] " mahiuchun
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: st3r4g @ 2021-04-12 15:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#issuecomment-817926266
Comment:
> Is there a direct reason for it? Does it make a difference for any packages we build?
I think it's good to optimize the build dependencies (and build time) of some packages, such as wayland compositors. The `MesaLib-devel` makedep could be reduced to`libglvnd-devel` + `libgbm-devel`. See https://github.com/void-linux/void-packages/issues/23243
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (2 preceding siblings ...)
2021-04-12 15:57 ` st3r4g
@ 2021-04-12 16:20 ` mahiuchun
2021-04-12 16:41 ` [PR REVIEW] " mahiuchun
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: mahiuchun @ 2021-04-12 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by mahiuchun against master on the void-packages repository
https://github.com/mahiuchun/void-packages libgbm-devel
https://github.com/void-linux/void-packages/pull/30176
mesa: separate out libgbm-devel.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Since there is libgbm, there should be libgbm-devel as well.
A patch file from https://github.com/void-linux/void-packages/pull/30176.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgbm-devel-30176.patch --]
[-- Type: text/x-diff, Size: 2212 bytes --]
From 5cb5b47cebcc902e07c9724ddb944168ec02cf23 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Sun, 11 Apr 2021 15:11:56 -0700
Subject: [PATCH] mesa: separate out libgbm-devel.
---
srcpkgs/libgbm-devel | 1 +
srcpkgs/mesa/template | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libgbm-devel
diff --git a/srcpkgs/libgbm-devel b/srcpkgs/libgbm-devel
new file mode 120000
index 000000000000..1ad1bbec7ab3
--- /dev/null
+++ b/srcpkgs/libgbm-devel
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 0dbe36205d7e..ecd6b83340bd 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -30,7 +30,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libOSMesa"
+subpackages="libglapi libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -228,6 +228,16 @@ libgbm_package() {
}
}
+libgbm-devel_package() {
+ short_desc="Mesa Generic buffer management API - development files"
+ depends="libgbm>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/gbm.h
+ vmove usr/lib/libgbm.so
+ vmove usr/lib/pkgconfig/gbm.pc
+ }
+}
+
libOSMesa_package() {
short_desc="Mesa Off-Screen interface library"
pkg_install() {
@@ -239,7 +249,7 @@ MesaLib-devel_package() {
depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
libdrm-devel libglvnd-devel
- libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
+ libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision}
mesa>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
@@ -254,7 +264,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libgbm.so
vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (3 preceding siblings ...)
2021-04-12 16:20 ` [PR PATCH] [Updated] " mahiuchun
@ 2021-04-12 16:41 ` mahiuchun
2021-04-14 12:26 ` ericonr
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: mahiuchun @ 2021-04-12 16:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New review comment by mahiuchun on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#discussion_r611789182
Comment:
done
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (4 preceding siblings ...)
2021-04-12 16:41 ` [PR REVIEW] " mahiuchun
@ 2021-04-14 12:26 ` ericonr
2021-04-16 2:44 ` [PR PATCH] [Updated] " mahiuchun
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-04-14 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#issuecomment-819478173
Comment:
I think it'd be nice to include such improvements here already, otherwise people are unlikely to proactively discover them when touching the affected packages (note that they probably won't require revbumps).
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (5 preceding siblings ...)
2021-04-14 12:26 ` ericonr
@ 2021-04-16 2:44 ` mahiuchun
2021-04-16 3:14 ` mahiuchun
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: mahiuchun @ 2021-04-16 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by mahiuchun against master on the void-packages repository
https://github.com/mahiuchun/void-packages libgbm-devel
https://github.com/void-linux/void-packages/pull/30176
mesa: separate out libgbm-devel.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Since there is libgbm, there should be libgbm-devel as well.
A patch file from https://github.com/void-linux/void-packages/pull/30176.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgbm-devel-30176.patch --]
[-- Type: text/x-diff, Size: 3281 bytes --]
From 5cb5b47cebcc902e07c9724ddb944168ec02cf23 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Sun, 11 Apr 2021 15:11:56 -0700
Subject: [PATCH 1/2] mesa: separate out libgbm-devel.
---
srcpkgs/libgbm-devel | 1 +
srcpkgs/mesa/template | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libgbm-devel
diff --git a/srcpkgs/libgbm-devel b/srcpkgs/libgbm-devel
new file mode 120000
index 000000000000..1ad1bbec7ab3
--- /dev/null
+++ b/srcpkgs/libgbm-devel
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 0dbe36205d7e..ecd6b83340bd 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -30,7 +30,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libOSMesa"
+subpackages="libglapi libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -228,6 +228,16 @@ libgbm_package() {
}
}
+libgbm-devel_package() {
+ short_desc="Mesa Generic buffer management API - development files"
+ depends="libgbm>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/gbm.h
+ vmove usr/lib/libgbm.so
+ vmove usr/lib/pkgconfig/gbm.pc
+ }
+}
+
libOSMesa_package() {
short_desc="Mesa Off-Screen interface library"
pkg_install() {
@@ -239,7 +249,7 @@ MesaLib-devel_package() {
depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
libdrm-devel libglvnd-devel
- libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
+ libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision}
mesa>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
@@ -254,7 +264,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libgbm.so
vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
From a2f862959f26f13ab2ac2d82a083b4d4d6bd6457 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Thu, 15 Apr 2021 19:44:16 -0700
Subject: [PATCH 2/2] wlroots: replace MesaLib-devel with libgbm-devel and
libglvnd-devel.
---
srcpkgs/wlroots/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index c4d3bad99c6b..b58392d0ae61 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -8,7 +8,7 @@ configure_args="-Dlogind=disabled -Dlibseat=enabled
-Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
-Dx11-backend=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
xcb-util-errors-devel xcb-util-wm-devel"
makedepends="${_devel_depends}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (6 preceding siblings ...)
2021-04-16 2:44 ` [PR PATCH] [Updated] " mahiuchun
@ 2021-04-16 3:14 ` mahiuchun
2021-04-23 4:13 ` [PR PATCH] [Updated] " mahiuchun
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: mahiuchun @ 2021-04-16 3:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by mahiuchun on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#issuecomment-820876735
Comment:
I did it for `wlroots`.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (7 preceding siblings ...)
2021-04-16 3:14 ` mahiuchun
@ 2021-04-23 4:13 ` mahiuchun
2021-10-03 6:05 ` mahiuchun
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: mahiuchun @ 2021-04-23 4:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by mahiuchun against master on the void-packages repository
https://github.com/mahiuchun/void-packages libgbm-devel
https://github.com/void-linux/void-packages/pull/30176
mesa: separate out libgbm-devel.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Since there is libgbm, there should be libgbm-devel as well.
A patch file from https://github.com/void-linux/void-packages/pull/30176.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgbm-devel-30176.patch --]
[-- Type: text/x-diff, Size: 3248 bytes --]
From c665208f06384f7a6a32a44c610a0750803e28c2 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Sun, 11 Apr 2021 15:11:56 -0700
Subject: [PATCH 1/2] mesa: separate out libgbm-devel.
---
srcpkgs/libgbm-devel | 1 +
srcpkgs/mesa/template | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libgbm-devel
diff --git a/srcpkgs/libgbm-devel b/srcpkgs/libgbm-devel
new file mode 120000
index 000000000000..1ad1bbec7ab3
--- /dev/null
+++ b/srcpkgs/libgbm-devel
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 267419298baa..ac42418f48a0 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -30,7 +30,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libOSMesa"
+subpackages="libglapi libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -228,6 +228,16 @@ libgbm_package() {
}
}
+libgbm-devel_package() {
+ short_desc="Mesa Generic buffer management API - development files"
+ depends="libgbm>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/gbm.h
+ vmove usr/lib/libgbm.so
+ vmove usr/lib/pkgconfig/gbm.pc
+ }
+}
+
libOSMesa_package() {
short_desc="Mesa Off-Screen interface library"
pkg_install() {
@@ -239,7 +249,7 @@ MesaLib-devel_package() {
depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
libdrm-devel libglvnd-devel
- libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
+ libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision}
mesa>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
@@ -254,7 +264,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libgbm.so
vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
From 0ae4d9d0164a2c2849cef82cfb5c6c91f4e883a6 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Thu, 15 Apr 2021 19:44:16 -0700
Subject: [PATCH 2/2] wlroots: replace MesaLib-devel with libgbm-devel and
libglvnd-devel.
---
srcpkgs/wlroots/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index fd3a4b0b5aae..f2e0618e8b27 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -8,7 +8,7 @@ build_style=meson
configure_args="--auto-features=enabled -Dlogind=disabled
-Dexamples=false -Dwerror=false -Db_ndebug=false"
hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel"
makedepends="${_devel_depends}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (8 preceding siblings ...)
2021-04-23 4:13 ` [PR PATCH] [Updated] " mahiuchun
@ 2021-10-03 6:05 ` mahiuchun
2021-11-04 15:31 ` q66
2021-11-04 15:31 ` [PR PATCH] [Closed]: " q66
11 siblings, 0 replies; 13+ messages in thread
From: mahiuchun @ 2021-10-03 6:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by mahiuchun against master on the void-packages repository
https://github.com/mahiuchun/void-packages libgbm-devel
https://github.com/void-linux/void-packages/pull/30176
mesa: separate out libgbm-devel.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Since there is libgbm, there should be libgbm-devel as well.
A patch file from https://github.com/void-linux/void-packages/pull/30176.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgbm-devel-30176.patch --]
[-- Type: text/x-diff, Size: 3296 bytes --]
From d43b41c40ee389861c2a5719685f2a196f1ece95 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Sun, 11 Apr 2021 15:11:56 -0700
Subject: [PATCH 1/2] mesa: separate out libgbm-devel.
---
srcpkgs/libgbm-devel | 1 +
srcpkgs/mesa/template | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libgbm-devel
diff --git a/srcpkgs/libgbm-devel b/srcpkgs/libgbm-devel
new file mode 120000
index 000000000000..1ad1bbec7ab3
--- /dev/null
+++ b/srcpkgs/libgbm-devel
@@ -0,0 +1 @@
+mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 88003e98c142..3d149b0537b6 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -29,7 +29,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libOSMesa"
+subpackages="libglapi libgbm libgbm-devel libOSMesa"
# Replace old mesa pkgs, superseded by libglvnd.
replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
@@ -238,6 +238,16 @@ libgbm_package() {
}
}
+libgbm-devel_package() {
+ short_desc="Mesa Generic buffer management API - development files"
+ depends="libgbm>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/gbm.h
+ vmove usr/lib/libgbm.so
+ vmove usr/lib/pkgconfig/gbm.pc
+ }
+}
+
libOSMesa_package() {
short_desc="Mesa Off-Screen interface library"
pkg_install() {
@@ -249,7 +259,7 @@ MesaLib-devel_package() {
depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
libdrm-devel libglvnd-devel
- libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
+ libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision}
mesa>=${version}_${revision}"
if [ "$_have_vmware" ]; then
depends+=" libxatracker>=${version}_${revision}"
@@ -264,7 +274,6 @@ MesaLib-devel_package() {
vmove usr/lib/libEGL_mesa.so
vmove usr/lib/libGLX_mesa.so
vmove usr/lib/libOSMesa.so
- vmove usr/lib/libgbm.so
vmove usr/lib/libglapi.so
if [ "$_have_vmware" ]; then
vmove usr/lib/libxatracker.so
From 36af8a7aa33c331c3ed50fd0875e69f5106a52b0 Mon Sep 17 00:00:00 2001
From: Hill Ma <maahiuzeon@gmail.com>
Date: Thu, 15 Apr 2021 19:44:16 -0700
Subject: [PATCH 2/2] wlroots: replace MesaLib-devel with libgbm-devel and
libglvnd-devel.
---
srcpkgs/wlroots/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index da514da32304..8fdc2ba6ab40 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -7,7 +7,7 @@ build_style=meson
# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
hostmakedepends="pkg-config wayland-devel"
-_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel"
makedepends="${_devel_depends}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (9 preceding siblings ...)
2021-10-03 6:05 ` mahiuchun
@ 2021-11-04 15:31 ` q66
2021-11-04 15:31 ` [PR PATCH] [Closed]: " q66
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2021-11-04 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/30176#issuecomment-961158548
Comment:
superseded by https://github.com/void-linux/void-packages/pull/33899
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Closed]: mesa: separate out libgbm-devel.
2021-04-12 4:17 [PR PATCH] mesa: separate out libgbm-devel mahiuchun
` (10 preceding siblings ...)
2021-11-04 15:31 ` q66
@ 2021-11-04 15:31 ` q66
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2021-11-04 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1505 bytes --]
There's a closed pull request on the void-packages repository
mesa: separate out libgbm-devel.
https://github.com/void-linux/void-packages/pull/30176
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Since there is libgbm, there should be libgbm-devel as well.
^ permalink raw reply [flat|nested] 13+ messages in thread