summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-06-29 10:31:51 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-30 13:19:09 +0100
commite125dd087b98e5b9f0764a4d99763193da1e239d (patch)
tree616ba28b7f3da746f28d751da842a4a186dc90ea /meta/packages
parentaa7c1959ddea63fdfec81c5e475700a8208096b0 (diff)
downloadopenembedded-core-e125dd087b98e5b9f0764a4d99763193da1e239d.tar.gz
openembedded-core-e125dd087b98e5b9f0764a4d99763193da1e239d.tar.bz2
openembedded-core-e125dd087b98e5b9f0764a4d99763193da1e239d.tar.xz
openembedded-core-e125dd087b98e5b9f0764a4d99763193da1e239d.zip
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>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-lib/libxcomposite/change-include-order.patch12
-rw-r--r--meta/packages/xorg-lib/libxcomposite_0.4.1.bb (renamed from meta/packages/xorg-lib/libxcomposite_0.4.0.bb)11
2 files changed, 14 insertions, 9 deletions
diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
index 630b8818f..9b10d1a26 100644
--- 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
index b3b9d49d6..8c5ca022c 100644
--- 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"