From 9f45ab7f8b172c3c4406551fbf2ad2ac1de6af73 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 23 Jan 2013 13:22:35 -0800 Subject: rgb: Update to 1.0.5 Remove the backported automake patch, now fixed upstream (From OE-Core rev: 2356ce3b58b44551d51b3de0eddb81e32e907c45) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xorg-app/rgb-1.0.4/obsolete_automake_macros.patch | 15 --------------- meta/recipes-graphics/xorg-app/rgb_1.0.4.bb | 12 ------------ meta/recipes-graphics/xorg-app/rgb_1.0.5.bb | 10 ++++++++++ 3 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch delete mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.4.bb create mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.5.bb (limited to 'meta/recipes-graphics') 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 @@ -Upstream-Status: Backport [fixed in development version] - -Signed-off-by: Marko Lindqvist -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 deleted file mode 100644 index 5f71787998..0000000000 --- a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xorg-app-common.inc -DEPENDS += " xproto util-macros" -LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" -PE = "1" -PR = "${INC_PR}.1" - -SRC_URI += "file://obsolete_automake_macros.patch" - -SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951" -SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1" - -FILES_${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 @@ +require xorg-app-common.inc +DEPENDS += " xproto util-macros" +LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e" +SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857" + +FILES_${PN} += "${datadir}/X11" -- cgit v1.2.3-54-g00ecf