1 |
aballier 13/07/31 21:28:57 |
2 |
|
3 |
Modified: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild |
4 |
Log: |
5 |
Wrap jconfig.h as it can differ between ABIs, bug #479302 by Alphat-PC. |
6 |
|
7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
8 |
|
9 |
Revision Changes Path |
10 |
1.65 media-libs/libjpeg-turbo/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.65&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.65&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.64&r2=1.65 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v |
19 |
retrieving revision 1.64 |
20 |
retrieving revision 1.65 |
21 |
diff -u -r1.64 -r1.65 |
22 |
--- ChangeLog 31 Jul 2013 21:24:23 -0000 1.64 |
23 |
+++ ChangeLog 31 Jul 2013 21:28:57 -0000 1.65 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-libs/libjpeg-turbo |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.64 2013/07/31 21:24:23 aballier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.65 2013/07/31 21:28:57 aballier Exp $ |
29 |
+ |
30 |
+ 31 Jul 2013; Alexis Ballier <aballier@g.o> |
31 |
+ libjpeg-turbo-1.3.0-r1.ebuild: |
32 |
+ Wrap jconfig.h as it can differ between ABIs, bug #479302 by Alphat-PC. |
33 |
|
34 |
31 Jul 2013; Alexis Ballier <aballier@g.o> |
35 |
libjpeg-turbo-1.3.0-r1.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.5 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: libjpeg-turbo-1.3.0-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 21:24:23 -0000 1.4 |
52 |
+++ libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 21:28:57 -0000 1.5 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2013 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.4 2013/07/31 21:24:23 aballier Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.5 2013/07/31 21:28:57 aballier Exp $ |
58 |
|
59 |
EAPI=5 |
60 |
|
61 |
@@ -41,6 +41,8 @@ |
62 |
x64-macos? ( ${ASM_DEPEND} ) |
63 |
java? ( >=virtual/jdk-1.5 )" |
64 |
|
65 |
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) |
66 |
+ |
67 |
src_prepare() { |
68 |
epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 |
69 |
|
70 |
@@ -108,7 +110,6 @@ |
71 |
rm -rf "${ED}"usr/classes |
72 |
java-pkg_dojar java/turbojpeg.jar |
73 |
fi |
74 |
- |
75 |
} |
76 |
|
77 |
multilib_src_install_all() { |