Skip to content
This repository
  • 7 commits
  • 12 files changed
  • 0 comments
  • 2 contributors
Jul 02, 2012
viric fltk: updating, the old url didn't work. f0e4e77
viric cinepaint: updating, and making it build
I wrote a little patch for the cmake files, or it
didn't install.

I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow.
dcdea9d
civodul viking: Update to 1.3. cb0d79e
viric xineLib: update to 1.2.2 946f2c1
viric xine-ui: update to 0.99.7 8a764b7
viric eaglemode: update to 0.84.0
It failds to build with xine-lib, but it goes on as it's
not a strong requirement. Then, the final path is not dependant
on xine anymore. I hope next releases fix this.
5592b1f
viric xine-lib: removing a now unused patch
I forgot that in a previous commit.
ef1d8eb
12  pkgs/applications/graphics/cinepaint/default.nix
@@ -2,7 +2,7 @@
2 2
   flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
3 3
   perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
4 4
   glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
5  
-  mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
  5
+  mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
6 6
 
7 7
 stdenv.mkDerivation rec {
8 8
   name = "cinepaint-1.0";
@@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
12 12
     sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
13 13
   };
14 14
 
15  
-  buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
  15
+  buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
16 16
     libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
17 17
     gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
18  
-    libXext libXpm libXxf86vm pixman libpthreadstubs
  18
+    libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
19 19
   ];
20 20
 
  21
+  patches = [ ./install.patch ];
  22
+
21 23
   buildNativeInputs = [ cmake pkgconfig ];
22 24
 
23  
-  NIX_CFLAGS_COMPILE = "-I.";
  25
+  NIX_LDFLAGS = "-llcms -ljpeg";
  26
+
  27
+  # NIX_CFLAGS_COMPILE = "-I.";
24 28
 
25 29
   meta = {
26 30
     homepage = http://www.cinepaint.org/;
24  pkgs/applications/graphics/cinepaint/install.patch
... ...
@@ -0,0 +1,24 @@
  1
+diff --git a/CMakeLists.txt b/CMakeLists.txt
  2
+index dfb182f..5adaaa5 100644
  3
+--- a/CMakeLists.txt
  4
++++ b/CMakeLists.txt
  5
+@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX})
  6
+ # Note that for MacOS this needs to be revised 
  7
+ # for the @OSX_ICC...@ variables
  8
+ ADD_CUSTOM_COMMAND(
  9
+-   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
  10
++   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc
  11
+    COMMAND  sed -e s/\@platform\@//g
  12
+ 		-e s/\@prefix\@/${ESCAPEDPREFIX}/g 
  13
+ 	        -e s/\@exec_prefix\@/\${prefix}/g
  14
+@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND(
  15
+ 
  16
+ ADD_CUSTOM_TARGET(RCFile ALL echo
  17
+       ""
  18
+-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install 
  19
+-              ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
  20
++      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install 
  21
++              ${CMAKE_CURRENT_BINARY_DIR}/gimprc
  22
+    )
  23
+ 
  24
+ 
11  pkgs/applications/misc/eaglemode/default.nix
@@ -2,11 +2,11 @@
2 2
 librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
3 3
 
4 4
 stdenv.mkDerivation {
5  
-  name = "eaglemode-0.83.0";
  5
+  name = "eaglemode-0.84.0";
6 6
  
7 7
   src = fetchurl {
8  
-    url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
9  
-    sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
  8
+    url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
  9
+    sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
10 10
   };
11 11
  
12 12
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig 
@@ -14,9 +14,12 @@ stdenv.mkDerivation {
14 14
  
15 15
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
16 16
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
  17
+  # I use 'yes y' to skip a build error linking with xineLib, 
  18
+  # because xine stopped exporting "_x_vo_new_port"
  19
+  #  http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
17 20
   buildPhase = ''
18 21
     export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
19  
-    yes n | perl make.pl build
  22
+    yes y | perl make.pl build
20 23
   '';
21 24
 
22 25
   dontPatchELF = true;
26  pkgs/applications/misc/viking/default.nix
... ...
@@ -1,19 +1,27 @@
1 1
 { fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
2  
-, gpsd, bc, file }:
  2
+, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
  3
+, docbook_xml_dtd_412 }:
3 4
 
4  
-stdenv.mkDerivation rec {
5  
-  name = "viking-0.9.8";
  5
+let version = "1.3"; in
  6
+stdenv.mkDerivation {
  7
+  name = "viking-${version}";
6 8
 
7 9
   src = fetchurl {
8  
-    url = "mirror://sourceforge/viking/${name}.tar.gz";
9  
-    sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d";
  10
+    url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
  11
+    sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
10 12
   };
11 13
 
12  
-  patches = [
13  
-    ./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch
14  
-  ];
  14
+  buildInputs =
  15
+   [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
  16
+     libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
  17
+   ];
15 18
 
16  
-  buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ];
  19
+  configureFlags = [ "--disable-scrollkeeper" ];
  20
+
  21
+  preBuild =
  22
+    '' sed -i help/Makefile \
  23
+           -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
  24
+    '';
17 25
 
18 26
   doCheck = true;
19 27
 
51  pkgs/applications/misc/viking/gpsdclient.patch
... ...
@@ -1,51 +0,0 @@
1  
-Debian patch that allows compilation with libgps (from `gpsd').
2  
-Failing to apply this patch, we get the following error:
3  
-
4  
-  vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type
5  
-  vikgpslayer.c: In function 'vik_gps_layer_new':
6  
-  vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units'
7  
-  vikgpslayer.c: In function 'rt_gpsd_try_connect':
8  
-  vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type
9  
-
10  
-diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h
11  
---- trunk~/src/gpsdclient.h	1970-01-01 01:00:00.000000000 +0100
12  
-+++ trunk/src/gpsdclient.h	2009-04-15 14:30:22.000000000 +0200
13  
-@@ -0,0 +1,25 @@
14  
-+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */
15  
-+/* gpsdclient.h -- common functions for GPSD clients */
16  
-+
17  
-+#ifndef _GPSD_GPSDCLIENT_H_
18  
-+#define _GPSD_GPSDCLIENT_H_
19  
-+struct fixsource_t 
20  
-+/* describe a data source */
21  
-+{
22  
-+    char *spec;		/* pointer to actual storage */
23  
-+    char *server;
24  
-+    char *port;
25  
-+    char *device;
26  
-+};
27  
-+
28  
-+enum unit {unspecified, imperial, nautical, metric};
29  
-+enum unit gpsd_units(void);
30  
-+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss };
31  
-+
32  
-+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type,  double f);
33  
-+
34  
-+extern void gpsd_source_spec(/*@null@*/const char *fromstring, 
35  
-+			     /*@out@*/struct fixsource_t *source);
36  
-+
37  
-+#endif /* _GPSDCLIENT_H_ */
38  
-+/* gpsdclient.h ends here */
39  
-diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c
40  
---- trunk~/src/vikgpslayer.c	2009-02-08 14:47:01.000000000 +0100
41  
-+++ trunk/src/vikgpslayer.c	2009-04-15 14:30:55.000000000 +0200
42  
-@@ -39,6 +39,9 @@
43  
- #include <glib/gi18n.h>
44  
- #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
45  
- #include <gps.h>
46  
-+#ifndef gpsd_units
47  
-+#include "gpsdclient.h"
48  
-+#endif
49  
- #endif
50  
- 
51  
- #if ! GLIB_CHECK_VERSION(2,14,0)
13  pkgs/applications/misc/viking/implicit-declaration.patch
... ...
@@ -1,13 +0,0 @@
1  
-Debian patch that fixes an implicat declaration.
2  
-
3  
-diff -urNad trunk~/src/util.c trunk/src/util.c
4  
---- trunk~/src/util.c	2009-02-08 14:47:01.000000000 +0100
5  
-+++ trunk/src/util.c	2009-04-15 17:23:44.000000000 +0200
6  
-@@ -26,6 +26,7 @@
7  
- #endif
8  
- 
9  
- #include <glib/gi18n.h>
10  
-+#include <glib/gprintf.h>
11  
- 
12  
- #include "dialog.h"
13  
- 
22  pkgs/applications/misc/viking/test-bc.patch
... ...
@@ -1,22 +0,0 @@
1  
-For some reason, `bc -l' yields no output.
2  
-
3  
---- viking-0.9.8/test/check_degrees_conversions.sh	2008-03-15 23:01:48.000000000 +0100
4  
-+++ viking-0.9.8/test/check_degrees_conversions.sh	2009-05-30 23:23:27.000000000 +0200
5  
-@@ -7,7 +7,7 @@ function check_success()
6  
-   for value in "$@"
7  
-   do
8  
-     result=`./degrees_converter "$value" | cut -d' ' -f3`
9  
--    diff=`echo "$result - $expected" | bc -l`
10  
-+    diff=`echo "$result - $expected" | bc`
11  
-     if [ $diff != 0 ]
12  
-     then
13  
-       echo "$value -> $result != $expected"
14  
-@@ -23,7 +23,7 @@ function check_failure()
15  
-   for value in "$@"
16  
-   do
17  
-     result=`./degrees_converter "$value" | cut -d' ' -f3`
18  
--    diff=`echo "$result - $expected" | bc -l`
19  
-+    diff=`echo "$result - $expected" | bc`
20  
-     if [ $diff = 0 ]
21  
-     then
22  
-       echo "$value -> $result = $expected"
10  pkgs/applications/video/xine-ui/default.nix
... ...
@@ -1,18 +1,18 @@
1  
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
2  
-, lirc, shared_mime_info }:
  1
+{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl
  2
+, lirc, shared_mime_info, libjpeg }:
3 3
 
4 4
 stdenv.mkDerivation rec {
5  
-  name = "xine-ui-0.99.6";
  5
+  name = "xine-ui-0.99.7";
6 6
   
7 7
   src = fetchurl {
8 8
     url = "mirror://sourceforge/xine/${name}.tar.xz";
9  
-    sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
  9
+    sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x";
10 10
   };
11 11
   
12 12
   buildNativeInputs = [ pkgconfig shared_mime_info ];
13 13
 
14 14
   buildInputs =
15  
-    [ xineLib libpng12 readline ncurses curl lirc
  15
+    [ xineLib libpng readline ncurses curl lirc libjpeg
16 16
       xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
17 17
       xlibs.libXinerama xlibs.libXi xlibs.libXft
18 18
     ];
4  pkgs/development/libraries/fltk/default.nix
@@ -4,11 +4,11 @@
4 4
 let inherit (composableDerivation) edf; in
5 5
 
6 6
 composableDerivation.composableDerivation {} rec {
7  
-  name = "fltk-2.0.x-alpha-r8550";
  7
+  name = "fltk-2.0.x-alpha-r9296";
8 8
 
9 9
   src = fetchurl {
10 10
     url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
11  
-    sha256 = "0y9fazsv61j8dkg9aiinnw4nd68h7zxmvapmygrl4rq5ywqygng7";
  11
+    sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
12 12
   };
13 13
 
14 14
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
14  pkgs/development/libraries/xine-lib/default.nix
@@ -5,21 +5,13 @@
5 5
 }:
6 6
 
7 7
 stdenv.mkDerivation rec {
8  
-  name = "xine-lib-1.2.0";
  8
+  name = "xine-lib-1.2.2";
9 9
   
10 10
   src = fetchurl {
11  
-    url = "mirror://sourceforge/xine/${name}.tar.bz2";
12  
-    sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c";
  11
+    url = "mirror://sourceforge/xine/${name}.tar.xz";
  12
+    sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1";
13 13
   };
14 14
 
15  
-  patches = [ ./zlib126.patch ];
16  
-#  patches =
17  
-#    [ (fetchurl {
18  
-#        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
19  
-#        sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
20  
-#      })
21  
-#    ];
22  
-  
23 15
   buildNativeInputs = [ pkgconfig perl ];
24 16
 
25 17
   buildInputs = [
52  pkgs/development/libraries/xine-lib/zlib126.patch
... ...
@@ -1,52 +0,0 @@
1  
-http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09
2  
-
3  
-# HG changeset patch
4  
-# User Ulrich Müller <ulm@gentoo.org>
5  
-# Date 1327945720 0
6  
-# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd
7  
-# Parent  da296856c52e654cf599248de3a01bb754363c79
8  
-Compile failure in osd.c with sys-libs/zlib-1.2.6
9  
-
10  
-diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c
11  
---- a/misc/xine-fontconv.c	Wed Jan 18 22:01:28 2012 +0000
12  
-+++ b/misc/xine-fontconv.c	Mon Jan 30 17:48:40 2012 +0000
13  
-@@ -109,7 +109,7 @@
14  
- osd_font_t     font;
15  
- 
16  
- 
17  
--static int gzwrite_i16(gzFile *fp, uint16_t number) {
18  
-+static int gzwrite_i16(gzFile fp, uint16_t number) {
19  
-   return gzputc(fp, number & 0xFF) != -1 &&
20  
-          gzputc(fp, (number >> 8) & 0xFF) != -1;
21  
- }
22  
-@@ -341,7 +341,7 @@
23  
- 
24  
-   char                filename[1024];
25  
-   FT_Bitmap          *out_bitmap;
26  
--  gzFile             *fp;
27  
-+  gzFile              fp;
28  
-   int                 error;
29  
-   int                 error_counter;
30  
-   int                 glyph_index;
31  
-diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c
32  
---- a/src/xine-engine/osd.c	Wed Jan 18 22:01:28 2012 +0000
33  
-+++ b/src/xine-engine/osd.c	Mon Jan 30 17:48:40 2012 +0000
34  
-@@ -650,7 +650,7 @@
35  
-   osd->display_y = y;
36  
- }
37  
- 
38  
--static uint16_t gzread_i16(gzFile *fp) {
39  
-+static uint16_t gzread_i16(gzFile fp) {
40  
-   uint16_t ret;
41  
-   ret = gzgetc(fp);
42  
-   ret |= (gzgetc(fp)<<8);
43  
-@@ -663,7 +663,7 @@
44  
- 
45  
- static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
46  
- 
47  
--  gzFile      *fp;
48  
-+  gzFile       fp;
49  
-   osd_font_t  *font = NULL;
50  
-   int          i, ret = 0;
51  
- 
52  
-
9  pkgs/top-level/all-packages.nix
@@ -1533,7 +1533,9 @@ let
1533 1533
 
1534 1534
   vifm = callPackage ../applications/misc/vifm {};
1535 1535
 
1536  
-  viking = callPackage ../applications/misc/viking { };
  1536
+  viking = callPackage ../applications/misc/viking {
  1537
+    inherit (gnome) scrollkeeper;
  1538
+  };
1537 1539
 
1538 1540
   vncrec = builderDefsPackage ../tools/video/vncrec {
1539 1541
     inherit (xlibs) imake libX11 xproto gccmakedep libXt
@@ -6402,7 +6404,10 @@ let
6402 6404
 
6403 6405
   compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
6404 6406
 
6405  
-  cinepaint = callPackage ../applications/graphics/cinepaint { };
  6407
+  cinepaint = callPackage ../applications/graphics/cinepaint {
  6408
+    fltk = fltk13;
  6409
+    libpng = libpng12;
  6410
+  };
6406 6411
 
6407 6412
   codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
6408 6413
     inherit makeWrapper;

No commit comments for this range

Something went wrong with that request. Please try again.