From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/tuxpuck-0.8.2-freetype_pkgconfig.patch | 11 ++++ .../tuxpuck/files/tuxpuck-0.8.2-ldflags.patch | 11 ++++ .../tuxpuck/files/tuxpuck-0.8.2-parallel.patch | 58 ++++++++++++++++++++ .../tuxpuck/files/tuxpuck-0.8.2-png15.patch | 63 ++++++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch create mode 100644 games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch create mode 100644 games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch create mode 100644 games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch (limited to 'games-arcade/tuxpuck/files') 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 new file mode 100644 index 000000000000..410024e48dcd --- /dev/null +++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..b4abb60f0fd4 --- /dev/null +++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..7d9b199f55cf --- /dev/null +++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch @@ -0,0 +1,58 @@ +--- 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 new file mode 100644 index 000000000000..5860d2b1c171 --- /dev/null +++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch @@ -0,0 +1,63 @@ +--- 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; ++ } + } + } + } -- cgit v1.2.3