Răsfoiți Sursa

feh: xinemara is optional not mandatory

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 7 ani în urmă
părinte
comite
de2fe74e2a
2 a modificat fișierele cu 8 adăugiri și 2 ștergeri
  1. 0 1
      package/feh/Config.in
  2. 8 1
      package/feh/feh.mk

+ 0 - 1
package/feh/Config.in

@@ -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

+ 8 - 1
package/feh/feh.mk

@@ -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