From 58ac79cfadec1eadf6b8b456f6f7c4c85342d039 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 28 Mar 2012 18:39:03 -0400 Subject: [PATCH] libjpeg-turbo: update to latest stable Upgraded media-libs/libjpeg-turbo to version 1.2.0-r1 on amd64, arm, x86. Just did compile tests as no package depends on this (yet). BUG=chromium-os:25237 TEST=`emerge-amd64-generic libjpeg-turbo` works TEST=`emerge-arm-generic libjpeg-turbo` works TEST=`emerge-x86-generic libjpeg-turbo` works Change-Id: Id8f49dba10bce3ddf93c63d1cc0ea7e271390b62 Reviewed-on: https://gerrit.chromium.org/gerrit/19258 Reviewed-by: Matt Tennant Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../media-libs/libjpeg-turbo/Manifest | 4 +- .../libjpeg-turbo/libjpeg-turbo-1.1.1.ebuild | 57 --------- .../libjpeg-turbo-1.2.0-r1.ebuild | 111 ++++++++++++++++++ .../md5-cache/media-libs/libjpeg-turbo-1.1.1 | 13 -- .../media-libs/libjpeg-turbo-1.2.0-r1 | 13 ++ 5 files changed, 126 insertions(+), 72 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.1.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r1 diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest index b0aa1ac22d..28f865f09a 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest +++ b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest @@ -1,2 +1,2 @@ -DIST libjpeg-turbo-1.1.1.tar.gz 1444529 RMD160 d70979dabe05b8eb74cddaaf0ffbd4b9fbaba41a SHA1 131cef514c34e0b3f6952000968796d5a87a59e9 SHA256 553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2 -DIST libjpeg8_8c-1.debian.tar.gz 13756 RMD160 7ceb995b47678bc841e217deaa32f05d70f8d80e SHA1 0c95ebe091e3d535d9d6d8c128ec8bd07e0542fb SHA256 2d45eb7302d2c9a5b6cf12784629ec1bdbbb271a10d600532e5fbde3c19ea765 +DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e +DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.1.ebuild deleted file mode 100644 index c08d8a9aa3..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2011 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.1.1.ebuild,v 1.5 2011/06/18 15:41:08 phajdan.jr Exp $ - -EAPI=4 -inherit 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="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8c-1.debian.tar.gz" - -LICENSE="as-is LGPL-2.1 wxWinLL-3.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -NASM_DEPEND="dev-lang/nasm" -RDEPEND="!media-libs/jpeg:0" -DEPEND="${RDEPEND} - amd64? ( ${NASM_DEPEND} ) - x86? ( ${NASM_DEPEND} ) - amd64-linux? ( ${NASM_DEPEND} ) - x86-linux? ( ${NASM_DEPEND} )" - -DOCS=( BUILDING.txt ChangeLog.txt example.c README-turbo.txt ) - -src_prepare() { - elibtoolize -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - --with-jpeg8 -} - -src_compile() { - default - - cd ../debian/extra || die - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" -} - -src_test() { - emake test -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f {} + - - cd ../debian/extra || die - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install -} diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild new file mode 100644 index 0000000000..dec9be1f19 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild @@ -0,0 +1,111 @@ +# 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.0-r1.ebuild,v 1.8 2012/03/25 15:36:48 maekke Exp $ + +# http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/?view=tar + +EAPI=4 + +unset _inherits + +JPEG_ABI=8 + +if [[ ${PV} == *_p20* ]]; then + SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz" + _inherits=autotools +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +fi + +inherit ${_inherits} 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="amd64 arm hppa ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" +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-linux? ( ${ASM_DEPEND} ) + x86-linux? ( ${ASM_DEPEND} ) + java? ( >=virtual/jdk-1.5 )" + +src_prepare() { + if [[ -x ./configure ]]; then + elibtoolize + else + eautoreconf + fi + 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 + + econf \ + $(use_enable static-libs static) \ + --with-jpeg${JPEG_ABI} \ + $(use_with java) +} + +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 + + find "${ED}"usr -name '*.la' -exec rm -f {} + + + 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 $? +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.1.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.1.1 deleted file mode 100644 index 25b8eb256b..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.1.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=!media-libs/jpeg:0 amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) amd64-linux? ( dev-lang/nasm ) x86-linux? ( dev-lang/nasm ) -DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library -EAPI=4 -HOMEPAGE=http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/ -IUSE=static-libs -KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux -LICENSE=as-is LGPL-2.1 wxWinLL-3.1 -RDEPEND=!media-libs/jpeg:0 -SLOT=0 -SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.1.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8c-1.debian.tar.gz -_eclasses_=libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 -_md5_=673be48ff1b51a86aec07ebbffc5d211 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r1 new file mode 100644 index 0000000000..7a1305c65c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install preinst prepare setup test +DEPEND=!media-libs/jpeg:0 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 ) +DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library +EAPI=4 +HOMEPAGE=http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/ +IUSE=java static-libs elibc_FreeBSD java +KEYWORDS=amd64 arm hppa ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=!media-libs/jpeg:0 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 ) +SLOT=0 +SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.2.0.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz +_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a java-pkg-opt-2 31a1663247652448431dcc8c194e2752 java-utils-2 6beafc7c3d1dbae83a4478182b158f66 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed +_md5_=95dc850f58f4c36cdcda0a3829b9d104