diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2010-06-29 10:31:51 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-30 13:19:09 +0100 |
| commit | e125dd087b98e5b9f0764a4d99763193da1e239d (patch) | |
| tree | 616ba28b7f3da746f28d751da842a4a186dc90ea /meta | |
| parent | aa7c1959ddea63fdfec81c5e475700a8208096b0 (diff) | |
| download | poky-e125dd087b98e5b9f0764a4d99763193da1e239d.tar.gz | |
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')
| -rw-r--r-- | meta/packages/xorg-lib/libxcomposite/change-include-order.patch | 12 | ||||
| -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 630b8818fc..9b10d1a26d 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 @@ | |||
| 1 | This patch makes the build use its own Xcomposite.h over rather than an | 1 | This patch makes the build use its own Xcomposite.h over rather than an |
| 2 | older Xcomposite.h that might already be installed in the staging dir. | 2 | older Xcomposite.h that might already be installed in the staging dir. |
| 3 | 3 | ||
| 4 | --- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100 | 4 | --- libXcomposite-0.4.1/src/Makefile.am.orig 2010-06-27 15:50:05.000000000 +0800 |
| 5 | +++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 | 5 | +++ libXcomposite-0.4.1/src/Makefile.am 2010-06-27 15:51:48.000000000 +0800 |
| 6 | @@ -21,7 +21,7 @@ | 6 | @@ -19,7 +19,7 @@ |
| 7 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | 7 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
| 8 | # PERFORMANCE OF THIS SOFTWARE. | 8 | # PERFORMANCE OF THIS SOFTWARE. |
| 9 | 9 | ||
| 10 | -AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include | 10 | -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) |
| 11 | +AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) | 11 | +AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) |
| 12 | AM_CPPFLAGS = -I$(top_srcdir)/include | ||
| 12 | 13 | ||
| 13 | lib_LTLIBRARIES = libXcomposite.la | 14 | lib_LTLIBRARIES = libXcomposite.la |
| 14 | |||
diff --git a/meta/packages/xorg-lib/libxcomposite_0.4.0.bb b/meta/packages/xorg-lib/libxcomposite_0.4.1.bb index b3b9d49d63..8c5ca022c7 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 @@ | |||
| 1 | DESCRIPTION = "X Composite extension library." | ||
| 2 | |||
| 1 | require xorg-lib-common.inc | 3 | require xorg-lib-common.inc |
| 2 | 4 | ||
| 3 | DESCRIPTION = "X Composite extension library." | 5 | LICENSE= "MIT-style" |
| 4 | LICENSE= "BSD-X" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" |
| 7 | |||
| 5 | DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" | 8 | DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" |
| 6 | PROVIDES = "xcomposite" | 9 | PROVIDES = "xcomposite" |
| 10 | |||
| 7 | PE = "1" | 11 | PE = "1" |
| 12 | PR = "r0" | ||
| 8 | 13 | ||
| 9 | XORG_PN = "libXcomposite" | 14 | XORG_PN = "libXcomposite" |
| 10 | 15 | ||
| 11 | SRC_URI += " file://change-include-order.patch;patch=1" | 16 | SRC_URI += " file://change-include-order.patch" |