From e50ccf4c138d940fc1c0283e14769e590093d90a Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 28 Feb 2026 07:17:42 +0400 Subject: [PATCH] fbida-2.15 --- multimedia/graphics/fbida/actions.py | 20 +- .../fbida/files/gcc10_build_fix.patch | 77 -------- multimedia/graphics/fbida/pspec.xml | 178 +++++++++--------- 3 files changed, 98 insertions(+), 177 deletions(-) delete mode 100644 multimedia/graphics/fbida/files/gcc10_build_fix.patch diff --git a/multimedia/graphics/fbida/actions.py b/multimedia/graphics/fbida/actions.py index 093bacb655..00f5e94869 100644 --- a/multimedia/graphics/fbida/actions.py +++ b/multimedia/graphics/fbida/actions.py @@ -4,24 +4,16 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -#from pisi.actionsapi import mesontools -from pisi.actionsapi import autotools +from pisi.actionsapi import mesontools from pisi.actionsapi import pisitools -from pisi.actionsapi import get -i = "-Wno-strict-prototypes \ - -Wno-missing-prototypes \ - -Wno-unused-result \ - -Wno-format-overflow \ - -Wno-format-truncation \ - " +def setup(): + mesontools.configure() def build(): - pisitools.dosed("GNUmakefile", "-Wno-pointer-sign", "-Wno-pointer-sign %s" % i) - autotools.make("prefix=/usr") + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s prefix=/usr" % get.installDIR()) - - pisitools.dodoc("COPYING", "README", "TODO") + mesontools.install() + pisitools.dodoc("COPYING") diff --git a/multimedia/graphics/fbida/files/gcc10_build_fix.patch b/multimedia/graphics/fbida/files/gcc10_build_fix.patch deleted file mode 100644 index 33abedfb70..0000000000 --- a/multimedia/graphics/fbida/files/gcc10_build_fix.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1bb8a8aa29845378903f3c690e17c0867c820da2 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 16 Mar 2020 13:24:12 +0100 -Subject: [PATCH] gcc10 build fix - -by Adrian Reber ---- - fbi.c | 1 - - filter.c | 2 -- - idaconfig.h | 2 +- - readers.c | 2 ++ - viewer.c | 1 - - 5 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/fbi.c b/fbi.c -index 8882302..8fd9d31 100644 ---- a/fbi.c -+++ b/fbi.c -@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb; - - /* graphics interface */ - gfxstate *gfx; --int debug; - - /* framebuffer */ - char *fbdev = NULL; -diff --git a/filter.c b/filter.c -index a75f73a..e20ebc2 100644 ---- a/filter.c -+++ b/filter.c -@@ -6,8 +6,6 @@ - #include "readers.h" - #include "filter.h" - --int debug = 0; -- - /* ----------------------------------------------------------------------- */ - - static void -diff --git a/idaconfig.h b/idaconfig.h -index 8d616ef..d09a178 100644 ---- a/idaconfig.h -+++ b/idaconfig.h -@@ -17,7 +17,7 @@ - - /* -------------------------------------------------------------------------- */ - --char *ida_lists; -+extern char *ida_lists; - - void ida_init_config(void); - void ida_read_config(void); -diff --git a/readers.c b/readers.c -index e94bbcb..1516ed9 100644 ---- a/readers.c -+++ b/readers.c -@@ -7,6 +7,8 @@ - #include "readers.h" - #include "byteorder.h" - -+int debug=0; -+ - /* ----------------------------------------------------------------------- */ - - void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, -diff --git a/viewer.c b/viewer.c -index ab4b31c..02ba807 100644 ---- a/viewer.c -+++ b/viewer.c -@@ -38,7 +38,6 @@ - - #define PROCESS_LINES 16 - --int debug; - Cursor ptrs[POINTER_COUNT]; - - /* ----------------------------------------------------------------------- */ diff --git a/multimedia/graphics/fbida/pspec.xml b/multimedia/graphics/fbida/pspec.xml index 5c8f7fd523..d63fcb5cef 100644 --- a/multimedia/graphics/fbida/pspec.xml +++ b/multimedia/graphics/fbida/pspec.xml @@ -1,92 +1,98 @@ - - fbida - https://www.kraxel.org/blog/linux/fbida/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app - multimedia.graphics - The fbida project contains a few applications for viewing and editing images, with the main focus being photos. - The fbida project contains a few applications for viewing and editing images, with the main focus being photos. - - https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz - - - gc-devel - util-linux - mesa-devel - lirc-devel - tiff-devel - webp-devel - cairo-devel - libdrm-devel - libpng-devel - giflib-devel - pixman-devel - libXpm-devel - libpcd-devel - sane-backends - libexif-devel - freetype-devel - libepoxy-devel - openmotif-devel - fontconfig-devel - imagemagick-devel - poppler-glib-devel - libjpeg-turbo-devel - - - gcc10_build_fix.patch - - + + fbida + https://www.kraxel.org/blog/linux/fbida/ + + Pisi Linux Community + admin@pisilinux.org + + GPLv2 + app + multimedia.graphics + The fbida project contains a few applications for viewing and editing images, with the main focus being photos. + The fbida project contains a few applications for viewing and editing images, with the main focus being photos. + + https://gitlab.com/kraxel/fbida/-/archive/fbida-2.15-1/fbida-fbida-2.15-1.tar.bz2 + + + meson + ninja + gc-devel + util-linux + mesa-devel + lirc-devel + tiff-devel + webp-devel + cairo-devel + libdrm-devel + libpng-devel + giflib-devel + pixman-devel + libXpm-devel + libpcd-devel + sane-backends + libexif-devel + freetype-devel + libepoxy-devel + openmotif-devel + fontconfig-devel + imagemagick-devel + poppler-glib-devel + libjpeg-turbo-devel + + + + + - - fbida - - mesa - tiff - webp - cairo - libXt - giflib - libX11 - libXpm - libdrm - libpcd - libpng - pixman - libXext - libexif - freetype - libepoxy - openmotif - fontconfig - imagemagick - ghostscript - poppler-glib - libjpeg-turbo - - - /usr/bin - /usr/share - /usr/share/man - /usr/share/doc - - + + fbida + + mesa + tiff + webp + cairo + libXt + giflib + libX11 + libXpm + libdrm + libpcd + libpng + pixman + libXext + libexif + freetype + libepoxy + openmotif + fontconfig + imagemagick + ghostscript + poppler-glib + libjpeg-turbo + + + /usr/bin + /usr/share + + - - - 2020-12-06 - 2.14 - First build - fury - uglyside@yandex.ru - - + + + 2026-02-28 + 2.15 + Version bump. + Pisi Linux Community + admin@pisilinux.org + + + 2020-12-06 + 2.14 + First build + fury + uglyside@yandex.ru + + -