summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-12-17 02:01:37 -0500
committerMichael Sterrett <mr_bones_@gentoo.org>2015-12-17 02:01:37 -0500
commit353f08f3e69746840366fad109547c82744b2859 (patch)
treeb9edc26ae88643963b22ad00a2c674f09f156075 /games-puzzle/neverball/files
parentadd slot dep for sys-libs/ncurses (diff)
downloadgentoo-353f08f3e69746840366fad109547c82744b2859.tar.gz
gentoo-353f08f3e69746840366fad109547c82744b2859.tar.bz2
gentoo-353f08f3e69746840366fad109547c82744b2859.zip
clean old (drops ppc support)
Package-Manager: portage-2.2.24
Diffstat (limited to 'games-puzzle/neverball/files')
-rw-r--r--games-puzzle/neverball/files/neverball-1.5.4-libpng.patch21
-rw-r--r--games-puzzle/neverball/files/neverball-1.5.4-lm.patch28
-rw-r--r--games-puzzle/neverball/files/neverball-1.5.4-underlink.patch11
3 files changed, 0 insertions, 60 deletions
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch b/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
deleted file mode 100644
index d7b224673186..000000000000
--- a/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: neverball-1.5.4/share/base_image.c
-===================================================================
---- neverball-1.5.4.orig/share/base_image.c
-+++ neverball-1.5.4/share/base_image.c
-@@ -15,6 +15,7 @@
- #include <png.h>
- #include <jpeglib.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <assert.h>
-
- #include "glext.h"
-@@ -94,7 +95,7 @@ static void *image_load_png(const char *
- default: longjmp(png_jmpbuf(readp), -1);
- }
-
-- if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep))))
-+ if (!(bytep = png_malloc(readp, h * sizeof(png_bytep))))
- longjmp(png_jmpbuf(readp), -1);
-
- /* Allocate the final pixel buffer and read pixels there. */
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-lm.patch b/games-puzzle/neverball/files/neverball-1.5.4-lm.patch
deleted file mode 100644
index 4245e28fe2f2..000000000000
--- a/games-puzzle/neverball/files/neverball-1.5.4-lm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix link faiure against -lm
-
-x86_64-pc-linux-gnu-gcc -Wall -ansi -pedantic -march=core2 -O2 -pipe -ggdb -o neverball-mapc share/vec3.o share/base_image.o share/solid.o share/binary.o share/base_config.o share/common.o share/fs.o share/fs_png.o share/fs_jpg.o share/dir.o share/array.o share/mapc.o -Wl,-O1 -Wl,--as-needed -ljpeg -lpng15 -lphysfs
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: share/mapc.o: undefined reference to symbol 'acosf@@GLIBC_2.2.5'
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: note: 'acosf@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
-
-Gentoo-bug: http://bugs.gentoo.org/464014
-diff --git a/Makefile b/Makefile
-index 62a87e9..1816707 100644
---- a/Makefile
-+++ b/Makefile
-@@ -132,6 +132,7 @@ ifdef DARWIN
- endif
-
- BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-+MAPC_LIBS := -lm # only acosf user
-
- ifdef DARWIN
- BASE_LIBS += -L/opt/local/lib
-@@ -318,7 +319,7 @@ $(PUTT_TARG) : $(PUTT_OBJS)
- $(CC) $(ALL_CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
-
- $(MAPC_TARG) : $(MAPC_OBJS)
-- $(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(BASE_LIBS)
-+ $(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(MAPC_LIBS) $(BASE_LIBS)
-
- # Work around some extremely helpful sdl-config scripts.
-
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch b/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch
deleted file mode 100644
index c6f27cc2bf8a..000000000000
--- a/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old 2011-06-22 06:30:52.441788160 +0200
-+++ Makefile 2011-06-22 06:31:59.754087534 +0200
-@@ -138,7 +138,7 @@
- endif
-
- ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
-- -lvorbisfile $(OGL_LIBS)
-+ -lvorbisfile $(OGL_LIBS) -lX11
-
- #------------------------------------------------------------------------------
-