diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-arcade/sdl-sopwith/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/sdl-sopwith/files')
-rw-r--r-- | games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch | 42 | ||||
-rw-r--r-- | games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch | 24 |
2 files changed, 66 insertions, 0 deletions
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch new file mode 100644 index 000000000000..e4fb1715d8d4 --- /dev/null +++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch @@ -0,0 +1,42 @@ +--- configure.in.old ++++ configure.in +@@ -61,11 +61,6 @@ + SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl" + ],) + +-PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.0 gtk+-2.0 >= 2.0, [ +- SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith" +- SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk" +-],) +- + AC_SUBST(SOPWITH_BINS) + AC_SUBST(SOPWITH_SUBDIRS) + +@@ -71,7 +71,7 @@ + + dnl check for TCPIP support + +-AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE(TCPIP),,) ++AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE([TCPIP], [1], [TCP/IP support]),,) + + dnl generate Makefiles + +--- src/Makefile.am.old ++++ src/Makefile.am +@@ -6,7 +6,7 @@ + bin_PROGRAMS = @SOPWITH_BINS@ + EXTRA_PROGRAMS = sopwith gtksopwith psopwith + +-CFLAGS = @CFLAGS@ -I.. ++AM_CFLAGS = @SDL_CFLAGS@ -I.. + + COMMON_SRC = \ + video.h swcollsn.c swgames.h swmain.h swutil.h \ +--- src/sdl/Makefile.am.old ++++ src/sdl/Makefile.am +@@ -1,4 +1,4 @@ +-CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I.. ++AM_CFLAGS = @SDL_CFLAGS@ -I.. + + noinst_LIBRARIES = libsdlsopwith.a + diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch new file mode 100644 index 000000000000..feab635518f1 --- /dev/null +++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch @@ -0,0 +1,24 @@ +Upstream patch: fix segfault while video device detection. +Discovered here - https://bugs.gentoo.org/show_bug.cgi?id=458504 + +--- src/sdl/video.c.orig 2013-02-21 11:48:57.000000000 -0400 ++++ src/sdl/video.c 2013-02-21 11:49:35.000000000 -0400 +@@ -364,11 +364,17 @@ + int n; + int w, h; + int flags = 0; ++ int status; + + printf("CGA Screen Emulation\n"); + printf("init screen: "); + +- SDL_Init(SDL_INIT_VIDEO); ++ status = SDL_Init(SDL_INIT_VIDEO); ++ if (status == -1) ++ { ++ fprintf(stderr, "Unable to locate video device. Exiting.\n"); ++ exit(1); ++ } + + srand(time(NULL)); + set_icon(symbol_plane[rand() % 2][rand() % 16]); |