1*4882a593SmuzhiyunFrom ad911cbc3c16397cf9d326c30571a4d1edaaa03f Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 2 Jun 2021 07:45:40 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Add Libs.private to libraw.pc 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAdd Libs.private to libraw.pc to avoid the following static build 7*4882a593Smuzhiyunfailure when enabling libraw with jasper support in imagemagick: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun/home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libjasper.a(jpg_enc.c.o): in function `jpg_encode': 10*4882a593Smuzhiyunjpg_enc.c:(.text+0x1f4): undefined reference to `jpeg_stdio_dest' 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun-ljpeg must be added after -ljasper because jasper depends on jpeg 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunFixes: 15*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/88e43a1ea2059a684e50b0f5f2af407e8c6df2e1 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 18*4882a593Smuzhiyun[Upstream status: https://github.com/LibRaw/LibRaw/pull/406] 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun configure.ac | 2 ++ 21*4882a593Smuzhiyun libraw.pc.in | 1 + 22*4882a593Smuzhiyun libraw_r.pc.in | 1 + 23*4882a593Smuzhiyun 3 files changed, 4 insertions(+) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 26*4882a593Smuzhiyunindex 4ab2f313..7bf5fdfd 100644 27*4882a593Smuzhiyun--- a/configure.ac 28*4882a593Smuzhiyun+++ b/configure.ac 29*4882a593Smuzhiyun@@ -57,6 +57,7 @@ if test x$jpeg = xtrue; then 30*4882a593Smuzhiyun AC_CHECK_HEADERS([jpeglib.h], [ 31*4882a593Smuzhiyun CPPFLAGS="$CPPFLAGS -DUSE_JPEG -DUSE_JPEG8" 32*4882a593Smuzhiyun LIBS="$LIBS -ljpeg" 33*4882a593Smuzhiyun+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljpeg $PACKAGE_LIBS_PRIVATE") 34*4882a593Smuzhiyun ], AC_MSG_WARN([no jpeg headers found])) 35*4882a593Smuzhiyun ], 36*4882a593Smuzhiyun AC_MSG_WARN([libjpeg not found]) 37*4882a593Smuzhiyun@@ -78,6 +79,7 @@ if test x$jasper = xtrue; then 38*4882a593Smuzhiyun AC_CHECK_HEADERS([jasper/jasper.h], [ 39*4882a593Smuzhiyun CPPFLAGS="$CPPFLAGS -DUSE_JASPER" 40*4882a593Smuzhiyun LIBS="$LIBS -ljasper" 41*4882a593Smuzhiyun+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljasper $PACKAGE_LIBS_PRIVATE") 42*4882a593Smuzhiyun ], AC_MSG_WARN([no jasper headers found])) 43*4882a593Smuzhiyun ], 44*4882a593Smuzhiyun AC_MSG_WARN([libjasper not found]) 45*4882a593Smuzhiyundiff --git a/libraw.pc.in b/libraw.pc.in 46*4882a593Smuzhiyunindex 1bab18b8..c95fbc48 100644 47*4882a593Smuzhiyun--- a/libraw.pc.in 48*4882a593Smuzhiyun+++ b/libraw.pc.in 49*4882a593Smuzhiyun@@ -8,4 +8,5 @@ Description: Raw image decoder library (non-thread-safe) 50*4882a593Smuzhiyun Requires: @PACKAGE_REQUIRES@ 51*4882a593Smuzhiyun Version: @PACKAGE_VERSION@ 52*4882a593Smuzhiyun Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ 53*4882a593Smuzhiyun+Libs.private: @PACKAGE_LIBS_PRIVATE@ 54*4882a593Smuzhiyun Cflags: -I${includedir}/libraw -I${includedir} 55*4882a593Smuzhiyundiff --git a/libraw_r.pc.in b/libraw_r.pc.in 56*4882a593Smuzhiyunindex e8427271..92bbbffa 100644 57*4882a593Smuzhiyun--- a/libraw_r.pc.in 58*4882a593Smuzhiyun+++ b/libraw_r.pc.in 59*4882a593Smuzhiyun@@ -8,4 +8,5 @@ Description: Raw image decoder library (thread-safe) 60*4882a593Smuzhiyun Requires: @PACKAGE_REQUIRES@ 61*4882a593Smuzhiyun Version: @PACKAGE_VERSION@ 62*4882a593Smuzhiyun Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ 63*4882a593Smuzhiyun+Libs.private: @PACKAGE_LIBS_PRIVATE@ 64*4882a593Smuzhiyun Cflags: -I${includedir}/libraw -I${includedir} 65*4882a593Smuzhiyun-- 66*4882a593Smuzhiyun2.30.2 67*4882a593Smuzhiyun 68