Gentoo Archives: gentoo-commits

From: "Joe Peterson (lavajoe)" <lavajoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/povray/files: povray-3.6.1-only-libjpeg-6b.patch
Date: Wed, 28 Sep 2011 17:43:25
Message-Id: 20110928174312.AA11C2004C@flycatcher.gentoo.org
1 lavajoe 11/09/28 17:43:12
2
3 Added: povray-3.6.1-only-libjpeg-6b.patch
4 Log:
5 Require older libjpeg-6b for older povray-3.6.1 and use included static lib if not available (bug #382459); revert use of EROOT, etc., in povray-3.6.1 ebuild (not EAPI 3)
6
7 (Portage version: 2.1.10.19/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch?rev=1.1&content-type=text/plain
14
15 Index: povray-3.6.1-only-libjpeg-6b.patch
16 ===================================================================
17 --- povray-3.6.1/acinclude.m4~ 2011-09-28 10:53:30.000000000 -0600
18 +++ povray-3.6.1/acinclude.m4 2011-09-28 10:54:17.000000000 -0600
19 @@ -494,7 +494,7 @@ AC_DEFUN([POV_CHECK_LIBJPEG],
20 [jpeglib.h],
21 [
22 # check library version, update LIBS
23 - AC_MSG_CHECKING([for libjpeg version >= $1])
24 + AC_MSG_CHECKING([for libjpeg version == $1])
25 AC_RUN_IFELSE(
26 [
27 AC_LANG_SOURCE(
28 @@ -507,7 +507,7 @@ int main (void)
29 sprintf (ver_string, "%d", JPEG_LIB_VERSION);
30 ver_string[[1]] = (ver_string[[1]] > '0') ? ver_string[[1]] + 48 : '\0';
31 fprintf (stderr, "%s\n", ver_string);
32 - return ! (strcmp (ver_string, "$1") >= 0);
33 + return ! (strcmp (ver_string, "$1") == 0);
34 }]
35 )
36 ],