[PATCH 1/2] weston: drop superfluous --disable-lcms

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/2] weston: drop superfluous --disable-lcms
@ 2014-05-29 14:30 Tim Orling
  2014-05-29 14:30 ` [PATCH 2/2] weston: fix make-lcms-configurable.patch Tim Orling
  0 siblings, 1 reply; 4+ messages in thread
From: Tim Orling @ 2014-05-29 14:30 UTC (permalink / raw)
  To: openembedded-core

From: Tim Orling <TicoTimo@gmail.com>

Thank you to Henning Heinold for the catch.
"Is this needed when you use PACKAGECONFIG later on?"

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 meta/recipes-graphics/wayland/weston_1.5.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb
index f6ae8c4..6a79e32 100644
--- a/meta/recipes-graphics/wayland/weston_1.5.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb
@@ -26,7 +26,7 @@ EXTRA_OECONF = "--enable-setuid-install \
                 --disable-libunwind \
                 --disable-rpi-compositor \
                 --disable-rdp-compositor \
-                --disable-lcms"
+                "
 
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
-- 
1.8.3.2



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] weston: fix make-lcms-configurable.patch
  2014-05-29 14:30 [PATCH 1/2] weston: drop superfluous --disable-lcms Tim Orling
@ 2014-05-29 14:30 ` Tim Orling
  2014-05-29 22:49   ` Burton, Ross
  0 siblings, 1 reply; 4+ messages in thread
From: Tim Orling @ 2014-05-29 14:30 UTC (permalink / raw)
  To: openembedded-core

From: Tim Orling <TicoTimo@gmail.com>

In AS_IF([test "x$enable_lcms" != "no"],
"no" should have been "xno"

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
index 817ac70..ef145b8 100644
--- a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
+++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
@@ -11,7 +11,7 @@ Index: weston-1.5.0/configure.ac
 +                             [disable lcms support]),,
 +              enable_lcms=yes)
 +
-+AS_IF([test "x$enable_lcms" != "no"], [
++AS_IF([test "x$enable_lcms" != "xno"], [
  PKG_CHECK_MODULES(LCMS, lcms2,
 -                  [have_lcms=yes], [have_lcms=no])
 +                  [have_lcms=yes], [have_lcms=no])],
-- 
1.8.3.2



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] weston: fix make-lcms-configurable.patch
  2014-05-29 14:30 ` [PATCH 2/2] weston: fix make-lcms-configurable.patch Tim Orling
@ 2014-05-29 22:49   ` Burton, Ross
  2014-05-30 15:52     ` [PATCH v2] weston: make lcms explicitly configurable Tim Orling
  0 siblings, 1 reply; 4+ messages in thread
From: Burton, Ross @ 2014-05-29 22:49 UTC (permalink / raw)
  To: Tim Orling; +Cc: OE-core

On 29 May 2014 15:30, Tim Orling <ticotimo@gmail.com> wrote:
> In AS_IF([test "x$enable_lcms" != "no"],
> "no" should have been "xno"

This patch doesn't quite satisfy the general goal we have of being
fully deterministic: if --enable-lcms is specified but the lcms
dependency isn't satisfied (i.e. it gained a version requirement and
we didn't have it) then configure would happily and silently disable
lcms.

A small tweak so that it's a fatal error if lcms is specified but the
deps are not present would be good.  Also have you approached upstream
about this patch?

Ross

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v2] weston: make lcms explicitly configurable
  2014-05-29 22:49   ` Burton, Ross
@ 2014-05-30 15:52     ` Tim Orling
  0 siblings, 0 replies; 4+ messages in thread
From: Tim Orling @ 2014-05-30 15:52 UTC (permalink / raw)
  To: openembedded-core

From: Tim Orling <TicoTimo@gmail.com>

Per Ross's comment, make --enable-lcms deterministic.
Follow upstream style to make it more likely to be merged upstream.

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 .../wayland/weston/make-lcms-configurable.patch    | 22 -----------
 .../weston/make-lcms-explicitly-configurable.patch | 43 ++++++++++++++++++++++
 meta/recipes-graphics/wayland/weston_1.5.0.bb      |  2 +-
 3 files changed, 44 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
 create mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch

diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
deleted file mode 100644
index 29fe5b8..0000000
--- a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: weston-1.5.0/configure.ac
-===================================================================
---- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install,
- 			     enable_demo_clients_install=no)
- AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
- 
-+AC_ARG_ENABLE(lcms,
-+              AS_HELP_STRING([--disable-lcms],
-+                             [disable lcms support]),,
-+              enable_lcms=yes)
-+
-+AS_IF([test "x$enable_lcms" != "xno"], [
- PKG_CHECK_MODULES(LCMS, lcms2,
--                  [have_lcms=yes], [have_lcms=no])
-+                  [have_lcms=yes], [AC_MSG_ERROR([lcms enabled but not found])])],
-+                  [have_lcms=no])
-+
- if test "x$have_lcms" = xyes; then
-        AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
- fi
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
new file mode 100644
index 0000000..35e6d6f
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
@@ -0,0 +1,43 @@
+weston-1.5.0/configure.ac: make lcms explicitly configurable
+
+The lcms package is outside of openembedded-core, so make it
+explicitly configurable. Make it deterministic, so that if lcms
+dependencies are missing, autoconf throws a fatal error. Follow
+upstream style to make it more likely to be merged.
+
+Upstream-Status: Pending
+
+Index: weston-1.5.0/configure.ac
+===================================================================
+--- weston-1.5.0.orig/configure.ac
++++ weston-1.5.0/configure.ac
+@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install,
+ 			     enable_demo_clients_install=no)
+ AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
+ 
+-PKG_CHECK_MODULES(LCMS, lcms2,
+-                  [have_lcms=yes], [have_lcms=no])
+-if test "x$have_lcms" = xyes; then
+-       AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
++AC_ARG_ENABLE(lcms,
++              AS_HELP_STRING([--disable-lcms],
++                             [Disable lcms support]),,
++              enable_lcms=auto)
++AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
++if test "x$enable_lcms" != "xno"; then
++        PKG_CHECK_MODULES(LCMS, 
++                         lcms2,
++                         [have_lcms=yes],
++                         [have_lcms=no])
++        if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
++          AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
++        fi
++        if test "x$have_lcms" = "xyes"; then
++                enable_lcms=yes
++                AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
++        fi
+ fi
+-AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
+ 
+ AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+ if test x$wayland_scanner = x; then
diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb
index 6a79e32..5573a06 100644
--- a/meta/recipes-graphics/wayland/weston_1.5.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
            file://disable-wayland-scanner-pkg-check.patch \
-           file://make-lcms-configurable.patch"
+           file://make-lcms-explicitly-configurable.patch"
 SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780"
 SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684"
 
-- 
1.8.3.2



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-05-30 15:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-29 14:30 [PATCH 1/2] weston: drop superfluous --disable-lcms Tim Orling
2014-05-29 14:30 ` [PATCH 2/2] weston: fix make-lcms-configurable.patch Tim Orling
2014-05-29 22:49   ` Burton, Ross
2014-05-30 15:52     ` [PATCH v2] weston: make lcms explicitly configurable Tim Orling

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.