libpng: disable tools
PATCH 1/3 libpng: disable tools
They can fail on some odd toolchain configurations because of buildsystem shortcomings and aren't expected to be used in normal scenarios.
--- package/libpng/libpng-01-disable-tools.patch | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libpng/libpng-01-disable-tools.patch
package/libpng/libpng-01-disable-tools.patch new file +30 -0
@@ -0,0 +1,30 @@ +Disable the new pngfix and png-fix-itxt tools: they take up space, fail to +build on some oddball toolchain configurations and aren't expected/needed +in a non-interactive embedded system. + +Signed-off-by: Gustavo Zacarias <[email protected]> + +diff -Nura libpng-1.6.6.orig/Makefile.am libpng-1.6.6/Makefile.am +--- libpng-1.6.6.orig/Makefile.am 2013-10-27 19:13:39.183376955 -0300 ++++ libpng-1.6.6/Makefile.am 2013-10-27 19:13:50.388744191 -0300 +@@ -10,7 +10,7 @@ + check_PROGRAMS= pngtest pngunknown pngstest pngvalid + + # Utilities - installed +-bin_PROGRAMS= pngfix png-fix-itxt ++bin_PROGRAMS= + + pngtest_SOURCES = pngtest.c + pngtest_LDADD = libpng at PNGLIB_MAJOR@@PNGLIB_MINOR at .la +diff -Nura libpng-1.6.6.orig/Makefile.in libpng-1.6.6/Makefile.in +--- libpng-1.6.6.orig/Makefile.in 2013-10-27 19:13:39.180376856 -0300 ++++ libpng-1.6.6/Makefile.in 2013-10-27 19:14:55.332872643 -0300 +@@ -59,7 +59,7 @@ + host_triplet = @host@ + check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ + pngstest$(EXEEXT) pngvalid$(EXEEXT) +-bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) ++bin_PROGRAMS = + @PNG_ARM_NEON_TRUE at am__append_1 = arm/arm_init.c\ + @PNG_ARM_NEON_TRUE@ arm/filter_neon.S +
Signature · 1 line
1.8.1.5
PATCH 2/3 fltk: bump to version 1.3.2
Fixes:
http://autobuild.buildroot.net/results/519/5195f7a8a38a5ba3ce5a0bf2a7649d390e461ee9/
The failure is related to bundled libpng conflicting with system libpng. Which was a problem even before the libpng bump because the bundled version for the previous fltk version has several security vulnerabilities.
So disable bundled libraries and use global ones.
--- package/fltk/Config.in | 3 + package/fltk/fltk-01-disable-tests.patch | 16 +++ package/fltk/fltk-1.1.7-bail-out-on-error.patch | 54 ---------- package/fltk/fltk-1.1.7-disable-test.patch | 17 --- package/fltk/fltk-1.1.7-makefiles.patch | 132 ------------------------ package/fltk/fltk-1.1.7-scandir-fix.patch | 20 ---- package/fltk/fltk.mk | 31 +++++- 7 files changed, 45 insertions(+), 228 deletions(-) create mode 100644 package/fltk/fltk-01-disable-tests.patch delete mode 100644 package/fltk/fltk-1.1.7-bail-out-on-error.patch delete mode 100644 package/fltk/fltk-1.1.7-disable-test.patch delete mode 100644 package/fltk/fltk-1.1.7-makefiles.patch delete mode 100644 package/fltk/fltk-1.1.7-scandir-fix.patch
package/fltk/Config.in +3 -0
@@ -2,6 +2,9 @@ config BR2_PACKAGE_FLTK bool "fltk" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT
package/fltk/fltk-01-disable-tests.patch new file +16 -0
@@ -0,0 +1,16 @@ +Disable tests, slower to build and would need host-fltk. + +Signed-off-by: Gustavo Zacarias <[email protected]> + +diff -Nura fltk-1.3.2.orig/Makefile fltk-1.3.2/Makefile +--- fltk-1.3.2.orig/Makefile 2013-10-27 18:19:39.693208127 -0300 ++++ fltk-1.3.2/Makefile 2013-10-27 18:20:08.032136885 -0300 +@@ -18,7 +18,7 @@ + + include makeinclude + +-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation ++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation + + all: makeinclude fltk-config + for dir in $(DIRS); do\
package/fltk/fltk-1.1.7-bail-out-on-error.patch deleted +0 -54
54 lines not on this page · raw message
package/fltk/fltk-1.1.7-disable-test.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Disable tests in FLTK because they use the fluid tool on the host. - -Patch borrowed from OpenEmbedded. - -Index: fltk-1.1.9/Makefile -=================================================================== ---- fltk-1.1.9.orig/Makefile 2008-06-06 16:14:11.936736201 +0200 -+++ fltk-1.1.9/Makefile 2008-06-06 16:14:22.526357637 +0200 -@@ -27,7 +27,7 @@ - - include makeinclude - --DIRS = $(IMAGEDIRS) src fluid test documentation -+DIRS = $(IMAGEDIRS) src fluid documentation - - all: makeinclude fltk-config - for dir in $(DIRS); do\
package/fltk/fltk-1.1.7-makefiles.patch deleted +0 -132
132 lines not on this page · raw message
package/fltk/fltk-1.1.7-scandir-fix.patch deleted +0 -20
@@ -1,20 +0,0 @@ -Use the correct scandir() call. - -See http://www.fltk.org/str.php?L2205. This patch is a simplified -version of http://www.fltk.org/strfiles/2205/scandir_posix.patch. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: fltk-1.1.7/src/filename_list.cxx -=================================================================== ---- fltk-1.1.7.orig/src/filename_list.cxx 2010-05-21 15:58:09.000000000 +0200 -+++ fltk-1.1.7/src/filename_list.cxx 2010-05-21 16:00:21.000000000 +0200 -@@ -54,7 +54,7 @@ - Fl_File_Sort_F *sort) { - #ifndef HAVE_SCANDIR - int n = scandir(d, list, 0, sort); --#elif defined(__hpux) || defined(__CYGWIN__) -+#elif defined(__hpux) || defined(__CYGWIN__) || defined(__USE_POSIX) - // HP-UX, Cygwin define the comparison function like this: - int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); - #elif defined(__osf__)
package/fltk/fltk.mk +26 -5
@@ -4,14 +4,35 @@ # ################################################################################ -FLTK_VERSION = 1.1.7 -FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.bz2 -FLTK_SITE = http://ftp.easysw.com/pub/fltk/1.1.7/ +FLTK_VERSION = 1.3.2 +FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz +FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION) FLTK_INSTALL_STAGING = YES FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install -FLTK_CONF_OPT = --enable-threads --with-x -FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt +FLTK_CONF_OPT = --enable-threads --with-x --disable-gl \ + --disable-localjpeg --disable-localpng --disable-localzlib +FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt FLTK_CONFIG_SCRIPTS = fltk-config +FLTK_LICENSE = LGPLv2 with exceptions +FLTK_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_CAIRO),y) +FLTK_CONF_OPT += --enable-cairo +FLTK_DEPENDENCIES += cairo +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) +FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config +FLTK_DEPENDENCIES += xlib_libXft +else +FLTK_CONF_OPT += --disable-xft +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +FLTK_DEPENDENCIES += xlib_libXinerama +else +FLTK_CONF_OPT += --disable-xinerama +endif $(eval $(autotools-package))
Signature · 1 line
1.8.1.5
PATCH 2/3 fltk: bump to version 1.3.2
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Fixes:
http://autobuild.buildroot.net/results/519/5195f7a8a38a5ba3ce5a0bf2a7649d390e461ee9/The failure is related to bundled libpng conflicting with system libpng. Which was a problem even before the libpng bump because the bundled version for the previous fltk version has several security vulnerabilities.
So disable bundled libraries and use global ones.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 alsamixergui: needs mmu
In reply to Gustavo ZacariasBecause of the new fl_open_uri() function since the fltk bump using fork().
--- package/alsamixergui/Config.in | 1 + 1 file changed, 1 insertion(+)
package/alsamixergui/Config.in +1 -0
@@ -1,6 +1,7 @@ config BR2_PACKAGE_ALSAMIXERGUI depends on BR2_PACKAGE_XORG7 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fltk fork() select BR2_PACKAGE_FLTK select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_PCM
Signature · 1 line
1.8.1.5
PATCH 3/3 alsamixergui: needs mmu
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Because of the new
fl_open_uri()function since the fltk bump usingfork().
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 libpng: disable tools
In reply to Gustavo ZacariasQuoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
They can fail on some odd toolchain configurations because of buildsystem shortcomings and aren't expected to be used in normal scenarios.
Signed-off-by Gustavo Zacarias <[email protected]>--- package/libpng/libpng-01-disable-tools.patch | 30 ++++++++++++++++++++++++++++1 file changed, 30 insertions(+) create mode 100644 package/libpng/libpng-01-disable-tools.patchpackage/libpng/libpng-01-disable-tools.patch new file +0
-0
package/libpng/libpng-01-disable-tools.patch line 7
Quoted 7 lines
package/libpng/libpng-01-disable-tools.patch new file +7
-0@@ -0,0 +1,30 @@ +Disable the new pngfix and png-fix-itxt tools: they take up space, fail to +build on some oddball toolchain configurations and aren't expected/needed +in a non-interactive embedded system. + +Signed-off-by: Gustavo Zacarias <[email protected]> + +diff -Nura libpng-1.6.6.orig/Makefile.am libpng-1.6.6/Makefile.am
My first thought upon seeing this was that it would be cleaner to just pass bin_PROGRAMS= to make instead of patching the autotools files, but it also ends up quite ugly (especially as we need to tweak the variables AFTER the evals if we want to append to the default values):
package/libpng/libpng.mk +9 -0
@@ -17,3 +17,12 @@ LIBPNG_CONF_OPT = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-n $(eval $(autotools-package)) $(eval $(host-autotools-package)) + +# disable pngfix / png-fix-itxt tools: They take up space, fail to +# build on oddball toolchain configurations and generally aren't +# expected/needed on the target +LIBPNG_MAKE_OPT = bin_PROGRAMS= +LIBPNG_INSTALL_STAGING_OPT += $(LIBPNG_MAKE_OPT) +LIBPNG_INSTALL_TARGET_OPT += $(LIBPNG_MAKE_OPT) +HOST_LIBPNG_MAKE_OPT = $(LIBPNG_MAKE_OPT) +HOST_LIBPNG_INSTALL_OPT += $(LIBPNG_MAKE_OPT)
So it probably makes more sense to just patch Makefile.am / Makefile.in like you do - Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard