[oe] [PATCH v2] Enable bmp and JPEG files for fbv

[Philip Balister]

On 01/19/2010 07:15 PM, Ulf Samuelsson wrote:
> 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<ulf.samuelsson at atmel.com>

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

> ---
>   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
>
> diff --git a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch
> b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch
> new file mode 100644
> index 0000000..6fbd1fb
> --- /dev/null
> +++ b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch
> @@ -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.
> diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb
> index 04c7066..e593eb4 100644
> --- a/recipes/fbv/fbv_1.0b.bb
> +++ b/recipes/fbv/fbv_1.0b.bb
> @@ -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"
> +