Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg)
svn path=/nixpkgs/trunk/; revision=22553
This commit is contained in:
parent
134e944758
commit
a8c5534849
|
@ -19,11 +19,17 @@ stdenv.mkDerivation {
|
|||
cmakeFlags = ''
|
||||
-DPATH64_ENABLE_HUGEPAGES=ON
|
||||
-DPATH64_ENABLE_MATHLIBS=ON -DPATH64_ENABLE_OPENMP=ON
|
||||
-DPATH64_ENABLE_PSCRUNTIME=OFF -DPSC_CRT_PATH=/usr/lib64
|
||||
-DPATH64_ENABLE_PSCRUNTIME=OFF
|
||||
-DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664
|
||||
-DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
|
||||
-DPSC_CRT_PATH=${stdenv.glibc}/lib
|
||||
'';
|
||||
|
||||
makeFlags = "-j4";
|
||||
|
||||
installPhase = ''
|
||||
exit 1;
|
||||
'';
|
||||
|
||||
buildInputs = [ perl flex bison gmp mpfr cmake ];
|
||||
}
|
||||
|
|
18
pkgs/development/libraries/libjpeg-turbo/default.nix
Normal file
18
pkgs/development/libraries/libjpeg-turbo/default.nix
Normal file
|
@ -0,0 +1,18 @@
|
|||
{ stdenv, fetchurl, nasm }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libjpeg-turbo-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.0.0.tar.gz;
|
||||
sha256 = "17zvyckjbscrr9b8i43g6g0960q5ammf4r93hkkx7s4hzjxvmkfj";
|
||||
};
|
||||
|
||||
buildInputs = [ nasm ];
|
||||
|
||||
meta = {
|
||||
homepage = http://libjpeg-turbo.virtualgl.org/;
|
||||
description = "A faster (using SIMD) libjpeg implementation";
|
||||
license = "free";
|
||||
};
|
||||
}
|
23
pkgs/tools/X11/virtualgl/default.nix
Normal file
23
pkgs/tools/X11/virtualgl/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{stdenv, fetchurl, mesa, libX11, openssl, libXext, libjpeg_turbo}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "virtualgl-2.1.4";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/virtualgl/VirtualGL-2.1.4.tar.gz;
|
||||
sha256 = "d455e599620473a07711196615e59c73d08a7f392a9fcf60a6bc05d82809d89d";
|
||||
};
|
||||
|
||||
patches = [ ./xshm.patch ];
|
||||
|
||||
preInstall =''
|
||||
export makeFlags="prefix=$out"
|
||||
'';
|
||||
|
||||
buildInputs = [ mesa libX11 openssl libXext libjpeg_turbo ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.virtualgl.org/;
|
||||
description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
|
||||
license = "free"; # many parts under different free licenses
|
||||
};
|
||||
}
|
13
pkgs/tools/X11/virtualgl/xshm.patch
Normal file
13
pkgs/tools/X11/virtualgl/xshm.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/util/fbx.c b/util/fbx.c
|
||||
index 06ea835..0d89842 100644
|
||||
--- a/util/fbx.c
|
||||
+++ b/util/fbx.c
|
||||
@@ -15,6 +15,8 @@
|
||||
// This library abstracts fast frame buffer access
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#include <X11/Xmd.h>
|
||||
+#include <X11/extensions/shmproto.h>
|
||||
#include "fbx.h"
|
||||
|
||||
#define MINWIDTH 160
|
|
@ -4670,6 +4670,10 @@ let
|
|||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
libjpeg_turbo = makeOverridable (import ../development/libraries/libjpeg-turbo) {
|
||||
inherit fetchurl stdenv nasm;
|
||||
};
|
||||
|
||||
libjpeg62 = makeOverridable (import ../development/libraries/libjpeg/62.nix) {
|
||||
inherit fetchurl stdenv;
|
||||
libtool = libtool_1_5;
|
||||
|
@ -8944,6 +8948,11 @@ let
|
|||
flags = [ "X11" ]; # only flag "X11" by now
|
||||
};
|
||||
|
||||
virtualgl = import ../tools/X11/virtualgl {
|
||||
inherit stdenv fetchurl mesa openssl libjpeg_turbo;
|
||||
inherit (xlibs) libX11 libXext;
|
||||
};
|
||||
|
||||
vlc = import ../applications/video/vlc {
|
||||
inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2
|
||||
ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf
|
||||
|
|
Loading…
Reference in a new issue