Move all to deprecated folder.
This commit is contained in:
44
deprecated/firmware/buildroot/package/fbv/0002-cross.patch
Normal file
44
deprecated/firmware/buildroot/package/fbv/0002-cross.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
diff -urpN fbv-1.0b.orig/configure fbv-1.0b/configure
|
||||
--- fbv-1.0b.orig/configure 2004-09-07 13:29:27.000000000 +0200
|
||||
+++ fbv-1.0b/configure 2008-04-24 10:52:37.000000000 +0200
|
||||
@@ -80,6 +80,7 @@ while true ; do
|
||||
esac
|
||||
done
|
||||
|
||||
+[ -z "$CC" ] && CC=cc
|
||||
[ -z "$prefix" ] && prefix="/usr/local"
|
||||
[ -z "$bindir" ] && bindir="${prefix}/bin"
|
||||
[ -z "$mandir" ] && mandir="${prefix}/man"
|
||||
@@ -106,12 +107,12 @@ xdir="/usr/X11R6"
|
||||
ungif="no"
|
||||
echo "libungif check" >>./config.log
|
||||
echo " 1st:" >>./config.log
|
||||
-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
|
||||
+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
|
||||
if [ -e \$\$~test ]; then
|
||||
libs="-lungif $libs" ; ungif="yes"
|
||||
else
|
||||
echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
|
||||
- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
|
||||
+ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
|
||||
if [ -e \$\$~test ]; then
|
||||
libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
|
||||
fi
|
||||
@@ -124,7 +125,7 @@ echo "libungif: $ungif" >> ./config.log
|
||||
echo -n "checking for libjpeg presence... "
|
||||
if [ "$jpeg" != "disabled" ]; then
|
||||
jpeg="no"
|
||||
-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
|
||||
+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
|
||||
if [ -e \$\$~test ]; then
|
||||
libs="-ljpeg $libs" ; jpeg="yes"
|
||||
fi
|
||||
@@ -135,7 +136,7 @@ echo "libjpeg: $jpeg" >> ./config.log
|
||||
echo -n "checking for libpng presence... "
|
||||
if [ "$png" != "disabled" ]; then
|
||||
png="no"
|
||||
-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
|
||||
+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
|
||||
if [ -e \$\$~test ]; then
|
||||
libs="-lpng $libs" ; png="yes"
|
||||
fi
|
||||
@@ -0,0 +1,32 @@
|
||||
diff -upr a/fb_display.c b/fb_display.c
|
||||
--- a/fb_display.c 2007-06-01 16:52:45.000000000 +0200
|
||||
+++ b/fb_display.c 2007-06-01 16:51:43.000000000 +0200
|
||||
@@ -307,7 +307,7 @@ void* convertRGB2FB(int fh, unsigned cha
|
||||
{
|
||||
unsigned long i;
|
||||
void *fbbuff = NULL;
|
||||
- u_int8_t *c_fbbuff;
|
||||
+ u_int8_t *c_fbbuff;
|
||||
u_int16_t *s_fbbuff;
|
||||
u_int32_t *i_fbbuff;
|
||||
|
||||
@@ -335,6 +335,16 @@ void* convertRGB2FB(int fh, unsigned cha
|
||||
fbbuff = (void *) s_fbbuff;
|
||||
break;
|
||||
case 24:
|
||||
+ *cpp = 3;
|
||||
+ c_fbbuff = (unsigned char *) malloc(count * 3 * sizeof(unsigned char));
|
||||
+ for(i = 0; i < (3 * count); i += 3) {
|
||||
+ /* Big endian framebuffer. */
|
||||
+ c_fbbuff[i] = rgbbuff[i+2];
|
||||
+ c_fbbuff[i+1] = rgbbuff[i+1];
|
||||
+ c_fbbuff[i+2] = rgbbuff[i];
|
||||
+ }
|
||||
+ fbbuff = (void *) c_fbbuff;
|
||||
+ break;
|
||||
case 32:
|
||||
*cpp = 4;
|
||||
i_fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int));
|
||||
Only in build_avr32/fbv-1.0b-modified: .fb_display.c.swp
|
||||
Binary files build_avr32/fbv-1.0b/fb_display.o and build_avr32/fbv-1.0b-modified/fb_display.o differ
|
||||
Binary files build_avr32/fbv-1.0b/fbv and build_avr32/fbv-1.0b-modified/fbv differ
|
||||
@@ -0,0 +1,64 @@
|
||||
[PATCH] fbv: support bgr555 format
|
||||
|
||||
Signed-off-by: Josh.Wu <josh.wu@atmel.com>
|
||||
diff -Naur fbv-1.0b-ori/fb_display.c fbv-1.0b/fb_display.c
|
||||
--- fbv-1.0b-ori/fb_display.c 2010-04-02 09:38:15.000000000 +0800
|
||||
+++ fbv-1.0b/fb_display.c 2010-04-01 18:54:15.000000000 +0800
|
||||
@@ -297,6 +297,14 @@
|
||||
((b >> 3) & 31) );
|
||||
}
|
||||
|
||||
+inline static unsigned short make15color_bgr(unsigned char r, unsigned char g, unsigned char b)
|
||||
+{
|
||||
+ return (
|
||||
+ (((b >> 3) & 31) << 10) |
|
||||
+ (((g >> 3) & 31) << 5) |
|
||||
+ ((r >> 3) & 31) );
|
||||
+}
|
||||
+
|
||||
inline static unsigned short make16color(unsigned char r, unsigned char g, unsigned char b)
|
||||
{
|
||||
return (
|
||||
@@ -313,6 +321,14 @@
|
||||
u_int16_t *s_fbbuff;
|
||||
u_int32_t *i_fbbuff;
|
||||
|
||||
+ int is_bgr555 = 0;
|
||||
+ struct fb_var_screeninfo var;
|
||||
+ getVarScreenInfo(fh, &var);
|
||||
+ if(var.red.offset == 0 &&
|
||||
+ var.green.offset == 5 &&
|
||||
+ var.blue.offset == 10)
|
||||
+ is_bgr555 = 1;
|
||||
+
|
||||
switch(bpp)
|
||||
{
|
||||
case 8:
|
||||
@@ -325,15 +341,23 @@
|
||||
case 15:
|
||||
*cpp = 2;
|
||||
s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short));
|
||||
- for(i = 0; i < count ; i++)
|
||||
- s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
|
||||
+ if(is_bgr555)
|
||||
+ for(i = 0; i < count ; i++)
|
||||
+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
|
||||
+ else
|
||||
+ for(i = 0; i < count ; i++)
|
||||
+ s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
|
||||
fbbuff = (void *) s_fbbuff;
|
||||
break;
|
||||
case 16:
|
||||
*cpp = 2;
|
||||
s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short));
|
||||
- for(i = 0; i < count ; i++)
|
||||
- s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
|
||||
+ if(is_bgr555)
|
||||
+ for(i = 0; i < count ; i++)
|
||||
+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
|
||||
+ else
|
||||
+ for(i = 0; i < count ; i++)
|
||||
+ s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
|
||||
fbbuff = (void *) s_fbbuff;
|
||||
break;
|
||||
case 24:
|
||||
84
deprecated/firmware/buildroot/package/fbv/0005-giflib.patch
Normal file
84
deprecated/firmware/buildroot/package/fbv/0005-giflib.patch
Normal file
@@ -0,0 +1,84 @@
|
||||
Adjust source code to work with giflib 5.1x
|
||||
|
||||
Downloaded patch for gif.c from
|
||||
https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib-5.1.patch?h=packages/fbv
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c
|
||||
--- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400
|
||||
+++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400
|
||||
@@ -31,10 +31,10 @@
|
||||
#include <string.h>
|
||||
#define min(a,b) ((a) < (b) ? (a) : (b))
|
||||
#define gflush return(FH_ERROR_FILE);
|
||||
-#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
|
||||
-#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
|
||||
+#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
|
||||
+#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
|
||||
#define agflush return(FH_ERROR_FORMAT);
|
||||
-#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
|
||||
+#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
|
||||
|
||||
|
||||
int fh_gif_id(char *name)
|
||||
@@ -81,7 +81,7 @@
|
||||
ColorMapObject *cmap;
|
||||
int cmaps;
|
||||
|
||||
- gft=DGifOpenFileName(name);
|
||||
+ gft=DGifOpenFileName(name, NULL);
|
||||
if(gft==NULL){printf("err5\n"); gflush;} //////////
|
||||
do
|
||||
{
|
||||
@@ -170,7 +170,7 @@
|
||||
}
|
||||
}
|
||||
while( rt!= TERMINATE_RECORD_TYPE );
|
||||
- DGifCloseFile(gft);
|
||||
+ DGifCloseFile(gft, NULL);
|
||||
return(FH_ERROR_OK);
|
||||
}
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
int extcode;
|
||||
GifRecordType rt;
|
||||
|
||||
- gft=DGifOpenFileName(name);
|
||||
+ gft=DGifOpenFileName(name, NULL);
|
||||
if(gft==NULL) gflush;
|
||||
do
|
||||
{
|
||||
@@ -197,7 +197,7 @@
|
||||
px=gft->Image.Width;
|
||||
py=gft->Image.Height;
|
||||
*x=px; *y=py;
|
||||
- DGifCloseFile(gft);
|
||||
+ DGifCloseFile(gft, NULL);
|
||||
return(FH_ERROR_OK);
|
||||
break;
|
||||
case EXTENSION_RECORD_TYPE:
|
||||
@@ -210,7 +210,7 @@
|
||||
}
|
||||
}
|
||||
while( rt!= TERMINATE_RECORD_TYPE );
|
||||
- DGifCloseFile(gft);
|
||||
+ DGifCloseFile(gft, NULL);
|
||||
return(FH_ERROR_FORMAT);
|
||||
}
|
||||
#endif
|
||||
diff -uNr fbv-1.0b.org/configure fbv-1.0b/configure
|
||||
--- fbv-1.0b.org/configure 2004-09-07 13:29:27.000000000 +0200
|
||||
+++ fbv-1.0b/configure 2015-01-29 19:58:30.374599874 +0100
|
||||
@@ -106,9 +106,9 @@
|
||||
ungif="no"
|
||||
echo "libungif check" >>./config.log
|
||||
echo " 1st:" >>./config.log
|
||||
-$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
|
||||
+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lgif $libs
|
||||
if [ -e \$\$~test ]; then
|
||||
- libs="-lungif $libs" ; ungif="yes"
|
||||
+ libs="-lgif $libs" ; ungif="yes"
|
||||
else
|
||||
echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
|
||||
$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
|
||||
20
deprecated/firmware/buildroot/package/fbv/0006-include.patch
Normal file
20
deprecated/firmware/buildroot/package/fbv/0006-include.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
diff -urpN fbv-1.0b.orig/fb_display.c fbv-1.0b/fb_display.c
|
||||
--- fbv-1.0b.orig/fb_display.c 2004-09-07 14:09:43.000000000 +0200
|
||||
+++ fbv-1.0b/fb_display.c 2008-04-24 10:48:29.000000000 +0200
|
||||
@@ -18,8 +18,6 @@
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
-#include <linux/fb.h>
|
||||
-
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
@@ -31,6 +29,7 @@
|
||||
#include <asm/types.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
+#include <linux/fb.h>
|
||||
#include "config.h"
|
||||
/* Public Use Functions:
|
||||
*
|
||||
@@ -0,0 +1,24 @@
|
||||
Support for libpng 1.5+ shamelessly taken from Gentoo.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
--- a/png.c
|
||||
+++ b/png.c
|
||||
@@ -69,7 +69,7 @@
|
||||
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 @@
|
||||
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);
|
||||
33
deprecated/firmware/buildroot/package/fbv/Config.in
Normal file
33
deprecated/firmware/buildroot/package/fbv/Config.in
Normal file
@@ -0,0 +1,33 @@
|
||||
config BR2_PACKAGE_FBV
|
||||
bool "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.
|
||||
|
||||
http://freshmeat.net/projects/fbv/
|
||||
|
||||
if BR2_PACKAGE_FBV
|
||||
|
||||
config BR2_PACKAGE_FBV_PNG
|
||||
bool "PNG support"
|
||||
default y
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
help
|
||||
Enable support for PNG using libpng.
|
||||
|
||||
config BR2_PACKAGE_FBV_JPEG
|
||||
bool "JPEG support"
|
||||
default y
|
||||
select BR2_PACKAGE_JPEG
|
||||
help
|
||||
Enable support for JPEG using IJG's libjpeg.
|
||||
|
||||
config BR2_PACKAGE_FBV_GIF
|
||||
bool "GIF support"
|
||||
default y
|
||||
select BR2_PACKAGE_GIFLIB
|
||||
help
|
||||
Enable support for GIF using giflib.
|
||||
|
||||
endif # BR2_PACKAGE_FBV
|
||||
2
deprecated/firmware/buildroot/package/fbv/fbv.hash
Normal file
2
deprecated/firmware/buildroot/package/fbv/fbv.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz
|
||||
57
deprecated/firmware/buildroot/package/fbv/fbv.mk
Normal file
57
deprecated/firmware/buildroot/package/fbv/fbv.mk
Normal file
@@ -0,0 +1,57 @@
|
||||
################################################################################
|
||||
#
|
||||
# fbv
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FBV_VERSION = 1.0b
|
||||
FBV_SITE = http://s-tech.elsat.net.pl/fbv
|
||||
|
||||
FBV_LICENSE = GPLv2
|
||||
FBV_LICENSE_FILES = COPYING
|
||||
|
||||
### image format dependencies and configure options
|
||||
FBV_DEPENDENCIES = # empty
|
||||
FBV_CONFIGURE_OPTS = # empty
|
||||
ifeq ($(BR2_PACKAGE_FBV_PNG),y)
|
||||
FBV_DEPENDENCIES += libpng
|
||||
|
||||
# libpng in turn depends on other libraries
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng`"
|
||||
endif
|
||||
|
||||
else
|
||||
FBV_CONFIGURE_OPTS += --without-libpng
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_FBV_JPEG),y)
|
||||
FBV_DEPENDENCIES += jpeg
|
||||
else
|
||||
FBV_CONFIGURE_OPTS += --without-libjpeg
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_FBV_GIF),y)
|
||||
FBV_DEPENDENCIES += giflib
|
||||
else
|
||||
FBV_CONFIGURE_OPTS += --without-libungif
|
||||
endif
|
||||
|
||||
#fbv doesn't support cross-compilation
|
||||
define FBV_CONFIGURE_CMDS
|
||||
(cd $(FBV_DIR); rm -f config.cache; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
$(TARGET_CONFIGURE_ARGS) \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
$(FBV_CONFIGURE_OPTS) \
|
||||
)
|
||||
endef
|
||||
|
||||
define FBV_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define FBV_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D $(@D)/fbv $(TARGET_DIR)/usr/bin/fbv
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user