From 0ff1e3037004d6bf9ed3f36ccf47fd42f8b1958e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Jul 2012 09:31:37 +0200 Subject: [PATCH] libjpeg-turbo: update to 1.2.1. --- .../libjpeg-turbo-devel.template | 8 +++----- .../libjpeg-turbo-tools.template | 8 +++----- srcpkgs/libjpeg-turbo/template | 19 ++++++++----------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template index c2c0753f16b..0f8d55ce1f2 100644 --- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template +++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template @@ -1,15 +1,13 @@ # Template file for 'libjpeg-turbo-devel'. # -depends="glibc-devel libjpeg-turbo" +depends="glibc-devel libjpeg-turbo>=$version" +provides="jpeg-devel-8" +replaces="jpeg-devel>=0" short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -provides="jpeg-devel-8" -replaces="jpeg-devel>=0" - do_install() { vmove usr/include usr vmove "usr/lib/*.a" usr/lib diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template index fe3cf7eb9b9..6adcfe6a5d2 100644 --- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template +++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template @@ -1,15 +1,13 @@ # Template file for 'libjpeg-turbo-tools'. # -depends="libjpeg-turbo>=1.2.0" +depends="libjpeg-turbo>=$version" +provides="jpeg-tools-8" +replaces="jpeg-tools>=0" short_desc="${sourcepkg} - bundled tools" long_desc="${long_desc} This package contains tools to manipulate JPG files." - -provides="jpeg-tools-8" -replaces="jpeg-tools>=0" - do_install() { vmove usr/bin usr vmove usr/share/man usr/share diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template index fec1e89d00d..ae24b69ef0c 100644 --- a/srcpkgs/libjpeg-turbo/template +++ b/srcpkgs/libjpeg-turbo/template @@ -1,16 +1,19 @@ # Template build file for 'libjpeg-turbo'. pkgname=libjpeg-turbo -version=1.2.0 -homepage="http://libjpeg-turbo.virtualgl.org/" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +version=1.2.1 +revision=1 +provides="jpeg-8" +replaces="jpeg>=0" +subpackages="${pkgname}-devel ${pkgname}-tools" build_style=gnu-configure configure_args="--with-jpeg8" makedepends="nasm" -revision=1 short_desc="Derivative of libjpeg which uses SIMD instructions" maintainer="Juan RP " license="BSD" -checksum=629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e +homepage="http://libjpeg-turbo.virtualgl.org/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=cb3323f054a02cedad193bd0ca418d46934447f995d19e678ea64f78e4903770 long_desc=" $pkgname is a derivative of libjpeg which uses SIMD instructions MMX, SSE2, etc. to accelerate baseline JPEG compression and decompression @@ -18,12 +21,6 @@ long_desc=" generally 2-4x as fast as the unmodified version of libjpeg, all else being equal." -build_requires=11 -provides="jpeg-8" -replaces="jpeg>=0" -subpackages="${pkgname}-devel ${pkgname}-tools" - - post_install() { vinstall jpegint.h 644 usr/include vinstall README-turbo.txt 644 usr/share/licenses/${pkgname}