| 1 |
ssuominen 11/05/07 10:01:28 |
| 2 |
|
| 3 |
Modified: ChangeLog libjpeg-turbo-1.1.0.ebuild |
| 4 |
Log: |
| 5 |
Limit dev-lang/nasm DEPEND to amd64/x86/amd64-linux/and x86-linux wrt #364985. Convert to EAPI=4 while at it. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.14 media-libs/libjpeg-turbo/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.14&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.14&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.13&r2=1.14 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v |
| 19 |
retrieving revision 1.13 |
| 20 |
retrieving revision 1.14 |
| 21 |
diff -u -r1.13 -r1.14 |
| 22 |
--- ChangeLog 28 Mar 2011 12:31:28 -0000 1.13 |
| 23 |
+++ ChangeLog 7 May 2011 10:01:28 -0000 1.14 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for media-libs/libjpeg-turbo |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.13 2011/03/28 12:31:28 phajdan.jr Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.14 2011/05/07 10:01:28 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 07 May 2011; Samuli Suominen <ssuominen@g.o> |
| 31 |
+ libjpeg-turbo-1.1.0.ebuild: |
| 32 |
+ Limit dev-lang/nasm DEPEND to amd64/x86/amd64-linux/and x86-linux wrt |
| 33 |
+ #364985. |
| 34 |
|
| 35 |
28 Mar 2011; Pawel Hajdan jr <phajdan.jr@g.o> |
| 36 |
libjpeg-turbo-1.1.0.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.7 media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild?rev=1.7&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild?rev=1.7&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild?r1=1.6&r2=1.7 |
| 45 |
|
| 46 |
Index: libjpeg-turbo-1.1.0.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v |
| 49 |
retrieving revision 1.6 |
| 50 |
retrieving revision 1.7 |
| 51 |
diff -u -r1.6 -r1.7 |
| 52 |
--- libjpeg-turbo-1.1.0.ebuild 28 Mar 2011 12:31:28 -0000 1.6 |
| 53 |
+++ libjpeg-turbo-1.1.0.ebuild 7 May 2011 10:01:28 -0000 1.7 |
| 54 |
@@ -1,8 +1,8 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v 1.6 2011/03/28 12:31:28 phajdan.jr Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v 1.7 2011/05/07 10:01:28 ssuominen Exp $ |
| 59 |
|
| 60 |
-EAPI=3 |
| 61 |
+EAPI=4 |
| 62 |
inherit libtool toolchain-funcs |
| 63 |
|
| 64 |
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" |
| 65 |
@@ -15,9 +15,15 @@ |
| 66 |
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 67 |
IUSE="static-libs" |
| 68 |
|
| 69 |
+NASM_DEPEND="dev-lang/nasm" |
| 70 |
RDEPEND="!media-libs/jpeg:0" |
| 71 |
DEPEND="${RDEPEND} |
| 72 |
- dev-lang/nasm" |
| 73 |
+ amd64? ( ${NASM_DEPEND} ) |
| 74 |
+ x86? ( ${NASM_DEPEND} ) |
| 75 |
+ amd64-linux? ( ${NASM_DEPEND} ) |
| 76 |
+ x86-linux? ( ${NASM_DEPEND} )" |
| 77 |
+ |
| 78 |
+DOCS=( BUILDING.txt ChangeLog.txt example.c README-turbo.txt ) |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
elibtoolize |
| 82 |
@@ -25,16 +31,15 @@ |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
econf \ |
| 86 |
- --disable-dependency-tracking \ |
| 87 |
$(use_enable static-libs static) \ |
| 88 |
--with-jpeg8 |
| 89 |
} |
| 90 |
|
| 91 |
src_compile() { |
| 92 |
- emake || die |
| 93 |
+ default |
| 94 |
|
| 95 |
cd ../debian/extra || die |
| 96 |
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" || die |
| 97 |
+ emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" |
| 98 |
} |
| 99 |
|
| 100 |
src_test() { |
| 101 |
@@ -42,12 +47,11 @@ |
| 102 |
} |
| 103 |
|
| 104 |
src_install() { |
| 105 |
- emake DESTDIR="${D}" install || die |
| 106 |
- dodoc BUILDING.txt ChangeLog.txt example.c README-turbo.txt |
| 107 |
+ default |
| 108 |
find "${D}" -name '*.la' -exec rm -f {} + |
| 109 |
|
| 110 |
cd ../debian/extra || die |
| 111 |
emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ |
| 112 |
INSTALL="install -m755" INSTALLDIR="install -d -m755" \ |
| 113 |
- install || die |
| 114 |
+ install |
| 115 |
} |
Archives