Github messages for voidlinux
 help / color / mirror / Atom feed
From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: glslViewer: update to 3.2.4.
Date: Sat, 02 Mar 2024 17:23:50 +0100	[thread overview]
Message-ID: <20240302162350.8443522FCF@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48828@inbox.vuxu.org>

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/48828#issuecomment-1974843065

Comment:
```diff
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
index 57c4c7e4f7b..dd65120a124 100644
--- a/srcpkgs/glslViewer/patches/liblo.patch
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -1,5 +1,5 @@
---- a/glslViewer/CMakeLists.txt
-+++ b/glslViewer/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -125,7 +125,7 @@ else()
          set(CPACK_GENERATOR "ZIP")
  
@@ -9,8 +9,8 @@
          install(TARGETS glslViewer DESTINATION ${CMAKE_INSTALL_BINDIR})
          
          if (NOT APPLE)
---- a/glslViewer/deps/CMakeLists.txt
-+++ b/glslViewer/deps/CMakeLists.txt
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
 @@ -1,6 +1,2 @@
  ## Ada
  add_subdirectory(vera)
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index ab2f5910de1..ec0ab5030f7 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -5,7 +5,6 @@ revision=1
 _lygia_gitrev="84eae417ba4bb333dab9204dc303c43ef6a223e8"
 _pybind11_gitrev="68211d41c1ef94fa65ef27ea2a6cdd8677996635"
 _vera_gitrev="93b2496679c005a723d3e04327199602955ed1dc"
-build_wrksrc=${pkgname}
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
@@ -16,19 +15,21 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://patriciogonzalezvivo.com/2015/glslViewer/"
 distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
- https://github.com/patriciogonzalezvivo/lygia/archive/${_lygia_gitrev}.tar.gz
- https://github.com/pybind/pybind11/archive/${_pybind11_gitrev}.tar.gz
- https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+ https://github.com/patriciogonzalezvivo/lygia/archive/${_lygia_gitrev}.tar.gz>lygia-${_lygia_gitrev}.tar.gz
+ https://github.com/pybind/pybind11/archive/${_pybind11_gitrev}.tar.gz>pybind11-${_pybind11_gitrev}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz>vera-${_vera_gitrev}.tar.gz"
 checksum="3b65172f54d0c5e5f909a31db20c16451355c6c623af6d6e0e3ef690746acb1f
  199d651d6f843dd31872229f263cc5408d7e79db2d4d9f8a263e3cd02e4cbbfd
  4dc757ad3ab7ba4564dbabfc47eb7d4f3b53a36de0fbc04bf07fd0373e1d5621
  eccbfe0e94fc4e333de1975e48deadd606cb954a4109b734573928b49b579a5a"
+skip_extraction="lygia-${_lygia_gitrev}.tar.gz
+ pybind11-${_pybind11_gitrev}.tar.gz
+ vera-${_vera_gitrev}.tar.gz"
 
 post_extract() {
-	mv ${pkgname}-${version} ${build_wrksrc}
-	mv lygia-${_lygia_gitrev}/* ${build_wrksrc}/deps/lygia
-	mv pybind11-${_pybind11_gitrev}/* ${build_wrksrc}/deps/pybind11
-	mv vera-${_vera_gitrev}/* ${build_wrksrc}/deps/vera
+	vsrcextract -C deps/lygia "lygia-${_lygia_gitrev}.tar.gz"
+	vsrcextract -C deps/pybind11 "pybind11-${_pybind11_gitrev}.tar.gz"
+	vsrcextract -C deps/vera "vera-${_vera_gitrev}.tar.gz"
 }
 
 pre_configure() {
```

  reply	other threads:[~2024-03-02 16:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-19  6:46 [PR PATCH] " yoshiyoshyosh
2024-03-02 16:23 ` classabbyamp [this message]
2024-03-05 22:36 ` [PR PATCH] [Updated] " yoshiyoshyosh
2024-06-04  1:48 ` github-actions
2024-06-04  2:02 ` classabbyamp
2024-06-04  3:03 ` [PR PATCH] [Updated] " yoshiyoshyosh
2024-06-04  3:06 ` yoshiyoshyosh
2024-06-04  3:06 ` yoshiyoshyosh
2024-06-04  3:17 ` [PR PATCH] [Merged]: " classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240302162350.8443522FCF@inbox.vuxu.org \
    --to=classabbyamp@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).