void-packages
void-packages copied to clipboard
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)
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 <[email protected]>"
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() {
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
can you rebase this? sorry for leaving it
sorry for leaving it
@classabbyamp no worries, you all have lots of PRs to handle :P