rgb: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..43ab68f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Backport [fixed in development version]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd rgb-1.0.4/configure.ac rgb-1.0.4/configure.ac
+--- rgb-1.0.4/configure.ac     2010-10-07 06:17:16.000000000 +0300
++++ rgb-1.0.4/configure.ac     2013-01-11 08:04:23.767562150 +0200
+@@ -26,7 +26,7 @@
+       [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [rgb])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],

diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
index 59dca2ac7d65e881e2a749f32cf9ddf19a2420f4..5f71787998972c61ae703a089f09fb330c83cbd1 100644 (file)
--- a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
@@ -2,7 +2,9 @@ require xorg-app-common.inc
 DEPENDS += " xproto util-macros"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://obsolete_automake_macros.patch"
 
 SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
 SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"