looking-glass-client: B3 -> B4

This commit is contained in:
Babbaj 2021-07-17 23:22:17 -04:00
parent 00cfd7ecd6
commit aabf5dd5f7
No known key found for this signature in database
GPG key ID: F044309848A07CAC
2 changed files with 33 additions and 64 deletions

View file

@ -1,45 +0,0 @@
From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Tue, 23 Feb 2021 20:25:30 +1100
Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in
use
Closes #475
---
client/renderers/EGL/egl.c | 3 ++-
client/src/main.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c
index b7a5644..72ce50d 100644
--- a/client/renderers/EGL/egl.c
+++ b/client/renderers/EGL/egl.c
@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this)
if (!this->formatValid)
return;
- int w, h;
+ int w = 0, h = 0;
+
switch(this->format.rotate)
{
case LG_ROTATE_0:
diff --git a/client/src/main.c b/client/src/main.c
index f05e929..f5d6fad 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -186,8 +186,9 @@ static void updatePositionInfo(void)
if (!g_state.haveSrcSize)
goto done;
- float srcW;
- float srcH;
+ float srcW = 0.0f;
+ float srcH = 0.0f;
+
switch(params.winRotate)
{
case LG_ROTATE_0:
--
2.30.1

View file

@ -1,40 +1,54 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver
, expat, libbfd
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeDesktopItem, cmake, pkg-config
, SDL, SDL2_ttf, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig
, libXi, libXScrnSaver, libXinerama
, wayland, wayland-protocols
}:
let
desktopItem = makeDesktopItem {
name = "looking-glass-client";
desktopName = "Looking Glass Client";
type = "Application";
exec = "looking-glass-client";
icon = "lg-logo";
terminal = true;
};
in
stdenv.mkDerivation rec {
pname = "looking-glass-client";
version = "B3";
version = "B4";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f";
sha256 = "0fwmz0l1dcfwklgvxmv0galgj2q3nss90kc3jwgf6n80x27rsnhf";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols
libffi libGLU libXScrnSaver expat libbfd
SDL SDL2_ttf freefont_ttf spice-protocol
libbfd nettle fontconfig
libXi libXScrnSaver libXinerama
wayland wayland-protocols
];
patches = [
# error: h may be used uninitialized in this function [-Werror=maybe-uninitialized]
# Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3.
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
];
patchFlags = "-p2";
sourceRoot = "source/client";
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
postUnpack = ''
echo $version > source/VERSION
export sourceRoot="source/client"
'';
postInstall = ''
mkdir -p $out/share/pixmaps
ln -s ${desktopItem}/share/applications $out/share/
cp $src/resources/lg-logo.png $out/share/pixmaps
'';
meta = with lib; {
description = "A KVM Frame Relay (KVMFR) implementation";
longDescription = ''
@ -46,7 +60,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ alexbakker ];
maintainers = with maintainers; [ alexbakker babbaj ];
platforms = [ "x86_64-linux" ];
};
}