commit 5a4bc5b072abb4cea584b144c535c4e6fa851dcc · tjh.dev/nixpkgs

+61

pkgs/development/libraries/urt/default.nix

··· 1 + {stdenv, fetchurl, ncompress}: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "urt-${version}"; 5 + version = "3.1b"; 6 + 7 + src = fetchurl { 8 + url = ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z; 9 + sha256 = "0hbb3avgvkfb2cksqn6cmmgcr0278nb2qd1srayqx0876pq6g2vd"; 10 + }; 11 + 12 + buildInputs = [ ncompress ]; 13 + 14 + unpackPhase = '' 15 + mkdir urt 16 + tar xvf "$src" -C urt 17 + ''; 18 + patchFlags = "-p0 -d urt"; 19 + patches = [ ./urt-3.1b-build-fixes.patch ./urt-3.1b-compile-updates.patch 20 + ./urt-3.1b-make.patch ./urt-3.1b-rle-fixes.patch ./urt-3.1b-tempfile.patch ]; 21 + postPatch = '' 22 + cd urt 23 + 24 + rm bin/README 25 + rm man/man1/template.1 26 + 27 + # stupid OS X declares a stack_t type already 28 + sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c 29 + 30 + sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr 31 + 32 + cp "${./gentoo-config}" config/gentoo 33 + ''; 34 + configurePhase = '' 35 + ./Configure config/gentoo 36 + ''; 37 + postInstall = '' 38 + mkdir -p $out/bin 39 + cp bin/* $out/bin 40 + 41 + mkdir -p $out/lib 42 + cp lib/librle.a $out/lib 43 + 44 + mkdir -p $out/include 45 + cp include/rle*.h $out/include 46 + 47 + mkdir -p $out/share/man/man1 48 + cp man/man1/*.1 $out/share/man/man1 49 + 50 + mkdir -p $out/share/man/man3 51 + cp man/man3/*.3 $out/share/man/man3 52 + 53 + mkdir -p $out/share/man/man5 54 + cp man/man5/*.5 $out/share/man/man5 55 + ''; 56 + 57 + meta = { 58 + homepage = http://www.cs.utah.edu/gdc/projects/urt/; 59 + description = "The Utah Raster Toolkit is a library for dealing with raster images"; 60 + }; 61 + }

+52

pkgs/development/libraries/urt/gentoo-config

··· 1 + #define ABEKASA60 2 + #define ABEKASA62 3 + #define ALIAS 4 + ##define CGM 5 + #define CUBICOMP 6 + ##define DVIRLE 7 + #define GRAYFILES 8 + #define MACPAINT 9 + ##define PBMPLUS 10 + ##define SUNRASTER 11 + #define TARGA 12 + #define VICAR 13 + #define WASATCH 14 + #define WAVEFRONT 15 + 16 + #define GCC 17 + 18 + #define CONST_DECL 19 + #define NO_MAKE_MAKEFILE 20 + #define USE_TIME_H 21 + #define SYS_V_SETPGRP 22 + #define USE_PROTOTYPES 23 + #define USE_RANDOM 24 + #define USE_STDARG 25 + #define USE_STDLIB_H 26 + #define USE_UNISTD_H 27 + #define USE_STRING_H 28 + #define VOID_STAR 29 + #define USE_XLIBINT_H 30 + #define X_SHARED_MEMORY 31 + 32 + #defpath DEST bin 33 + #defpath RI include 34 + #defpath RL lib 35 + 36 + ROFF = nroff 37 + ROFFOPT = -man 38 + ROFFPIPE = | lpr 39 + 40 + INCTIFF = 41 + LIBTIFF = -ltiff 42 + INCX11 = 43 + LIBX11 = -lX11 44 + 45 + # Most people have migrated X11 to /usr/lib, but just in case ... 46 + check_x11=$(shell \ 47 + echo 'int main(){}' > test.c ; \ 48 + if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \ 49 + echo "-L/usr/X11R6/lib" ; \ 50 + fi ; \ 51 + rm -f .urt-x11-test test.c) 52 + LIBX11 += $(call check_x11)

+151

pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch

··· 1 + some hosts are more anal about ar usage than others 2 + http://bugs.gentoo.org/107428 3 + 4 + respect user LDFLAGS 5 + http://bugs.gentoo.org/126872 6 + 7 + --- lib/makefile.src 8 + +++ lib/makefile.src 9 + @@ -181,8 +181,7 @@ 10 + # Rebuild the library from all the .o files. 11 + buildlib: $(OBJS) 12 + -rm -f $(LIBNAME) 13 + - ar rc $(LIBNAME) 14 + - ar q $(LIBNAME) $(OBJS) 15 + + ar rc $(LIBNAME) $(OBJS) 16 + #ifndef NO_RANLIB 17 + ranlib $(LIBNAME) 18 + #endif 19 + --- tools/clock/makefile.src 20 + +++ tools/clock/makefile.src 21 + @@ -6,7 +6,7 @@ install: rleClock 22 + mv rleClock ../rleClock.out 23 + 24 + rleClock:rleClock.o font.o 25 + - ${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock 26 + + ${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm 27 + 28 + font.c:font.src makeFont 29 + chmod +x makeFont 30 + --- tools/makefile.src 31 + +++ tools/makefile.src 32 + @@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h 33 + pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h 34 + $(CC) $(CFLAGS) pyrlib.c -c 35 + pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h 36 + - $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new 37 + + $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new 38 + mv pyrmask.new pyrmask.out 39 + 40 + fant.out: fant.o mallocNd.o 41 + - $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new 42 + + $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new 43 + mv fant.new fant.out 44 + 45 + # rlebox and crop use some common code. 46 + rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h 47 + 48 + crop.out: crop.c rle_box.o 49 + - ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new 50 + + ${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new 51 + mv crop.new crop.out 52 + rlebox.out: rlebox.c rle_box.o 53 + - ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new 54 + + ${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new 55 + mv rlebox.new rlebox.out 56 + 57 + # rleClock has it's own directory, must be built special 58 + @@ -100,7 +100,7 @@ clean: clean-pgm 59 + .SUFFIXES: 60 + .SUFFIXES: .out .c .o 61 + .c.out: 62 + - $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new 63 + + $(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new 64 + mv $*.new $@ 65 + 66 + .c.o: 67 + --- cnv/makefile.src 68 + +++ cnv/makefile.src 69 + @@ -76,13 +76,13 @@ PBMDIR = 70 + # ppmtorle - ppm format to RLE 71 + # rletoppm - RLE to ppm format 72 + pgmtorle.out: pgmtorle.c 73 + - $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new 74 + + $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new 75 + mv $*.new $@ 76 + ppmtorle.out: ppmtorle.c 77 + - $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new 78 + + $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new 79 + mv $*.new $@ 80 + rletoppm.out: rletoppm.c 81 + - $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new 82 + + $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new 83 + mv $*.new $@ 84 + #endif 85 + 86 + @@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c 87 + # iristorle/rletoiris - Convert between RLE and SGI image format. 88 + # 89 + iristorle.out: iristorle.c 90 + - $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new 91 + + $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new 92 + mv $*.new $@ 93 + rletoiris.out: rletoiris.c 94 + - $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new 95 + + $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new 96 + mv $*.new $@ 97 + #endif 98 + 99 + @@ -108,10 +108,10 @@ TIFFDIR = 100 + # tifftorle - Convert TIFF images to RLE 101 + # rletotiff - Convert RLE images to TIFF 102 + rletotiff.out: rletotiff.c 103 + - $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new 104 + + $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new 105 + mv $*.new $@ 106 + tifftorle.out: tifftorle.c 107 + - $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new 108 + + $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new 109 + mv $*.new $@ 110 + #endif 111 + 112 + @@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c 113 + # Will build with the default rule. 114 + # rletorla - RLE to Wavefront RLA 115 + rletorla.out: rletorla.c 116 + - $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new 117 + + $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new 118 + mv $*.new $@ 119 + #endif WAVEFRONT 120 + 121 + @@ -144,7 +144,7 @@ pristine: pristine-pgm 122 + .SUFFIXES: 123 + .SUFFIXES: .out .c 124 + .c.out: 125 + - $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new 126 + + $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new 127 + mv $*.new $@ 128 + 129 + # Dependency lines. Make sure to #ifdef them. 130 + --- cnv/rletoabA62/makefile.src 131 + +++ cnv/rletoabA62/makefile.src 132 + @@ -15,7 +15,7 @@ all : $(PGMS) 133 + # Executables. The .out will be stripped off in the install action. 134 + 135 + rletoabA62.out : rletoabA62.o rle.o 136 + - $(CC) $(CFLAGS) -o rletoabA62.new \ 137 + + $(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \ 138 + rletoabA62.o rle.o $(LIBS) 139 + mv rletoabA62.new rletoabA62.out 140 + 141 + --- cnv/rletogif/makefile.src 142 + +++ cnv/rletogif/makefile.src 143 + @@ -15,7 +15,7 @@ all: $(PGMS) 144 + # The executable. The ".out" will be stripped off in the install action. 145 + 146 + rletogif.out: ${OBJ} 147 + - ${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new 148 + + ${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new 149 + mv rletogif.new rletogif.out 150 + 151 + # Incremental install, copies executable to DEST dir.

+141

pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch

··· 1 + --- get/getx11/XGetHClrs.c 2 + +++ get/getx11/XGetHClrs.c 3 + @@ -1,5 +1,4 @@ 4 + #ifndef XLIBINT_H_NOT_AVAILABLE 5 + -#include <X11/copyright.h> 6 + 7 + /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ 8 + /* Copyright Massachusetts Institute of Technology 1986 */ 9 + --- tools/mallocNd.c 10 + +++ tools/mallocNd.c 11 + @@ -67,7 +67,7 @@ 12 + 13 + /* Imports */ 14 + #include <stdio.h> 15 + -extern char *malloc(); 16 + +#include <string.h> 17 + 18 + /* Forward declarations */ 19 + char *BuildIndirectionTable(); 20 + --- tools/into.c 21 + +++ tools/into.c 22 + @@ -40,8 +40,8 @@ 23 + static char buf[MAXPATHLEN+1]; 24 + short forceflg; /* overwrite an unwritable file? */ 25 + 26 + -extern int errno; 27 + -extern char *sys_errlist[]; 28 + +#include <errno.h> 29 + +#include <string.h> 30 + 31 + void 32 + main(argc, argv) 33 + @@ -103,7 +103,7 @@ 34 + if (ferror(outf)) 35 + { 36 + fprintf(stderr, "into: %s, \"%s\" not modified\n", 37 + - sys_errlist[errno], argv[1]); 38 + + strerror(errno), argv[1]); 39 + unlink(buf); 40 + exit(1); 41 + } 42 + --- cnv/tex/dvirle2.c 43 + +++ cnv/tex/dvirle2.c 44 + @@ -55,7 +55,6 @@ 45 + void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks(); 46 + 47 + char *ProgName; 48 + -extern int errno; 49 + extern char *optarg; 50 + extern int optind; 51 + 52 + --- cnv/wasatchrle.c 53 + +++ cnv/wasatchrle.c 54 + @@ -32,7 +32,6 @@ 55 + #include <errno.h> 56 + #include "rle.h" 57 + 58 + -extern int errno; 59 + 60 + /* "short" in our world is 16 bits. Beware of swyte-bopping. */ 61 + 62 + --- get/getx11/x11_stuff.c 63 + +++ get/getx11/x11_stuff.c 64 + @@ -155,7 +155,6 @@ 65 + IPC_CREAT|0777 ); 66 + if ( img->shm_img.shmid < 0 ) 67 + { 68 + - extern int errno; 69 + if ( errno == ENOSPC ) 70 + { 71 + if ( !no_shared_space ) 72 + @@ -361,7 +360,6 @@ Boolean reallocate; 73 + XDestroyImage( image ); 74 + if ( img->shm_pix.shmid < 0 ) 75 + { 76 + - extern int errno; 77 + if ( errno == ENOSPC ) 78 + { 79 + if ( !no_shared_space ) 80 + --- get/qcr/qcr.h 81 + +++ get/qcr/qcr.h 82 + @@ -6,8 +6,6 @@ 83 + #define GREEN 1 84 + #define BLUE 2 85 + 86 + -extern int errno; 87 + - 88 + /* Command defs for QCR-Z Film Recorder */ 89 + 90 + /* These are for 8 bit Look Up Tables */ 91 + --- get/gettaac.c 92 + +++ get/gettaac.c 93 + @@ -24,6 +24,7 @@ 94 + * Send bug fixes and improvements to: ksp@maxwell.nde.swri.edu 95 + */ 96 + 97 + +#include <errno.h> 98 + #include <stdio.h> 99 + #include <strings.h> 100 + #include <signal.h> 101 + @@ -459,7 +460,6 @@ char *template; 102 + char nonUnique; 103 + char twiddleUserCompletion; 104 + 105 + - extern int errno; 106 + struct direct *nameEntry; 107 + DIR *dirChan; 108 + struct passwd *pwdEntry; 109 + --- tools/clock/rleClock.c 110 + +++ tools/clock/rleClock.c 111 + @@ -598,7 +598,7 @@ 112 + { TRUE, "-tf", STRING, "Text area format string", (char *)&FormatString }, 113 + { FALSE, "-Xm", BOOL, "Output the alpha channel on RGB", (char *)&DebugAlpha }, 114 + { FALSE, "-D", BOOL, "Turn on debugging", (char *)&Debug }, 115 + - NULL 116 + + { FALSE, NULL } 117 + }; 118 + 119 + void 120 + --- tools/to8.c 121 + +++ tools/to8.c 122 + @@ -175,7 +175,7 @@ 123 + * Give it a background color of black, since the real background 124 + * will be dithered anyway. 125 + */ 126 + - if ( in_hdr.background != NULL ) 127 + + if ( in_hdr.background != 0 ) 128 + { 129 + out_hdr.bg_color = (int *)malloc( sizeof( int ) ); 130 + RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 ); 131 + --- cnv/rletoabA62/rletoabA62.c 132 + +++ cnv/rletoabA62/rletoabA62.c 133 + @@ -157,7 +157,7 @@ 134 + exit(1); 135 + } 136 + if (optind < argc) { 137 + - if ((file = open(argv[optind], 0)) == NULL) { 138 + + if ((file = open(argv[optind], 0)) == -1) { 139 + perror(argv[optind]); 140 + exit(1); 141 + }

+75

pkgs/development/libraries/urt/urt-3.1b-make.patch

··· 1 + Index: makefile.src 2 + =================================================================== 3 + --- makefile.src 4 + +++ makefile.src 5 + @@ -17,7 +17,7 @@ all: default 6 + # clean deletes all but source, pristine (below) deletes installed stuff, too 7 + default clean: doit 8 + @for d in $(DIRS) ; do \ 9 + - ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ 10 + + ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ 11 + done 12 + 13 + # install puts library, binaries and documentation into global location 14 + @@ -29,7 +29,7 @@ MAKE_TARGET = 15 + 16 + install $(MAKE_TARGET) pristine depend:: doit 17 + @for d in $(ALLDIRS) ; do \ 18 + - ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ 19 + + ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ 20 + done 21 + 22 + 23 + Index: tools/makefile.src 24 + =================================================================== 25 + --- tools/makefile.src 26 + +++ tools/makefile.src 27 + @@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o 28 + # rleClock has it's own directory, must be built special 29 + 30 + rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c 31 + - (cd clock ; make) 32 + + (cd clock ; $(MAKE)) 33 + 34 + # Incremental install, copies everything ("$?") since last install to DEST dir. 35 + install: $(PGMS) install-pgm 36 + Index: makefile.tlr 37 + =================================================================== 38 + --- makefile.tlr 39 + +++ makefile.tlr 40 + @@ -7,7 +7,7 @@ subdirs: 41 + @sh -c "if test 'x$(DIRS)' != x ; then eval \ 42 + 'set -e ; for dir in $(DIRS) ; do \ 43 + (cd \$$dir ; echo Make ${HERE}\$$dir ; \ 44 + - make $(MFLAGS) $(DIRMFLAGS) ) ; \ 45 + + $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ 46 + done' ; \ 47 + else \ 48 + true ; \ 49 + @@ -46,7 +46,7 @@ install-subdirs: subdirs 50 + @sh -c "if test 'x$(DIRS)' != x ; then eval \ 51 + 'for dir in $(DIRS) ; do \ 52 + (cd \$$dir ; echo Install ${HERE}\$$dir ; \ 53 + - make $(MFLAGS) $(DIRMFLAGS) install) ; \ 54 + + $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ 55 + done' ; \ 56 + else \ 57 + true ; \ 58 + @@ -105,7 +105,7 @@ pristine-pgm: clean-pgm 59 + 'for dir in $(ALLDIRS); do \ 60 + if test -d $$dir ; then \ 61 + (cd $$dir; echo Make ${HERE}$$dir pristine ; \ 62 + - make $(MFLAGS) pristine); \ 63 + + $(MAKE) $(MFLAGS) pristine); \ 64 + else \ 65 + true; \ 66 + fi; \ 67 + @@ -124,7 +124,7 @@ clean-pgm: 68 + 'for dir in $(ALLDIRS); do \ 69 + if test -d $$dir ; then \ 70 + (cd $$dir; echo Clean ${HERE}$$dir ; \ 71 + - make $(MFLAGS) clean); \ 72 + + $(MAKE) $(MFLAGS) clean); \ 73 + else \ 74 + true; \ 75 + fi; \

+203

pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch

··· 1 + Fixes taken from netpbm 2 + 3 + --- lib/rle_global.c 4 + +++ lib/rle_global.c 5 + @@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = { 6 + 8, /* cmaplen (log2 of length of color map) */ 7 + NULL, /* pointer to color map */ 8 + NULL, /* pointer to comment strings */ 9 + - stdout, /* output file */ 10 + + NULL, /* output file -- must be set dynamically */ 11 + { 7 }, /* RGB channels only */ 12 + 0L, /* Can't free name and file fields. */ 13 + "Urt", /* Default "program name". */ 14 + --- lib/rle_hdr.c 15 + +++ lib/rle_hdr.c 16 + @@ -269,6 +273,9 @@ 17 + { 18 + rle_hdr *ret_hdr; 19 + 20 + + rle_dflt_hdr.rle_file = stdout; 21 + + /* The rest of rle_dflt_hdr is set by the loader's data initialization */ 22 + + 23 + if ( the_hdr == &rle_dflt_hdr ) 24 + return the_hdr; 25 + 26 + --- lib/dither.c 27 + +++ lib/dither.c 28 + @@ -38,10 +38,10 @@ void make_square(); 29 + #endif 30 + 31 + static int magic4x4[4][4] = { 32 + - 0, 14, 3, 13, 33 + - 11, 5, 8, 6, 34 + - 12, 2, 15, 1, 35 + - 7, 9, 4, 10 36 + +{ 0, 14, 3, 13}, 37 + +{ 11, 5, 8, 6}, 38 + +{ 12, 2, 15, 1}, 39 + +{ 7, 9, 4, 10} 40 + }; 41 + 42 + /* basic dithering macro */ 43 + --- lib/rle_open_f.c 44 + +++ lib/rle_open_f.c 45 + @@ -9,7 +9,11 @@ 46 + */ 47 + 48 + #include "rle_config.h" 49 + +#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ 50 + + 51 + #include <stdio.h> 52 + +#include <unistd.h> 53 + +#include <fcntl.h> 54 + 55 + #ifndef NO_OPEN_PIPES 56 + /* Need to have a SIGCLD signal catcher. */ 57 + @@ -260,7 +260,6 @@ 58 + int pipefd[2]; 59 + int i; 60 + char *argv[4]; 61 + - extern int errno; 62 + 63 + /* Check args. */ 64 + if ( *mode != 'r' && *mode != 'w' ) 65 + --- lib/rle_getcom.c 66 + +++ lib/rle_getcom.c 67 + @@ -53,11 +53,12 @@ 68 + { 69 + for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) 70 + ; 71 + - if (*n == '\0' || *n == '=') 72 + + if (*n == '\0' || *n == '=') { 73 + if ( *v == '\0' ) 74 + return v; 75 + else if ( *v == '=' ) 76 + return ++v; 77 + + } 78 + 79 + return NULL; 80 + } 81 + --- lib/scanargs.c 82 + +++ lib/scanargs.c 83 + @@ -128,10 +130,10 @@ 84 + va_list argl; 85 + { 86 + 87 + - register check; /* check counter to be sure all argvs 88 + + int check; /* check counter to be sure all argvs 89 + are processed */ 90 + register CONST_DECL char *cp; 91 + - register cnt; 92 + + int cnt; 93 + int optarg = 0; /* where optional args start */ 94 + int nopt = 0; 95 + char tmpflg, /* temp flag */ 96 + @@ -375,11 +377,12 @@ 97 + if ( optarg > 0 ) /* end optional args? */ 98 + { 99 + /* Eat the arg, too, if necessary */ 100 + - if ( list_cnt == 0 ) 101 + + if ( list_cnt == 0 ) { 102 + if ( typchr == 's' ) 103 + (void)va_arg( argl, char * ); 104 + else 105 + (void)va_arg( argl, ptr ); 106 + + } 107 + break; 108 + } 109 + else 110 + @@ -567,7 +570,7 @@ 111 + * Do conversion for n and N types 112 + */ 113 + tmpflg = typchr; 114 + - if (typchr == 'n' || typchr == 'N' ) 115 + + if (typchr == 'n' || typchr == 'N' ) { 116 + if (*argp != '0') 117 + tmpflg = 'd'; 118 + else if (*(argp+1) == 'x' || 119 + @@ -578,6 +581,7 @@ 120 + } 121 + else 122 + tmpflg = 'o'; 123 + + } 124 + if (typchr == 'N') 125 + tmpflg = toupper( tmpflg ); 126 + 127 + --- lib/inv_cmap.c 128 + +++ lib/inv_cmap.c 129 + @@ -42,7 +42,7 @@ 130 + static long cbinc, cginc, crinc; 131 + static unsigned long *gdp, *rdp, *cdp; 132 + static unsigned char *grgbp, *rrgbp, *crgbp; 133 + -static gstride, rstride; 134 + +static long gstride, rstride; 135 + static long x, xsqr, colormax; 136 + static int cindex; 137 + #ifdef INSTRUMENT_IT 138 + --- lib/rle_getrow.c 139 + +++ lib/rle_getrow.c 140 + @@ -351,7 +351,7 @@ 141 + bzero( (char *)scanline[-1] + the_hdr->xmin, 142 + the_hdr->xmax - the_hdr->xmin + 1 ); 143 + for ( nc = 0; nc < the_hdr->ncolors; nc++ ) 144 + - if ( RLE_BIT( *the_hdr, nc ) ) 145 + + if ( RLE_BIT( *the_hdr, nc ) ) { 146 + /* Unless bg color given explicitly, use 0. */ 147 + if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 ) 148 + bzero( (char *)scanline[nc] + the_hdr->xmin, 149 + @@ -360,6 +360,7 @@ 150 + bfill( (char *)scanline[nc] + the_hdr->xmin, 151 + the_hdr->xmax - the_hdr->xmin + 1, 152 + the_hdr->bg_color[nc] ); 153 + + } 154 + } 155 + 156 + /* If skipping, then just return */ 157 + @@ -367,7 +368,7 @@ 158 + { 159 + the_hdr->priv.get.vert_skip--; 160 + the_hdr->priv.get.scan_y++; 161 + - if ( the_hdr->priv.get.vert_skip > 0 ) 162 + + if ( the_hdr->priv.get.vert_skip > 0 ) { 163 + if ( the_hdr->priv.get.scan_y >= the_hdr->ymax ) 164 + { 165 + int y = the_hdr->priv.get.scan_y; 166 + @@ -377,6 +378,7 @@ 167 + } 168 + else 169 + return the_hdr->priv.get.scan_y; 170 + + } 171 + } 172 + 173 + /* If EOF has been encountered, return also */ 174 + @@ -457,11 +459,12 @@ 175 + else 176 + nc = DATUM(inst); 177 + nc++; 178 + - if ( debug_f ) 179 + + if ( debug_f ) { 180 + if ( RLE_BIT( *the_hdr, channel ) ) 181 + fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc ); 182 + else 183 + fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc); 184 + + } 185 + if ( RLE_BIT( *the_hdr, channel ) ) 186 + { 187 + /* Don't fill past end of scanline! */ 188 + --- lib/rle_putcom.c 189 + +++ lib/rle_putcom.c 190 + @@ -53,11 +53,12 @@ 191 + { 192 + for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) 193 + ; 194 + - if (*n == '\0' || *n == '=') 195 + + if (*n == '\0' || *n == '=') { 196 + if ( *v == '\0' ) 197 + return v; 198 + else if ( *v == '=' ) 199 + return ++v; 200 + + } 201 + 202 + return NULL; 203 + }

+19

pkgs/development/libraries/urt/urt-3.1b-tempfile.patch

··· 1 + --- tools/rlecat.c 2 + +++ tools/rlecat.c 3 + @@ -110,8 +110,14 @@ 4 + nflag = 0; /* Not really repeating! */ 5 + else 6 + { 7 + - mktemp( temp ); /* Make a temporary file name */ 8 + - tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); 9 + + /* we dont have to use rle_open_f() because all it does in 10 + + * this case is run fopen() ... we're creating a file so all 11 + + * the checks for opening an existing file aren't needed */ 12 + + int fd = mkstemp(temp); 13 + + if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) { 14 + + perror("Unable to open tempfile"); 15 + + exit(-1); 16 + + } 17 + } 18 + } 19 +

+2

pkgs/top-level/all-packages.nix

··· 3845 3845 inherit postgresql mysql sqlite; 3846 3846 }); 3847 3847 3848 + urt = callPackage ../development/libraries/urt { }; 3849 + 3848 3850 vamp = callPackage ../development/libraries/audio/vamp { }; 3849 3851 3850 3852 vigra = callPackage ../development/libraries/vigra { };