From b2e1b766abe2fb512943d77ada4f7f04b748b3f4 Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Sat, 30 Oct 2010 21:42:33 +0300 Subject: feh: Bumped feh version from 1.7 to 1.10. feh 1.10 has some nice new features. Both recipes are otherwise the same. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- recipes/feh/feh-1.10/noxinerama.patch | 13 +++++++++++++ recipes/feh/feh-1.7/noxinerama.patch | 13 ------------- recipes/feh/feh_1.10.bb | 18 ++++++++++++++++++ recipes/feh/feh_1.7.bb | 17 ----------------- 4 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 recipes/feh/feh-1.10/noxinerama.patch delete mode 100644 recipes/feh/feh-1.7/noxinerama.patch create mode 100644 recipes/feh/feh_1.10.bb delete mode 100644 recipes/feh/feh_1.7.bb diff --git a/recipes/feh/feh-1.10/noxinerama.patch b/recipes/feh/feh-1.10/noxinerama.patch new file mode 100644 index 0000000000..d84d9d5d66 --- /dev/null +++ b/recipes/feh/feh-1.10/noxinerama.patch @@ -0,0 +1,13 @@ +--- a/config.mk 2010-06-10 14:16:09.000000000 +0400 ++++ b/config.mk 2010-06-21 01:30:35.615419264 +0400 +@@ -17,8 +17,8 @@ + CFLAGS += -Wall -Wextra -pedantic + + # Comment these out if you don't have libxinerama +-xinerama = -DHAVE_LIBXINERAMA +-xinerama_ld = -lXinerama ++# xinerama = -DHAVE_LIBXINERAMA ++# xinerama_ld = -lXinerama + + debug = -DDEBUG + # Uncomment this for debug mode diff --git a/recipes/feh/feh-1.7/noxinerama.patch b/recipes/feh/feh-1.7/noxinerama.patch deleted file mode 100644 index d84d9d5d66..0000000000 --- a/recipes/feh/feh-1.7/noxinerama.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/config.mk 2010-06-10 14:16:09.000000000 +0400 -+++ b/config.mk 2010-06-21 01:30:35.615419264 +0400 -@@ -17,8 +17,8 @@ - CFLAGS += -Wall -Wextra -pedantic - - # Comment these out if you don't have libxinerama --xinerama = -DHAVE_LIBXINERAMA --xinerama_ld = -lXinerama -+# xinerama = -DHAVE_LIBXINERAMA -+# xinerama_ld = -lXinerama - - debug = -DDEBUG - # Uncomment this for debug mode diff --git a/recipes/feh/feh_1.10.bb b/recipes/feh/feh_1.10.bb new file mode 100644 index 0000000000..d77da885b7 --- /dev/null +++ b/recipes/feh/feh_1.10.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." +SECTION = "x11/utils" +LICENSE = "MIT" +DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" + +SRC_URI = "https://derf.homelinux.org/projects/feh/feh-${PV}.tar.bz2 \ + file://noxinerama.patch" + +S = "${WORKDIR}/feh-${PV}" + +inherit autotools + +do_install() { + oe_runmake 'DESTDIR=${D}' PREFIX=/usr install-bin +} + +SRC_URI[md5sum] = "a27d4bdd470099dcd3d59b7c39227162" +SRC_URI[sha256sum] = "506e4f833a9c5c1eff55c20784b08aee36540c0643d822dbb76fcdbee729812c" diff --git a/recipes/feh/feh_1.7.bb b/recipes/feh/feh_1.7.bb deleted file mode 100644 index b01e0f15bc..0000000000 --- a/recipes/feh/feh_1.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "x11/utils" -DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2." -LICENSE = "MIT" -DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt" - -SRC_URI = "https://derf.homelinux.org/projects/feh/feh-${PV}.tar.bz2 \ - file://noxinerama.patch" -S = "${WORKDIR}/feh-${PV}" - -inherit autotools - -do_install() { - oe_runmake 'DESTDIR=${D}' PREFIX=/usr install-bin -} - -SRC_URI[md5sum] = "59181976384d1f5bddae016b39334e2e" -SRC_URI[sha256sum] = "13cd57ac8e97430ea7875d9e5d642166df4f1fb5884cc4523da84bcfe4fa6c56" -- cgit 1.2.3-korg