Merge from bittboy/buildroot@db180c0

package/feh/Config.in

@@ -0,0 +1,13 @@
+config BR2_PACKAGE_FEH
+	bool "feh"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_IMLIB2
+	select BR2_PACKAGE_IMLIB2_PNG
+	select BR2_PACKAGE_IMLIB2_JPEG
+	select BR2_PACKAGE_IMLIB2_X
+	help
+	  feh is an X11 image viewer aimed mostly at console users.
+
+	  http://feh.finalrewind.org/

package/feh/feh.hash

@@ -0,0 +1,3 @@
+# Locally calculated after checking pgp signature
+sha256 9fe840fbc6ce66dcf1e99296c90eb6fc44a4c2fad9a1069dfc7e0fad88eb56ef  feh-3.1.3.tar.bz2
+sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d  COPYING

package/feh/feh.mk

@@ -0,0 +1,45 @@
+################################################################################
+#
+# feh
+#
+################################################################################
+
+FEH_VERSION = 3.1.3
+FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
+FEH_SITE = http://feh.finalrewind.org
+FEH_DEPENDENCIES = imlib2 libpng xlib_libXt
+FEH_LICENSE = MIT
+FEH_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+FEH_DEPENDENCIES += libcurl
+FEH_MAKE_OPTS += curl=1
+else
+FEH_MAKE_OPTS += curl=0
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEXIF),y)
+FEH_DEPENDENCIES += libexif
+FEH_MAKE_OPTS += exif=1
+else
+FEH_MAKE_OPTS += exif=0
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+FEH_DEPENDENCIES += xlib_libXinerama
+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
+endef
+
+define FEH_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(FEH_MAKE_OPTS) PREFIX=/usr \
+		DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+$(eval $(generic-package))