diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-chemistry/molscript/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-chemistry/molscript/files')
-rw-r--r-- | sci-chemistry/molscript/files/2.1.2-ldflags.patch | 22 | ||||
-rw-r--r-- | sci-chemistry/molscript/files/2.1.2-libpng15.patch | 19 | ||||
-rw-r--r-- | sci-chemistry/molscript/files/2.1.2-prll.patch | 10 | ||||
-rw-r--r-- | sci-chemistry/molscript/files/fix-makefile-shared.patch | 62 | ||||
-rw-r--r-- | sci-chemistry/molscript/files/glutbitmap.h | 32 |
5 files changed, 145 insertions, 0 deletions
diff --git a/sci-chemistry/molscript/files/2.1.2-ldflags.patch b/sci-chemistry/molscript/files/2.1.2-ldflags.patch new file mode 100644 index 000000000000..8867bc10a6b5 --- /dev/null +++ b/sci-chemistry/molscript/files/2.1.2-ldflags.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile.complete b/Makefile.complete +index 4ad535a..b565266 100644 +--- a/Makefile.complete ++++ b/Makefile.complete +@@ -91,7 +91,7 @@ clean: + + #------------------------------------------------------------ + molscript: $(OBJ) clib/clib.a +- $(CC) -o molscript $(COPT) $(OBJ) $(YLIB) clib/clib.a \ ++ $(CC) $(LDFLAGS) -o molscript $(COPT) $(OBJ) $(YLIB) clib/clib.a \ + $(GLUTLINK) $(JPEGLINK) $(PNGLINK) $(GIFLINK) $(ZLIBLINK) -lm + + molscript.tab.o: molscript.tab.c molscript.tab.h +@@ -147,7 +147,7 @@ gif_img.o: gif_img.c gif_img.h global.h graphics.h image.h opengl.h + + #------------------------------------------------------------ + molauto: molauto.o clib/clib.a +- $(CC) -o molauto molauto.o clib/clib.a -lm ++ $(CC) $(LDFLAGS) -o molauto molauto.o clib/clib.a -lm + + molauto.o: molauto.c + diff --git a/sci-chemistry/molscript/files/2.1.2-libpng15.patch b/sci-chemistry/molscript/files/2.1.2-libpng15.patch new file mode 100644 index 000000000000..9ed1b85909e8 --- /dev/null +++ b/sci-chemistry/molscript/files/2.1.2-libpng15.patch @@ -0,0 +1,19 @@ +--- png_img.c ++++ png_img.c +@@ -18,6 +18,7 @@ + + #include <GL/gl.h> + ++#include <zlib.h> + #include <png.h> + + #include "clib/str_utils.h" +@@ -69,7 +70,7 @@ + info_ptr = png_create_info_struct (png_ptr); + if (info_ptr == NULL) + yyerror ("png_img: could not create PNG info structure"); +- if (setjmp (png_ptr->jmpbuf)) yyerror ("png_img: could not setjmp"); ++ if (setjmp (png_jmpbuf(png_ptr))) yyerror ("png_img: could not setjmp"); + + png_init_io (png_ptr, outfile); + png_set_compression_level (png_ptr, compression_level); diff --git a/sci-chemistry/molscript/files/2.1.2-prll.patch b/sci-chemistry/molscript/files/2.1.2-prll.patch new file mode 100644 index 000000000000..e4c972a10533 --- /dev/null +++ b/sci-chemistry/molscript/files/2.1.2-prll.patch @@ -0,0 +1,10 @@ +diff --git a/Makefile.complete b/Makefile.complete +index 92ef20a..e3f68e3 100644 +--- a/Makefile.complete ++++ b/Makefile.complete +@@ -153,4 +153,4 @@ molauto.o: molauto.c + + #------------------------------------------------------------ + clib/clib.a: +- cd clib; make clib.a CFLAGS="-I. $(CFLAGS)" OPENGLCLIBOBJ="$(OPENGLCLIBOBJ)" ++ $(MAKE) -C clib clib.a CFLAGS="-I. $(CFLAGS)" OPENGLCLIBOBJ="$(OPENGLCLIBOBJ)" diff --git a/sci-chemistry/molscript/files/fix-makefile-shared.patch b/sci-chemistry/molscript/files/fix-makefile-shared.patch new file mode 100644 index 000000000000..a9947a61a665 --- /dev/null +++ b/sci-chemistry/molscript/files/fix-makefile-shared.patch @@ -0,0 +1,62 @@ +diff -urN molscript-2.1.2.orig/Makefile.complete molscript-2.1.2/Makefile.complete +--- molscript-2.1.2.orig/Makefile.complete 1998-11-25 01:04:39.000000000 -0800 ++++ molscript-2.1.2/Makefile.complete 2005-11-21 12:28:06.000000000 -0800 +@@ -23,9 +23,9 @@ + + # OpenGL and GLUT for X (UNIX). + # Must be modified for Windows 95/NT. <--- +-GLUTDIR = $(FREEWAREDIR)/glut +-GLUTLINK = $(GLUTDIR)/lib/glut/libglut.a -lGLU -lGL -lXmu -lXext -lX11 +-OPENGLFLAG = -DOPENGL_SUPPORT -I$(GLUTDIR)/include ++GLUTDIR = $(FREEWAREDIR) ++GLUTLINK = -lglut -lGLU -lGL -lXmu -lXext -lX11 ++OPENGLFLAG = -DOPENGL_SUPPORT -I$(GLUTDIR)/include/GL + OPENGLOBJ = opengl.o + OPENGLCLIBOBJ = ogl_utils.o ogl_body.o ogl_bitmap_character.o + +@@ -35,25 +35,25 @@ + + # JPEG image file format; requires the JPEG library. + # Comment out these lines if the JPEG library is not available. <--- +-JPEGDIR = $(FREEWAREDIR)/jpeg +-JPEGLINK = $(JPEGDIR)/libjpeg.a +-JPEGFLAG = -DJPEG_SUPPORT -I$(JPEGDIR) ++JPEGDIR = $(FREEWAREDIR) ++JPEGLINK = -ljpeg ++JPEGFLAG = -DJPEG_SUPPORT + JPEGOBJ = jpeg_img.o + + # PNG image file format; requires the PNG library and the zlib library. + # Comment out these lines if the PNG and zlib libraries are not available. <--- +-ZLIBDIR = $(FREEWAREDIR)/zlib +-ZLIBLINK = $(ZLIBDIR)/libz.a +-PNGDIR = $(FREEWAREDIR)/libpng +-PNGLINK = $(PNGDIR)/libpng.a +-PNGFLAG = -DPNG_SUPPORT -I$(PNGDIR) -I$(ZLIBDIR) ++ZLIBDIR = $(FREEWAREDIR) ++ZLIBLINK = -lz ++PNGDIR = $(FREEWAREDIR) ++PNGLINK = -lpng ++PNGFLAG = -DPNG_SUPPORT + PNGOBJ = png_img.o + + # GIF image file format; requires the gd 1.3 library. + # Comment out these lines if the gd 1.3 library is not available. <--- +-GIFDIR = $(FREEWAREDIR)/gd +-GIFLINK = $(GIFDIR)/libgd.a +-GIFFLAG = -DGIF_SUPPORT -I$(GIFDIR) ++GIFDIR = $(FREEWAREDIR) ++GIFLINK = -lgd ++GIFFLAG = -DGIF_SUPPORT + GIFOBJ = gif_img.o + + # SGI IRIX's C compiler. +@@ -62,7 +62,7 @@ + COPT = -O1 + # Correctness flags: + #CCHECK = -ansi -fullwarn -g -DSELECT_DEBUG +-CCHECK = -ansi -fullwarn ++CCHECK = -ansi + #CCHECK = -ansi -fullwarn -DNDEBUG + + # General cc compile flags. diff --git a/sci-chemistry/molscript/files/glutbitmap.h b/sci-chemistry/molscript/files/glutbitmap.h new file mode 100644 index 000000000000..9584bb129daa --- /dev/null +++ b/sci-chemistry/molscript/files/glutbitmap.h @@ -0,0 +1,32 @@ +#ifndef __glutbitmap_h__ +#define __glutbitmap_h__ + +/* Copyright (c) Mark J. Kilgard, 1994, 1998. */ + +/* This program is freely distributable without licensing fees + and is provided without guarantee or warrantee expressed or + implied. This program is -not- in the public domain. */ + +#define GLUT_NO_LIB_PRAGMA /* Avoid auto library linking when building + the GLUT library itself. */ +#include <GL/glut.h> + +typedef struct { + const GLsizei width; + const GLsizei height; + const GLfloat xorig; + const GLfloat yorig; + const GLfloat advance; + const GLubyte *bitmap; +} BitmapCharRec, *BitmapCharPtr; + +typedef struct { + const char *name; + const int num_chars; + const int first; + const BitmapCharRec * const *ch; +} BitmapFontRec, *BitmapFontPtr; + +typedef void *GLUTbitmapFont; + +#endif /* __glutbitmap_h__ */ |