* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r2.ebuild
@ 2013-08-01 20:35 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-01 20:35 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/08/01 20:35:54
Modified: ChangeLog
Added: libjpeg-turbo-1.3.0-r2.ebuild
Log:
Revert back to .so.62 with 2 functions backported from .so.8, namely jpeg_mem_dest() and jpeg_mem_src(). ABIs .so.7 and .so.8 are dead and shouldn't be used anywhere anymore.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.66 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.65&r2=1.66
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog 31 Jul 2013 21:28:57 -0000 1.65
+++ ChangeLog 1 Aug 2013 20:35:54 -0000 1.66
@@ -1,6 +1,14 @@
# 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.65 2013/07/31 21:28:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.66 2013/08/01 20:35:54 ssuominen Exp $
+
+*libjpeg-turbo-1.3.0-r2 (01 Aug 2013)
+
+ 01 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ +libjpeg-turbo-1.3.0-r2.ebuild:
+ Revert back to .so.62 with 2 functions backported from .so.8, namely
+ jpeg_mem_dest() and jpeg_mem_src(). ABIs .so.7 and .so.8 are dead and
+ shouldn't be used anywhere anymore.
31 Jul 2013; Alexis Ballier <aballier@gentoo.org>
libjpeg-turbo-1.3.0-r1.ebuild:
1.1 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild?rev=1.1&content-type=text/plain
Index: libjpeg-turbo-1.3.0-r2.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-r2.ebuild,v 1.1 2013/08/01 20:35:54 ssuominen Exp $
EAPI=5
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="mirror://sourceforge/${PN}/${P}.tar.gz
mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-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
!media-libs/jpeg:62
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
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 )"
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
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-mem-srcdst \
"${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
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() {
prune_libtool_files
insinto /usr/share/doc/${PF}/html
doins -r doc/html/*
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] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r2.ebuild
@ 2013-08-05 6:13 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-05 6:13 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/08/05 06:13:09
Modified: ChangeLog libjpeg-turbo-1.3.0-r2.ebuild
Log:
Use "multilib_is_native_abi" where required wrt #479614
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.73 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 4 Aug 2013 13:39:29 -0000 1.72
+++ ChangeLog 5 Aug 2013 06:13:08 -0000 1.73
@@ -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.72 2013/08/04 13:39:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.73 2013/08/05 06:13:08 ssuominen Exp $
+
+ 05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ libjpeg-turbo-1.3.0-r2.ebuild:
+ Use "multilib_is_native_abi" where required wrt #479614
04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> libjpeg-turbo-1.3.0.ebuild:
Stable for ppc64, wrt bug #479078
1.3 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.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-r2.ebuild?r1=1.2&r2=1.3
Index: libjpeg-turbo-1.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libjpeg-turbo-1.3.0-r2.ebuild 1 Aug 2013 20:37:01 -0000 1.2
+++ libjpeg-turbo-1.3.0-r2.ebuild 5 Aug 2013 06:13:08 -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-r2.ebuild,v 1.2 2013/08/01 20:37:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild,v 1.3 2013/08/05 06:13:08 ssuominen Exp $
EAPI=5
@@ -51,7 +51,7 @@
multilib_src_configure() {
local myconf=()
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+ if multilib_is_native_abi; then
myconf+=( $(use_with java) )
if use java; then
export JAVACFLAGS="$(java-pkg_javac-args)"
@@ -74,12 +74,10 @@
use java && _java_makeopts="-j1"
emake ${_java_makeopts}
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
- ebegin "Building exifautotran and jpegexiforient extra tools"
+ if multilib_is_native_abi; then
pushd ../debian/extra >/dev/null
emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
popd >/dev/null
- eend $?
fi
}
@@ -94,13 +92,18 @@
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
+ if multilib_is_native_abi; then
+ pushd "${WORKDIR}"/debian/extra >/dev/null
+ emake \
+ DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+ INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+ install
+ popd >/dev/null
- rm -rf "${ED}"usr/classes
- java-pkg_dojar java/turbojpeg.jar
+ if use java; then
+ rm -rf "${ED}"/usr/classes
+ java-pkg_dojar "${S}"/java/turbojpeg.jar
+ fi
fi
}
@@ -108,16 +111,11 @@
prune_libtool_files
insinto /usr/share/doc/${PF}/html
- doins -r doc/html/*
-
- 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 $?
+ doins -r "${S}"/doc/html/*
+ newdoc "${WORKDIR}"/debian/changelog changelog.debian
+ if use java; then
+ insinto /usr/share/doc/${PF}/html/java
+ doins -r "${S}"/java/doc/*
+ newdoc "${S}"/java/README README.java
+ fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r2.ebuild
@ 2013-08-05 18:14 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-05 18:14 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/08/05 18:14:51
Modified: ChangeLog libjpeg-turbo-1.3.0-r2.ebuild
Log:
Fix the java-pkg_dojar line again wrt #479300#c5 by "DaggyStyle"
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.74 media-libs/libjpeg-turbo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.73&r2=1.74
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog 5 Aug 2013 06:13:08 -0000 1.73
+++ ChangeLog 5 Aug 2013 18:14:51 -0000 1.74
@@ -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.73 2013/08/05 06:13:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.74 2013/08/05 18:14:51 ssuominen Exp $
+
+ 05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ libjpeg-turbo-1.3.0-r2.ebuild:
+ Fix the java-pkg_dojar line again wrt #479300#c5 by "DaggyStyle"
05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
libjpeg-turbo-1.3.0-r2.ebuild:
1.4 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.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-r2.ebuild?r1=1.3&r2=1.4
Index: libjpeg-turbo-1.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libjpeg-turbo-1.3.0-r2.ebuild 5 Aug 2013 06:13:08 -0000 1.3
+++ libjpeg-turbo-1.3.0-r2.ebuild 5 Aug 2013 18:14:51 -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-r2.ebuild,v 1.3 2013/08/05 06:13:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild,v 1.4 2013/08/05 18:14:51 ssuominen Exp $
EAPI=5
@@ -102,7 +102,7 @@
if use java; then
rm -rf "${ED}"/usr/classes
- java-pkg_dojar "${S}"/java/turbojpeg.jar
+ java-pkg_dojar java/turbojpeg.jar
fi
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-05 18:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-01 20:35 [gentoo-commits] gentoo-x86 commit in media-libs/libjpeg-turbo: ChangeLog libjpeg-turbo-1.3.0-r2.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-08-05 6:13 Samuli Suominen (ssuominen)
2013-08-05 18:14 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox