Enable bmp and JPEG files for fbv

PATCH NAK Ulf Samuelsson 8 participants 9 messages Jan 20, 2010 – Jan 26, 2010

lore

Share & tools

lore

Ulf Samuelsson

author

2010-01-20 00:18 UTC #0 lore raw

PATCH v2 1/1 Enable bmp and JPEG files for fbv

Enable bmp and JPEG files for fbv

Previously only supported PNG.
Ungif still not supported
Remove unneccesary whitespace
Do not install manuals to target

Signed-off-by Ulf Samuelsson <[email protected]>

---
 recipes/fbv/fbv-1.0b/fbv-1.0b.patch |   12 ++++++++++++
 recipes/fbv/fbv_1.0b.bb             |   21 +++++++++++----------
 2 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 recipes/fbv/fbv-1.0b/fbv-1.0b.patch

(quoted diff) +0 -0

b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch
new file mode 100644
index 0000000..6fbd1fb

recipes/fbv/fbv-1.0b/fbv-1.0b.patch new file +12 -0

@@ -0,0 +1,12 @@
+diff -urN fbv-1.0b-0rig/Makefile fbv-1.0b/Makefile
+--- fbv-1.0b-0rig/Makefile	2009-08-20 00:33:58.000000000 +0200
++++ fbv-1.0b/Makefile	2009-08-20 00:34:16.000000000 +0200
+@@ -12,7 +12,7 @@
+ OBJECTS	= ${SOURCES:.c=.o}
+
+ OUT	= fbv
+-#LIBS	= -lungif -L/usr/X11R6/lib -ljpeg -lpng
++LIBS	= -L/usr/lib -ljpeg -lpng #-lungif
+
+ all: $(OUT)
+ 	@echo Build DONE.

recipes/fbv/fbv_1.0b.bb +11 ~~-10~~

index 04c7066..e593eb4 100644
@@ -1,25 +1,26 @@
 DESCRIPTION = "Frame Buffer Viewer"
 LICENSE = "GPL"
-DEPENDS = "libpng"
-PR = "r1"
+DEPENDS = "libpng jpeg"
+PR = "r2"
 
 SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \
-	   file://cross_compile.patch;patch=1"
+	file://cross_compile.patch;patch=1 \
+	file://fbv-1.0b.patch;patch=1 \
+	"
 
 do_configure() {
-	CC="${CC}" ./configure --without-libungif --without-bmp \
-		--without-libjpeg
+	CC="${CC}" ./configure --without-libungif
 }
 
 do_compile() {
 	oe_runmake CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" \
 		CC="${CC}"
 }
+
 do_install() {
 	install -d ${D}${bindir}
-        install -m 0755 fbv ${D}${bindir}
-
-        # man
-        install -d ${D}${mandir}/man1/
-        install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1
+	install -m 0755 fbv ${D}${bindir}
 }
+
+PACKAGES = "fbv"
+

Signature · 5 lines

1.6.0.2

-- 
Best Regards
Ulf Samuelsson

Marcin Juszkiewicz

2010-01-20 06:46 UTC #1 lore raw

Dnia środa, 20 stycznia 2010 o 01:15:57 Ulf Samuelsson napisał(a):

recipes/fbv/fbv_1.0b.bb line 23

Quoted 9 lines

 do_install() {
        install -d ${D}${bindir}

recipes/fbv/fbv_1.0b.bb +1 -5

-        install -m 0755 fbv ${D}${bindir}
-
-        # man
-        install -d ${D}${mandir}/man1/
-        install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1
+       install -m 0755 fbv ${D}${bindir}
 }

I like to be able to install fbv-doc package to read manuals. Please revert that part.

Regards,

Signature · 3 lines

JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

Paul Menzel

Reviewed-by on v2 1/1

2010-01-20 09:39 UTC #2 lore raw

In reply to Ulf Samuelsson

Am Mittwoch, den 20.01.2010, 01:15 +0100 schrieb Ulf Samuelsson:

Quoted 4 lines

Enable bmp and JPEG files for fbv
Previously only supported PNG.
Ungif still not supported.

Not supported or just not enabled?

One last question. Does anyone know why this support was not enabled in the first place? Not needed back then, not working, size constrains?

        $ git log --follow recipes/fbv/fbv_1.0b.bb 
        commit 0bdb7654c8a9b9850db27e5f6b4a746fb1083ed1
        Author: Tom Rini <[email protected]>
        Date:   Thu Apr 23 15:07:52 2009 -0400

fbv: Add a framebuffer-based png viewer. bmp/gif is supported but disabled.

Quoted 4 lines

Remove unneccesary whitespace.
Do not install manuals to target
Signed-off-by Ulf Samuelsson <[email protected]>

Reviewed-by Paul Menzel <[email protected]>

I do not have commit rights. Someone else has to commit your patches.

Thanks,

Paul

Tom Rini

2010-01-26 21:07 UTC #3 lore raw

Quoted 11 lines · Paul Menzel

Am Mittwoch, den 20.01.2010, 01:15 +0100 schrieb Ulf Samuelsson:
Quoted 4 lines
Enable bmp and JPEG files for fbv
Previously only supported PNG.
Ungif still not supported.
Not supported or just not enabled?
One last question. Does anyone know why this support was not enabled in the first place? Not needed back then, not working, size constrains?

Quoted 7 lines

        $ git log --follow recipes/fbv/fbv_1.0b.bb 
        commit 0bdb7654c8a9b9850db27e5f6b4a746fb1083ed1
        Author: Tom Rini <[email protected]>
        Date:   Thu Apr 23 15:07:52 2009 -0400

fbv: Add a framebuffer-based png viewer. bmp/gif is supported but disabled.

Didn't need bmp/jpeg support in the use case I added fbv for (testing the fb driver easily) and didn't have jpeg/bmp support being pulled in otherwise.

Signature · 2 lines

Tom Rini <[email protected]>
Mentor Graphics Corporation

Philip Balister

2010-01-21 12:46 UTC #4 lore raw

In reply to Ulf Samuelsson

Quoted 8 lines · Ulf Samuelsson

Enable bmp and JPEG files for fbv
Previously only supported PNG.
Ungif still not supported
Remove unneccesary whitespace
Do not install manuals to target
Signed-off-by Ulf Samuelsson<[email protected]>

Ulf,

Thanks for the patches. Can you fix your commit messages to follow the form outlined in:

http://wiki.openembedded.net/index.php/Commit_log_example

Having everyone follow the same form makes it much easier to follow OE development by following the git short log.

Sorry I didn't make this comment earlier :(

Philip

Quoted 66 lines

---
  recipes/fbv/fbv-1.0b/fbv-1.0b.patch |   12 ++++++++++++
  recipes/fbv/fbv_1.0b.bb             |   21 +++++++++++----------
  2 files changed, 23 insertions(+), 10 deletions(-)

create mode 100644 recipes/fbv/fbv-1.0b/fbv-1.0b.patch

recipes/fbv/fbv-1.0b/fbv-1.0b.patch new file +12 -0

new file mode 100644
index 0000000..6fbd1fb
@@ -0,0 +1,12 @@
+diff -urN fbv-1.0b-0rig/Makefile fbv-1.0b/Makefile
+--- fbv-1.0b-0rig/Makefile	2009-08-20 00:33:58.000000000 +0200
++++ fbv-1.0b/Makefile	2009-08-20 00:34:16.000000000 +0200
+@@ -12,7 +12,7 @@
+ OBJECTS	= ${SOURCES:.c=.o}
+
+ OUT	= fbv
+-#LIBS	= -lungif -L/usr/X11R6/lib -ljpeg -lpng
++LIBS	= -L/usr/lib -ljpeg -lpng #-lungif
+
+ all: $(OUT)
+ 	@echo Build DONE.

recipes/fbv/fbv_1.0b.bb +11 ~~-10~~

index 04c7066..e593eb4 100644
@@ -1,25 +1,26 @@
  DESCRIPTION = "Frame Buffer Viewer"
  LICENSE = "GPL"
-DEPENDS = "libpng"
-PR = "r1"
+DEPENDS = "libpng jpeg"
+PR = "r2"
 
  SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \
-	   file://cross_compile.patch;patch=1"
+	file://cross_compile.patch;patch=1 \
+	file://fbv-1.0b.patch;patch=1 \
+	"
 
  do_configure() {
-	CC="${CC}" ./configure --without-libungif --without-bmp \
-		--without-libjpeg
+	CC="${CC}" ./configure --without-libungif
  }
 
  do_compile() {
  	oe_runmake CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" \
  		CC="${CC}"
  }
+
  do_install() {
  	install -d ${D}${bindir}
-        install -m 0755 fbv ${D}${bindir}
-
-        # man
-        install -d ${D}${mandir}/man1/
-        install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1
+	install -m 0755 fbv ${D}${bindir}
  }
+
+PACKAGES = "fbv"
+

Phil Blundell

2010-01-21 13:15 UTC #5 lore raw

In reply to Ulf Samuelsson

Quoted 8 lines · Ulf Samuelsson

Enable bmp and JPEG files for fbv
Previously only supported PNG.
Ungif still not supported
Remove unneccesary whitespace
Do not install manuals to target
Signed-off-by Ulf Samuelsson <[email protected]>

What's the reason for not installing the manuals? That seems like a retrograde step.

Graeme Gregory

NAK

2010-01-22 09:12 UTC #6 lore raw

In reply to Ulf Samuelsson

Quoted 1 line · Ulf Samuelsson <ulf.samuelsson <at> atmel.com> writes:

+PACKAGES = "fbv"

NAK

PACKAGES is never set in a recipe only added to.

Graeme

Paul Menzel

2010-01-22 13:10 UTC #7 lore raw

Am Freitag, den 22.01.2010, 09:05 +0000 schrieb Graeme Gregory:

Quoted 7 lines

Quoted 1 line · Ulf Samuelsson <ulf.samuelsson <at> atmel.com> writes:
+PACKAGES = "fbv"
NAK
PACKAGES is never set in a recipe only added to.

More information seems to available in the user manual [1].

Thanks,

Paul

[1] http://docs.openembedded.org/usermanual/html/recipes_packages.html

Koen Kooi

NAK

2010-01-23 09:11 UTC #8 lore raw

In reply to Ulf Samuelsson

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

recipes/fbv/fbv_1.0b.bb line 22

Quoted 8 lines · Ulf Samuelsson

do_install() {

recipes/fbv/fbv_1.0b.bb +1 -5

 	install -d ${D}${bindir}
-        install -m 0755 fbv ${D}${bindir}
-
-        # man
-        install -d ${D}${mandir}/man1/
-        install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1
+	install -m 0755 fbv ${D}${bindir}

NAK, we still want proper -doc packages

recipes/fbv/fbv_1.0b.bb line 26

Quoted 4 lines

}
recipes/fbv/fbv_1.0b.bb +3 -0
+
+PACKAGES = "fbv"
+

And NEVER EVER redefine PACKAGES! We want proper -dbg and -dev packages for depchain purposes.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLWrykMkyGM64RGpERAg0RAJ9AFmVVMuoZ2/Dh9QM6ehG8H7WsAgCfSGGC dd0SrEUtuXUkbRSnLSLRt0s=
=x2vo
-----END PGP SIGNATURE-----