From patchwork Mon Jan 4 21:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1422261 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DYyTLnvu; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8pXP10GZz9sVb for ; Tue, 5 Jan 2021 08:23:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 936A987167; Mon, 4 Jan 2021 21:23:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pPsBcds3tG+L; Mon, 4 Jan 2021 21:23:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A8D528715E; Mon, 4 Jan 2021 21:23:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 92D1A1BF29D for ; Mon, 4 Jan 2021 21:23:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D3A085455 for ; Mon, 4 Jan 2021 21:23:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eojsVkQkqi+4 for ; Mon, 4 Jan 2021 21:23:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0689186956 for ; Mon, 4 Jan 2021 21:23:38 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id y23so568941wmi.1 for ; Mon, 04 Jan 2021 13:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mhUZp4ulFwc9IB2TmBX7aYh3anVsqXfnhbR0UxC3HzM=; b=DYyTLnvuJASONlMxL0sUSSs3GNnNod0g0rv8ECYV8XKgY+gvI90NpY2w05N4ND+R5t RDdggQFVHWBPDt1iuXaBairsU1THXmD4eNShIca801JNAZb/PUdL89wnIpahgVm5IZN5 EEH6cRpMwAizE/EcgLWB8uCYdukqknS3F1vuCXDbl18P483Qfjf8j8JQeJrEznsUsW6p jYwDtP6fglFt08tC4pY7Y1yJ9wI1pE5v3ZRW7nzojAkSbN7WXEZfIC8rcRNo5L91jXmo ZoiBwsTwRJhZ5eOCiwLefwATf6Uxjq1lS1yy349gboZVr2U25pMeh6NqM86cobUK4cFJ SY2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mhUZp4ulFwc9IB2TmBX7aYh3anVsqXfnhbR0UxC3HzM=; b=U5JkDV1HmaV/s/FhZZmwu3zeHTEq4U0lLnTcpgVRvpMs4jYTENvnFkKSwy/rvzaJzD KPSTeKRiyt6Nq04ONJtQPGUMPAjyBYVrfV8D+PpqgP6z8ohXz94p7qNWdauC/V7dSFee AyS2TXdUK7HmgJlA+qDpJT7Ql2bFERFsIB0Yc67v9iDvJVu9pD511GGrubQ7Vi5qAOxv 7nhVlVLsM4OH9hx77EJ/dSWi4LnhxkVqdqGBjzuCNpBC/vsJ+9kw9wI/VhtupPLEXxhU Kc5mGR9y91pI3xWD2Q/PYSRQBD0G/qKWwud9BMhrJudb8rPwX9soHyjcCX0x7Gv53irn DB0A== X-Gm-Message-State: AOAM530LrUlSTu3xroYwtAtCsb6XdRasvUdG1j11RmKebmyN1LBJrfox 66D1uV47RViIKT7zyzJoFwfHRkG+uYA= X-Google-Smtp-Source: ABdhPJwJttROosROKszLI2jRNOkNcT/RTK4Q5qk7UoKjyNPEwRmAcP6Py/wIyUoPUbNF0FmZkgqbIA== X-Received: by 2002:a1c:7dd8:: with SMTP id y207mr649769wmc.181.1609795416581; Mon, 04 Jan 2021 13:23:36 -0800 (PST) Received: from atlas.home (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id u26sm958280wmm.24.2021.01.04.13.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jan 2021 13:23:35 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 4 Jan 2021 22:23:30 +0100 Message-Id: <20210104212330.207317-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/ogre: bump to version 1.12.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove upstream patch [1]. tinyxml has been replaced by pugixml [2]. Switch to git download method since github release without the complete source code in the tarball [3]. Update indentation of hash file (two spaces). The sdl2-config.cmake generated by sdl2 package is broken for cross-compilation since it add /usr/include/SDL2 in CFLAGS. Such flags are unsafe for cross-compilation since it mixes headers for the host and target. sdl2-config.cmake must be removed from staging since we are using autotools build system to build sdl2 package [4][5]. This has been fixed by [6] that was part of a previous patch series of two patches bumping ogre to 1.12.6. Previous ogre version unconditionally include header that has been removed from glibc since 2.32. This has been fixed since Ogre 1.12.7 [7]. [1] https://github.com/OGRECave/ogre/commit/de4d5c920e23e1e2b21dc5c8192ef74ba6210cca [2] https://github.com/OGRECave/ogre/commit/338103324096b78ae4718f97ac2150c4bb98c2d1 [3] https://github.com/OGRECave/ogre/issues/1332#issuecomment-563189058 [4] https://bugzilla.libsdl.org/show_bug.cgi?id=4597 [5] https://github.com/OGRECave/ogre/issues/1568 [6] d59261836a2ae2d024645b1e286540dd4269b6c8 [7] https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69 Signed-off-by: Romain Naour --- v3: improve commit log. --- ...ompiledHeader.cmake-Add-c-argument-t.patch | 57 ------------------- package/ogre/Config.in | 1 + package/ogre/ogre.hash | 4 +- package/ogre/ogre.mk | 14 +++-- 4 files changed, 13 insertions(+), 63 deletions(-) delete mode 100644 package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch diff --git a/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch b/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch deleted file mode 100644 index 97f4e24890..0000000000 --- a/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f480ac538eb69086d4b7db855c2a457d5d6420d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 10 Feb 2020 14:05:12 +0100 -Subject: [PATCH] CMake/Utils/PrecompiledHeader.cmake: Add -c argument to build - precompiled headers - -Add "-c" argument when building precompiled headers to fix build with -RELRO. - -More information on a similar issue with domoticz can be found here: -https://patchwork.ozlabs.org/patch/1187328: - -"The problem AFAICS is that if no -c or similar option is given, GCC -decides what needs to be done based on the rest of the arguments. If the -rest of the arguments include a -Wl,... option, it decides that linking -needs to be done. If the rest of the arguments are just header files, it -decides to create a precompiled header." - -Fixes: - - http://autobuild.buildroot.org/results/8fabf8d270b9257c3a9db6a2f17f1c08ec9428d3 - -Signed-off-by: Fabrice Fontaine -[Upstream: https://github.com/OGRECave/ogre/commit/de4d5c920e23e1e2b21dc5c8192ef74ba6210cca] ---- - CMake/Utils/PrecompiledHeader.cmake | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake -index a02d99acd..bfb0059db 100644 ---- a/CMake/Utils/PrecompiledHeader.cmake -+++ b/CMake/Utils/PrecompiledHeader.cmake -@@ -133,11 +133,11 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) - STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1}) - - SET(${out_command} -- ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} -+ ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input} - ) - ELSE(CMAKE_CXX_COMPILER_ARG1) - SET(${out_command} -- ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} -+ ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input} - ) - ENDIF(CMAKE_CXX_COMPILER_ARG1) - ELSE(CMAKE_COMPILER_IS_GNUCXX) -@@ -291,7 +291,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) - set_target_properties(${_targetName}_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES "${DIRINC}") - - #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") -- #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") -+ #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}") - - ADD_CUSTOM_COMMAND( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_name}" --- -2.24.1 - diff --git a/package/ogre/Config.in b/package/ogre/Config.in index 1d7784714d..7d57d3f82a 100644 --- a/package/ogre/Config.in +++ b/package/ogre/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_OGRE depends on BR2_USE_WCHAR # use wchar_t select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBFREEIMAGE + select BR2_PACKAGE_PUGIXML select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_OPENGL select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11 diff --git a/package/ogre/ogre.hash b/package/ogre/ogre.hash index 8bb4ae96a1..c1ac4e8925 100644 --- a/package/ogre/ogre.hash +++ b/package/ogre/ogre.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 163e7700e319532d4389ecba91e3ab88551f78610886fa36f8f262f9a5080988 ogre-1.12.0.tar.gz -sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8 LICENSE +sha256 d07342016fbb4b6a4158cb12724c2c75b406eea2c5327dd48d9302cf812df8ba ogre-v1.12.9.tar.gz +sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8 LICENSE diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk index 2df685a23a..52bd3b32d2 100644 --- a/package/ogre/ogre.mk +++ b/package/ogre/ogre.mk @@ -4,17 +4,21 @@ # ################################################################################ -OGRE_VERSION = 1.12.0 -OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION)) -OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml) +OGRE_VERSION = v1.12.9 +OGRE_SITE = https://github.com/OGRECave/ogre +OGRE_SITE_METHOD = git +OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins) OGRE_LICENSE_FILES = LICENSE OGRE_INSTALL_STAGING = YES -# Ogre use a bundled version of tinyxml +# Download with imgui submodule (https://github.com/ocornut/imgui +OGRE_GIT_SUBMODULES = YES + OGRE_DEPENDENCIES = host-pkgconf \ freetype \ libfreeimage \ libgl \ + pugixml \ sdl2 \ xlib_libX11 \ xlib_libXaw \ @@ -27,9 +31,11 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU # Unbundle freetype and zziplib. # Disable java and nvidia cg support. +# Disable imgui overlay to avoid extra download from CMake. OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ -DOGRE_BUILD_COMPONENT_JAVA=OFF \ -DOGRE_BUILD_PLUGIN_CG=OFF \ + -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \ -DOGRE_INSTALL_DOCS=OFF \ -DCMAKE_C_FLAGS="$(OGRE_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)"