* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
@ 2013-07-31 6:28 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-31 6:28 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/31 06:28:23
Modified: ChangeLog
Added: libjpeg-turbo-1.3.0-r1.ebuild
Log:
Initial conversion to the new multilib format.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.61 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.60&r2=1.61
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog 27 May 2013 09:32:30 -0000 1.60
+++ ChangeLog 31 Jul 2013 06:28:23 -0000 1.61
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.60 2013/05/27 09:32:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.61 2013/07/31 06:28:23 ssuominen Exp $
+
+*libjpeg-turbo-1.3.0-r1 (31 Jul 2013)
+
+ 31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+ +libjpeg-turbo-1.3.0-r1.ebuild:
+ Initial conversion to the new multilib format.
*libjpeg-turbo-1.3.0 (27 May 2013)
1.1 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: libjpeg-turbo-1.3.0-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.1 2013/07/31 06:28:23 ssuominen Exp $
EAPI=5
JPEG_ABI=8
if [[ ${PV} == *_p20* ]]; then
SRC_URI="mirror://gentoo/${P}.tar.xz"
inherit autotools
elif [[ ${PV} != "9999" ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
fi
inherit eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
SRC_URI="${SRC_URI}
mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz"
LICENSE="BSD IJG"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
COMMON_DEPEND="!media-libs/jpeg:0"
RDEPEND="${COMMON_DEPEND}
java? ( >=virtual/jre-1.5 )"
DEPEND="${COMMON_DEPEND}
amd64? ( ${ASM_DEPEND} )
x86? ( ${ASM_DEPEND} )
amd64-fbsd? ( ${ASM_DEPEND} )
x86-fbsd? ( ${ASM_DEPEND} )
amd64-linux? ( ${ASM_DEPEND} )
x86-linux? ( ${ASM_DEPEND} )
x64-macos? ( ${ASM_DEPEND} )
java? ( >=virtual/jdk-1.5 )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
if [[ -x ./configure ]]; then
elibtoolize
else
eautoreconf
fi
epunt_cxx #424689
java-pkg-opt-2_src_prepare
}
multilib_src_configure() {
local myconf=()
if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
myconf+=( $(use_with java) )
if use java; then
export JAVACFLAGS="$(java-pkg_javac-args)"
export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
fi
else
myconf+=( --without-java )
fi
[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
ECONF_SOURCE=${S} \
econf \
$(use_enable static-libs static) \
--with-jpeg${JPEG_ABI} \
"${myconf[@]}"
}
multilib_src_compile() {
local _java_makeopts
use java && _java_makeopts="-j1"
emake ${_java_makeopts}
if ! [[ ${ABI} == ${DEFAULT_ABI} ]]; then
ebegin "Building exifautotran and jpegexiforient extra tools"
pushd ../debian/extra >/dev/null
emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
popd >/dev/null
eend $?
fi
}
multilib_src_test() {
emake test
}
multilib_src_install() {
emake \
DESTDIR="${D}" \
docdir="${EPREFIX}"/usr/share/doc/${PF} \
exampledir="${EPREFIX}"/usr/share/doc/${PF} \
install
}
multilib_src_install_all() {
prune_libtool_files
insinto /usr/share/doc/${PF}/html
doins -r doc/html/*
if use java; then
insinto /usr/share/doc/${PF}/html/java
doins -r java/doc/*
newdoc java/README README.java
rm -rf "${ED}"usr/classes
java-pkg_dojar java/turbojpeg.jar
fi
ebegin "Installing exifautotran and jpegexiforient extra tools"
pushd ../debian/extra >/dev/null
newdoc ../changelog changelog.debian
emake \
DESTDIR="${D}" prefix="${EPREFIX}"/usr \
INSTALL="install -m755" INSTALLDIR="install -d -m755" \
install
popd >/dev/null
eend $?
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
@ 2013-07-31 16:07 Alexis Ballier (aballier)
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-31 16:07 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/31 16:07:28
Modified: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
Log:
add the blocker on emul-linux so that it is stacked for baselibs -r4
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.63 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 31 Jul 2013 10:07:13 -0000 1.62
+++ ChangeLog 31 Jul 2013 16:07:28 -0000 1.63
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.62 2013/07/31 10:07:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.63 2013/07/31 16:07:28 aballier Exp $
+
+ 31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+ libjpeg-turbo-1.3.0-r1.ebuild:
+ add the blocker on emul-linux so that it is stacked for baselibs -r4
31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
libjpeg-turbo-1.3.0-r1.ebuild:
1.3 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?r1=1.2&r2=1.3
Index: libjpeg-turbo-1.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 10:07:13 -0000 1.2
+++ libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 16:07:28 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.2 2013/07/31 10:07:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.3 2013/07/31 16:07:28 aballier Exp $
EAPI=5
@@ -28,7 +28,9 @@
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
COMMON_DEPEND="!media-libs/jpeg:0"
RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
+ java? ( >=virtual/jre-1.5 )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
DEPEND="${COMMON_DEPEND}
amd64? ( ${ASM_DEPEND} )
x86? ( ${ASM_DEPEND} )
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
@ 2013-07-31 21:24 Alexis Ballier (aballier)
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-31 21:24 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/31 21:24:23
Modified: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
Log:
Install java stuff from the proper place, bug #479300.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.64 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.63&r2=1.64
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog 31 Jul 2013 16:07:28 -0000 1.63
+++ ChangeLog 31 Jul 2013 21:24:23 -0000 1.64
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.63 2013/07/31 16:07:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.64 2013/07/31 21:24:23 aballier Exp $
+
+ 31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+ libjpeg-turbo-1.3.0-r1.ebuild:
+ Install java stuff from the proper place, bug #479300.
31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
libjpeg-turbo-1.3.0-r1.ebuild:
1.4 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?r1=1.3&r2=1.4
Index: libjpeg-turbo-1.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 16:07:28 -0000 1.3
+++ libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 21:24:23 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.3 2013/07/31 16:07:28 aballier Exp $
+# $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 $
EAPI=5
@@ -99,6 +99,16 @@
docdir="${EPREFIX}"/usr/share/doc/${PF} \
exampledir="${EPREFIX}"/usr/share/doc/${PF} \
install
+
+ if [[ ${ABI} == ${DEFAULT_ABI} ]] && use java; then
+ insinto /usr/share/doc/${PF}/html/java
+ doins -r "${S}/"java/doc/*
+ newdoc "${S}/"java/README README.java
+
+ rm -rf "${ED}"usr/classes
+ java-pkg_dojar java/turbojpeg.jar
+ fi
+
}
multilib_src_install_all() {
@@ -107,15 +117,6 @@
insinto /usr/share/doc/${PF}/html
doins -r doc/html/*
- if use java; then
- insinto /usr/share/doc/${PF}/html/java
- doins -r java/doc/*
- newdoc java/README README.java
-
- rm -rf "${ED}"usr/classes
- java-pkg_dojar java/turbojpeg.jar
- fi
-
ebegin "Installing exifautotran and jpegexiforient extra tools"
pushd ../debian/extra >/dev/null
newdoc ../changelog changelog.debian
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
@ 2013-07-31 21:28 Alexis Ballier (aballier)
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-31 21:28 UTC (permalink / raw
To: gentoo-commits
aballier 13/07/31 21:28:57
Modified: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild
Log:
Wrap jconfig.h as it can differ between ABIs, bug #479302 by Alphat-PC.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.65 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 31 Jul 2013 21:24:23 -0000 1.64
+++ ChangeLog 31 Jul 2013 21:28:57 -0000 1.65
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.64 2013/07/31 21:24:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.65 2013/07/31 21:28:57 aballier Exp $
+
+ 31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+ libjpeg-turbo-1.3.0-r1.ebuild:
+ Wrap jconfig.h as it can differ between ABIs, bug #479302 by Alphat-PC.
31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
libjpeg-turbo-1.3.0-r1.ebuild:
1.5 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild
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
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
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
Index: libjpeg-turbo-1.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 21:24:23 -0000 1.4
+++ libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 21:28:57 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -41,6 +41,8 @@
x64-macos? ( ${ASM_DEPEND} )
java? ( >=virtual/jdk-1.5 )"
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
@@ -108,7 +110,6 @@
rm -rf "${ED}"usr/classes
java-pkg_dojar java/turbojpeg.jar
fi
-
}
multilib_src_install_all() {
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-07-31 21:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-31 6:28 [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r1.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-07-31 16:07 Alexis Ballier (aballier)
2013-07-31 21:24 Alexis Ballier (aballier)
2013-07-31 21:28 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox