diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch index 46a53a17f2..61af98d95e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch | |||
@@ -6,12 +6,16 @@ Subject: [PATCH] Drop x11 dependencies | |||
6 | Upstream-Status: Inappropriate [OE-Specific] | 6 | Upstream-Status: Inappropriate [OE-Specific] |
7 | 7 | ||
8 | Signed-off-by: Ming Liu <ming.liu@toradex.com> | 8 | Signed-off-by: Ming Liu <ming.liu@toradex.com> |
9 | |||
10 | Rebase for version 1.8.3. | ||
11 | |||
12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
9 | --- | 13 | --- |
10 | configure.ac | 44 -------------------------------------------- | 14 | configure.ac | 44 -------------------------------------------- |
11 | 1 file changed, 44 deletions(-) | 15 | 1 file changed, 44 deletions(-) |
12 | 16 | ||
13 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
14 | index a5fd706..b42488c 100644 | 18 | index 33d0102..50e2d93 100644 |
15 | --- a/configure.ac | 19 | --- a/configure.ac |
16 | +++ b/configure.ac | 20 | +++ b/configure.ac |
17 | @@ -76,27 +76,8 @@ fi | 21 | @@ -76,27 +76,8 @@ fi |
@@ -20,7 +24,7 @@ index a5fd706..b42488c 100644 | |||
20 | # Checks for pkg-config packages | 24 | # Checks for pkg-config packages |
21 | - | 25 | - |
22 | -# Always required | 26 | -# Always required |
23 | -X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1' | 27 | -X11_REQUIRES='xproto >= 7.0.25 xextproto xtrans xcb >= 1.11.1' |
24 | -X11_EXTRA_DEPS="xcb >= 1.11.1" | 28 | -X11_EXTRA_DEPS="xcb >= 1.11.1" |
25 | - | 29 | - |
26 | PKG_PROG_PKG_CONFIG() | 30 | PKG_PROG_PKG_CONFIG() |
@@ -42,7 +46,7 @@ index a5fd706..b42488c 100644 | |||
42 | # Check for dlopen | 46 | # Check for dlopen |
43 | AC_MSG_CHECKING([if run-time linking is supported]) | 47 | AC_MSG_CHECKING([if run-time linking is supported]) |
44 | AC_SEARCH_LIBS(dlopen,[dl svld]) | 48 | AC_SEARCH_LIBS(dlopen,[dl svld]) |
45 | @@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS) | 49 | @@ -255,30 +236,6 @@ AC_SUBST(USE_THREAD_LIBS) |
46 | 50 | ||
47 | AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) | 51 | AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) |
48 | 52 | ||
@@ -73,7 +77,7 @@ index a5fd706..b42488c 100644 | |||
73 | AC_ARG_ENABLE(xcms, | 77 | AC_ARG_ENABLE(xcms, |
74 | AS_HELP_STRING([--disable-xcms], | 78 | AS_HELP_STRING([--disable-xcms], |
75 | [Disable Xlib support for CMS *EXPERIMENTAL*]), | 79 | [Disable Xlib support for CMS *EXPERIMENTAL*]), |
76 | @@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11" | 80 | @@ -358,7 +315,6 @@ X11_LIBDIR="${libdir}/X11" |
77 | AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) | 81 | AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) |
78 | AC_SUBST(X11_LIBDIR) | 82 | AC_SUBST(X11_LIBDIR) |
79 | 83 | ||