summaryrefslogtreecommitdiff
path: root/games-arcade/tuxpuck/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:58:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:58:29 +0100
commit0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch)
tree07815070629c7c11000a7f51ceb8ccbccb49a809 /games-arcade/tuxpuck/files
parent1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'games-arcade/tuxpuck/files')
-rw-r--r--games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch11
-rw-r--r--games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch11
-rw-r--r--games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch58
-rw-r--r--games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch63
4 files changed, 0 insertions, 143 deletions
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
deleted file mode 100644
index 410024e48dcd..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuxpuck-0.8.2/utils/Makefile
-+++ tuxpuck-0.8.2/utils/Makefile
-@@ -6,7 +6,7 @@
- all : ttf2font data2c anim
-
- ttf2font : ttf2font.c
-- $(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
-+ $(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
-
- data2c : data2c.c
- $(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index b4abb60f0fd4..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old 2010-10-05 10:34:57.000000000 +0200
-+++ b/Makefile 2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
-
- $(NAME) : $(OBJS)
- cd data; $(MAKE)
-- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
-
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
deleted file mode 100644
index 7d9b199f55cf..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/data/Makefile.old 2015-01-07 14:22:34.852150894 +0100
-+++ b/data/Makefile 2015-01-07 14:57:44.079822614 +0100
-@@ -15,20 +15,29 @@
- ar r libdata.a $(OBJS)
- ranlib libdata.a
-
--$(SOURCES):
-- cd ../utils/; $(MAKE)
-+monos_fnt.c:
- ../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
- ../utils/data2c monos.fnt monos_fnt
-+ rm monos.fnt
-+monob_fnt.c:
- ../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
- ../utils/data2c monob.fnt monob_fnt
-- rm *.fnt
-+ rm monob.fnt
-+title_jpg.c:
- ../utils/data2c jpgs/title.jpg title_jpg
-+board_jpg.c:
- ../utils/data2c jpgs/board.jpg board_jpg
-+logo_jpg.c:
- ../utils/data2c jpgs/logo.jpg logo_jpg
-+pad_png.c: pngs/pad.png
- ../utils/data2c pngs/pad.png pad_png
-+puck_png.c: pngs/puck.png
- ../utils/data2c pngs/puck.png puck_png
-+scoreboard_png.c:
- ../utils/data2c pngs/scoreboard.png scoreboard_png
-+mousebar_png.c:
- ../utils/data2c pngs/mousebar.png mousebar_png
-+glass_png.c:
- ../utils/data2c pngs/glass.png glass_png
- ../utils/data2c pngs/piece1.png piece1_png
- ../utils/data2c pngs/piece2.png piece2_png
-@@ -37,15 +46,22 @@
- ../utils/data2c pngs/piece5.png piece5_png
- mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
- rm piece?_png.c temp
-+crash_ogg.c:
- ../utils/data2c sounds/crash.ogg crash_ogg
-+nock_ogg.c:
- ../utils/data2c sounds/nock.ogg nock_ogg
-+tux_eyes_spr.c:
- # Tux
- ../utils/anim tux/eyes.ac tux_eyes.spr
- ../utils/data2c tux_eyes.spr tux_eyes_spr
- rm tux_eyes.spr
-+tux_png.c: tux/tux.png
- ../utils/data2c tux/tux.png tux_png
-+tux_apps_ogg.c:
- ../utils/data2c tux/apps.ogg tux_apps_ogg
-+tux_boos_ogg.c:
- ../utils/data2c tux/boos.ogg tux_boos_ogg
-+arcana_png.c:
- # Arcana
- ../utils/data2c arcana/arcana.png arcana_png
- clean :
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
deleted file mode 100644
index 5860d2b1c171..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/png.c.old 2011-09-14 16:25:54.415338149 +0200
-+++ b/png.c 2011-09-14 17:41:02.190803110 +0200
-@@ -38,6 +38,8 @@
- png_color_16 *transv;
- SDL_RWops *src = NULL;
- Uint32 size;
-+ int num_palette;
-+ png_colorp png_palette;
-
- memcpy(&size, data, sizeof(Uint32));
- if (memcounter)
-@@ -74,7 +76,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in png_create_read_struct() earlier.
- */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- SDL_SetError("Error reading the PNG file.");
- goto done;
- }
-@@ -142,9 +144,9 @@
- Rmask = 0x000000FF;
- Gmask = 0x0000FF00;
- Bmask = 0x00FF0000;
-- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- } else {
-- int s = (info_ptr->channels == 4) ? 0 : 8;
-+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- Rmask = 0xFF000000 >> s;
- Gmask = 0x00FF0000 >> s;
- Bmask = 0x0000FF00 >> s;
-@@ -152,7 +154,7 @@
- }
- }
- surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
-- bit_depth * info_ptr->channels, Rmask, Gmask,
-+ bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,
- Bmask, Amask);
- if (surface == NULL) {
- SDL_SetError("Out of memory");
-@@ -197,12 +199,15 @@
- palette->colors[i].g = i;
- palette->colors[i].b = i;
- }
-- } else if (info_ptr->num_palette > 0) {
-- palette->ncolors = info_ptr->num_palette;
-- for (i = 0; i < info_ptr->num_palette; ++i) {
-- palette->colors[i].b = info_ptr->palette[i].blue;
-- palette->colors[i].g = info_ptr->palette[i].green;
-- palette->colors[i].r = info_ptr->palette[i].red;
-+ } else {
-+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+ if (num_palette > 0) {
-+ palette->ncolors = num_palette;
-+ for (i = 0; i < num_palette; ++i) {
-+ palette->colors[i].b = png_palette[i].blue;
-+ palette->colors[i].g = png_palette[i].green;
-+ palette->colors[i].r = png_palette[i].red;
-+ }
- }
- }
- }