Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).