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 /games-arcade/amphetamine/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-arcade/amphetamine/files')
-rw-r--r-- | games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch | 72 | ||||
-rw-r--r-- | games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch | 33 |
2 files changed, 105 insertions, 0 deletions
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch new file mode 100644 index 000000000000..b7588face714 --- /dev/null +++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch @@ -0,0 +1,72 @@ +--- amphetamine-0.8.10.orig/src/Shape.cpp ++++ amphetamine-0.8.10/src/Shape.cpp +@@ -56,12 +56,12 @@ + */ + #ifdef __OPT_MEM_ACCESS__ + +-#define GET_LONG(adr) *(unsigned long *)adr +-#define SET_LONG(adr, l) *(unsigned long *)adr = l ++#define GET_LONG(adr) *(uint32_t *)adr ++#define SET_LONG(adr, l) *(uint32_t *)adr = l + + #else + +-#define GET_LONG(adr) ((long)((unsigned char *)(adr))[0] << 24) + ((long)((unsigned char *)(adr))[1] << 16) + ((long)((unsigned char *)(adr))[2] << 8) + ((long)((unsigned char *)(adr))[3]) ++#define GET_LONG(adr) ((uint32_t)((unsigned char *)(adr))[0] << 24) + ((uint32_t)((unsigned char *)(adr))[1] << 16) + ((uint32_t)((unsigned char *)(adr))[2] << 8) + ((uint32_t)((unsigned char *)(adr))[3]) + #define SET_LONG(adr, l) ((unsigned char *)adr)[0] = (unsigned char)((l) >> 24); \ + ((unsigned char *)adr)[1] = (unsigned char)((l) >> 16); \ + ((unsigned char *)adr)[2] = (unsigned char)((l) >> 8); \ +@@ -116,7 +116,7 @@ + { + // store the location of this line start + lineStartPtr = destPtr; +- destPtr += sizeof( unsigned long ); ++ destPtr += sizeof( uint32_t ); + + // at the beginning of each row we are not in any run + drawRunFlag = kFalse; +@@ -160,7 +160,7 @@ + // create the skip token + //*( ( unsigned long * )destPtr ) = ( kSkipPixelsToken << 24 ) + runCounter; + SET_LONG(destPtr, ( kSkipPixelsToken << 24 ) + runCounter); +- destPtr += sizeof( unsigned long ); ++ destPtr += sizeof( uint32_t ); + } + + // are we in a draw run +@@ -179,7 +179,7 @@ + + // save the location of the token (so we can fill it in later) + runTokenPtr = destPtr; +- destPtr += sizeof( unsigned long ); ++ destPtr += sizeof( uint32_t ); + + // copy the pixel + *destPtr = *srcPtr; +@@ -215,7 +215,7 @@ + + // create the end of shape token + SET_LONG(destPtr, kEndShapeToken << 24); +- destPtr += sizeof( unsigned long ); ++ destPtr += sizeof( uint32_t ); + + // Resize the handle to match the real size of the shape + //SetHandleSize( shapeHandle, destPtr - ( unsigned char * )( *shapeHandle ) ); +@@ -280,7 +280,7 @@ + // get a token + tokenOp = GET_LONG(srcPtr ) >> 24; + tokenData = GET_LONG(srcPtr ) & 0x00ffffff; +- srcPtr += sizeof( unsigned long ); ++ srcPtr += sizeof( uint32_t ); + + // depending on the token + switch( tokenOp ) +@@ -435,7 +435,7 @@ + // get a token + tokenOp = GET_LONG(srcPtr) >> 24; + tokenData = GET_LONG(srcPtr) & 0x00ffffff; +- srcPtr += sizeof( unsigned long ); ++ srcPtr += sizeof( uint32_t ); + + // depending on the token + switch( tokenOp ) diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch new file mode 100644 index 000000000000..2c0185f3ff01 --- /dev/null +++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch @@ -0,0 +1,33 @@ +--- Makefile ++++ Makefile +@@ -26,8 +26,8 @@ + + # makemake variables + +-LINKER := g++ +-DEPENDFLAGS := -g ${SEARCHDIRS} ++LINKER = $(CXX) $(CXXFLAGS) ++DEPENDFLAGS := ${SEARCHDIRS} + TOUCHHEADERS := ${MYCODEDIR}/*.h + + # C +@@ -37,8 +37,8 @@ + + # C++ + +-CXX := g++ +-CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align ++CXX ?= g++ ++CXXFLAGS += ${DEPENDFLAGS} + + %.o : %.cpp + ${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@ +@@ -66,7 +66,7 @@ + LOADLIBES := $(LOADLIBES) -lXpm -lXt + endif + +-LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib ++LDFLAGS += -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib + + .PHONY : default + default : amph |