Skip to contentSkip to conversation

apitrace: do not use bundled version of libpng

PATCH New Jérôme Pouiller 2 participants 2 messages Nov 21, 2015 – Nov 22, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 apitrace: do not use bundled version of libpng

In case libpng is not found apitrace its own version of libpng. However current bundled version (1.1.16) is impacted by
https://sourceforge.net/p/libpng/bugs/230/. We simplify problem by forcing use of external libpng.

Notice this patch also impact use of zlib. Apitrace also use its own version of zlib if none was found. Since we select libpng, external zlib is also selected.

Fix:
http://autobuild.buildroot.net/results/ac790191127cf4d8b19d0c7c640981264772f503/

---
 package/apitrace/Config.in   | 1 +
 package/apitrace/apitrace.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
package/apitrace/Config.in +1 -0
index 4fe82aa..a977712 100644
@@ -10,6 +10,7 @@ config BR2_PACKAGE_APITRACE
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_LIBPNG
 	help
 	  Trace and replay OpenGL and OpenGL ES APIs calls to/from a
 	  file. You may install apitrace GUI from your distribution to
package/apitrace/apitrace.mk +1 -1
index 28a40e4..fbd957c 100644
@@ -9,7 +9,7 @@ APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION))
 APITRACE_LICENSE = MIT
 APITRACE_LICENSE_FILES = LICENSE
 
-APITRACE_DEPENDENCIES = xlib_libX11 host-python
+APITRACE_DEPENDENCIES = xlib_libX11 host-python libpng
 
 # Gui was never tested, so we prefer to explicitly disable it
 APITRACE_CONF_OPTS += -DENABLE_GUI=false
Signature · 1 line
2.6.2
#1 lore raw

PATCH 1/1 apitrace: do not use bundled version of libpng

Dear J?r?me Pouiller,

Quoted 9 lines · J?r?me Pouiller

In case libpng is not found apitrace its own version of libpng. However current bundled version (1.1.16) is impacted by
https://sourceforge.net/p/libpng/bugs/230/. We simplify problem by forcing use of external libpng.

Notice this patch also impact use of zlib. Apitrace also use its own version of zlib if none was found. Since we select libpng, external zlib is also selected.

Quoted 8 lines

Fix:
http://autobuild.buildroot.net/results/ac790191127cf4d8b19d0c7c640981264772f503/

---
 package/apitrace/Config.in   | 1 +
 package/apitrace/apitrace.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Applied to master, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com