diff options
| author | Eric Engestrom | 2019-05-08 16:43:12 +0100 |
|---|---|---|
| committer | Eric Engestrom | 2019-05-08 16:50:20 +0100 |
| commit | 6fa8874fcecf3a3f1edcefbb78c7f506e492f364 (patch) | |
| tree | 56d6849e4501f9d74c842a71a1c1562aff63f2f2 | |
| parent | a0b7ce7194b3d5d285f96623c90c36449c6fc890 (diff) | |
| download | aur-6fa8874fcecf3a3f1edcefbb78c7f506e492f364.tar.gz | |
update build hack - part of it has been merged upstream
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | fix.diff | 22 |
3 files changed, 4 insertions, 26 deletions
@@ -1,5 +1,5 @@ pkgbase = gpuvis-git - pkgver = r1639.a138c1cf40c23830d49c + pkgver = r1641.c927324c1296b5f50819 pkgrel = 1 url = https://github.com/mikesart/gpuvis arch = x86_64 @@ -7,7 +7,7 @@ pkgbase = gpuvis-git source = https://github.com/mikesart/gpuvis source = fix.diff sha1sums = SKIP - sha1sums = 12ad046b5d470ce133e21993498949e48a192553 + sha1sums = 0011dcd305d7cb9d67d36d5329240e4d06a68484 pkgname = gpuvis-git @@ -1,7 +1,7 @@ # Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch> pkgname=gpuvis-git -pkgver=r1639.a138c1cf40c23830d49c +pkgver=r1641.c927324c1296b5f50819 pkgrel=1 pkgdesc="" arch=(x86_64) @@ -10,7 +10,7 @@ license=('MIT') source=("git+$url" 'fix.diff') sha1sums=('SKIP' - '12ad046b5d470ce133e21993498949e48a192553') + '0011dcd305d7cb9d67d36d5329240e4d06a68484') pkgver() { cd "$srcdir"/gpuvis @@ -1,16 +1,3 @@ -diff --git a/Makefile b/Makefile -index d33da19f0f3c8e3a6d40..eff25631f4fe3764d38f 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,7 +29,7 @@ VERBOSE ?= 0 - COMPILER = $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) - - SDL2FLAGS=$(shell sdl2-config --cflags) --SDL2LIBS=$(shell sdl2-config --static-libs) -+SDL2LIBS=$(shell sdl2-config --libs) - - ifeq ($(USE_GTK3), 1) - GTK3FLAGS=$(shell pkg-config --cflags gtk+-3.0) -DUSE_GTK3 diff --git a/src/gpuvis_etl.cpp b/src/gpuvis_etl.cpp index 549c4f29d6aaa3cad99e..26d1ad9fdea6da5bed72 100644 --- a/src/gpuvis_etl.cpp @@ -34,15 +21,6 @@ index 549c4f29d6aaa3cad99e..26d1ad9fdea6da5bed72 100644 // Parsing ETL files is only supported on windows // We heavily rely on the TDH windows library for the heavy lifting #ifdef _WIN32 -@@ -1001,7 +1009,7 @@ int read_etl_file( const char *file, StrPool &strpool, trace_info_t &trace_info, - // Stub implementation for non-windows OSs - int read_etl_file( const char *file, StrPool &strpool, trace_info_t &trace_info, EventCallback &cb ) - { -- return -1 -+ return -1; - } - #endif - diff --git a/src/gpuvis_macros.h b/src/gpuvis_macros.h index 8efa70e19f7e68906832..416acc8a53a755412d9e 100644 --- a/src/gpuvis_macros.h |