diff options
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch | 18 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb | 2 |
2 files changed, 0 insertions, 20 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 deleted file mode 100644 index 60331f6e78..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | This patch makes the build use its own Xcomposite.h over rather than an | ||
4 | older Xcomposite.h that might already be installed in the staging dir. | ||
5 | |||
6 | Index: libXcomposite-0.4.3/src/Makefile.am | ||
7 | =================================================================== | ||
8 | --- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 | ||
9 | +++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 | ||
10 | @@ -19,7 +19,7 @@ | ||
11 | # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
12 | # PERFORMANCE OF THIS SOFTWARE. | ||
13 | |||
14 | -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) | ||
15 | +AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) | ||
16 | AM_CPPFLAGS = -I$(top_srcdir)/include | ||
17 | |||
18 | lib_LTLIBRARIES = libXcomposite.la | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb index 77b3db5cf9..881f579695 100644 --- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb +++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb | |||
@@ -22,6 +22,4 @@ PE = "1" | |||
22 | 22 | ||
23 | XORG_PN = "libXcomposite" | 23 | XORG_PN = "libXcomposite" |
24 | 24 | ||
25 | SRC_URI += " file://change-include-order.patch" | ||
26 | |||
27 | SRC_URI[sha256sum] = "fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87" | 25 | SRC_URI[sha256sum] = "fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87" |