From 7483cb0bdbc58d0e7dd62620742b64339785901a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 12 Feb 2012 08:19:01 +0100
Subject: [PATCH] libjpeg-turbo: update to 1.2.0.

---
 srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template |  4 +---
 srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template |  4 +---
 srcpkgs/libjpeg-turbo/template                     | 10 +++++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
index 0b830c986ae..957fcccf51e 100644
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
+++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
@@ -10,10 +10,8 @@ Add_dependency run libjpeg-turbo
 
 provides="jpeg-devel-8"
 replaces="jpeg-devel>=0"
-revision=6
 
-do_install()
-{
+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 4badcf4d591..cae98090438 100644
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
+++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
@@ -9,10 +9,8 @@ Add_dependency run libjpeg-turbo ">=${version}"
 
 provides="jpeg-tools-8"
 replaces="jpeg-tools>=0"
-revision=7
 
-do_install()
-{
+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 d5a53b9d10f..fd3af60161a 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,15 +1,14 @@
 # Template build file for 'libjpeg-turbo'.
 pkgname=libjpeg-turbo
-version=1.1.1
-revision=7
+version=1.2.0
 homepage="http://libjpeg-turbo.virtualgl.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--with-jpeg8"
 short_desc="Derivative of libjpeg which uses SIMD instructions"
 maintainer="Juan RP <xtraeme@gmail.com>"
-license="LGPL-2.1, ${pkgname}"
-checksum=553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2
+license="BSD"
+checksum=629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
 long_desc="
  $pkgname is a derivative of libjpeg which uses SIMD instructions
  MMX, SSE2, etc. to accelerate baseline JPEG compression and decompression
@@ -26,8 +25,9 @@ Add_dependency build nasm
 
 post_install() {
 	vinstall jpegint.h 644 usr/include
-	vinstall LICENSE.txt 644 usr/share/licenses/${pkgname}
+	vinstall README-turbo.txt 644 usr/share/licenses/${pkgname}
 
+	rm -f ${DESTDIR}/usr/bin/tjbench
 	rm -f ${DESTDIR}/usr/bin/jpegut
 	rm -f ${DESTDIR}/usr/bin/jpgtest
 	rm -f ${DESTDIR}/usr/lib/libturbojpeg*