diff options
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch | 10 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb (renamed from meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb) | 2 |
2 files changed, 7 insertions, 5 deletions
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 9b10d1a26..848beff08 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.3.bb index 8c5ca022c..0d7b84daf 100644 --- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "X Composite extension library." require xorg-lib-common.inc LICENSE= "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" |