jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

feh: xinemara is optional not mandatory

Browse Source 
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2018-09-12 19:33:42 +02:00 committed by Thomas Petazzoni
parent e75d9c6bcf
commit de2fe74e2a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/feh/Config.in
View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_FEH
bool "feh" bool "feh"
depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_XLIB_LIBXINERAMA
select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXT
select BR2_PACKAGE_IMLIB2 select BR2_PACKAGE_IMLIB2
select BR2_PACKAGE_IMLIB2_PNG select BR2_PACKAGE_IMLIB2_PNG

9
package/feh/feh.mk
View File

@ -7,7 +7,7 @@
FEH_VERSION = 2.27.1 FEH_VERSION = 2.27.1
FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
FEH_SITE = http://feh.finalrewind.org 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 = MIT
FEH_LICENSE_FILES = COPYING FEH_LICENSE_FILES = COPYING
@ -18,6 +18,13 @@ else
FEH_MAKE_OPTS += curl=0 FEH_MAKE_OPTS += curl=0
endif 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 define FEH_BUILD_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
$(MAKE) $(FEH_MAKE_OPTS) -C $(@D) all $(MAKE) $(FEH_MAKE_OPTS) -C $(@D) all