fbida-2.15

This commit is contained in:
4fury-c3440d8
2026-02-28 07:17:42 +04:00
parent 08ba096fe1
commit e50ccf4c13
3 changed files with 98 additions and 177 deletions
+6 -14
View File
@@ -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")
@@ -1,77 +0,0 @@
From 1bb8a8aa29845378903f3c690e17c0867c820da2 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 16 Mar 2020 13:24:12 +0100
Subject: [PATCH] gcc10 build fix
by Adrian Reber <adrian@lisas.de>
---
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];
/* ----------------------------------------------------------------------- */
+92 -86
View File
@@ -1,92 +1,98 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>fbida</Name>
<Homepage>https://www.kraxel.org/blog/linux/fbida/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>app</IsA>
<PartOf>multimedia.graphics</PartOf>
<Summary>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Summary>
<Description>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Description>
<Archive sha1sum="fe2ec92dc98296e46cd8ddddcd8b3a169cb506a0" type="targz">
https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz
</Archive>
<BuildDependencies>
<Dependency>gc-devel</Dependency>
<Dependency>util-linux</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>lirc-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>libdrm-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>pixman-devel</Dependency>
<Dependency>libXpm-devel</Dependency>
<Dependency>libpcd-devel</Dependency>
<Dependency>sane-backends</Dependency>
<Dependency>libexif-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>libepoxy-devel</Dependency>
<Dependency>openmotif-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>imagemagick-devel</Dependency>
<Dependency>poppler-glib-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gcc10_build_fix.patch</Patch>
</Patches>
</Source>
<Source>
<Name>fbida</Name>
<Homepage>https://www.kraxel.org/blog/linux/fbida/</Homepage>
<Packager>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>app</IsA>
<PartOf>multimedia.graphics</PartOf>
<Summary>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Summary>
<Description>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Description>
<Archive sha1sum="fbe36711bdf515015f7bcabd7b7079227982a049" type="tarbz2">
https://gitlab.com/kraxel/fbida/-/archive/fbida-2.15-1/fbida-fbida-2.15-1.tar.bz2
</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>ninja</Dependency>
<Dependency>gc-devel</Dependency>
<Dependency>util-linux</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>lirc-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>libdrm-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>pixman-devel</Dependency>
<Dependency>libXpm-devel</Dependency>
<Dependency>libpcd-devel</Dependency>
<Dependency>sane-backends</Dependency>
<Dependency>libexif-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>libepoxy-devel</Dependency>
<Dependency>openmotif-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>imagemagick-devel</Dependency>
<Dependency>poppler-glib-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package>
<Name>fbida</Name>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>tiff</Dependency>
<Dependency>webp</Dependency>
<Dependency>cairo</Dependency>
<Dependency>libXt</Dependency>
<Dependency>giflib</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXpm</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libpcd</Dependency>
<Dependency>libpng</Dependency>
<Dependency>pixman</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libexif</Dependency>
<Dependency>freetype</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>openmotif</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>imagemagick</Dependency>
<Dependency>ghostscript</Dependency>
<Dependency>poppler-glib</Dependency>
<Dependency>libjpeg-turbo</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>fbida</Name>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>tiff</Dependency>
<Dependency>webp</Dependency>
<Dependency>cairo</Dependency>
<Dependency>libXt</Dependency>
<Dependency>giflib</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXpm</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libpcd</Dependency>
<Dependency>libpng</Dependency>
<Dependency>pixman</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libexif</Dependency>
<Dependency>freetype</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>openmotif</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>imagemagick</Dependency>
<Dependency>ghostscript</Dependency>
<Dependency>poppler-glib</Dependency>
<Dependency>libjpeg-turbo</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-12-06</Date>
<Version>2.14</Version>
<Comment>First build</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
<History>
<Update release="2">
<Date>2026-02-28</Date>
<Version>2.15</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2020-12-06</Date>
<Version>2.14</Version>
<Comment>First build</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
</PISI>