libxcomposite: upgrade to the latest version 0.4.1

Remove the ";patch=1" in SRC_URI since by default a .patch file is applied.
Update change-include-order.patch to apply it to 0.4.1.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>

diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
index 630b8818fc0bf8354226f08df447d6a29a8c0bd3..9b10d1a26d0c5c5b0ac5c6bda58e33adb21ff7db 100644 (file)
--- a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
+++ b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
@@ -1,14 +1,14 @@
 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-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
-+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am      2006-03-12 20:10:35.000000000 +0100
-@@ -21,7 +21,7 @@
+--- 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
+@@ -19,7 +19,7 @@
  #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  #  PERFORMANCE OF THIS SOFTWARE.
  
--AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
-+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+-AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
++AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/include
  
  lib_LTLIBRARIES = libXcomposite.la
- 

diff --git a/meta/packages/xorg-lib/libxcomposite_0.4.0.bb b/meta/packages/xorg-lib/libxcomposite_0.4.1.bb
similarity index 56%
rename from meta/packages/xorg-lib/libxcomposite_0.4.0.bb
rename to meta/packages/xorg-lib/libxcomposite_0.4.1.bb
index b3b9d49d634a7fb9b7243c78fbcff4d5542f2b7f..8c5ca022c7be51094ff29ba72b807555c073162f 100644 (file)
--- a/meta/packages/xorg-lib/libxcomposite_0.4.0.bb
+++ b/meta/packages/xorg-lib/libxcomposite_0.4.1.bb
@@ -1,11 +1,16 @@
+DESCRIPTION = "X Composite extension library."
+
 require xorg-lib-common.inc
 
-DESCRIPTION = "X Composite extension library."
-LICENSE= "BSD-X"
+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;patch=1"
+SRC_URI += " file://change-include-order.patch"