Version bump.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

2 files changed, 125 insertions, 1 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 1af5a341388b..8b1d6305d35e 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libjpeg-turbo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.48 2012/07/04 18:24:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.49 2012/07/07 07:11:15 ssuominen Exp $
+
+*libjpeg-turbo-1.2.1 (07 Jul 2012)
+
+  07 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libjpeg-turbo-1.2.1.ebuild:
+  Version bump.
 
   04 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   libjpeg-turbo-1.2.0-r2.ebuild:
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
new file mode 100644
index 000000000000..33bee5ca0360
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 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.2.1.ebuild,v 1.1 2012/07/07 07:11:15 ssuominen Exp $
+
+EAPI=4
+
+JPEG_ABI=8
+
+if [[ ${PV} == *_p20* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	inherit autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+inherit eutils java-pkg-opt-2 libtool toolchain-funcs
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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
+}
+
+src_configure() {
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+	local myconf=()
+	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+	econf \
+		$(use_enable static-libs static) \
+		--with-jpeg${JPEG_ABI} \
+		$(use_with java) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	local _java_makeopts
+	use java && _java_makeopts="-j1"
+	emake ${_java_makeopts}
+
+	ebegin "Building exifautotran and jpegexiforient extra tools"
+	pushd ../debian/extra >/dev/null
+	emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+	popd >/dev/null
+	eend $?
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	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 $?
+}