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 9b10d1a26d..848beff08c 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 @@ | |||
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-0.4.1/src/Makefile.am.orig 2010-06-27 15:50:05.000000000 +0800 | 4 | Index: libXcomposite-0.4.3/src/Makefile.am |
5 | +++ libXcomposite-0.4.1/src/Makefile.am 2010-06-27 15:51:48.000000000 +0800 | 5 | =================================================================== |
6 | --- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 | ||
7 | +++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 | ||
6 | @@ -19,7 +19,7 @@ | 8 | @@ -19,7 +19,7 @@ |
7 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | 9 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
8 | # PERFORMANCE OF THIS SOFTWARE. | 10 | # PERFORMANCE OF THIS SOFTWARE. |
9 | 11 | ||
10 | -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) | 12 | -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) |
11 | +AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) | 13 | +AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) |
12 | AM_CPPFLAGS = -I$(top_srcdir)/include | 14 | AM_CPPFLAGS = -I$(top_srcdir)/include |
13 | 15 | ||
14 | lib_LTLIBRARIES = libXcomposite.la | 16 | 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 8c5ca022c7..0d7b84dafc 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." | |||
3 | require xorg-lib-common.inc | 3 | require xorg-lib-common.inc |
4 | 4 | ||
5 | LICENSE= "MIT-style" | 5 | LICENSE= "MIT-style" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" |
7 | 7 | ||
8 | DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" | 8 | DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" |
9 | PROVIDES = "xcomposite" | 9 | PROVIDES = "xcomposite" |