* [PR PATCH] glslViewer: update to 3.2.4.
@ 2024-02-19 6:46 yoshiyoshyosh
2024-03-02 16:23 ` classabbyamp
2024-03-05 22:36 ` [PR PATCH] [Updated] " yoshiyoshyosh
0 siblings, 2 replies; 3+ messages in thread
From: yoshiyoshyosh @ 2024-02-19 6:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is a new pull request by yoshiyoshyosh against master on the void-packages repository
https://github.com/yoshiyoshyosh/void-packages glslviewerupdate
https://github.com/void-linux/void-packages/pull/48828
glslViewer: update to 3.2.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
- I built this PR locally for these architectures
- i686
- armv7l (crossbuild)
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/48828.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewerupdate-48828.patch --]
[-- Type: text/x-diff, Size: 2352 bytes --]
From 943ad25edf76e1bf0b66f2b6a55737a8b69ab186 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Sat, 23 Dec 2023 12:15:44 -0600
Subject: [PATCH] glslViewer: update to 3.2.4.
---
srcpkgs/glslViewer/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index dcd1b295fb5748..ab2f5910de1473 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,8 +1,10 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=3.1.0
+version=3.2.4
revision=1
-_vera_gitrev="5af26f827d3d36c4abba00f3053be3b0ef1b89c2"
+_lygia_gitrev="84eae417ba4bb333dab9204dc303c43ef6a223e8"
+_pybind11_gitrev="68211d41c1ef94fa65ef27ea2a6cdd8677996635"
+_vera_gitrev="93b2496679c005a723d3e04327199602955ed1dc"
build_wrksrc=${pkgname}
build_style=cmake
hostmakedepends="pkg-config"
@@ -13,20 +15,26 @@ short_desc="Live GLSL coding render"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://patriciogonzalezvivo.com/2015/glslViewer/"
-distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/v${version}.tar.gz
+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"
-checksum="48109ed70e5de6ce05ca8cab6f2ed4a368f228d83df561d522b4ba8e49018008
- 1276b1d664902622728ce9cded9b6605f79cb58bc7bff77e82abbf95f4cd4424"
+checksum="3b65172f54d0c5e5f909a31db20c16451355c6c623af6d6e0e3ef690746acb1f
+ 199d651d6f843dd31872229f263cc5408d7e79db2d4d9f8a263e3cd02e4cbbfd
+ 4dc757ad3ab7ba4564dbabfc47eb7d4f3b53a36de0fbc04bf07fd0373e1d5621
+ eccbfe0e94fc4e333de1975e48deadd606cb954a4109b734573928b49b579a5a"
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
}
pre_configure() {
if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
vsed -e '/target_link_libraries(glslViewer PRIVATE atomic)/d' \
- -i CMakeLists.txt
+ -i CMakeLists.txt
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: glslViewer: update to 3.2.4.
2024-02-19 6:46 [PR PATCH] glslViewer: update to 3.2.4 yoshiyoshyosh
@ 2024-03-02 16:23 ` classabbyamp
2024-03-05 22:36 ` [PR PATCH] [Updated] " yoshiyoshyosh
1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2024-03-02 16:23 UTC (permalink / raw)
To: ml
[-- 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() {
```
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.2.4.
2024-02-19 6:46 [PR PATCH] glslViewer: update to 3.2.4 yoshiyoshyosh
2024-03-02 16:23 ` classabbyamp
@ 2024-03-05 22:36 ` yoshiyoshyosh
1 sibling, 0 replies; 3+ messages in thread
From: yoshiyoshyosh @ 2024-03-05 22:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 617 bytes --]
There is an updated pull request by yoshiyoshyosh against master on the void-packages repository
https://github.com/yoshiyoshyosh/void-packages glslviewerupdate
https://github.com/void-linux/void-packages/pull/48828
glslViewer: update to 3.2.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
- I built this PR locally for these architectures
- i686
- armv7l (crossbuild)
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/48828.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewerupdate-48828.patch --]
[-- Type: text/x-diff, Size: 3583 bytes --]
From 302d7b60f68d5542dd75e18b8578900b68389aa3 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Sat, 23 Dec 2023 12:15:44 -0600
Subject: [PATCH] glslViewer: update to 3.2.4.
---
srcpkgs/glslViewer/patches/liblo.patch | 8 +++----
srcpkgs/glslViewer/template | 29 +++++++++++++++++---------
2 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
index 57c4c7e4f7b603..dd65120a1244cc 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 dcd1b295fb5748..ec0ab5030f753e 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,9 +1,10 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=3.1.0
+version=3.2.4
revision=1
-_vera_gitrev="5af26f827d3d36c4abba00f3053be3b0ef1b89c2"
-build_wrksrc=${pkgname}
+_lygia_gitrev="84eae417ba4bb333dab9204dc303c43ef6a223e8"
+_pybind11_gitrev="68211d41c1ef94fa65ef27ea2a6cdd8677996635"
+_vera_gitrev="93b2496679c005a723d3e04327199602955ed1dc"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
@@ -13,20 +14,28 @@ short_desc="Live GLSL coding render"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://patriciogonzalezvivo.com/2015/glslViewer/"
-distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/v${version}.tar.gz
- https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
-checksum="48109ed70e5de6ce05ca8cab6f2ed4a368f228d83df561d522b4ba8e49018008
- 1276b1d664902622728ce9cded9b6605f79cb58bc7bff77e82abbf95f4cd4424"
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.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 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() {
if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
vsed -e '/target_link_libraries(glslViewer PRIVATE atomic)/d' \
- -i CMakeLists.txt
+ -i CMakeLists.txt
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-05 22:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-19 6:46 [PR PATCH] glslViewer: update to 3.2.4 yoshiyoshyosh
2024-03-02 16:23 ` classabbyamp
2024-03-05 22:36 ` [PR PATCH] [Updated] " yoshiyoshyosh
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).