xinput-calibrator_0.5.0.bb: Upgraded to latest git version

* Upgraded to latest git version and removed patches already included in the package itself
* removed 0001-switch-to-autotools-based-build-system.patch
* removed 0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch

3 files changed, 3 insertions, 199 deletions

diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
deleted file mode 100644
index adec403147..0000000000
--- a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 1a85be450fba4585c64b3178316603a5ad7dd4e6 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
-Date: Tue, 19 Jan 2010 18:59:52 +0100
-Subject: [PATCH] switch to autotools based build system
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This patch autotoolize xinput_calibrator for easier (cross)compiling.
-
-Signed-off-by: Petr Štetiar <ynezz@true.cz>
----
- Makefile     |   11 -----------
- Makefile.am  |   41 +++++++++++++++++++++++++++++++++++++++++
- autogen.sh   |   12 ++++++++++++
- configure.ac |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 102 insertions(+), 11 deletions(-)
- delete mode 100644 Makefile
- create mode 100644 Makefile.am
- create mode 100755 autogen.sh
- create mode 100644 configure.ac
-
-diff --git a/Makefile b/Makefile
-deleted file mode 100644
-index c6eabed..0000000
---- a/Makefile
-+++ /dev/null
-@@ -1,11 +0,0 @@
--all: x11 gtkmm
--
--x11: main_x11.cpp gui_x11.cpp
--	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
--	cp xinput_calibrator.x11 xinput_calibrator
--
--gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
--	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
--
--clean:
--	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..ef8f531
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,41 @@
-+#
-+# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
-+#
-+# Permission is hereby granted, free of charge, to any person
-+# obtaining a copy of this software and associated documentation
-+# files (the "Software"), to deal in the Software without
-+# restriction, including without limitation the rights to use,
-+# copy, modify, merge, publish, distribute, sublicense, and/or sell
-+# copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following
-+# conditions:
-+# 
-+# The above copyright notice and this permission notice shall be
-+# included in all copies or substantial portions of the Software.
-+# 
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+# OTHER DEALINGS IN THE SOFTWARE.
-+#
-+
-+#AM_CFLAGS = -Wall -ansi -pedantic -W -Wmissing-prototypes -Wmissing-declarations -Werror -std=gnu99
-+
-+if BUILD_GTKMM
-+bin_PROGRAMS = xinput_calibrator_x11 xinput_calibrator_gtkmm
-+xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
-+xinput_calibrator_gtkmm_CXXFLAGS = $(GTKMM_CFLAGS)
-+xinput_calibrator_gtkmm_LDADD = $(GTKMM_LIBS)
-+else
-+bin_PROGRAMS = xinput_calibrator_x11
-+endif
-+
-+xinput_calibrator_x11_LDADD = $(XORG_LIBS)
-+xinput_calibrator_x11_CFLAGS = $(XORG_CFLAGS)
-+xinput_calibrator_x11_SOURCES = main_x11.cpp
-+
-+EXTRA_DIST = autogen.sh
-diff --git a/autogen.sh b/autogen.sh
-new file mode 100755
-index 0000000..904cd67
---- /dev/null
-+++ b/autogen.sh
-@@ -0,0 +1,12 @@
-+#! /bin/sh
-+
-+srcdir=`dirname $0`
-+test -z "$srcdir" && srcdir=.
-+
-+ORIGDIR=`pwd`
-+cd $srcdir
-+
-+autoreconf -v --install || exit 1
-+cd $ORIGDIR || exit $?
-+
-+$srcdir/configure --enable-maintainer-mode "$@"
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..13257b4
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,49 @@
-+#
-+# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
-+#
-+# Permission is hereby granted, free of charge, to any person
-+# obtaining a copy of this software and associated documentation
-+# files (the "Software"), to deal in the Software without
-+# restriction, including without limitation the rights to use,
-+# copy, modify, merge, publish, distribute, sublicense, and/or sell
-+# copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following
-+# conditions:
-+# 
-+# The above copyright notice and this permission notice shall be
-+# included in all copies or substantial portions of the Software.
-+# 
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+# OTHER DEALINGS IN THE SOFTWARE.
-+#
-+
-+AC_PREREQ([2.57])
-+AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
-+AM_MAINTAINER_MODE
-+
-+AC_PROG_CC
-+AC_PROG_CXX
-+AC_PROG_INSTALL
-+
-+AC_ARG_ENABLE([gtkmm], AS_HELP_STRING([--enable-gtkmm], [Enable GTKMM GUI]))
-+AS_IF([test "x$enable_gtkmm" = "xyes"], [
-+	PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4])
-+	AC_SUBST(GTKMM_CFLAGS)
-+	AC_SUBST(GTKMM_LIBS)
-+])
-+
-+AM_CONDITIONAL([BUILD_GTKMM], [test "x$enable_gtkmm" = "xyes"])
-+
-+PKG_CHECK_MODULES(XORG, [x11 xi])
-+AC_SUBST(XORG_CFLAGS)
-+AC_SUBST(XORG_LIBS)
-+
-+AC_CONFIG_FILES(Makefile)
-+AC_OUTPUT
--- 
-1.6.0.4
-
diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch
deleted file mode 100644
index 08f430999b..0000000000
--- a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From aaf549ecacc05bd5ddd29bb345cae471ce3ab48c Mon Sep 17 00:00:00 2001
-From: Marco Cavallini <m.cavallini@koansoftware.com>
-Date: Thu, 21 Jan 2010 16:46:18 +0100
-Subject: [PATCH] gui_x11.cpp: Load font fixed when 9x15 fails in GuiCalibratorX11
-
-
-Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
----
- gui_x11.cpp |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gui_x11.cpp b/gui_x11.cpp
-index bc483cd..02ddc73 100644
---- a/gui_x11.cpp
-+++ b/gui_x11.cpp
-@@ -112,8 +112,11 @@ GuiCalibratorX11::GuiCalibratorX11(Calibrator* calibrator0)
-     // Load font and get font information structure
-     font_info = XLoadQueryFont(display, "9x15");
-     if (font_info == NULL) {
--        XCloseDisplay(display);
--        throw std::runtime_error("Unable to open 9x15 font");
-+        font_info = XLoadQueryFont(display, "fixed");
-+        if (font_info == NULL) {
-+            XCloseDisplay(display);
-+            throw std::runtime_error("Unable to open 9x15 neither fixed font");
-+        }
-     }
- 
-     // Compute absolute circle centers
--- 
-1.6.3.3
-
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
index 8f3152056f..43f77ee2a0 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
@@ -1,19 +1,17 @@
 DEPENDS = "virtual/libx11 libxi"
 
-SRCREV  = "6af268f1b435f7bdd83335092ddc684054df2110"
+SRCREV  = "1c715824334c5d33085dba02f195c9720c2883b5"
 SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
-           file://0001-switch-to-autotools-based-build-system.patch;patch=1 \
-           file://0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch;patch=1 \
            file://xinput-calibrator.desktop \
 "
 
-PR = "r2"
+PR = "r3"
 inherit autotools
 S = "${WORKDIR}/git/"
 
 do_install() {
 	install -d ${D}${bindir}
-	install -m 0755 xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
+	install -m 0755 src/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
 	install -d ${D}${datadir}/applications/	
 	install -m 0755 ${WORKDIR}/xinput-calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop	
 }