From 679a4b2639a9ef6e70a803f4b12a57de8ee5184b Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Thu, 14 Apr 2011 14:10:31 +0800 Subject: [PATCH] jpeg: Upgrade to 8c (from 8b) (From OE-Core rev: 5f17c96c196db21e7590ef3ed530e1a6a22acb06) Signed-off-by: Zhai Edwin Signed-off-by: Richard Purdie --- .../jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff | 4 ++++ meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) rename meta/recipes-core/jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff (98%) mode change 100755 => 100644 rename meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} (85%) diff --git a/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff old mode 100755 new mode 100644 similarity index 98% rename from meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff rename to meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff index 2e4867aa75..3b8fa6980a --- a/meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff +++ b/meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff @@ -1,3 +1,7 @@ +This is a well-known debian patch used by many Linux distribution, but not +accepted by upstream yet. +Upstream-Status: Pending + --- libjpeg7-7.orig/config.sub +++ libjpeg7-7/config.sub @@ -1,4 +1,10 @@ diff --git a/meta/recipes-core/jpeg/jpeg_8b.bb b/meta/recipes-core/jpeg/jpeg_8c.bb similarity index 85% rename from meta/recipes-core/jpeg/jpeg_8b.bb rename to meta/recipes-core/jpeg/jpeg_8c.bb index 93aa7be678..ac00275337 100644 --- a/meta/recipes-core/jpeg/jpeg_8b.bb +++ b/meta/recipes-core/jpeg/jpeg_8c.bb @@ -5,7 +5,7 @@ BUGTRACKER = "" LICENSE ="jpeg" LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe21d \ - file://jpeglib.h;endline=14;md5=dd06b5575519f735ec2565ed36ce62e7 \ + file://jpeglib.h;endline=14;md5=22f1e0f8fc71f6f7563146d3b210dbe5 \ file://djpeg.c;endline=13;md5=ca89254925da06fef47e4b6468233432" SECTION = "libs" @@ -17,10 +17,10 @@ DEPENDS_virtclass-native = "libtool-native" PR = "r1" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ - file://debian-libjpeg7_7-1.diff;patch=1" + file://debian-libjpeg7_7-1.diff;" -SRC_URI[md5sum] = "e022acbc5b36cd2cb70785f5b575661e" -SRC_URI[sha256sum] = "36e6208edec591bae8f2fc370ea4f991447badb6377a125c211ffa7b503174a7" +SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9" +SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a" inherit autotools