* [gentoo-commits] gentoo-x86 commit in media-gfx/tuxpaint/files: tuxpaint-0.9.21-LDFLAGS.patch tuxpaint-0.9.21-libpng1.5.patch
@ 2011-08-09 19:18 Peter Volkov (pva)
0 siblings, 0 replies; only message in thread
From: Peter Volkov (pva) @ 2011-08-09 19:18 UTC (permalink / raw
To: gentoo-commits
pva 11/08/09 19:18:58
Added: tuxpaint-0.9.21-LDFLAGS.patch
tuxpaint-0.9.21-libpng1.5.patch
Log:
Respect LDFLAGS, bug #334571; build with libpng-1.5, bug #378199 thank Diego Elio Pettenò for reporting both. Drop old.
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Revision Changes Path
1.1 media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch?rev=1.1&content-type=text/plain
Index: tuxpaint-0.9.21-LDFLAGS.patch
===================================================================
=== modified file 'Makefile'
--- Makefile 2011-08-09 15:19:01 +0000
+++ Makefile 2011-08-09 15:19:43 +0000
@@ -871,7 +871,7 @@
$(ARCH_LIBS)
@echo
@echo "...Linking Tux Paint..."
- $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-o tuxpaint $^ \
$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
@$(RSRC_CMD)
@@ -1043,7 +1043,7 @@
MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c
- $(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
+ $(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
# Probably should separate the various flags like the following:
# $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
1.1 media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch?rev=1.1&content-type=text/plain
Index: tuxpaint-0.9.21-libpng1.5.patch
===================================================================
http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
--- src/tuxpaint.c 2011/07/29 21:27:39 1.828
+++ src/tuxpaint.c 2011/08/08 17:59:12 1.829
@@ -13425,12 +13425,7 @@
{
png_init_io(png_ptr, fi);
- info_ptr->width = surf->w;
- info_ptr->height = surf->h;
- info_ptr->bit_depth = 8;
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
- info_ptr->interlace_type = 1;
- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */
+ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
PNG_sRGB_INTENT_PERCEPTUAL);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-09 19:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-09 19:18 [gentoo-commits] gentoo-x86 commit in media-gfx/tuxpaint/files: tuxpaint-0.9.21-LDFLAGS.patch tuxpaint-0.9.21-libpng1.5.patch Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox