From fb0bd9aac1dcd940a82778941cd4ebd821614128 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 24 Nov 2010 12:13:04 -0800 Subject: libxcomposite: Update to version 0.4.3 Signed-off-by: Saul Wold --- .../xorg-lib/libxcomposite/change-include-order.patch | 10 ++++++---- meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb | 16 ---------------- meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch index 9b10d1a26d..848beff08c 100644 --- a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch +++ b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch @@ -1,14 +1,16 @@ This patch makes the build use its own Xcomposite.h over rather than an older Xcomposite.h that might already be installed in the staging dir. ---- libXcomposite-0.4.1/src/Makefile.am.orig 2010-06-27 15:50:05.000000000 +0800 -+++ libXcomposite-0.4.1/src/Makefile.am 2010-06-27 15:51:48.000000000 +0800 +Index: libXcomposite-0.4.3/src/Makefile.am +=================================================================== +--- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 ++++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. --AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -+AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) +-AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) ++AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libXcomposite.la diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb deleted file mode 100644 index 8c5ca022c7..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "X Composite extension library." - -require xorg-lib-common.inc - -LICENSE= "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" - -DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" -PROVIDES = "xcomposite" - -PE = "1" -PR = "r0" - -XORG_PN = "libXcomposite" - -SRC_URI += " file://change-include-order.patch" diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb new file mode 100644 index 0000000000..0d7b84dafc --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Composite extension library." + +require xorg-lib-common.inc + +LICENSE= "MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" + +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" +PROVIDES = "xcomposite" + +PE = "1" +PR = "r0" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch" -- cgit v1.2.3-54-g00ecf