---- fbida-2.12/GNUmakefile.orig 2016-04-23 23:13:37.947221742 +0200
-+++ fbida-2.12/GNUmakefile 2016-04-23 23:18:37.660542503 +0200
-@@ -65,15 +65,15 @@
- HAVE_NEW_EXIF := $(call ac_header,libexif/exif-log.h)
- HAVE_GLIBC := $(call ac_func,fopencookie)
- HAVE_STRSIGNAL := $(call ac_func,strsignal)
+--- fbida-2.14/GNUmakefile.orig 2018-05-28 21:14:02.388987847 +0200
++++ fbida-2.14/GNUmakefile 2018-05-28 21:19:24.712317500 +0200
+@@ -67,11 +67,11 @@
+ LIB := $(LIB)
+ RESDIR := $(call ac_resdir)
+ HAVE_LINUX_FB_H := $(call ac_header,linux/fb.h)
+-HAVE_CAIRO_GL := $(call ac_pkg_config,cairo-gl)
-HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd)
-HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif)
--HAVE_LIBPNG := $(call ac_pkg_config,libpng)
--HAVE_LIBTIFF := $(call ac_pkg_config,libtiff-4)
-HAVE_LIBWEBP := $(call ac_pkg_config,libwebp)
--HAVE_LIBSANE := $(call ac_lib,sane_init,sane)
--HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl)
--HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client)
-HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11)
++HAVE_CAIRO_GL ?= $(call ac_pkg_config,cairo-gl)
+HAVE_LIBPCD ?= $(call ac_lib,pcd_open,pcd)
+HAVE_LIBGIF ?= $(call ac_lib,DGifOpenFileName,gif)
-+HAVE_LIBPNG ?= $(call ac_pkg_config,libpng)
-+HAVE_LIBTIFF ?= $(call ac_pkg_config,libtiff-4)
+HAVE_LIBWEBP ?= $(call ac_pkg_config,libwebp)
-+HAVE_LIBSANE ?= $(call ac_lib,sane_init,sane)
-+HAVE_LIBCURL ?= $(call ac_lib,curl_easy_init,curl)
-+HAVE_LIBLIRC ?= $(call ac_lib,lirc_init,lirc_client)
+HAVE_MOTIF ?= $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11)
JPEG_VER := $(call ac_jpeg_ver)
- endef
-
+ # deprecated
+ #HAVE_GLIBC := $(call ac_func,fopencookie)
%bcond_without lirc # without LIRC control support
%bcond_without motif # don't build (Motif-based) ida
%bcond_without pcd # without PCD images support
-%bcond_without png # without PNG images support
%bcond_without sane # without SANE scanning support (in ida)
-%bcond_without tiff # without TIFF images support
%bcond_without webp # without WebP images support
-%bcond_with cairo_gl # with Cairo-GL support (fbpdf program)
+%bcond_with cairo_gl # with Cairo-GL support (in fbpdf program)
%if %{without motif}
# SANE used only in ida
Summary: fbida - a few applications for viewing and editing images
Summary(pl.UTF-8): fbida - kilka aplikacji do oglądania i edycji obrazków
Name: fbida
-Version: 2.13
+Version: 2.14
Release: 1
License: GPL
Group: Applications/Graphics
Source0: https://www.kraxel.org/releases/fbida/%{name}-%{version}.tar.gz
-# Source0-md5: de4268242e93eb95e220e14e441c1c50
+# Source0-md5: f5475b359461d2d995bde59e13cc584f
Patch0: %{name}-config-noforce.patch
Patch1: %{name}-desktop.patch
-Patch2: format-security.patch
-Patch3: no-cairo-gl.patch
URL: https://www.kraxel.org/blog/linux/fbida/
+BuildRequires: EGL-devel
BuildRequires: ImageMagick-devel
BuildRequires: Mesa-libgbm-devel
BuildRequires: cairo-devel
BuildRequires: libexif-devel >= 1:0.6.9
BuildRequires: libjpeg-devel
%{?with_pcd:BuildRequires: libpcd-devel >= 1:1.0.1}
-%{?with_png:BuildRequires: libpng-devel}
-%{?with_tiff:BuildRequires: libtiff-devel}
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel >= 4
%{?with_webp:BuildRequires: libwebp-devel}
%{?with_lirc:BuildRequires: lirc-devel}
# acc. to README lesstif is not sufficient
%{?with_motif:BuildRequires: motif-devel >= 2.0}
BuildRequires: perl-base
+BuildRequires: pixman-devel
BuildRequires: pkgconfig
%{?with_cairo_gl:BuildRequires: pkgconfig(cairo-gl)}
BuildRequires: poppler-glib-devel
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
CFLAGS="%{rpmcflags}" \
%{__make} \
CC="%{__cc}" \
verbose=yes \
+ %{!?with_cairo_gl:HAVE_CAIRO_GL=no} \
%{!?with_pcd:HAVE_LIBPCD=no} \
%{!?with_gif:HAVE_LIBGIF=no} \
- %{!?with_png:HAVE_LIBPNG=no} \
- %{!?with_tiff:HAVE_LIBTIFF=no} \
%{!?with_webp:HAVE_LIBWEBP=no} \
- %{!?with_sane:HAVE_LIBSANE=no} \
- %{!?with_curl:HAVE_LIBCURL=no} \
- %{!?with_lirc:HAVE_LIBLIRC=no} \
- %{!?with_motif:HAVE_MOTIF=no}
+ %{!?with_motif:HAVE_MOTIF=no} \
+ %{?with_sane:HAVE_LIBSANE=yes} \
+ %{?with_curl:HAVE_LIBCURL=yes} \
+ %{?with_lirc:HAVE_LIBLIRC=yes}
%install
rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT \
prefix=%{_prefix} \
INSTALL_BINARY=install \
+ %{!?with_cairo_gl:HAVE_CAIRO_GL=no} \
%{!?with_pcd:HAVE_LIBPCD=no} \
%{!?with_gif:HAVE_LIBGIF=no} \
- %{!?with_png:HAVE_LIBPNG=no} \
- %{!?with_tiff:HAVE_LIBTIFF=no} \
%{!?with_webp:HAVE_LIBWEBP=no} \
- %{!?with_sane:HAVE_LIBSANE=no} \
- %{!?with_curl:HAVE_LIBCURL=no} \
- %{!?with_lirc:HAVE_LIBLIRC=no} \
- %{!?with_motif:HAVE_MOTIF=no}
+ %{!?with_motif:HAVE_MOTIF=no} \
+ %{?with_sane:HAVE_LIBSANE=yes} \
+ %{?with_curl:HAVE_LIBCURL=yes} \
+ %{?with_lirc:HAVE_LIBLIRC=yes}
%if %{with motif}
install -D desktop/ida.desktop $RPM_BUILD_ROOT%{_desktopdir}/ida.desktop
%{_mandir}/man1/fbgs.1*
%{_mandir}/man1/fbi.1*
-%if %{with cairo_gl}
%files -n fbpdf
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fbpdf
-%endif
%if %{with motif}
%files -n ida
+++ /dev/null
---- fbida-2.09/wr/write-ps.c~ 2012-02-22 18:13:36.000000000 +0100
-+++ fbida-2.09/wr/write-ps.c 2013-11-08 17:54:52.546636006 +0100
-@@ -457,7 +457,7 @@
- fprintf(fp,"\n");
- }
- }
-- fprintf(fp,footer);
-+ fprintf(fp,"%s",footer);
- return 0;
- }
-
+++ /dev/null
-diff -ur fbida-2.12/GNUmakefile fbida-2.12-cairo/GNUmakefile
---- fbida-2.12/GNUmakefile 2016-05-01 20:29:28.027653192 +0200
-+++ fbida-2.12-cairo/GNUmakefile 2016-05-01 20:27:24.416185030 +0200
-@@ -15,23 +15,8 @@
- PKGS_IDA := libexif
- PKGS_FBI := freetype2 fontconfig libdrm libexif
- PKGS_FBPDF := libdrm poppler-glib gbm epoxy cairo-gl
--HAVE_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) $(PKGS_FBPDF) && echo yes)
--
--ifeq ($(HAVE_LINUX_FB_H),yes)
--ifneq ($(HAVE_DEPS),yes)
--.PHONY: deps
--deps:
-- @echo "Build dependencies missing for fbi and/or fbpdf."
-- @echo " fbi needs: $(PKGS_FBI)"
-- @echo " fbpdf needs: $(PKGS_FBPDF)"
-- @echo "Please install. You can try 'make yum' (needs sudo)."
-- @false
--
--yum dnf:
-- sudo $@ install $(patsubst %,"pkgconfig(%)",$(PKGS_FBI) $(PKGS_FBPDF))
--
--endif
--endif
-+HAVE_FBI_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) && echo yes)
-+HAVE_FBPDF_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBPDF) && echo yes)
-
- # default target
- all: build
-@@ -39,7 +24,13 @@
- # what to build
- TARGETS := exiftran thumbnail.cgi
- ifeq ($(HAVE_LINUX_FB_H),yes)
-- TARGETS += fbi fbpdf kbdtest
-+ifeq ($(HAVE_FBI_DEPS),yes)
-+ TARGETS += fbi
-+endif
-+ifeq ($(HAVE_FBPDF_DEPS),yes)
-+ TARGETS += fbpdf
-+endif
-+ TARGETS += kbdtest
- endif
- ifeq ($(HAVE_MOTIF),yes)
- TARGETS += ida
-@@ -248,10 +239,14 @@
- $(INSTALL_BINARY) exiftran $(bindir)
- $(INSTALL_DATA) $(srcdir)/exiftran.man $(mandir)/man1/exiftran.1
- ifeq ($(HAVE_LINUX_FB_H),yes)
-+ifeq ($(HAVE_FBI_DEPS),yes)
- $(INSTALL_BINARY) fbi $(bindir)
-- $(INSTALL_SCRIPT) fbgs $(bindir)
-- $(INSTALL_SCRIPT) fbpdf $(bindir)
- $(INSTALL_DATA) $(srcdir)/fbi.man $(mandir)/man1/fbi.1
-+endif
-+ifeq ($(HAVE_FBPDF_DEPS),yes)
-+ $(INSTALL_SCRIPT) fbpdf $(bindir)
-+endif
-+ $(INSTALL_SCRIPT) fbgs $(bindir)
- $(INSTALL_DATA) $(srcdir)/fbgs.man $(mandir)/man1/fbgs.1
- endif
- ifeq ($(HAVE_MOTIF),yes)
projects / packages / fbida.git / commitdiff