feh: bump to 2.12

giblib is now part of feh, so drop giblib as dependency.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/feh/Config.in b/package/feh/Config.in
index f85612e6c0d4cbf7c0ca9c35324ed157c1230d16..19b4abe0e3f4d05b924914eb4d22e96cfb59114e 100644 (file)
--- a/package/feh/Config.in
+++ b/package/feh/Config.in
@@ -4,10 +4,10 @@ config BR2_PACKAGE_FEH
        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
        select BR2_PACKAGE_IMLIB2_JPEG
        select BR2_PACKAGE_IMLIB2_X
-       select BR2_PACKAGE_GIBLIB
        select BR2_PACKAGE_LIBCURL
        help
          feh is an X11 image viewer aimed mostly at console users.

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index ddd48955e1af630c588af5e0d5d59586c711b6aa..e63f89ed48d24ba24be36cfd618e39acf30a488b 100644 (file)
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-FEH_VERSION = 2.10
+FEH_VERSION = 2.12
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org/
-FEH_DEPENDENCIES = libcurl giblib imlib2 libpng xlib_libXinerama xlib_libXt
+FEH_DEPENDENCIES = libcurl imlib2 libpng xlib_libXinerama xlib_libXt
 
 define FEH_BUILD_CMDS
        $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \