mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
jpeg: update to version 9a
Previous webkit version was blocking this; latest webkit works fine. (From OE-Core rev: 5d9d179023857c53801e24b18f9b3051d9c84145) (From OE-Core rev: 5a4df6286399f59e081cbc8b7ffe25b713a54167) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
650fe92a0b
commit
b749251338
File diff suppressed because it is too large
Load Diff
@@ -1,44 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
The support for automatic de-ANSI-fication has been deprecated in
|
||||
automake 1.11.2, and will be removed altogether in automake 1.12
|
||||
|
||||
This avoids this error:
|
||||
| configure.ac:24: automatic de-ANSI-fication support is deprecated
|
||||
| autoreconf: automake failed with exit status: 1
|
||||
| ERROR: autoreconf execution failed.
|
||||
NOTE: package jpeg-native-8c-r2: task do_configure: Failed
|
||||
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2011/12/28
|
||||
|
||||
|
||||
Index: jpeg-8d/configure.ac
|
||||
===================================================================
|
||||
--- jpeg-8d.orig/configure.ac
|
||||
+++ jpeg-8d/configure.ac
|
||||
@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
|
||||
|
||||
# Initialize Automake
|
||||
# Don't require all the GNU mandated files
|
||||
-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
|
||||
+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign])
|
||||
|
||||
# Make --enable-silent-rules the default.
|
||||
# To get verbose build output you may configure
|
||||
@@ -29,7 +29,14 @@ AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obs
|
||||
AM_SILENT_RULES([yes])
|
||||
|
||||
# This is required when using the de-ANSI-fication feature.
|
||||
-AM_C_PROTOTYPES
|
||||
+#AM_C_PROTOTYPES
|
||||
+# add following to avoid this error:
|
||||
+#| automake: warnings are treated as errors
|
||||
+#| /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libjpeg.la': linking libtool libraries using a non-POSIX
|
||||
+#| /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
|
||||
+#| Makefile.am:65: while processing Libtool library 'libjpeg.la'
|
||||
+#| autoreconf: automake failed with exit status: 1
|
||||
+AM_PROG_AR
|
||||
|
||||
# Add configure option --enable-maintainer-mode which enables
|
||||
# dependency checking and generation useful to package maintainers.
|
||||
@@ -3,39 +3,17 @@ DESCRIPTION = "libjpeg contains a library for handling the JPEG (JFIF) image for
|
||||
HOMEPAGE = "http://www.ijg.org/"
|
||||
|
||||
LICENSE ="BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://README;md5=4f46756b064c225fae088903300e5c98"
|
||||
LIC_FILES_CHKSUM = "file://README;md5=ea93a8a2fed10106b63bc21679edacb9"
|
||||
|
||||
SECTION = "libs"
|
||||
|
||||
DEPENDS = "libtool-cross"
|
||||
DEPENDS_class-native = "libtool-native"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
|
||||
file://debian-libjpeg7_7-1.diff \
|
||||
file://fix_for_automake_1.12.1.patch"
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "52654eb3b2e60c35731ea8fc87f1bd29"
|
||||
SRC_URI[sha256sum] = "00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"
|
||||
SRC_URI[md5sum] = "3353992aecaee1805ef4109aadd433e7"
|
||||
SRC_URI[sha256sum] = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"
|
||||
|
||||
inherit autotools
|
||||
|
||||
EXTRA_OECONF="--enable-static --enable-shared"
|
||||
EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"'
|
||||
|
||||
CFLAGS_append = " -D_REENTRANT"
|
||||
|
||||
do_configure_prepend () {
|
||||
rm -f ${S}/ltconfig
|
||||
rm -f ${S}/ltmain.sh
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir} ${D}${includedir} \
|
||||
${D}${mandir}/man1 ${D}${libdir}
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
}
|
||||
inherit autotools
|
||||
|
||||
PACKAGES =+ "jpeg-tools "
|
||||
DESCRIPTION_jpeg-tools = "The jpeg-tools package includes the client programs for access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files."
|
||||
Reference in New Issue
Block a user