diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-fps/industri/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 'games-fps/industri/files')
-rw-r--r-- | games-fps/industri/files/industri-1.01-exec-stack.patch | 36 | ||||
-rw-r--r-- | games-fps/industri/files/industri-1.01-glext.patch | 18 | ||||
-rw-r--r-- | games-fps/industri/files/industri-1.01-ldflags.patch | 20 | ||||
-rw-r--r-- | games-fps/industri/files/industri.pretty | 2 |
4 files changed, 76 insertions, 0 deletions
diff --git a/games-fps/industri/files/industri-1.01-exec-stack.patch b/games-fps/industri/files/industri-1.01-exec-stack.patch new file mode 100644 index 000000000000..bc74e951fe6a --- /dev/null +++ b/games-fps/industri/files/industri-1.01-exec-stack.patch @@ -0,0 +1,36 @@ +--- math.s ++++ math.s +@@ -416,3 +416,6 @@ + call C(BOPS_Error) + + #endif // id386 ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- snd_mixa.s ++++ snd_mixa.s +@@ -216,3 +216,6 @@ + + #endif // id386 + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- sys_dosa.s ++++ sys_dosa.s +@@ -93,3 +93,6 @@ + + ret + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- worlda.s ++++ worlda.s +@@ -142,3 +142,6 @@ + + #endif // id386 + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/games-fps/industri/files/industri-1.01-glext.patch b/games-fps/industri/files/industri-1.01-glext.patch new file mode 100644 index 000000000000..8a5042e431f2 --- /dev/null +++ b/games-fps/industri/files/industri-1.01-glext.patch @@ -0,0 +1,18 @@ +--- glquake.h.old 2011-04-29 12:36:53.000000000 +0200 ++++ glquake.h 2011-04-29 12:44:39.000000000 +0200 +@@ -977,6 +977,7 @@ + #define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F + + /* NV_vertex_program */ ++#ifndef GL_NV_vertex_program + typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); + typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); + typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); +@@ -1040,6 +1041,7 @@ + typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); + typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); + typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); ++#endif + + extern PFNGLAREPROGRAMSRESIDENTNVPROC qglAreProgramsResidentNV ; + extern PFNGLBINDPROGRAMNVPROC qglBindProgramNV ; diff --git a/games-fps/industri/files/industri-1.01-ldflags.patch b/games-fps/industri/files/industri-1.01-ldflags.patch new file mode 100644 index 000000000000..987d464f6b48 --- /dev/null +++ b/games-fps/industri/files/industri-1.01-ldflags.patch @@ -0,0 +1,20 @@ +--- linux/Makefile.old 2010-10-13 11:37:27.000000000 +0200 ++++ linux/Makefile 2010-10-13 11:38:20.000000000 +0200 +@@ -42,7 +42,7 @@ + RELEASE_CFLAGS = $(BASE_CFLAGS) -O2 -march=pentium4 -pipe -msse -mfpmath=sse \ + -fomit-frame-pointer -fexpensive-optimizations + DEBUG_CFLAGS = $(BASE_CFLAGS) -g +-LDFLAGS = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) ++LDLIBS = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) + + DO_GL_CC = $(CC) $(CFLAGS) -o $@ -c $< + DO_GL_AS = $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< +@@ -156,7 +156,7 @@ + + + $(BUILDDIR)/bin/industri.run : $(GLQUAKE_OBJS) +- $(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDLIBS) + + $(BUILDDIR)/glquake/cl_demo.o : $(MOUNT_DIR)/cl_demo.c + $(DO_GL_CC) diff --git a/games-fps/industri/files/industri.pretty b/games-fps/industri/files/industri.pretty new file mode 100644 index 000000000000..b328c803b9df --- /dev/null +++ b/games-fps/industri/files/industri.pretty @@ -0,0 +1,2 @@ +#!/bin/sh +exec industri +sh_glares 1 "$@" |