Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/jpeg: ChangeLog jpeg-8d-r1.ebuild jpeg-9.ebuild
Date: Wed, 31 Jul 2013 10:04:18
Message-Id: 20130731100415.9F9502171C@flycatcher.gentoo.org
1 ssuominen 13/07/31 10:04:15
2
3 Modified: ChangeLog jpeg-9.ebuild
4 Added: jpeg-8d-r1.ebuild
5 Log:
6 Convert to the new multilib format.
7
8 (Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.138 media-libs/jpeg/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.138&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.138&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?r1=1.137&r2=1.138
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v
20 retrieving revision 1.137
21 retrieving revision 1.138
22 diff -u -r1.137 -r1.138
23 --- ChangeLog 14 Jan 2013 11:00:43 -0000 1.137
24 +++ ChangeLog 31 Jul 2013 10:04:15 -0000 1.138
25 @@ -1,6 +1,12 @@
26 # ChangeLog for media-libs/jpeg
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.137 2013/01/14 11:00:43 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.138 2013/07/31 10:04:15 ssuominen Exp $
30 +
31 +*jpeg-8d-r1 (31 Jul 2013)
32 +
33 + 31 Jul 2013; Samuli Suominen <ssuominen@g.o> +jpeg-8d-r1.ebuild,
34 + jpeg-9.ebuild:
35 + Convert to the new multilib format.
36
37 *jpeg-9 (14 Jan 2013)
38
39
40
41
42 1.2 media-libs/jpeg/jpeg-9.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild?rev=1.2&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild?rev=1.2&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild?r1=1.1&r2=1.2
47
48 Index: jpeg-9.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v
51 retrieving revision 1.1
52 retrieving revision 1.2
53 diff -u -r1.1 -r1.2
54 --- jpeg-9.ebuild 14 Jan 2013 11:00:43 -0000 1.1
55 +++ jpeg-9.ebuild 31 Jul 2013 10:04:15 -0000 1.2
56 @@ -1,9 +1,9 @@
57 # Copyright 1999-2013 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.1 2013/01/14 11:00:43 ssuominen Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.2 2013/07/31 10:04:15 ssuominen Exp $
61
62 EAPI=5
63 -inherit eutils libtool toolchain-funcs
64 +inherit eutils libtool toolchain-funcs multilib-minimal
65
66 DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
67 HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
68 @@ -17,37 +17,43 @@
69 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
70 IUSE="static-libs"
71
72 -DOCS="change.log example.c README *.txt"
73 -
74 src_prepare() {
75 epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
76 elibtoolize
77 }
78
79 -src_configure() {
80 +multilib_src_configure() {
81 # Fix building against this library on eg. Solaris and DragonFly BSD, see:
82 # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
83 local ldverscript=
84 [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
85
86 + ECONF_SOURCE=${S} \
87 econf \
88 $(use_enable static-libs static) \
89 --enable-maxmem=64 \
90 ${ldverscript}
91 }
92
93 -src_compile() {
94 - default
95 +multilib_src_compile() {
96 + emake
97
98 - # Build exifautotran and jpegexiforient
99 - cd ../debian/extra
100 - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
101 + if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
102 + # Build exifautotran and jpegexiforient
103 + cd ../debian/extra
104 + emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
105 + fi
106 }
107
108 -src_install() {
109 - default
110 +multilib_src_install() {
111 + emake DESTDIR="${D}" install
112 +}
113 +
114 +multilib_src_install_all() {
115 prune_libtool_files
116
117 + dodoc change.log example.c README *.txt
118 +
119 # Install exifautotran and jpegexiforient
120 newdoc ../debian/changelog changelog.debian
121 cd ../debian/extra
122
123
124
125 1.1 media-libs/jpeg/jpeg-8d-r1.ebuild
126
127 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild?rev=1.1&view=markup
128 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild?rev=1.1&content-type=text/plain
129
130 Index: jpeg-8d-r1.ebuild
131 ===================================================================
132 # Copyright 1999-2013 Gentoo Foundation
133 # Distributed under the terms of the GNU General Public License v2
134 # $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v 1.1 2013/07/31 10:04:15 ssuominen Exp $
135
136 EAPI=5
137 inherit eutils libtool toolchain-funcs multilib-minimal
138
139 MY_PN=libjpeg8
140 MY_PV=1
141
142 DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
143 HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
144 SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
145 mirror://debian/pool/main/${MY_PN:0:4}/${MY_PN}/${MY_PN}_${PV}-${MY_PV}.debian.tar.gz"
146
147 LICENSE="IJG"
148 SLOT="0"
149 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
150 IUSE="static-libs"
151
152 src_prepare() {
153 epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
154 elibtoolize
155 }
156
157 multilib_src_configure() {
158 # Fix building against this library on eg. Solaris and DragonFly BSD, see:
159 # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
160 local ldverscript=
161 [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
162
163 ECONF_SOURCE=${S} \
164 econf \
165 $(use_enable static-libs static) \
166 --enable-maxmem=64 \
167 ${ldverscript}
168 }
169
170 multilib_src_compile() {
171 emake
172
173 if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
174 # Build exifautotran and jpegexiforient
175 cd ../debian/extra
176 emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
177 fi
178 }
179
180 multilib_src_install() {
181 emake DESTDIR="${D}" install
182 }
183
184 multilib_src_install_all() {
185 prune_libtool_files
186
187 dodoc change.log example.c README *.txt
188
189 # Install exifautotran and jpegexiforient
190 newdoc ../debian/changelog changelog.debian
191 cd ../debian/extra
192 emake \
193 DESTDIR="${D}" prefix="${EPREFIX}"/usr \
194 INSTALL="install -m755" INSTALLDIR="install -d -m755" \
195 install
196 }
197
198 pkg_postinst() {
199 ewarn "If you are switching from media-libs/libjpeg-turbo you might need to"
200 ewarn "rebuild reverse dependencies:"
201 ewarn
202 ewarn "# emerge gentoolkit"
203 ewarn "# revdep-rebuild --library libjpeg.so.8"
204 }
Report Message
Find on MARC Find on Google Groups