mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

libxcomposite: upgrade to the latest version 0.4.1

Browse Source 
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>
This commit is contained in:
Dexuan Cui
2010-06-29 10:31:51 +08:00
committed by Richard Purdie
parent aa7c1959dd
commit e125dd087b
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/packages/xorg-lib/libxcomposite/change-include-order.patch
View File

@@ -1,14 +1,14 @@
This patch makes the build use its own Xcomposite.h over rather than an 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. 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-0.4.1/src/Makefile.am.orig 2010-06-27 15:50:05.000000000 +0800
+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 +++ libXcomposite-0.4.1/src/Makefile.am 2010-06-27 15:51:48.000000000 +0800
@@ -21,7 +21,7 @@ @@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(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 lib_LTLIBRARIES = libXcomposite.la

11
meta/packages/xorg-lib/libxcomposite_0.4.0.bb → meta/packages/xorg-lib/libxcomposite_0.4.1.bb
View File

@@ -1,11 +1,16 @@
DESCRIPTION = "X Composite extension library."
require xorg-lib-common.inc require xorg-lib-common.inc
DESCRIPTION = "X Composite extension library." LICENSE= "MIT-style"
LICENSE= "BSD-X" LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
PROVIDES = "xcomposite" PROVIDES = "xcomposite"
PE = "1" PE = "1"
PR = "r0"
XORG_PN = "libXcomposite" XORG_PN = "libXcomposite"
SRC_URI += " file://change-include-order.patch;patch=1" SRC_URI += " file://change-include-order.patch"