feh: xinemara is optional not mandatory
PATCH 1/1 feh: xinemara is optional not mandatory
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/feh/Config.in | 1 - package/feh/feh.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
package/feh/Config.in +0 -1
@@ -2,7 +2,6 @@ config BR2_PACKAGE_FEH bool "feh" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_IMLIB2 select BR2_PACKAGE_IMLIB2_PNG
package/feh/feh.mk +8 -1
@@ -7,7 +7,7 @@ FEH_VERSION = 2.27.1 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org -FEH_DEPENDENCIES = imlib2 libpng xlib_libXinerama xlib_libXt +FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING
@@ -18,6 +18,13 @@ else FEH_MAKE_OPTS += curl=0 endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +FEH_DEPENDENCIES += xlib_libXinemara +FEH_MAKE_OPTS += xinerama=1 +else +FEH_MAKE_OPTS += xinerama=0 +endif + define FEH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ $(MAKE) $(FEH_MAKE_OPTS) -C $(@D) all
Signature · 1 line
2.17.1
Thomas Petazzoni
AppliedPATCH 1/1 feh: xinemara is optional not mandatory
Hello,
Quoted 5 lines · Fabrice Fontaine
Signed-off-by Fabrice Fontaine <[email protected]>--- package/feh/Config.in | 1 - package/feh/feh.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 feh: xinemara is optional not mandatory
In reply to Fabrice FontaineHi Fabrice,
Quoted 1 line
Signed-off-by Fabrice Fontaine <[email protected]>
Reviewed-by Petr Vorel <[email protected]>
Quoted 31 lines
--- package/feh/Config.in | 1 - package/feh/feh.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)package/feh/Config.in +0
-1@@ -2,7 +2,6 @@ config BR2_PACKAGE_FEH bool "feh" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_IMLIB2 select BR2_PACKAGE_IMLIB2_PNGpackage/feh/feh.mk +1
-1@@ -7,7 +7,7 @@ FEH_VERSION = 2.27.1 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org -FEH_DEPENDENCIES = imlib2 libpng xlib_libXinerama xlib_libXt +FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING
package/feh/feh.mk else · line 22
Quoted 5 lines
package/feh/feh.mk +2
-0@@ -18,6 +18,13 @@ else FEH_MAKE_OPTS += curl=0 endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +FEH_DEPENDENCIES += xlib_libXinemara
^ typo:
this is correct:FEH_DEPENDENCIES += xlib_libXinemara
@Thomas (or whoever is merging this): can you please fix this before merging?
BTW I created the same commit in the morning (without a typo :)), but forget to send it.
Kind regards,
Petr