Fix compilation with glibc-2.10, wrt bug #274305 , Patch thanks to Markus Dittrich <markusle@gentoo.org>

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 120 insertions, 14 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index a48a1b7bc7f1..f0d32f567408 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.84 2009/02/28 00:12:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.85 2009/07/23 14:51:59 vostorga Exp $
+
+  23 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> svgalib-1.9.25.ebuild,
+  +files/svgalib-1.9.25-glibc210.patch:
+  Fix compilation with glibc-2.10, wrt bug #274305
+  Patch thanks to Markus Dittrich <markusle@gentoo.org>
 
   28 Feb 2009; Christian Faulhammer <fauli@gentoo.org>
   +files/svgalib-1.9.25-linux2.6.28.patch, metadata.xml,
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 06b937f6e13d..f2ad3d8eb499 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX svgalib-1.9.19-pic.patch 487 RMD160 5bd8935162cdfa55292e4fabfbec1515ad80a507 SHA1 326f4132d7f625d2fd5ae04795da5f2e6f1bc36f SHA256 cbce8a1067b6618300de8b1934dd72a28130eba6953938434333dab3b29c8358
 AUX svgalib-1.9.25-build.patch 2163 RMD160 70255c504d944e173a98604ffb96a8f1839301df SHA1 9f103dd569efc1e4eb7fd2937cbf6edb5f7c9f34 SHA256 f2d5033376e02f4424a7d6252dd442eb2f6b6a3834244d8830248b7c651da361
+AUX svgalib-1.9.25-glibc210.patch 3842 RMD160 23210ad56b8f6491e43aa1e6ffe454272980c4ed SHA1 fd77a6ce10ed5bba54680cc73d81ab1f16ae0f40 SHA256 d8ac6b82406e9d85fbd7ce3f35ee94a3bb77b729352d62f51d51931c46a2a434
 AUX svgalib-1.9.25-linux2.6.28.patch 1672 RMD160 6fb7b32d15c24f927d3d5566cdfacd70ecad212d SHA1 d578c12c05c6d2377972bb7a8f2164f2a9af2d79 SHA256 79e3b78faadc7fc4a0f965e8ce7564c0a391293105a5bcd88ce44a77543af512
 AUX svgalib-1.9.25-linux2.6.patch 9547 RMD160 64a9b66e455da08784f464cda70e250684873441 SHA1 eb5ffc6af7c68e51897ac01c37f538b23b6ac9d0 SHA256 553b4c81a87a9c584377cae2795849b5237ca07e6bf0bef5ffc00ebb0b9a1160
 AUX svgalib.udev.rules.d 55 RMD160 05987efb133e53358a8f1aeb69895b8f44fb9f80 SHA1 a0851d5de96c9e3933515fcbdb0fb6de9a07339e SHA256 ae60596a1b5fdc0e6cc9d625f363d869f8674e4da631cc341e663b22870f7d81
 DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602
-EBUILD svgalib-1.9.25.ebuild 3634 RMD160 142fe515f4af12053fa02cc6fcb3a33473264217 SHA1 f242f4207b63b8c3f586ab9c983052a52939b7a9 SHA256 9ea0e101706e884c0f45348a3c96e91a674362062b8affbeca1a3aac4cc31ea6
-MISC ChangeLog 14789 RMD160 4656e63e44fc15a851df7795fc206d79fc5b4c4a SHA1 323a0cad93694485d4605e14b01ed5da463757ab SHA256 8b78d947dc1596c947c0a81df0eded13945b76721dbeedfead01e2fe9865d458
+EBUILD svgalib-1.9.25.ebuild 3695 RMD160 577d4aac60da1da240179afdc31b4867352a1d06 SHA1 6b3ee17ecd41e7f6cbec88f307c1a446c332534d SHA256 7c4aba3ad96e37c9c40e5b2ceadcf6d377b8d5202424f72d64297f34b8b4768f
+MISC ChangeLog 15016 RMD160 38863715a35e51a2a5aaa8c0743669481fdc0c0b SHA1 f3b40245d2bdf17f676021efbe0aa82682076c68 SHA256 302563eb94b722bb5240eba1f1ee34714e6bbf14cbb0187ac1ea601555f5323a
 MISC metadata.xml 248 RMD160 f2cd2d1c1000b98ac486798631c6f3142095b3f4 SHA1 df1e5841b984a1d14c0e7241c2a71032e6341bf4 SHA256 a647430cad5a57d9f46d97df82575b73efcb2b05f1d92756d10934d176f27ef2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmogXwACgkQNQqtfCuFneNaywCfYdW6Uj4BRYzMapSbJjHKKOO/
-JzIAoJyX3tTa/ctqPG0rbGaOak9qJJWt
-=VZyb
------END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-glibc210.patch b/media-libs/svgalib/files/svgalib-1.9.25-glibc210.patch
new file mode 100644
index 000000000000..ed80935e955a
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-glibc210.patch
@@ -0,0 +1,109 @@
+diff -Naur svgalib-1.9.25/utils/gtf/gtfcalc.c svgalib-1.9.25.new/utils/gtf/gtfcalc.c
+--- svgalib-1.9.25/utils/gtf/gtfcalc.c	2005-07-10 15:33:16.000000000 -0400
++++ svgalib-1.9.25.new/utils/gtf/gtfcalc.c	2009-07-09 15:39:08.743610103 -0400
+@@ -64,7 +64,9 @@
+ 
+ /*-------------------------- Implementation -------------------------------*/
+ 
+-static double round(double v)
++static double svg_round(double v);
++
++double svg_round(double v)
+ {
+ 	return floor(v + 0.5);
+ }
+@@ -84,9 +86,9 @@
+ ****************************************************************************/
+ {
+ 	c->margin = GC.margin;
+-	c->cellGran = round(GC.cellGran);
+-	c->minPorch = round(GC.minPorch);
+-	c->vSyncRqd = round(GC.vSyncRqd);
++	c->cellGran = svg_round(GC.cellGran);
++	c->minPorch = svg_round(GC.minPorch);
++	c->vSyncRqd = svg_round(GC.vSyncRqd);
+ 	c->hSync = GC.hSync;
+ 	c->minVSyncBP = GC.minVSyncBP;
+ 	if (GC.k == 0)
+@@ -140,13 +142,13 @@
+ 	vFreq = hFreq = dotClock = freq;
+ 
+ 	/* Round pixels to character cell granularity */
+-	hPixels = round(hPixels / c.cellGran) * c.cellGran;
++	hPixels = svg_round(hPixels / c.cellGran) * c.cellGran;
+ 
+ 	/* For interlaced mode halve the vertical parameters, and double
+ 	 * the required field refresh rate.
+ 	 */
+ 	if (wantInterlace) {
+-		vLines = round(vLines / 2);
++		vLines = svg_round(vLines / 2);
+ 		vFieldRate = vFreq * 2;
+ 		dotClock = dotClock * 2;
+ 		interlace = 0.5;
+@@ -158,8 +160,8 @@
+ 
+ 	/* Determine the lines for margins */
+ 	if (wantMargins) {
+-		topMarginLines = round(c.margin / 100 * vLines);
+-		botMarginLines = round(c.margin / 100 * vLines);
++		topMarginLines = svg_round(c.margin / 100 * vLines);
++		botMarginLines = svg_round(c.margin / 100 * vLines);
+ 		}
+ 	else {
+ 		topMarginLines = 0;
+@@ -173,11 +175,11 @@
+ 				(vLines + (2*topMarginLines) + c.minPorch + interlace) * 1000000;
+ 
+ 			/* Find the number of lines in vSync + back porch */
+-			vSyncBP = round(c.minVSyncBP / hPeriodEst);
++			vSyncBP = svg_round(c.minVSyncBP / hPeriodEst);
+ 			}
+ 		else if (type == GTF_lockHF) {
+ 			/* Find the number of lines in vSync + back porch */
+-			vSyncBP = round((c.minVSyncBP * hFreq) / 1000);
++			vSyncBP = svg_round((c.minVSyncBP * hFreq) / 1000);
+ 			}
+ 
+ 		/* Find the number of lines in the V back porch alone */
+@@ -205,8 +207,8 @@
+ 
+ 	/* Find the number of pixels in the left and right margins */
+ 	if (wantMargins) {
+-		leftMarginPixels = round(hPixels * c.margin) / (100 * c.cellGran);
+-		rightMarginPixels = round(hPixels * c.margin) / (100 * c.cellGran);
++		leftMarginPixels = svg_round(hPixels * c.margin) / (100 * c.cellGran);
++		rightMarginPixels = svg_round(hPixels * c.margin) / (100 * c.cellGran);
+ 		}
+ 	else {
+ 		leftMarginPixels = 0;
+@@ -235,17 +237,17 @@
+ 		}
+ 
+ 	/* Find the number of pixels in blanking time */
+-	hBlankPixels = round((hTotalActivePixels * idealDutyCycle) /
++	hBlankPixels = svg_round((hTotalActivePixels * idealDutyCycle) /
+ 		((100 - idealDutyCycle) * 2 * c.cellGran)) * (2 * c.cellGran);
+ 
+ 	/* Find the total number of pixels */
+ 	hTotalPixels = hTotalActivePixels + hBlankPixels;
+ 
+ 	/* Find the horizontal back porch */
+-	hBackPorch = round((hBlankPixels / 2) / c.cellGran) * c.cellGran;
++	hBackPorch = svg_round((hBlankPixels / 2) / c.cellGran) * c.cellGran;
+ 
+ 	/* Find the horizontal sync width */
+-	hSyncWidth = round(((c.hSync/100) * hTotalPixels) / c.cellGran) * c.cellGran;
++	hSyncWidth = svg_round(((c.hSync/100) * hTotalPixels) / c.cellGran) * c.cellGran;
+ 
+ 	/* Find the horizontal sync + back porch */
+ 	hSyncBP = hBackPorch + hSyncWidth;
+@@ -258,7 +260,7 @@
+ 		hPeriod = 1000 / hFreq;
+ 
+ 		/* Find the number of lines in vSync + back porch */
+-		vSyncBP = round((c.minVSyncBP * hFreq) / 1000);
++		vSyncBP = svg_round((c.minVSyncBP * hFreq) / 1000);
+ 
+ 		/* Find the number of lines in the V back porch alone */
+ 		vBackPorch = vSyncBP - c.vSyncRqd;
diff --git a/media-libs/svgalib/svgalib-1.9.25.ebuild b/media-libs/svgalib/svgalib-1.9.25.ebuild
index 610c549509c8..34d6b8660beb 100644
--- a/media-libs/svgalib/svgalib-1.9.25.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25.ebuild,v 1.8 2009/02/28 00:12:14 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25.ebuild,v 1.9 2009/07/23 14:51:59 vostorga Exp $
 
 EAPI=1
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
 	epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
 	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
 }
 
 src_compile() {