fbv: fix cflags and libs and enable libungif

* remove missleading patch
* bump PR

diff --git a/recipes/fbv/fbv-1.0b/cflags.patch b/recipes/fbv/fbv-1.0b/cflags.patch
new file mode 100644 (file)
index 0000000..1259c6b
--- /dev/null
+++ b/recipes/fbv/fbv-1.0b/cflags.patch
@@ -0,0 +1,13 @@
+Index: fbv-1.0b/Makefile
+===================================================================
+--- fbv-1.0b.orig/Makefile     2011-02-26 21:50:39.786273304 +0100
++++ fbv-1.0b/Makefile  2011-02-26 21:53:44.051693304 +0100
+@@ -6,7 +6,7 @@
+ include Make.conf
+ 
+ CC    = gcc 
+-CFLAGS  = -O2 -Wall -D_GNU_SOURCE
++CFLAGS  += -D_GNU_SOURCE
+ 
+ SOURCES       = main.c jpeg.c gif.c png.c bmp.c fb_display.c transforms.c
+ OBJECTS       = ${SOURCES:.c=.o}

diff --git a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch
deleted file mode 100644 (file)
index 2ca9d52..0000000
--- a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libs.patch b/recipes/fbv/fbv-1.0b/libs.patch
new file mode 100644 (file)
index 0000000..47f5d91
--- /dev/null
+++ b/recipes/fbv/fbv-1.0b/libs.patch
@@ -0,0 +1,13 @@
+Index: fbv-1.0b/Makefile
+===================================================================
+--- fbv-1.0b.orig/Makefile     2004-09-07 14:34:29.000000000 +0200
++++ fbv-1.0b/Makefile  2011-02-26 22:11:03.217683306 +0100
+@@ -12,7 +12,7 @@
+ OBJECTS       = ${SOURCES:.c=.o}
+ 
+ OUT   = fbv
+-#LIBS = -lungif -L/usr/X11R6/lib -ljpeg -lpng
++#LIBS = -lungif -ljpeg -lpng
+ 
+ all: $(OUT)
+       @echo Build DONE.

diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb
index 3629fe4..d8ca180 100644 (file)
--- a/recipes/fbv/fbv_1.0b.bb
+++ b/recipes/fbv/fbv_1.0b.bb
@@ -1,21 +1,23 @@
 DESCRIPTION = "Frame Buffer Viewer"
 LICENSE = "GPL"
-DEPENDS = "libpng jpeg"
-PR = "r3"
+DEPENDS = "libpng jpeg libungif"
+PR = "r4"
 
 SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \
        file://cross_compile.patch \
-       file://fbv-1.0b.patch \
         file://fbv-1.0b-BGR666.patch \
+        file://libs.patch \
+        file://cflags.patch \
        "
 
+CFLAGS += "-D_GNU_SOURCE -D__KERNEL_STRICT_NAMES"
+
 do_configure() {
-       CC="${CC}" ./configure --without-libungif
+       CC="${CC}" ./configure
 }
 
 do_compile() {
-       oe_runmake CC="${CC}" \
-               CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES"                
+       oe_runmake CC="${CC}"
 }
 
 do_install() {