[ptxdist] [PATCH] fbv: Restored package

[ptxdist] [PATCH] fbv: Restored package

[Guillermo Rodríguez]

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>
---
 ...uild-error-due-to-direct-access-to-jmpbuf.patch | 34 ++++++++++++
 patches/fbv-1.0b-ptx3/series                       |  4 ++
 rules/fbv.in                                       | 21 ++++++++
 rules/fbv.make                                     | 61 ++++++++++++++++++++++
 4 files changed, 120 insertions(+)
 create mode 100644 patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
 create mode 100644 patches/fbv-1.0b-ptx3/series
 create mode 100644 rules/fbv.in
 create mode 100644 rules/fbv.make

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 0000000..cfe00b3
--- /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 0000000..1a7f9e2
--- /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 0000000..d66e11d
--- /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 0000000..90391b9
--- /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
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de