[-- Attachment #1: Type: text/plain, Size: 1526 bytes --] There is a new pull request by subnut against master on the void-packages repository https://github.com/subnut/void-packages glfw-wayland https://github.com/void-linux/void-packages/pull/37078 Added new package glfw-wayland-devel-3.3.7 Executables built with the current glfw-devel links with the default glfw library and works on X11 only. This package replaces the glfw-devel package files with the wayland-compatible files, so the executable links with the wayland-compatible glfw libraries provided by glfw-wayland. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES** <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> #### Local build testing - I built this PR locally for my native architecture, (x86_64-glibc) <!-- - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/37078.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-glfw-wayland-37078.patch --] [-- Type: text/x-diff, Size: 1767 bytes --] From 8b0b99e13324317c9d98544f711fee6d8390c709 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath <sn03.general@gmail.com> Date: Wed, 11 May 2022 10:13:32 +0530 Subject: [PATCH] Added new package glfw-wayland-devel-3.3.7 Executables built with the current glfw-devel links with the default glfw library and works on X11 only. This package replaces the glfw-devel package files with the wayland-compatible files, so the executable links with the wayland-compatible glfw libraries provided by glfw-wayland. --- srcpkgs/glfw-wayland-devel | 1 + srcpkgs/glfw-wayland/template | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/glfw-wayland-devel diff --git a/srcpkgs/glfw-wayland-devel b/srcpkgs/glfw-wayland-devel new file mode 120000 index 000000000000..be41fbcf9717 --- /dev/null +++ b/srcpkgs/glfw-wayland-devel @@ -0,0 +1 @@ +glfw-wayland \ No newline at end of file diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template index f2abe3a8a608..feb84f41f81a 100644 --- a/srcpkgs/glfw-wayland/template +++ b/srcpkgs/glfw-wayland/template @@ -18,8 +18,15 @@ checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04 provides="glfw-${version}_${revision}" replaces="glfw>=0" -do_install() { - vmkdir usr/lib - install -m755 ${wrksrc}/build/src/libglfw.so.${version%.*} ${DESTDIR}/usr/lib/ - ln -s libglfw.so.${version%.*} ${DESTDIR}/usr/lib/libglfw.so.3 +glfw-wayland-devel_package() { + replaces="glfw-devel>=0" + provides="glfw-devel-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} $makedepends" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove /usr/lib/cmake + vmove "usr/lib/*.so" + } }
[-- Attachment #1: Type: text/plain, Size: 242 bytes --] New comment by subnut on void-packages repository https://github.com/void-linux/void-packages/pull/37078#issuecomment-1123183540 Comment: Ping @q66 (maintainer of glfw-wayland) Ping @Gottox (maintainer of glfw, whose template I've copied)
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --] There is an updated pull request by subnut against master on the void-packages repository https://github.com/subnut/void-packages glfw-wayland https://github.com/void-linux/void-packages/pull/37078 Added new package glfw-wayland-devel-3.3.7 Executables built with the current glfw-devel links with the default glfw library and works on X11 only. This package replaces the glfw-devel package files with the wayland-compatible files, so the executable links with the wayland-compatible glfw libraries provided by glfw-wayland. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES** <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> #### Local build testing - I built this PR locally for my native architecture, (x86_64-glibc) <!-- - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/37078.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-glfw-wayland-37078.patch --] [-- Type: text/x-diff, Size: 1762 bytes --] From 6491045409c3c19d4caac065f98526fd9c5fe7b5 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath <sn03.general@gmail.com> Date: Wed, 11 May 2022 10:13:32 +0530 Subject: [PATCH] New package: glfw-wayland-devel-3.3.7 Executables built with the current glfw-devel links with the default glfw library and works on X11 only. This package replaces the glfw-devel package files with the wayland-compatible files, so the executable links with the wayland-compatible glfw libraries provided by glfw-wayland. --- srcpkgs/glfw-wayland-devel | 1 + srcpkgs/glfw-wayland/template | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/glfw-wayland-devel diff --git a/srcpkgs/glfw-wayland-devel b/srcpkgs/glfw-wayland-devel new file mode 120000 index 000000000000..be41fbcf9717 --- /dev/null +++ b/srcpkgs/glfw-wayland-devel @@ -0,0 +1 @@ +glfw-wayland \ No newline at end of file diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template index f2abe3a8a608..feb84f41f81a 100644 --- a/srcpkgs/glfw-wayland/template +++ b/srcpkgs/glfw-wayland/template @@ -18,8 +18,15 @@ checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04 provides="glfw-${version}_${revision}" replaces="glfw>=0" -do_install() { - vmkdir usr/lib - install -m755 ${wrksrc}/build/src/libglfw.so.${version%.*} ${DESTDIR}/usr/lib/ - ln -s libglfw.so.${version%.*} ${DESTDIR}/usr/lib/libglfw.so.3 +glfw-wayland-devel_package() { + replaces="glfw-devel>=0" + provides="glfw-devel-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} $makedepends" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove /usr/lib/cmake + vmove "usr/lib/*.so" + } }
[-- Attachment #1: Type: text/plain, Size: 420 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/37078#issuecomment-1126079286 Comment: My understanding is that you're supposed to use this by installing `glfw-wayland` to replace `glfw`, and `glfw-devel` is enough to get your application correctly linked, we don't need a `glfw-wayland-devel` for that. Can you give a specific example where this caused trouble?
[-- Attachment #1: Type: text/plain, Size: 297 bytes --] New comment by subnut on void-packages repository https://github.com/void-linux/void-packages/pull/37078#issuecomment-1126115366 Comment: @ericonr Ah. Sorry. After your comment, I looked into the code, and it actually was failing with `glfw-wayland` due to a completely different cause. My bad.
[-- Attachment #1: Type: text/plain, Size: 1367 bytes --] There's a closed pull request on the void-packages repository New package: glfw-wayland-devel-3.3.7 https://github.com/void-linux/void-packages/pull/37078 Description: Executables built with the current glfw-devel links with the default glfw library and works on X11 only. This package replaces the glfw-devel package files with the wayland-compatible files, so the executable links with the wayland-compatible glfw libraries provided by glfw-wayland. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES** <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> #### Local build testing - I built this PR locally for my native architecture, (x86_64-glibc) <!-- - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->
[-- Attachment #1: Type: text/plain, Size: 183 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/37078#issuecomment-1126116855 Comment: No worries :) glad you found the problem!
[-- Attachment #1: Type: text/plain, Size: 228 bytes --] New comment by subnut on void-packages repository https://github.com/void-linux/void-packages/pull/37078#issuecomment-1126116966 Comment: @ericonr I was trying to build GTA Vice City, BTW. https://github.com/GTAmodding/re3