summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch32
-rw-r--r--meta-oe/recipes-support/epeg/epeg_git.bb7
2 files changed, 2 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch
deleted file mode 100644
index 1568fe96e1..0000000000
--- a/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 4e0c62634b0db6dbad0d41377bb71a8012abd75b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 1 Sep 2022 12:56:54 -0700
4Subject: [PATCH] configure: Fix checks for libjpeg and libexif
5
6Use the functions from the respective library instead of using main
7function which is not part of library
8
9Upstream-Status: Submitted [https://github.com/mattes/epeg/pull/27]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index a4f6ebd..e474b1d 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -31,8 +31,8 @@ AC_SUBST(version_info)
20 dnl AC_CHECK_FUNCS(fmemopen)
21 dnl AC_CHECK_FUNCS(open_memstream)
22
23-AC_CHECK_LIB([jpeg], [main], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1])
24-AC_CHECK_LIB([exif], [main], [], [echo "libexif library not found. Please install it before proceeding"; exit -1])
25+AC_CHECK_LIB([jpeg], [jpeg_simple_progression], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1])
26+AC_CHECK_LIB([exif], [exif_data_new_from_file], [], [echo "libexif library not found. Please install it before proceeding"; exit -1])
27
28 my_includes=""
29 my_libs="-ljpeg -lexif"
30--
312.37.3
32
diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb
index 63c1455f25..647d82ec53 100644
--- a/meta-oe/recipes-support/epeg/epeg_git.bb
+++ b/meta-oe/recipes-support/epeg/epeg_git.bb
@@ -5,10 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7732a9290ea1e4b034fdc15cf49968d \
5 file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" 5 file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035"
6DEPENDS = "jpeg libexif" 6DEPENDS = "jpeg libexif"
7 7
8SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https \ 8SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https"
9 file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \ 9SRCREV = "17bbae0f0a0b777e5fb01e0d16891e07153a41eb"
10 "
11SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047"
12 10
13inherit autotools pkgconfig 11inherit autotools pkgconfig
14