[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-440-ge4f06b7a6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-440-ge4f06b7a6
|
From: sszy <ss...@us...> - 2024-11-04 14:25:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e4f06b7a603a334b6d6daa1a12ef363f21700860 (commit)
from 9838b0c38bc823275f5e099a5a3df84bdf03d5e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e4f06b7a603a334b6d6daa1a12ef363f21700860
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Nov 4 12:57:52 2024 +0100
[BUILDROOT] 2024.02: patch to fix fbv downloading
-----------------------------------------------------------------------
Summary of changes:
...ackage-fbv-change-upstream-update-version.patch | 555 +++++++++++++++++++++
patches/buildroot/2024.02/cleanup_buildroot.sh | 14 +
2 files changed, 569 insertions(+)
create mode 100644 patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch
diff --git a/patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch b/patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch
new file mode 100644
index 000000000..b1d0e65a5
--- /dev/null
+++ b/patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch
@@ -0,0 +1,555 @@
+From c7109e265cb6c179dd51a02637bb5f97f4767d21 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wb...@op...>
+Date: Fri, 23 Aug 2024 14:54:40 +0200
+Subject: [PATCH 1/1] package/fbv: change upstream, update version
+
+After the official fbv download page is no longer available switch to
+an hopefully active github fork.
+
+Changes made to the Buildroot package:
+- new active upstream fork (6 month old commits)
+- use autoreconf to create configure
+- remove all patches because they are no longer required
+- upstream removed GIF support, so remove it here too
+- license is unchanged, but full COPYING file is now included
+
+Tested on a RPI5 with a PNG, BMP and JPEG picture.
+
+Signed-off-by: Waldemar Brodkorb <wb...@op...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ .checkpackageignore | 7 --
+ Config.in.legacy | 6 ++
+ DEVELOPERS | 1 +
+ package/fbv/0001-cross.patch | 44 ----------
+ ...nstead-of-a-macro-for-jpeg-detection.patch | 29 +++++++
+ ...0002-fix-24bpp-support-on-big-endian.patch | 32 -------
+ package/fbv/0003-fix-bgr555.patch | 64 --------------
+ package/fbv/0004-giflib.patch | 84 -------------------
+ package/fbv/0005-include.patch | 20 -----
+ package/fbv/0006-libpng15.patch | 24 ------
+ .../0007-gif.c-fic-build-with-gcc-10.patch | 36 --------
+ package/fbv/Config.in | 13 +--
+ package/fbv/fbv.hash | 4 +-
+ package/fbv/fbv.mk | 30 +------
+ 14 files changed, 44 insertions(+), 350 deletions(-)
+ delete mode 100644 package/fbv/0001-cross.patch
+ create mode 100644 package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+ delete mode 100644 package/fbv/0002-fix-24bpp-support-on-big-endian.patch
+ delete mode 100644 package/fbv/0003-fix-bgr555.patch
+ delete mode 100644 package/fbv/0004-giflib.patch
+ delete mode 100644 package/fbv/0005-include.patch
+ delete mode 100644 package/fbv/0006-libpng15.patch
+ delete mode 100644 package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
+
+Index: buildroot/.checkpackageignore
+===================================================================
+--- buildroot.orig/.checkpackageignore
++++ buildroot/.checkpackageignore
+@@ -376,13 +376,6 @@ package/fbterm/0001-fbio.cpp-improxy.cpp
+ package/fbterm/0002-mouse.cpp-fix-musl-compile.patch Upstream
+ package/fbterm/0003-C++11-compliance.patch Upstream
+ package/fbterm/0004-iconv.patch Upstream
+-package/fbv/0001-cross.patch Sob Upstream
+-package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob Upstream
+-package/fbv/0003-fix-bgr555.patch Upstream
+-package/fbv/0004-giflib.patch Upstream
+-package/fbv/0005-include.patch Sob Upstream
+-package/fbv/0006-libpng15.patch Upstream
+-package/fbv/0007-gif.c-fic-build-with-gcc-10.patch Upstream
+ package/fcgiwrap/0001-use-LIBS-from-configure.patch Upstream
+ package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch Upstream
+ package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch Upstream
+Index: buildroot/DEVELOPERS
+===================================================================
+--- buildroot.orig/DEVELOPERS
++++ buildroot/DEVELOPERS
+@@ -3147,6 +3147,7 @@ F: package/ngrep/
+
+ N: Waldemar Brodkorb <wb...@op...>
+ F: package/asterisk/
++F: package/fbv/
+ F: package/libjwt/
+ F: package/mksh/
+ F: package/ruby/
+Index: buildroot/package/fbv/0001-cross.patch
+===================================================================
+--- buildroot.orig/package/fbv/0001-cross.patch
++++ /dev/null
+@@ -1,44 +0,0 @@
+-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
+Index: buildroot/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+@@ -0,0 +1,29 @@
++From 3547055ba135dc1d8aacea68f16456aabb8c0a91 Mon Sep 17 00:00:00 2001
++From: Waldemar Brodkorb <wb...@op...>
++Date: Fri, 23 Aug 2024 06:11:43 +0200
++Subject: [PATCH] use a function instead of a macro for jpeg detection
++
++Signed-off-by: Waldemar Brodkorb <wb...@op...>
++Upstream: https://github.com/amadvance/fbv/pull/1
++---
++ configure.ac | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/configure.ac b/configure.ac
++index 3fa4666..fc65903 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -28,8 +28,8 @@ AC_SEARCH_LIBS([png_create_read_struct], [png], [
++ ]
++ )
++
++-AC_SEARCH_LIBS([jpeg_create_decompress], [jpeg], [
++- LIBS="-ljpeg"
+++AC_SEARCH_LIBS([jpeg_start_decompress], [jpeg], [
+++ LIBS="$LIBS -ljpeg"
++ CFLAGS="$CFLAGS -DFBV_SUPPORT_JPEG"
++ ], [
++ ]
++--
++2.39.2
++
+Index: buildroot/package/fbv/0002-fix-24bpp-support-on-big-endian.patch
+===================================================================
+--- buildroot.orig/package/fbv/0002-fix-24bpp-support-on-big-endian.patch
++++ /dev/null
+@@ -1,32 +0,0 @@
+-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
+Index: buildroot/package/fbv/0003-fix-bgr555.patch
+===================================================================
+--- buildroot.orig/package/fbv/0003-fix-bgr555.patch
++++ /dev/null
+@@ -1,64 +0,0 @@
+-[PATCH] fbv: support bgr555 format
+-
+-Signed-off-by: Josh.Wu <jo...@at...>
+-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:
+Index: buildroot/package/fbv/0004-giflib.patch
+===================================================================
+--- buildroot.orig/package/fbv/0004-giflib.patch
++++ /dev/null
+@@ -1,84 +0,0 @@
+-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 <ber...@t-...>
+-
+-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
+Index: buildroot/package/fbv/0005-include.patch
+===================================================================
+--- buildroot.orig/package/fbv/0005-include.patch
++++ /dev/null
+@@ -1,20 +0,0 @@
+-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:
+- *
+Index: buildroot/package/fbv/0006-libpng15.patch
+===================================================================
+--- buildroot.orig/package/fbv/0006-libpng15.patch
++++ /dev/null
+@@ -1,24 +0,0 @@
+-Support for libpng 1.5+ shamelessly taken from Gentoo.
+-
+-Signed-off-by: Gustavo Zacarias <gu...@za...>
+-
+---- 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);
+Index: buildroot/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
+===================================================================
+--- buildroot.orig/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
++++ /dev/null
+@@ -1,36 +0,0 @@
+-From 8877207b290da1c3bc100f2705c30e6bdafcd985 Mon Sep 17 00:00:00 2001
+-From: Fabrice Fontaine <fon...@gm...>
+-Date: Thu, 26 May 2022 23:59:46 +0200
+-Subject: [PATCH] gif.c: fic build with gcc >= 10
+-
+-Fix the following build failure with gcc >= 10::
+-
+-/nvmedata/autobuild/instance-30/output-1/per-package/fbv/host/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/11.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: gif.o: in function `fh_gif_load':
+-gif.c:(.text+0x338): undefined reference to `m_rend_gif_decodecolormap'
+-
+-Fixes:
+- - http://autobuild.buildroot.org/results/dca603a61b1fd0558992b4a40152d23b5b9c0049
+-
+-Signed-off-by: Fabrice Fontaine <fon...@gm...>
+-[Upstream status: not upstreamable (most active fork dropped gif
+-support: https://github.com/godspeed1989/fbv/pull/17)]
+----
+- gif.c | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/gif.c b/gif.c
+-index 689e549..5560f25 100644
+---- a/gif.c
+-+++ b/gif.c
+-@@ -48,7 +48,7 @@ int fh_gif_id(char *name)
+- return(0);
+- }
+-
+--inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,ColorMapObject *cm,int s,int l, int transparency)
+-+static inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,ColorMapObject *cm,int s,int l, int transparency)
+- {
+- GifColorType *cmentry;
+- int i;
+---
+-2.35.1
+-
+Index: buildroot/package/fbv/Config.in
+===================================================================
+--- buildroot.orig/package/fbv/Config.in
++++ buildroot/package/fbv/Config.in
+@@ -2,10 +2,10 @@ 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.
++ console, capable of displaying JPEG, PNG and BMP files
++ using libjpeg and libpng.
+
+- http://freshmeat.net/projects/fbv/
++ https://github.com/amadvance/fbv
+
+ if BR2_PACKAGE_FBV
+
+@@ -23,11 +23,4 @@ config BR2_PACKAGE_FBV_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
+Index: buildroot/package/fbv/fbv.hash
+===================================================================
+--- buildroot.orig/package/fbv/fbv.hash
++++ buildroot/package/fbv/fbv.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz
+-sha256 bf21d97bafcaacb5d6bc3d5502030c340f0e0593614078ab017af91e950083af COPYING
++sha256 d18505f95546adb8175652e971d9ab3f2bece6ed21d72ff8e62881caa286a22b fbv-7c2000804226ca860ca80f3baa993582e29aa1a2.tar.gz
++sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
+Index: buildroot/package/fbv/fbv.mk
+===================================================================
+--- buildroot.orig/package/fbv/fbv.mk
++++ buildroot/package/fbv/fbv.mk
+@@ -4,11 +4,11 @@
+ #
+ ################################################################################
+
+-FBV_VERSION = 1.0b
+-FBV_SITE = http://s-tech.elsat.net.pl/fbv
+-
++FBV_VERSION = 7c2000804226ca860ca80f3baa993582e29aa1a2
++FBV_SITE = $(call github,amadvance,fbv,$(FBV_VERSION))
+ FBV_LICENSE = GPL-2.0
+ FBV_LICENSE_FILES = COPYING
++FBV_AUTORECONF = YES
+
+ ### image format dependencies and configure options
+ FBV_DEPENDENCIES = # empty
+@@ -29,29 +29,5 @@ 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))
+Index: buildroot/Config.in.legacy
+===================================================================
+--- buildroot.orig/Config.in.legacy
++++ buildroot/Config.in.legacy
+@@ -144,6 +144,14 @@ endif
+
+ ###############################################################################
+
++comment "Legacy options removed in 2024.11"
++
++config BR2_PACKAGE_FBV_GIF
++ bool "fbv GIF support has been removed"
++ select BR2_LEGACY
++ help
++ Fbv GIF support has been removed, use PNG, BMP or JPEG.
++
+ comment "Legacy options removed in 2024.02"
+
+ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS
diff --git a/patches/buildroot/2024.02/cleanup_buildroot.sh b/patches/buildroot/2024.02/cleanup_buildroot.sh
index 83e6bea4e..bc4cb755e 100755
--- a/patches/buildroot/2024.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2024.02/cleanup_buildroot.sh
@@ -9,6 +9,9 @@
# #
####################################################
+rm -rf buildroot/.checkpackageignore
+rm -rf buildroot/Config.in.legacy
+rm -rf buildroot/DEVELOPERS
rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/arm-trusted-firmware/Config.in
@@ -26,6 +29,17 @@ rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
+rm -rf buildroot/package/fbv/0001-cross.patch
+rm -rf buildroot/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+rm -rf buildroot/package/fbv/0002-fix-24bpp-support-on-big-endian.patch
+rm -rf buildroot/package/fbv/0003-fix-bgr555.patch
+rm -rf buildroot/package/fbv/0004-giflib.patch
+rm -rf buildroot/package/fbv/0005-include.patch
+rm -rf buildroot/package/fbv/0006-libpng15.patch
+rm -rf buildroot/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
+rm -rf buildroot/package/fbv/Config.in
+rm -rf buildroot/package/fbv/fbv.hash
+rm -rf buildroot/package/fbv/fbv.mk
rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
hooks/post-receive
--
armadeus
|