summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-app
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-01-23 13:22:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:31 +0000
commit9f45ab7f8b172c3c4406551fbf2ad2ac1de6af73 (patch)
tree98576ca62febdedf04af216eae032a901433a301 /meta/recipes-graphics/xorg-app
parenta4fbcfbb7204ec4bd8f337451ed94498ede3c038 (diff)
downloadpoky-9f45ab7f8b172c3c4406551fbf2ad2ac1de6af73.tar.gz
rgb: Update to 1.0.5
Remove the backported automake patch, now fixed upstream (From OE-Core rev: 2356ce3b58b44551d51b3de0eddb81e32e907c45) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-app')
-rw-r--r--meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-graphics/xorg-app/rgb_1.0.4.bb12
-rw-r--r--meta/recipes-graphics/xorg-app/rgb_1.0.5.bb10
3 files changed, 10 insertions, 27 deletions
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
deleted file mode 100644
index 43ab68f030..0000000000
--- a/meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [fixed in development version]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd rgb-1.0.4/configure.ac rgb-1.0.4/configure.ac
5--- rgb-1.0.4/configure.ac 2010-10-07 06:17:16.000000000 +0300
6+++ rgb-1.0.4/configure.ac 2013-01-11 08:04:23.767562150 +0200
7@@ -26,7 +26,7 @@
8 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [rgb])
9 AM_INIT_AUTOMAKE([foreign dist-bzip2])
10 AM_MAINTAINER_MODE
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
15 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
deleted file mode 100644
index 5f71787998..0000000000
--- a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require xorg-app-common.inc
2DEPENDS += " xproto util-macros"
3LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
4PE = "1"
5PR = "${INC_PR}.1"
6
7SRC_URI += "file://obsolete_automake_macros.patch"
8
9SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
10SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
11
12FILES_${PN} += "${datadir}/X11"
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb
new file mode 100644
index 0000000000..602ee0996f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb
@@ -0,0 +1,10 @@
1require xorg-app-common.inc
2DEPENDS += " xproto util-macros"
3LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
4PE = "1"
5PR = "${INC_PR}.0"
6
7SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e"
8SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857"
9
10FILES_${PN} += "${datadir}/X11"