summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/jpeg
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2012-05-13 18:37:03 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 07:51:42 (GMT)
commit24038ec86e825fc3a4f1ffc6c89b605becac0f36 (patch)
tree243c0b8736bd72258d4bc4405f81e461a0d3f074 /meta/recipes-core/jpeg
parent319b6f2708bbf71adb518b832309e891cb9edfb1 (diff)
downloadpoky-24038ec86e825fc3a4f1ffc6c89b605becac0f36.tar.gz
jpeg: update to upstream version 8d
* fix_for_automake_1.11.2.patch removed as issue resolved upstream * Have README as license file instead of several source files that just refer to it (From OE-Core rev: 330173c75426aa38919091da9ae8a9e90de9e0e2) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/jpeg')
-rw-r--r--meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch28
-rwxr-xr-x[-rw-r--r--]meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff (renamed from meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff)0
-rw-r--r--meta/recipes-core/jpeg/jpeg_8d.bb (renamed from meta/recipes-core/jpeg/jpeg_8c.bb)13
3 files changed, 5 insertions, 36 deletions
diff --git a/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch b/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch
deleted file mode 100644
index c0d7f3e..0000000
--- a/meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Pending
2
3The support for automatic de-ANSI-fication has been deprecated in
4automake 1.11.2, and will be removed altogether in automake 1.12
5
6This avoids this error:
7| configure.ac:24: automatic de-ANSI-fication support is deprecated
8| autoreconf: automake failed with exit status: 1
9| ERROR: autoreconf execution failed.
10NOTE: package jpeg-native-8c-r2: task do_configure: Failed
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
132011/12/28
14
15
16Index: jpeg-8c/configure.ac
17===================================================================
18--- jpeg-8c.orig/configure.ac
19+++ jpeg-8c/configure.ac
20@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
21
22 # Initialize Automake
23 # Don't require all the GNU mandated files
24-AM_INIT_AUTOMAKE([-Wall -Werror ansi2knr no-dist foreign])
25+AM_INIT_AUTOMAKE([-Wall -Werror no-dist foreign])
26
27 # Make --enable-silent-rules the default.
28 # To get verbose build output you may configure
diff --git a/meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff b/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
index 3b8fa69..3b8fa69 100644..100755
--- a/meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff
+++ b/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
diff --git a/meta/recipes-core/jpeg/jpeg_8c.bb b/meta/recipes-core/jpeg/jpeg_8d.bb
index 6aeaeaa..61f1c2e 100644
--- a/meta/recipes-core/jpeg/jpeg_8c.bb
+++ b/meta/recipes-core/jpeg/jpeg_8d.bb
@@ -4,23 +4,20 @@ HOMEPAGE = "http://www.ijg.org/"
4BUGTRACKER = "" 4BUGTRACKER = ""
5 5
6LICENSE ="BSD-3-Clause" 6LICENSE ="BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe21d \ 7LIC_FILES_CHKSUM = "file://README;md5=4f46756b064c225fae088903300e5c98"
8 file://jpeglib.h;endline=14;md5=22f1e0f8fc71f6f7563146d3b210dbe5 \
9 file://djpeg.c;endline=13;md5=ca89254925da06fef47e4b6468233432"
10 8
11SECTION = "libs" 9SECTION = "libs"
12 10
13DEPENDS = "libtool-cross" 11DEPENDS = "libtool-cross"
14DEPENDS_virtclass-native = "libtool-native" 12DEPENDS_virtclass-native = "libtool-native"
15 13
16PR = "r3" 14PR = "r0"
17 15
18SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ 16SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
19 file://debian-libjpeg7_7-1.diff \ 17 file://debian-libjpeg7_7-1.diff"
20 file://fix_for_automake_1.11.2.patch"
21 18
22SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9" 19SRC_URI[md5sum] = "52654eb3b2e60c35731ea8fc87f1bd29"
23SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a" 20SRC_URI[sha256sum] = "00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"
24 21
25inherit autotools 22inherit autotools
26 23