From d570146f13c0cb34caed05c93cf3ec9fd3e3927e Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 10 May 2018 09:09:56 -0700 Subject: icetea7, openjdk-8: Fix depenency to xproto -> xorgproto The latest oe-core has changed the X protocol header provider package name. Signed-off-by: Jason Wessel Reviewed-by: Richard Leitner Tested-by: Richard Leitner Signed-off-by: Henning Heinold --- recipes-core/icedtea/icedtea7-native.inc | 2 +- recipes-core/openjdk/openjdk-8-cross.inc | 2 +- recipes-core/openjdk/openjdk-8-native.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index d4cf7ac..2c9fa92 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -12,7 +12,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ " PACKAGECONFIG ??= "" -PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" +PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index d70c946..46f13fd 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -21,7 +21,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ gif jpeg png zlib \ " -PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst" +PACKAGECONFIG[x11] = "--with-x,,libx11 xorgproto libxt libxext libxrender libxtst" PACKAGECONFIG[cups] = "--with-cups,,cups" PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib" diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index d674474..b782c32 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -10,7 +10,7 @@ DEPENDS = "\ SRC_URI_append += "file://handle_extra_output.patch" PACKAGECONFIG ??= "gif jpeg png zlib" -PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" +PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" PACKAGECONFIG[cups] = "--with-cups,,cups" PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib-native" -- cgit v1.2.3-54-g00ecf