diff options
| author | simoneScaravati <simone.scaravati@gmail.com> | 2025-10-06 10:23:39 +0200 |
|---|---|---|
| committer | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-10-10 11:09:27 +0200 |
| commit | 93fc9a2c0c36c3fb8edca52180ed8026957378a6 (patch) | |
| tree | 0af0cc4228b2acbf719a6b63f94d2b8193b7a775 | |
| parent | 96fbc156364fd78530d2bfbe1b8a77789f52997d (diff) | |
| download | meta-openembedded-93fc9a2c0c36c3fb8edca52180ed8026957378a6.tar.gz | |
fbida: fix make fbpdf build optional
this is a backport-like from scarthgap branch: fbida_git.bb and patch 0001-meson.build-make-fbpdf-build-optional.patch
From Github Pull request: https://github.com/openembedded/meta-openembedded/pull/1008
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
| -rw-r--r-- | meta-oe/recipes-graphics/fbida/fbida_2.14.bb | 5 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/fbida/files/0007-make-fbpdf-build-optional.patch | 102 |
2 files changed, 107 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.14.bb b/meta-oe/recipes-graphics/fbida/fbida_2.14.bb index bc6f021e6b..ecffbe23f7 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_2.14.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_2.14.bb | |||
| @@ -16,6 +16,7 @@ SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ | |||
| 16 | file://support-jpeg-turbo.patch \ | 16 | file://support-jpeg-turbo.patch \ |
| 17 | file://cairo-weak-detect.patch \ | 17 | file://cairo-weak-detect.patch \ |
| 18 | file://fbida-gcc10.patch \ | 18 | file://fbida-gcc10.patch \ |
| 19 | file://0007-make-fbpdf-build-optional.patch \ | ||
| 19 | " | 20 | " |
| 20 | SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" | 21 | SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" |
| 21 | 22 | ||
| @@ -34,6 +35,7 @@ PACKAGECONFIG[tiff] = ",,tiff" | |||
| 34 | PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" | 35 | PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" |
| 35 | PACKAGECONFIG[webp] = ",,libwebp" | 36 | PACKAGECONFIG[webp] = ",,libwebp" |
| 36 | PACKAGECONFIG[lirc] = ",,lirc" | 37 | PACKAGECONFIG[lirc] = ",,lirc" |
| 38 | PACKAGECONFIG[pdf] = ",,poppler libepoxy" | ||
| 37 | # This can only be enabled when cairo has egl enabled in its packageconfig support too | 39 | # This can only be enabled when cairo has egl enabled in its packageconfig support too |
| 38 | PACKAGECONFIG[egl] = ",," | 40 | PACKAGECONFIG[egl] = ",," |
| 39 | 41 | ||
| @@ -69,6 +71,9 @@ do_compile() { | |||
| 69 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then | 71 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then |
| 70 | sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile | 72 | sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile |
| 71 | fi | 73 | fi |
| 74 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'pdf', d)}" ]; then | ||
| 75 | sed -i -e '/^HAVE_LIBPDF/s/:=.*$/:= no/' ${S}/GNUmakefile | ||
| 76 | fi | ||
| 72 | 77 | ||
| 73 | oe_runmake | 78 | oe_runmake |
| 74 | } | 79 | } |
diff --git a/meta-oe/recipes-graphics/fbida/files/0007-make-fbpdf-build-optional.patch b/meta-oe/recipes-graphics/fbida/files/0007-make-fbpdf-build-optional.patch new file mode 100644 index 0000000000..c72747b77a --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0007-make-fbpdf-build-optional.patch | |||
| @@ -0,0 +1,102 @@ | |||
| 1 | From e1f3007cb40f031c600e884a2c7c763aadc7348b Tue Oct 6 00:00:00 2025 | ||
| 2 | From: simoneScaravati <simone.scaravati@gmail.com> | ||
| 3 | Date: Thu, 8 Oct 2025 16:37:58 +0200 | ||
| 4 | Subject: [PATCH] fbida: fix make fbpdf build optional | ||
| 5 | |||
| 6 | ORIGINAL BACKPORTED PATCH: 0001-meson.build-make-fbpdf-build-optional.patch FROM scarthgap branch: | ||
| 7 | From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001 | ||
| 8 | From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 9 | Date: Fri, 16 Sep 2022 18:45:58 +0200 | ||
| 10 | Subject: [PATCH] meson.build: make fbpdf build optional | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] | ||
| 13 | Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> | ||
| 14 | |||
| 15 | --- a/GNUmakefile 2025-10-03 15:20:42.926132622 +0000 | ||
| 16 | +++ b/GNUmakefile 2025-10-03 15:22:39.018131109 +0000 | ||
| 17 | @@ -29,7 +29,7 @@ deps: | ||
| 18 | @echo " fbi needs: $(PKGS_FBI)" | ||
| 19 | @echo " fbpdf needs: $(PKGS_FBPDF)" | ||
| 20 | @echo "Please install. Try 'make yum', 'make dnf' or 'make apt-get' (needs sudo)." | ||
| 21 | - @false | ||
| 22 | + @echo "Warning: missing some deps, build may fail due to missing packages" | ||
| 23 | |||
| 24 | yum dnf: | ||
| 25 | sudo $@ install $(patsubst %,"pkgconfig(%)",$(PKGS_FBI) $(PKGS_FBPDF)) | ||
| 26 | @@ -46,11 +46,14 @@ all: build | ||
| 27 | # what to build | ||
| 28 | TARGETS := exiftran thumbnail.cgi | ||
| 29 | ifeq ($(HAVE_LINUX_FB_H),yes) | ||
| 30 | - TARGETS += fbi fbpdf kbdtest | ||
| 31 | + TARGETS += fbi kbdtest | ||
| 32 | endif | ||
| 33 | ifeq ($(HAVE_MOTIF),yes) | ||
| 34 | TARGETS += ida | ||
| 35 | endif | ||
| 36 | +ifeq ($(HAVE_LIBPDF), yes) | ||
| 37 | + TARGETS += fbpdf | ||
| 38 | +endif | ||
| 39 | |||
| 40 | |||
| 41 | ################################################################# | ||
| 42 | @@ -73,6 +76,7 @@ HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) | ||
| 43 | HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) | ||
| 44 | HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11) | ||
| 45 | JPEG_VER := $(call ac_jpeg_ver) | ||
| 46 | +HAVE_LIBPDF := yes | ||
| 47 | # deprecated | ||
| 48 | #HAVE_GLIBC := $(call ac_func,fopencookie) | ||
| 49 | #HAVE_LIBSANE := $(call ac_lib,sane_init,sane) | ||
| 50 | @@ -215,17 +219,18 @@ fbi: $(OBJS_FBI) $(OBJS_READER) | ||
| 51 | ######################################################################## | ||
| 52 | # rules for fbpdf | ||
| 53 | |||
| 54 | -# object files | ||
| 55 | -OBJS_FBPDF := \ | ||
| 56 | - fbpdf.o vt.o kbd.o fbtools.o drmtools.o drmtools-egl.o \ | ||
| 57 | - fbiconfig.o parseconfig.o | ||
| 58 | - | ||
| 59 | -# font + drm + jpeg/exif libs | ||
| 60 | -fbpdf : CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS_FBPDF)) | ||
| 61 | -fbpdf : LDLIBS += $(shell $(PKG_CONFIG) --libs $(PKGS_FBPDF)) | ||
| 62 | - | ||
| 63 | -fbpdf: $(OBJS_FBPDF) | ||
| 64 | - | ||
| 65 | +ifeq ($(HAVE_LIBPDF),yes) | ||
| 66 | + # object files | ||
| 67 | + OBJS_FBPDF := \ | ||
| 68 | + fbpdf.o vt.o kbd.o fbtools.o drmtools.o drmtools-egl.o \ | ||
| 69 | + fbiconfig.o parseconfig.o | ||
| 70 | + | ||
| 71 | + # font + drm + jpeg/exif libs | ||
| 72 | + fbpdf : CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS_FBPDF)) | ||
| 73 | + fbpdf : LDLIBS += $(shell $(PKG_CONFIG) --libs $(PKGS_FBPDF)) | ||
| 74 | + | ||
| 75 | + fbpdf: $(OBJS_FBPDF) | ||
| 76 | +endif | ||
| 77 | |||
| 78 | ######################################################################## | ||
| 79 | # rules for kbdtest | ||
| 80 | @@ -249,10 +254,7 @@ install: build | ||
| 81 | $(INSTALL_DATA) $(srcdir)/man/exiftran.1 $(mandir)/man1 | ||
| 82 | ifeq ($(HAVE_LINUX_FB_H),yes) | ||
| 83 | $(INSTALL_BINARY) fbi $(bindir) | ||
| 84 | - $(INSTALL_SCRIPT) fbgs $(bindir) | ||
| 85 | - $(INSTALL_SCRIPT) fbpdf $(bindir) | ||
| 86 | $(INSTALL_DATA) $(srcdir)/man/fbi.1 $(mandir)/man1 | ||
| 87 | - $(INSTALL_DATA) $(srcdir)/man/fbgs.1 $(mandir)/man1 | ||
| 88 | endif | ||
| 89 | ifeq ($(HAVE_MOTIF),yes) | ||
| 90 | $(INSTALL_BINARY) ida $(bindir) | ||
| 91 | @@ -260,6 +262,11 @@ ifeq ($(HAVE_MOTIF),yes) | ||
| 92 | $(INSTALL_DIR) $(resdir)/app-defaults | ||
| 93 | $(INSTALL_DATA) $(srcdir)/Ida.ad $(resdir)/app-defaults/Ida | ||
| 94 | endif | ||
| 95 | +ifeq ($(HAVE_LIBPDF),yes) | ||
| 96 | + $(INSTALL_SCRIPT) fbpdf $(bindir) | ||
| 97 | + $(INSTALL_SCRIPT) fbgs $(bindir) | ||
| 98 | + $(INSTALL_DATA) $(srcdir)/man/fbgs.1 $(mandir)/man1 | ||
| 99 | +endif | ||
| 100 | |||
| 101 | clean: | ||
| 102 | -rm -f *.o jpeg/$(JPEG_VER)/*.o rd/*.o wr/*.o $(depfiles) core core.* | ||
