* [PR PATCH] glslViewer: update to 3.0.7.
@ 2022-11-15 23:34 kruceter
2022-11-18 12:24 ` [PR REVIEW] " paper42
` (25 more replies)
0 siblings, 26 replies; 27+ messages in thread
From: kruceter @ 2022-11-15 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
There is a new pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3574 bytes --]
From 86c135b18aaf06068bc7969d44719c337effc7a0 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 ++++++++++++++++++++++++++
srcpkgs/glslViewer/template | 29 ++++++++++------------
2 files changed, 46 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..d4bb057dce66
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..ffbb5694187e 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,28 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="91c48874900909ebd58440359657948aed906f50"
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel libatomic-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ be12b5876bcea771237e36ad9b3ea9ebc3f1fa6cc1a7e25a5cd4f5988210e041"
+skip_extraction="${_vera_gitrev}.tar.gz"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
-
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_vera_gitrev}.tar.gz \
+ --strip-components=1 -C ${wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
@ 2022-11-18 12:24 ` paper42
2022-11-18 12:24 ` paper42
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-11-18 12:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026371009
Comment:
Is libatomic required always or only on armv6? If only on armv6, it should be added conditionally.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
2022-11-18 12:24 ` [PR REVIEW] " paper42
@ 2022-11-18 12:24 ` paper42
2022-11-18 12:24 ` paper42
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-11-18 12:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026374594
Comment:
Where did you get this revision from? https://github.com/patriciogonzalezvivo/glslViewer/tree/3.0.7/deps seems to suggest it's wrong.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
2022-11-18 12:24 ` [PR REVIEW] " paper42
2022-11-18 12:24 ` paper42
@ 2022-11-18 12:24 ` paper42
2022-11-18 23:30 ` kruceter
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-11-18 12:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026370418
Comment:
can we not skip extraction and instead use `build_wrksrc=${pkgname}-${version}` and `mv ${wrksrc}/vera to ${wrksrc}/deps/vera` in post_extract?
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (2 preceding siblings ...)
2022-11-18 12:24 ` paper42
@ 2022-11-18 23:30 ` kruceter
2022-11-18 23:34 ` kruceter
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-18 23:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026972568
Comment:
libatomic is required always regardless of architecture.
I will note this moment in the commit.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (3 preceding siblings ...)
2022-11-18 23:30 ` kruceter
@ 2022-11-18 23:34 ` kruceter
2022-11-18 23:52 ` kruceter
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-18 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026974200
Comment:
It seems I had gotten this revision from the master branch, not the tagged one.
I am guilty on my part.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (4 preceding siblings ...)
2022-11-18 23:34 ` kruceter
@ 2022-11-18 23:52 ` kruceter
2022-11-18 23:52 ` kruceter
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-18 23:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026972568
Comment:
libatomic is required always regardless of architecture.
grep show this:
```
.vscode/settings.json: "atomic": "cpp",
CMakeLists.txt: target_link_libraries(glslViewer PRIVATE atomic)
deps/liblo/configure: # or fails outright, so override atomically:
deps/liblo/configure: # or fails outright, so override atomically:
deps/liblo/lo/lo_types.h: * and preserve ordering and atomicity of messages in bundles.
deps/liblo/m4/libtool.m4: # or fails outright, so override atomically:
deps/thread_pool/thread_pool.hpp:#include <atomic>
deps/thread_pool/thread_pool.hpp: std::atomic<bool> terminate_;
src/main.cpp:#include <atomic>
src/main.cpp:std::atomic<bool> bKeepRunnig(true);
src/sandbox.h:#include <atomic>
src/sandbox.h: std::atomic<int> m_task_count {0};
src/sandbox.h: std::atomic<long long> m_max_mem_in_queue {0};
src/tools/job.h:#include <atomic>
src/tools/job.h: std::atomic<int>& _task_count, std::atomic<long long>& _max_mem_in_queue):
src/tools/job.h: std::atomic<int> * m_task_count;
src/tools/job.h: std::atomic<long long> * m_max_mem_in_queue;
src/tools/record.cpp:#include <atomic>
src/tools/record.cpp:std::atomic<bool> pipe_isRecording;
```
CMake requires libatomic this way:
```cmake
if (NOT APPLE)
target_link_libraries(glslViewer PRIVATE atomic)
install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.png" DESTINATION share/pixmaps)
install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.desktop" DESTINATION share/applications)
```
I suspect that this requirement may be wrong, but I will look into it.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (5 preceding siblings ...)
2022-11-18 23:52 ` kruceter
@ 2022-11-18 23:52 ` kruceter
2022-11-19 0:47 ` kruceter
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-18 23:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026972568
Comment:
libatomic is required always regardless of architecture.
grep shows this:
```
.vscode/settings.json: "atomic": "cpp",
CMakeLists.txt: target_link_libraries(glslViewer PRIVATE atomic)
deps/liblo/configure: # or fails outright, so override atomically:
deps/liblo/configure: # or fails outright, so override atomically:
deps/liblo/lo/lo_types.h: * and preserve ordering and atomicity of messages in bundles.
deps/liblo/m4/libtool.m4: # or fails outright, so override atomically:
deps/thread_pool/thread_pool.hpp:#include <atomic>
deps/thread_pool/thread_pool.hpp: std::atomic<bool> terminate_;
src/main.cpp:#include <atomic>
src/main.cpp:std::atomic<bool> bKeepRunnig(true);
src/sandbox.h:#include <atomic>
src/sandbox.h: std::atomic<int> m_task_count {0};
src/sandbox.h: std::atomic<long long> m_max_mem_in_queue {0};
src/tools/job.h:#include <atomic>
src/tools/job.h: std::atomic<int>& _task_count, std::atomic<long long>& _max_mem_in_queue):
src/tools/job.h: std::atomic<int> * m_task_count;
src/tools/job.h: std::atomic<long long> * m_max_mem_in_queue;
src/tools/record.cpp:#include <atomic>
src/tools/record.cpp:std::atomic<bool> pipe_isRecording;
```
CMake requires libatomic this way:
```cmake
if (NOT APPLE)
target_link_libraries(glslViewer PRIVATE atomic)
install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.png" DESTINATION share/pixmaps)
install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.desktop" DESTINATION share/applications)
```
I suspect that this requirement may be wrong, but I will look into it.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (6 preceding siblings ...)
2022-11-18 23:52 ` kruceter
@ 2022-11-19 0:47 ` kruceter
2022-11-19 0:59 ` [PR PATCH] [Updated] " kruceter
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026996832
Comment:
Okay, false alarm. libatomic has to be placed under a condition.
`target_link_libraries(glslViewer PRIVATE atomic)` should not require libatomic on x86_64-musl since it already has one.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (7 preceding siblings ...)
2022-11-19 0:47 ` kruceter
@ 2022-11-19 0:59 ` kruceter
2022-11-19 1:00 ` [PR REVIEW] " kruceter
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3648 bytes --]
From 4654bd0a3947cf9554952dc983aa6303aba44089 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 ++++++++++++++++++++++++++
srcpkgs/glslViewer/template | 31 ++++++++++++------------
2 files changed, 49 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..23a78acddb7f
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ a/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..59fa05a01f7c 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,32 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${wrksrc}/${pkgname}-${version} ${wrksrc}/${pkgname}
+ mv ${wrksrc}/vera-${_vera_gitrev}/* ${wrksrc}/${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (8 preceding siblings ...)
2022-11-19 0:59 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-19 1:00 ` kruceter
2022-11-19 1:02 ` [PR PATCH] [Updated] " kruceter
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026996832
Comment:
Okay, false alarm. libatomic has to be placed under a condition.
`target_link_libraries(glslViewer PRIVATE atomic)` should not require libatomic on x86_64-musl since it already has one.
I have no idea, but before zapping masterdir for x86_64-musl it always complained about libatomic.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (9 preceding siblings ...)
2022-11-19 1:00 ` [PR REVIEW] " kruceter
@ 2022-11-19 1:02 ` kruceter
2022-11-19 1:18 ` [PR REVIEW] " kruceter
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 1:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3670 bytes --]
From 1b873acaf409993c9a4c551688dd1b9d78712bbb Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 ++++++++++++++++++++++++++
srcpkgs/glslViewer/template | 31 ++++++++++++------------
2 files changed, 49 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..236f89e60f3d
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ a/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ a/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..59fa05a01f7c 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,32 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${wrksrc}/${pkgname}-${version} ${wrksrc}/${pkgname}
+ mv ${wrksrc}/vera-${_vera_gitrev}/* ${wrksrc}/${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (10 preceding siblings ...)
2022-11-19 1:02 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-19 1:18 ` kruceter
2022-11-19 1:45 ` [PR PATCH] [Updated] " kruceter
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 1:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1026996832
Comment:
Okay, false alarm. libatomic has to be placed under a condition.
`target_link_libraries(glslViewer PRIVATE atomic)` should not require libatomic on x86_64-musl since it already has one.
I have no idea, but before zapping masterdir for x86_64-musl it always complained about libatomic.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (11 preceding siblings ...)
2022-11-19 1:18 ` [PR REVIEW] " kruceter
@ 2022-11-19 1:45 ` kruceter
2022-11-19 2:29 ` kruceter
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 4588 bytes --]
From c719717b568060621e973e8f4a78a1a46c6be283 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/atomic.patch | 13 ++++++++++
srcpkgs/glslViewer/patches/liblo.patch | 33 +++++++++++++++++++++++++
srcpkgs/glslViewer/template | 31 ++++++++++++-----------
3 files changed, 62 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/atomic.patch
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/atomic.patch b/srcpkgs/glslViewer/patches/atomic.patch
new file mode 100644
index 000000000000..f887d558f063
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/atomic.patch
@@ -0,0 +1,13 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -155,7 +155,9 @@
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+- target_link_libraries(glslViewer PRIVATE atomic)
++ if(ARCH_WIDTH EQUAL "32")
++ target_link_libraries(glslViewer PRIVATE atomic)
++ endif()
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.png" DESTINATION share/pixmaps)
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.desktop" DESTINATION share/applications)
+
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..236f89e60f3d
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ a/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ a/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..59fa05a01f7c 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,32 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${wrksrc}/${pkgname}-${version} ${wrksrc}/${pkgname}
+ mv ${wrksrc}/vera-${_vera_gitrev}/* ${wrksrc}/${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (12 preceding siblings ...)
2022-11-19 1:45 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-19 2:29 ` kruceter
2022-11-19 2:32 ` [PR REVIEW] " kruceter
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 2:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 4601 bytes --]
From 3c9151ffe8c4ae2cb693b44380708378a7f3fdc1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/atomic.patch | 13 ++++++++++
srcpkgs/glslViewer/patches/liblo.patch | 33 +++++++++++++++++++++++++
srcpkgs/glslViewer/template | 31 ++++++++++++-----------
3 files changed, 62 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/atomic.patch
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/atomic.patch b/srcpkgs/glslViewer/patches/atomic.patch
new file mode 100644
index 000000000000..5fc34c759eec
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/atomic.patch
@@ -0,0 +1,13 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -155,7 +155,9 @@
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+- target_link_libraries(glslViewer PRIVATE atomic)
++ if (NOT CMAKE_SIZEOF_VOID_P EQUAL "8")
++ target_link_libraries(glslViewer PRIVATE atomic)
++ endif()
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.png" DESTINATION share/pixmaps)
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.desktop" DESTINATION share/applications)
+
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..236f89e60f3d
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ a/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ a/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..59fa05a01f7c 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,32 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${wrksrc}/${pkgname}-${version} ${wrksrc}/${pkgname}
+ mv ${wrksrc}/vera-${_vera_gitrev}/* ${wrksrc}/${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (13 preceding siblings ...)
2022-11-19 2:29 ` kruceter
@ 2022-11-19 2:32 ` kruceter
2022-11-19 2:32 ` kruceter
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1027019313
Comment:
The problem is solved by patching CMakeLists.txt.
libatomic should not be required everywhere.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (14 preceding siblings ...)
2022-11-19 2:32 ` [PR REVIEW] " kruceter
@ 2022-11-19 2:32 ` kruceter
2022-11-19 2:33 ` kruceter
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1027019313
Comment:
The issue is solved by patching CMakeLists.txt.
libatomic should not be required everywhere.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (15 preceding siblings ...)
2022-11-19 2:32 ` kruceter
@ 2022-11-19 2:33 ` kruceter
2022-11-19 2:42 ` [PR PATCH] [Updated] " kruceter
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 2:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1027019313
Comment:
The issue is solved by patching CMakeLists.txt.
libatomic should not be required everywhere.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (16 preceding siblings ...)
2022-11-19 2:33 ` kruceter
@ 2022-11-19 2:42 ` kruceter
2022-11-19 2:47 ` kruceter
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 4661 bytes --]
From 7295bdb225e8998e2391ca873d196519154f62f1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/atomic.patch | 15 +++++++++++
srcpkgs/glslViewer/patches/liblo.patch | 33 +++++++++++++++++++++++++
srcpkgs/glslViewer/template | 31 ++++++++++++-----------
3 files changed, 64 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/atomic.patch
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/atomic.patch b/srcpkgs/glslViewer/patches/atomic.patch
new file mode 100644
index 000000000000..7cef65ff0b95
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/atomic.patch
@@ -0,0 +1,15 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -155,7 +155,9 @@
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+- target_link_libraries(glslViewer PRIVATE atomic)
++ set(ATOMIC libatomic.a)
++ find_library(ATOMIC atomic)
++ if (ATOMIC_FOUND)
++ target_link_libraries(glslViewer PRIVATE atomic)
++ endif()
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.png" DESTINATION share/pixmaps)
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.desktop" DESTINATION share/applications)
+
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..236f89e60f3d
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ a/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ a/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..59fa05a01f7c 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,32 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${wrksrc}/${pkgname}-${version} ${wrksrc}/${pkgname}
+ mv ${wrksrc}/vera-${_vera_gitrev}/* ${wrksrc}/${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (17 preceding siblings ...)
2022-11-19 2:42 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-19 2:47 ` kruceter
2022-11-19 4:22 ` kruceter
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 2:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 4662 bytes --]
From 1a15223206103a2c29ba6b0a5608aa6b9f5a5cd7 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/atomic.patch | 15 +++++++++++
srcpkgs/glslViewer/patches/liblo.patch | 33 +++++++++++++++++++++++++
srcpkgs/glslViewer/template | 31 ++++++++++++-----------
3 files changed, 64 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/atomic.patch
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/atomic.patch b/srcpkgs/glslViewer/patches/atomic.patch
new file mode 100644
index 000000000000..5997a27c45a0
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/atomic.patch
@@ -0,0 +1,15 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -155,7 +155,11 @@
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+- target_link_libraries(glslViewer PRIVATE atomic)
++ set(ATOMIC libatomic.a)
++ find_library(ATOMIC atomic)
++ if (ATOMIC_FOUND)
++ target_link_libraries(glslViewer PRIVATE atomic)
++ endif()
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.png" DESTINATION share/pixmaps)
+ install(FILES "${PROJECT_SOURCE_DIR}/assets/glslViewer.desktop" DESTINATION share/applications)
+
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..236f89e60f3d
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ a/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ a/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..59fa05a01f7c 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,32 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${wrksrc}/${pkgname}-${version} ${wrksrc}/${pkgname}
+ mv ${wrksrc}/vera-${_vera_gitrev}/* ${wrksrc}/${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (18 preceding siblings ...)
2022-11-19 2:47 ` kruceter
@ 2022-11-19 4:22 ` kruceter
2022-11-19 4:26 ` [PR REVIEW] " kruceter
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 4:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3700 bytes --]
From 48352d88a39dd89cb86d6c5da71f9bc85b719028 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 +++++++++++++++++++++++
srcpkgs/glslViewer/template | 37 +++++++++++++++-----------
2 files changed, 55 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..d4bb057dce66
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..8326c9587c46 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,38 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${pkgname}-${version}/* .
+ mv vera-${_vera_gitrev}/* deps/vera
}
-do_install() {
- vbin bin/glslViewer
+pre_configure() {
+ if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -e '/target_link_libraries(glslViewer PRIVATE atomic)/d' \
+ -i CMakeLists.txt
+ fi
+}
+
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (19 preceding siblings ...)
2022-11-19 4:22 ` kruceter
@ 2022-11-19 4:26 ` kruceter
2022-11-19 4:43 ` [PR PATCH] [Updated] " kruceter
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 4:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1027032251
Comment:
Solved by removing `target_link_libraries(glslViewer PRIVATE atomic)` from CMakeLists when `$XBPS_TARGET_NO_ATOMIC8` is unset.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (20 preceding siblings ...)
2022-11-19 4:26 ` [PR REVIEW] " kruceter
@ 2022-11-19 4:43 ` kruceter
2022-11-19 4:46 ` kruceter
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 4:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3823 bytes --]
From 814a2898e4cd7d0d7ccbac44e79b43e216388787 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 ++++++++++++++++++++++
srcpkgs/glslViewer/template | 38 ++++++++++++++++----------
2 files changed, 56 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..251b70217a68
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ b/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..d6e3d3c23085 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,39 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}-${version}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${pkgname}-${version} ${build_wrksrc}
+ mv vera-${_vera_gitrev}/* ${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+pre_configure() {
+ if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -e '/target_link_libraries(glslViewer PRIVATE atomic)/d' \
+ -i ${build_wrksrc}/CMakeLists.txt
+ fi
+}
+
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (21 preceding siblings ...)
2022-11-19 4:43 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-19 4:46 ` kruceter
2022-11-19 4:52 ` kruceter
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 4:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3812 bytes --]
From 12094cbd728f5bd89bc993397f9cbb45cc04e065 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 ++++++++++++++++++++++
srcpkgs/glslViewer/template | 38 ++++++++++++++++----------
2 files changed, 56 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..251b70217a68
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ b/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..a8c2448cc7f4 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,39 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${pkgname}-${version} ${build_wrksrc}
+ mv vera-${_vera_gitrev}/* ${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+pre_configure() {
+ if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -e '/target_link_libraries(glslViewer PRIVATE atomic)/d' \
+ -i ${build_wrksrc}/CMakeLists.txt
+ fi
+}
+
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (22 preceding siblings ...)
2022-11-19 4:46 ` kruceter
@ 2022-11-19 4:52 ` kruceter
2022-11-19 4:58 ` [PR REVIEW] " kruceter
2022-11-19 13:15 ` [PR PATCH] [Merged]: " paper42
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 4:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages glslviewer
https://github.com/void-linux/void-packages/pull/40547
glslViewer: update to 3.0.7.
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
A patch file from https://github.com/void-linux/void-packages/pull/40547.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glslviewer-40547.patch --]
[-- Type: text/x-diff, Size: 3796 bytes --]
From b23f09e20056d243845e6aca6f55ac73cb2a6d0f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 16 Nov 2022 01:36:02 +0300
Subject: [PATCH] glslViewer: update to 3.0.7.
---
srcpkgs/glslViewer/patches/liblo.patch | 33 ++++++++++++++++++++++
srcpkgs/glslViewer/template | 38 ++++++++++++++++----------
2 files changed, 56 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/glslViewer/patches/liblo.patch
diff --git a/srcpkgs/glslViewer/patches/liblo.patch b/srcpkgs/glslViewer/patches/liblo.patch
new file mode 100644
index 000000000000..251b70217a68
--- /dev/null
+++ b/srcpkgs/glslViewer/patches/liblo.patch
@@ -0,0 +1,33 @@
+--- a/glslViewer/CMakeLists.txt
++++ b/glslViewer/CMakeLists.txt
+@@ -31,7 +31,10 @@
+
+ add_executable(glslViewer ${ROOT_SOURCE})
+
+-include_directories(deps/liblo)
++include(FindPkgConfig)
++pkg_search_module(LIBLO REQUIRED liblo>=0.31)
++include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS})
++target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES})
+ target_include_directories(glslViewer PRIVATE deps)
+ target_link_libraries(glslViewer PRIVATE vera)
+ target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
+@@ -151,7 +154,7 @@
+ set(CPACK_GENERATOR "ZIP")
+
+ else()
+- target_link_libraries(glslViewer PRIVATE pthread dl lo_static)
++ target_link_libraries(glslViewer PRIVATE pthread dl)
+ install(TARGETS glslViewer DESTINATION bin)
+
+ if (NOT APPLE)
+--- a/glslViewer/deps/CMakeLists.txt
++++ b/glslViewer/deps/CMakeLists.txt
+@@ -1,6 +1,2 @@
+ ## Ada
+ add_subdirectory(vera)
+-
+-if (NOT EMSCRIPTEN)
+- add_subdirectory(liblo/cmake)
+-endif()
+\ No newline at end of file
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4e..e832b3df7b70 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,31 +1,39 @@
# Template file for 'glslViewer'
pkgname=glslViewer
-version=1.6.8
+version=3.0.7
revision=1
-build_style=gnu-makefile
-make_use_env=yes
+_vera_gitrev="a3538e06ecbfe0694e2a64fc51ce6c4ee018a9a0"
+build_wrksrc=${pkgname}
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
- libXrender-devel libXdamage-devel"
+ libXrender-devel libXdamage-devel ncurses-devel liblo-devel"
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/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz
+ https://github.com/patriciogonzalezvivo/vera/archive/${_vera_gitrev}.tar.gz"
+checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034
+ a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0"
-pre_build() {
- # can obscure real errors
- vsed -e 's|-fpermissive||g' \
- -e 's|^CXX =.*||g' \
- -i Makefile
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
- vsed -e '/window = glfwCreateWindow/i glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);' \
- -i src/window.cpp
+post_extract() {
+ mv ${pkgname}-${version} ${build_wrksrc}
+ mv vera-${_vera_gitrev}/* ${build_wrksrc}/deps/vera
}
-do_install() {
- vbin bin/glslViewer
+pre_configure() {
+ if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -e '/target_link_libraries(glslViewer PRIVATE atomic)/d' \
+ -i CMakeLists.txt
+ fi
+}
+
+post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (23 preceding siblings ...)
2022-11-19 4:52 ` kruceter
@ 2022-11-19 4:58 ` kruceter
2022-11-19 13:15 ` [PR PATCH] [Merged]: " paper42
25 siblings, 0 replies; 27+ messages in thread
From: kruceter @ 2022-11-19 4:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40547#discussion_r1027035149
Comment:
Implemented your suggestion.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Merged]: glslViewer: update to 3.0.7.
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
` (24 preceding siblings ...)
2022-11-19 4:58 ` [PR REVIEW] " kruceter
@ 2022-11-19 13:15 ` paper42
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-11-19 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There's a merged pull request on the void-packages repository
glslViewer: update to 3.0.7.
https://github.com/void-linux/void-packages/pull/40547
Description:
This package was built with GCC 12. No errors to report.
[glslviewer.txt](https://github.com/void-linux/void-packages/files/10036481/glslviewer.txt)
In reference to #39809.
#### 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-musl
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2022-11-19 13:15 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-15 23:34 [PR PATCH] glslViewer: update to 3.0.7 kruceter
2022-11-18 12:24 ` [PR REVIEW] " paper42
2022-11-18 12:24 ` paper42
2022-11-18 12:24 ` paper42
2022-11-18 23:30 ` kruceter
2022-11-18 23:34 ` kruceter
2022-11-18 23:52 ` kruceter
2022-11-18 23:52 ` kruceter
2022-11-19 0:47 ` kruceter
2022-11-19 0:59 ` [PR PATCH] [Updated] " kruceter
2022-11-19 1:00 ` [PR REVIEW] " kruceter
2022-11-19 1:02 ` [PR PATCH] [Updated] " kruceter
2022-11-19 1:18 ` [PR REVIEW] " kruceter
2022-11-19 1:45 ` [PR PATCH] [Updated] " kruceter
2022-11-19 2:29 ` kruceter
2022-11-19 2:32 ` [PR REVIEW] " kruceter
2022-11-19 2:32 ` kruceter
2022-11-19 2:33 ` kruceter
2022-11-19 2:42 ` [PR PATCH] [Updated] " kruceter
2022-11-19 2:47 ` kruceter
2022-11-19 4:22 ` kruceter
2022-11-19 4:26 ` [PR REVIEW] " kruceter
2022-11-19 4:43 ` [PR PATCH] [Updated] " kruceter
2022-11-19 4:46 ` kruceter
2022-11-19 4:52 ` kruceter
2022-11-19 4:58 ` [PR REVIEW] " kruceter
2022-11-19 13:15 ` [PR PATCH] [Merged]: " paper42
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).