diff options
author | Guillermo RodrÃguez <guille.rodriguez@gmail.com> | 2018-10-05 13:31:39 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-05 23:58:56 +0200 |
commit | 841aa7b282b491f438e6bb1d314972199c5cf096 (patch) | |
tree | ee71b4f7bab0ca41d1efc2eb84a405a8524b2867 | |
parent | 2c999beb94c8fdada1211eb676f7e69c42ac0405 (diff) | |
download | ptxdist-841aa7b282b491f438e6bb1d314972199c5cf096.tar.gz ptxdist-841aa7b282b491f438e6bb1d314972199c5cf096.tar.xz |
fbv: Restored package
Had been removed after one year in staging, but the reasons
for removal seem to be fixed; the package now builds correctly
with latest libpng, and upstream is alive.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch | 34 | ||||
-rw-r--r-- | patches/fbv-1.0b-ptx3/series | 4 | ||||
-rw-r--r-- | rules/fbv.in | 21 | ||||
-rw-r--r-- | rules/fbv.make | 61 |
4 files changed, 120 insertions, 0 deletions
diff --git a/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch b/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch new file mode 100644 index 000000000..cfe00b3fc --- /dev/null +++ b/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch @@ -0,0 +1,34 @@ +From: Gavin Schenk <g.schenk@eckelmann.de> +Date: Thu, 23 Nov 2017 12:13:48 +0100 +Subject: [PATCH] fbv: Fix build error due to direct access to jmpbuf + +The build fails with "dereferencing pointer to incomplete type" when +accessing the jmpbuf ptr directly. + +Using the macro png_jmpbuf(...) fixes this compiler error. +--- + png.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/png.c b/png.c +index 8a0c62073dfb..3f5afddbca5c 100644 +--- a/png.c ++++ b/png.c +@@ -69,7 +69,7 @@ int fh_png_load(char *name,unsigned char *buffer, unsigned char ** alpha,int x,i + fclose(fh); return(FH_ERROR_FORMAT); + } + rp=0; +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if(rp) free(rp); +@@ -161,7 +161,7 @@ int fh_png_getsize(char *name,int *x,int *y) + fclose(fh); return(FH_ERROR_FORMAT); + } + rp=0; +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if(rp) free(rp); diff --git a/patches/fbv-1.0b-ptx3/series b/patches/fbv-1.0b-ptx3/series new file mode 100644 index 000000000..1a7f9e2c6 --- /dev/null +++ b/patches/fbv-1.0b-ptx3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch +# 696c9ccc35cdb0d48da69c868da299fd - git-ptx-patches magic diff --git a/rules/fbv.in b/rules/fbv.in new file mode 100644 index 000000000..d66e11d70 --- /dev/null +++ b/rules/fbv.in @@ -0,0 +1,21 @@ +### SECTION=multimedia_framebuffer + +menuconfig FBV + tristate + select LIBPNG if FBV_PNG + prompt "fbv " + help + fbv is a very simple graphic file viewer for the framebuffer console, + capable of displaying GIF, JPEG, PNG and BMP files using libungif, + libjpeg, and libpng. The image can be shown either in fit-to-screen or + panning mode in 8, 15/16, and 32bpp. + +if FBV + +config FBV_PNG + bool + prompt "png support" + default y + +endif + diff --git a/rules/fbv.make b/rules/fbv.make new file mode 100644 index 000000000..90391b929 --- /dev/null +++ b/rules/fbv.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_FBV) += fbv + +# +# Paths and names +# +FBV_VERSION := 1.0b-ptx3 +FBV_MD5 := 0d466f678630941fb9a38884e3402f21 +FBV := fbv-$(FBV_VERSION) +FBV_SUFFIX := tar.bz2 +FBV_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(FBV).$(FBV_SUFFIX) +#FBV_URL := http://s-tech.elsat.net.pl/fbv/$(FBV).$(FBV_SUFFIX) +FBV_SOURCE := $(SRCDIR)/$(FBV).$(FBV_SUFFIX) +FBV_DIR := $(BUILDDIR)/$(FBV) +FBV_LICENSE := GPL-2.0-or-later + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +# +# autoconf +# +FBV_CONF_TOOL := autoconf +FBV_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis, PTXCONF_FBV_PNG)-libpng \ + --disable-debug + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/fbv.targetinstall: + @$(call targetinfo) + + @$(call install_init, fbv) + @$(call install_fixup, fbv,PRIORITY,optional) + @$(call install_fixup, fbv,SECTION,base) + @$(call install_fixup, fbv,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") + @$(call install_fixup, fbv,DESCRIPTION,missing) + + @$(call install_copy, fbv, 0, 0, 0755, -, /usr/bin/fbv) + + @$(call install_finish, fbv) + + @$(call touch) + +# vim: syntax=make |