Github messages for voidlinux
 help / color / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] glslViewer: update to 1.6.0
Date: Thu, 07 Nov 2019 05:58:06 +0100
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16194@inbox.vuxu.org> (raw)

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

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages glslViewer
https://github.com/void-linux/void-packages/pull/16194

glslViewer: update to 1.6.0


A patch file from https://github.com/void-linux/void-packages/pull/16194.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-glslViewer-16194.patch --]
[-- Type: text/x-diff, Size: 2352 bytes --]

From 0aaba29f4d5aede5934c9efbbd37c62632bafcb9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 6 Nov 2019 22:46:59 -0600
Subject: [PATCH] glslViewer: update to 1.6.0

---
 .../glslViewer/patches/floating_workaround.patch  | 15 ---------------
 srcpkgs/glslViewer/template                       | 13 ++++++-------
 2 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/glslViewer/patches/floating_workaround.patch

diff --git a/srcpkgs/glslViewer/patches/floating_workaround.patch b/srcpkgs/glslViewer/patches/floating_workaround.patch
deleted file mode 100644
index 678a8bd5349..00000000000
--- a/srcpkgs/glslViewer/patches/floating_workaround.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/window.cpp b/src/window.cpp
-index 66cf765..fc8f44c 100644
---- src/window.cpp
-+++ src/window.cpp
-@@ -204,6 +204,9 @@ void initGL (glm::ivec4 &_viewport, bool _headless, bool _alwaysOnTop) {
-             glfwWindowHint(GLFW_FLOATING, GL_TRUE);
-         }
- 
-+        // Make it float
-+        glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
-+
-         window = glfwCreateWindow(_viewport.z, _viewport.w, appTitle.c_str(), NULL, NULL);
- 
-         if(!window) {
-
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index a94a2e84992..1263d4cf480 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,7 +1,7 @@
 # Template file for 'glslViewer'
 pkgname=glslViewer
-version=1.5.5
-revision=2
+version=1.6.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
@@ -13,17 +13,16 @@ 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=28a784d701294fd335031ab293c5f4764a498f84714b1ae677dbc4e05ed94b23
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="Requires lots -D_GNU_SOURCE=1 and #include <sys/types.h>" ;;
-esac
+checksum=9235fefc41130ad4088c50c76a1f246069fe4986e42df972e352549d16d935b7
 
 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
 }
 
 do_install() {

             reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-07  4:58 voidlinux-github [this message]
2019-11-07 11:02 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

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

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

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

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

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16194@inbox.vuxu.org \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git