File 0002-fix-make-fix-dependencies-and-add-knowledge-about-op.patch of Package fbida
From f6f2c9390ffbe37f8a7b2cc79ae9389b916588af Mon Sep 17 00:00:00 2001 From: rpm-build <rpm-build> Date: Fri, 9 Jan 2026 23:16:51 +0100 Subject: [PATCH 2/4] fix(make): fix dependencies and add knowledge about openSUSE --- GNUmakefile | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index c17ece6..ecf90f2 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -15,38 +15,46 @@ PKG_CONFIG = pkg-config PKGS_IDA := libexif libpng libtiff-4 pixman-1 PKGS_FBI := freetype2 fontconfig libdrm libexif libpng libtiff-4 pixman-1 PKGS_FBPDF := libdrm poppler-glib gbm egl epoxy pixman-1 -HAVE_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) $(PKGS_FBPDF) && echo yes) +HAVE_FBI_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) && echo yes) +HAVE_FBPDF_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBPDF) && echo yes) # map pkg-config names to debian packages using apt-file APT_REGEX = /($(shell echo $(PKGS_FBI) $(PKGS_FBPDF) | sed -e 's/ /|/g')).pc APT_DEBS = $(shell apt-file search --package-only --regex "$(APT_REGEX)") +# map pkg-config names to openSUSE packages +ZYPPER_DEPS = freetype2-devel fontconfig-devel libdrm-devel libexif-devel libpng16-devel libtiff-devel libpixman-1-0-devel libwebp-devel poppler-glib-devel Mesa-libEGL-devel libepoxy-devel libgbm-devel + 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. Try 'make yum', 'make dnf' or 'make apt-get' (needs sudo)." - @false +# Note: Individual dependency checks are now handled by conditional target building + +.PHONY: yum dnf zypper apt-get yum dnf: sudo $@ install $(patsubst %,"pkgconfig(%)",$(PKGS_FBI) $(PKGS_FBPDF)) -apt-get: - sudo apt-get install $(APT_DEBS) +zypper: + sudo zypper install $(ZYPPER_DEPS) + +apt-get: + sudo apt-get install $(APT_DEPS) -endif endif # default target +.DEFAULT_GOAL := all all: build # what to build TARGETS := exiftran thumbnail.cgi ifeq ($(HAVE_LINUX_FB_H),yes) - TARGETS += fbi fbpdf kbdtest + TARGETS += kbdtest + ifeq ($(HAVE_FBI_DEPS),yes) + TARGETS += fbi + endif + ifeq ($(HAVE_FBPDF_DEPS),yes) + TARGETS += fbpdf + endif endif ifeq ($(HAVE_MOTIF),yes) TARGETS += ida @@ -250,7 +258,9 @@ install: build ifeq ($(HAVE_LINUX_FB_H),yes) $(INSTALL_BINARY) fbi $(bindir) $(INSTALL_SCRIPT) fbgs $(bindir) +ifeq ($(HAVE_FBPDF_DEPS),yes) $(INSTALL_SCRIPT) fbpdf $(bindir) +endif $(INSTALL_DATA) $(srcdir)/man/fbi.1 $(mandir)/man1 $(INSTALL_DATA) $(srcdir)/man/fbgs.1 $(mandir)/man1 endif -- 2.52.0