Skip to contentSkip to conversation

package/leptonica: add libwebp{demux, mux} optional dependency

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 31, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/leptonica: add libwebp{demux, mux} optional dependency

leptonica optionally depends on webp/demux.h and webp/mux.h since version 1.79.0:
https://github.com/DanBloomberg/leptonica/commit/a7c5bcdf04062aad3655642bdb853561a1c49733
https://github.com/DanBloomberg/leptonica/commit/0ce4b9cc0845b198583d51f0a0df277de8f8c5fa

Fixes:
- http://autobuild.buildroot.org/results/1f8531e1651e82a1e93707ccb205d0e7a3cae1a3

---
 package/leptonica/leptonica.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/leptonica/leptonica.mk +8 -1
index fd122fb15b..93d1e47c28 100644
@@ -52,8 +52,15 @@ endif
 ifeq ($(BR2_PACKAGE_WEBP),y)
 LEPTONICA_DEPENDENCIES += webp
 LEPTONICA_CONF_OPTS += --with-libwebp
+ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy)
+LEPTONICA_CONF_OPTS += --with-libwebpmux
 else
-LEPTONICA_CONF_OPTS += --without-libwebp
+LEPTONICA_CONF_OPTS += --without-libwebpmux
+endif
+else
+LEPTONICA_CONF_OPTS += \
+	--without-libwebp \
+	--without-libwebpmux
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/leptonica: add libwebp{demux, mux} optional dependency

Quoted 5 lines · On Sun, 31 Jan 2021 20:41:25 +0100 Fabrice Fontaine…

leptonica optionally depends on webp/demux.h and webp/mux.h since version 1.79.0:
https://github.com/DanBloomberg/leptonica/commit/a7c5bcdf04062aad3655642bdb853561a1c49733
https://github.com/DanBloomberg/leptonica/commit/0ce4b9cc0845b198583d51f0a0df277de8f8c5fa

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/1f8531e1651e82a1e93707ccb205d0e7a3cae1a3

---
 package/leptonica/leptonica.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com