| Message ID | 1454704804-11605-1-git-send-email-nicolas.dechesne@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 5, 2016 at 9:46 PM, Burton, Ross <ross.burton@intel.com> wrote: > On 5 February 2016 at 20:44, Khem Raj <raj.khem@gmail.com> wrote: >> >> its added new to this version. May be packageconfig is better place >> for --with-sha1 stuff > > > Agreed - some may not want openssl at all and being able to switch it for > another alternative would be useful. sure. but, then I have some questions.. 1. which one we default to? openssl? 2. which one we support, from configure.ac: [choose SHA1 implementation])]) case "x$with_sha1" in x | xlibc | xlibmd | xlibnettle | xlibgcrypt | xlibcrypto | xlibsha1 | xCommonCrypto | xCryptoAPI) ;; 3. is there a good way to handle 'multiple choice' with PACKAGECONFIG? How can we prevent more than 1 PACKAGECONFIG to be set (nicely)? -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 9b316e1..1ad4400 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3d PE = "2" -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev openssl" PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" @@ -22,7 +22,9 @@ inherit autotools pkgconfig pythonnative gettext distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" -EXTRA_OECONF = "--enable-shared-glapi" +EXTRA_OECONF = "--enable-shared-glapi \ + --with-sha1=libcrypto \ +" PACKAGECONFIG ??= "egl gles dri \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ diff --git a/meta/recipes-graphics/mesa/mesa_10.6.3.bb b/meta/recipes-graphics/mesa/mesa_11.1.1.bb similarity index 66% rename from meta/recipes-graphics/mesa/mesa_10.6.3.bb rename to meta/recipes-graphics/mesa/mesa_11.1.1.bb index 5da56ad..5d73feb 100644 --- a/meta/recipes-graphics/mesa/mesa_10.6.3.bb +++ b/meta/recipes-graphics/mesa/mesa_11.1.1.bb @@ -1,9 +1,9 @@ require ${BPN}.inc -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/${PV}/mesa-${PV}.tar.xz" +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" -SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" -SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" +SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427" +SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
* update SRC_URI and checksum. * use libcrypto for sha1 functions. In upstream commit a24bdce4, support for SHA-1 was copied from xserver repo, so let's use the same default for --with-sha1 option that we use in xserver recipe in OE core. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> --- meta/recipes-graphics/mesa/{mesa-gl_10.6.3.bb => mesa-gl_11.1.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 6 ++++-- meta/recipes-graphics/mesa/{mesa_10.6.3.bb => mesa_11.1.1.bb} | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_10.6.3.bb => mesa-gl_11.1.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_10.6.3.bb => mesa_11.1.1.bb} (66%) -- 2.7.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core