* [gentoo-commits] gentoo-x86 commit in dev-scheme/plt-scheme/files: plt-scheme-4.2.2-libpng14.patch
@ 2010-05-11 10:28 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-05-11 10:28 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/05/11 10:28:01
Added: plt-scheme-4.2.2-libpng14.patch
Log:
Fix building with libpng 1.4.x wrt #319253 by Dmitry Kravtsov.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?rev=1.1&content-type=text/plain
Index: plt-scheme-4.2.2-libpng14.patch
===================================================================
diff -ur plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx plt-4.2.2/src/wxcommon/wxJPEG.cxx
--- plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx 2009-09-17 06:08:52.000000000 +0300
+++ plt-4.2.2/src/wxcommon/wxJPEG.cxx 2010-05-11 13:17:28.000000000 +0300
@@ -726,7 +726,11 @@
png_set_strip_16(png_ptr);
/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+ #if PNG_LIBPNG_VER < 10400
png_set_gray_1_2_4_to_8(png_ptr);
+ #else
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ #endif
}
/* Set the background color to draw transparent and alpha images over.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-scheme/plt-scheme/files: plt-scheme-4.2.2-libpng14.patch
@ 2010-06-20 16:20 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-06-20 16:20 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/06/20 16:20:27
Modified: plt-scheme-4.2.2-libpng14.patch
Log:
Clean up after myself, the patch I grabbed from the-random-location is not perfect, the ifdefs are completely unnecessary as we don't ship libpng10 series
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?r1=1.1&r2=1.2
Index: plt-scheme-4.2.2-libpng14.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plt-scheme-4.2.2-libpng14.patch 11 May 2010 10:28:00 -0000 1.1
+++ plt-scheme-4.2.2-libpng14.patch 20 Jun 2010 16:20:27 -0000 1.2
@@ -1,15 +1,13 @@
-diff -ur plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx plt-4.2.2/src/wxcommon/wxJPEG.cxx
---- plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx 2009-09-17 06:08:52.000000000 +0300
-+++ plt-4.2.2/src/wxcommon/wxJPEG.cxx 2010-05-11 13:17:28.000000000 +0300
-@@ -726,7 +726,11 @@
+http://bugs.gentoo.org/319253
+
+--- src/wxcommon/wxJPEG.cxx
++++ src/wxcommon/wxJPEG.cxx
+@@ -726,7 +726,7 @@
png_set_strip_16(png_ptr);
/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
-+ #if PNG_LIBPNG_VER < 10400
- png_set_gray_1_2_4_to_8(png_ptr);
-+ #else
+- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
-+ #endif
}
/* Set the background color to draw transparent and alpha images over.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-scheme/plt-scheme/files: plt-scheme-4.2.2-libpng14.patch
@ 2011-11-28 18:33 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-11-28 18:33 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/11/28 18:33:44
Removed: plt-scheme-4.2.2-libpng14.patch
Log:
Punt plt-scheme wrt bug 389041
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-28 18:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-20 16:20 [gentoo-commits] gentoo-x86 commit in dev-scheme/plt-scheme/files: plt-scheme-4.2.2-libpng14.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2011-11-28 18:33 Samuli Suominen (ssuominen)
2010-05-11 10:28 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox