Patchwork [02/13] rgb: Update to 1.0.5

login
register
mail settings
Submitter Saul Wold
Date Jan. 28, 2013, 9:15 a.m.
Message ID <ad0c5bf5119784a9b636756aeafe969175c842d7.1359364462.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/43503/
State New
Headers show

Comments

Saul Wold - Jan. 28, 2013, 9:15 a.m.
Remove the backported automake patch, now fixed upstream

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-app/rgb-1.0.4/obsolete_automake_macros.patch     | 15 ---------------
 .../xorg-app/{rgb_1.0.4.bb => rgb_1.0.5.bb}               |  8 +++-----
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/rgb-1.0.4/obsolete_automake_macros.patch
 rename meta/recipes-graphics/xorg-app/{rgb_1.0.4.bb => rgb_1.0.5.bb} (45%)

Patch

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 43ab68f..0000000
--- 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 <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.5.bb
similarity index 45%
rename from meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
rename to meta/recipes-graphics/xorg-app/rgb_1.0.5.bb
index 5f71787..602ee09 100644
--- a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb
@@ -2,11 +2,9 @@  require xorg-app-common.inc
 DEPENDS += " xproto util-macros"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
 PE = "1"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
-SRC_URI += "file://obsolete_automake_macros.patch"
-
-SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
-SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
+SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e"
+SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857"
 
 FILES_${PN} += "${datadir}/X11"