public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge trunk right before reintegrating

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=32758
This commit is contained in:
Yury G. Kudryashov
2012-03-04 09:09:21 +00:00
parent d982e10f34 b0d12859fc
commit d4ffc7332c
22 changed files with 268 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/development/libraries/ftgl/2.1.2.nix Normal file
View File

@@ -0,0 +1,42 @@
{stdenv, fetchurl, freetype, mesa}:
let
name = "ftgl-2.1.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/ftgl/${name}.tar.gz";
sha256 = "0xa00fnn6wd3rnkrkcs1wpv21lxdsb83r4hjn3l33dn0zbawnn97";
};
buildInputs = [freetype mesa];
patches = [ ./gcc.patch ];
configureFlags = "--enable-shared";
preConfigure = ''
cd unix
cd docs
tar vxf ../../docs/html.tar.gz
cd ..
'';
meta = {
homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
description = "font rendering library for OpenGL applications";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
FTGL is a free cross-platform Open Source C++ library that uses
Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
and extruded polygon rendering modes.
'';
platforms = stdenv.lib.platforms.gnu;
maintainers = [];
};
}

13
pkgs/development/libraries/ftgl/gcc.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index c263f72..8959cb3 100755
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -52,7 +52,7 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph
* Reset the currently active texture to zero to get into a known state before
* drawing a string. This is to get round possible threading issues.
*/
- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+ static void ResetActiveTexture(){ activeTextureID = 0;}
private:
/**

4
pkgs/development/libraries/haskell/math-functions/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "math-functions";
version = "0.1.1.0";
sha256 = "0qb0hbfzd1g8cz3dkm8cs2wknz08b63vn7nljmynk794y64b1klp";
version = "0.1.1.1";
sha256 = "1256fyd80z6yf61a5a90b3lad7hj0n59cyn741nkdh8p6hqrsi7z";
buildDepends = [ erf vector ];
meta = {
homepage = "https://github.com/bos/math-functions";

4
pkgs/development/libraries/haskell/persistent-template/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "0.8.1.1";
sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks";
version = "0.8.1.2";
sha256 = "1zrd7v953avmkq40nb7jlsmy45r7dphym3fa6jfqy7d1big1mkzf";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

4
pkgs/development/libraries/haskell/yesod/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "0.10.1.1";
sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6";
version = "0.10.1.3";
sha256 = "01r9b88gsj7f1mn56nm5dyzj2s46l9pg9p7fjwkf0l8zdfmrbflw";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/libchop/default.nix
View File

@@ -2,11 +2,11 @@
, libuuid, lzo, pkgconfig, guile }:
stdenv.mkDerivation rec {
name = "libchop-0.5.1";
name = "libchop-0.5.2";
src = fetchurl {
url = "mirror://savannah/libchop/${name}.tar.gz";
sha256 = "1sfq4ibzc9fjmq7ga96k05lr77cyizxnipa3bzm5d22jwal1x3ib";
sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
};
buildNativeInputs = [ pkgconfig gperf ];

21
pkgs/development/libraries/opencascade/default.nix
View File

@@ -1,18 +1,25 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu}:
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.3.0";
name = "opencascade-6.5.2";
src = fetchurl {
url = http://files.opencascade.com/OCC_6.3_release/OpenCASCADE_src.tgz;
md5 = "52778127974cb3141c2827f9d40d1f11";
url = http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz;
sha256 = "0nsfjhd6rv1fmq8jbyzcs0f13h4xfld487vqs9bwd4lbwcfqxwcy";
};
buildInputs = [ mesa tcl tk file libXmu ];
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
preUnpack = ''
sourceRoot=`pwd`/ros
'';
preConfigure = ''
cd ros
sh ./build_configure
'';
NIX_CFLAGS_COMPILE = "-I${ftgl}/include/FTGL -I${freetype}/include/freetype2";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
postInstall = ''
@@ -21,6 +28,8 @@ stdenv.mkDerivation rec {
cp -R ../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;

10
pkgs/development/libraries/zlib/default.nix
View File

@@ -1,10 +1,14 @@
{stdenv, fetchurl, static ? false}:
let version = "1.2.5"; in
stdenv.mkDerivation (rec {
name = "zlib-1.2.5";
name = "zlib-${version}";
src = fetchurl {
url = "http://www.zlib.net/${name}.tar.gz";
urls =
[ "http://www.zlib.net/${name}.tar.gz" # old versions vanish from here
"mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
];
sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30";
};