From cc629c83ad09c46178ff5da4367cc74386dca0ee Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 7 Oct 2018 19:52:19 -0300 Subject: [PATCH] VirtualGL: update to 2.6. --- .../VirtualGL/patches/fix-gcc6-std_min.patch | 20 ------------------- srcpkgs/VirtualGL/template | 16 ++++++++------- 2 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/VirtualGL/patches/fix-gcc6-std_min.patch diff --git a/srcpkgs/VirtualGL/patches/fix-gcc6-std_min.patch b/srcpkgs/VirtualGL/patches/fix-gcc6-std_min.patch deleted file mode 100644 index 49b27d2600f..00000000000 --- a/srcpkgs/VirtualGL/patches/fix-gcc6-std_min.patch +++ /dev/null @@ -1,20 +0,0 @@ -With gcc6 there is an error: 'min' was not declared int this scope -Instead of looking for a missing header to include do it the simple way. - ---- server/fltk/fl_draw.cxx 2016-02-16 03:25:04.000000000 +0100 -+++ server/fltk/fl_draw.cxx 2016-10-03 16:51:17.424915957 +0200 -@@ -143,12 +143,12 @@ - *symptr++ = *str++); - *symptr = '\0'; - if (isspace(*str)) str++; -- symwidth[0] = min(w,h); -+ symwidth[0] = w < h ? w : h; - } - - if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1) && p[-1] != '@') { - strlcpy(symbol[1], p, sizeof(symbol[1])); -- symwidth[1] = min(w,h); -+ symwidth[1] = w < h ? w : h; - } - } - diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template index cd39f80a03a..928b87eae3e 100644 --- a/srcpkgs/VirtualGL/template +++ b/srcpkgs/VirtualGL/template @@ -1,17 +1,19 @@ # Template file for 'VirtualGL' pkgname=VirtualGL -version=2.5.2 -revision=2 +version=2.6 +revision=1 build_style=cmake -configure_args="-DTJPEG_INCLUDE_DIR=/usr/include - -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib" -makedepends="libXv-devel glu-devel libjpeg-turbo-devel" +configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON + -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib + -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON" +makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel + libXtst-devel fltk-devel libressl-devel" short_desc="Run remote OpenGL applications with full acceleration" maintainer="Juan RP " -homepage="http://www.virtualgl.org/" license="LGPL-2.1" +homepage="http://www.virtualgl.org/" distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz" -checksum=4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238 +checksum=a692e37ba7ec4ec192b911ba2f678596e1bec4a2cf96356440989b920ab2b031 only_for_archs="i686 i686-musl x86_64 x86_64-musl"