From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 04:52:20 2022 Received: (at submit) by debbugs.gnu.org; 3 Dec 2022 09:52:20 +0000 Received: from localhost ([127.0.0.1]:51439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PBz-0007Ey-U0 for submit@debbugs.gnu.org; Sat, 03 Dec 2022 04:52:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:43420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PBx-0007EX-JL for submit@debbugs.gnu.org; Sat, 03 Dec 2022 04:52:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p1PBx-0003M4-E0 for guix-patches@gnu.org; Sat, 03 Dec 2022 04:52:17 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1PBu-0004wP-Uc for guix-patches@gnu.org; Sat, 03 Dec 2022 04:52:17 -0500 Received: by mail-ej1-x641.google.com with SMTP id fc4so9872010ejc.12 for ; Sat, 03 Dec 2022 01:52:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=o5ic5EdAxBnx3XWgrh2/1vAd3nynYleGWNmKpos4kqg=; b=U7FHS/uW22yebW++UfmQcT+Va6+TDFeUDn/5jaVWGxUo61Y/786k7JKE/Q8aDSsKju tyNfRRkcTKaLgBYW1+a4XCRkiotEaNepmOM6U5fa/dk2PD7pDlHcyZM0OevHK76liOzK FaBsgpmgXrIDZUUOMILGDPfrqsh2rrQyQvh/OL8julAs+G1Vcsj3wUOZo7Lp9QbG0NGX +H06QaxRohjQVHykhWNN1qgrS16+ynJLRt/s/O/uli+bJPlmci++LCZ2UJSEAIlglFG0 I2gLhAElwanu5iqEHjeCLd0vqgNUPkauFGg3/cLRaedL8bbSe3nlGjrF80zoFCc/gV0z kf0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o5ic5EdAxBnx3XWgrh2/1vAd3nynYleGWNmKpos4kqg=; b=p6i8WjyXVH5UnOJS+XkUP8cDh/RLoHrYC/BxpR0jigIfqii0kA59ET+m08EPbj7Cn6 E/ArkeCRfgNHIqOwPOfIKdX7qamdaECSOUWv8gaffs+HYxSMW8QUgt9K5gdWmnsdf1Ew dC8YAQomUPXyON2iE3QhghsYQAWQKDovgmORuC/KawENXYTR5QMiy3Ou3IsHcFlX+/kA aLqmqEqXiWC+VQzDwAfWtj/SyRUWeIsT16w7k6zjJsksqBjSm+mFhdSeuCVIxMbwCRJd zjBOoP3n/88HAXsqRhRjC+aorVdsDj9r6FgY7t7dvLPoNrjvruYMdmT+dmctK+/uuYFz t8ug== X-Gm-Message-State: ANoB5pn1BifXZ70CIImuJw+KoSuCg/y9BT08VdLWQy8ZUrAMHHa/tQN1 WgcSAEaj3f6naBb/lSB22o03uEidUuM= X-Google-Smtp-Source: AA0mqf4Pl+C659IcscBRIWOkAwOTxWvG8hSpAfMSgEsNFq5wMxj/AsvXsvFRbpGMq28yvfmdRzbu7g== X-Received: by 2002:a17:906:2e82:b0:7ae:44b2:cb7f with SMTP id o2-20020a1709062e8200b007ae44b2cb7fmr47935230eji.437.1670061131701; Sat, 03 Dec 2022 01:52:11 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z17-20020a17090655d100b0078df26efb7dsm3993863ejp.107.2022.12.03.01.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 01:52:11 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:09:11 +0100 Subject: [PATCH 0/5] Add esmini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 to: guix-patches@gnu.org Content-Transfer-Encoding: 7bit Message-ID: <034d0ae2b33c04dc7a5f8f75ab285e20937ce4ec.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x641.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MALFORMED_FREEMAIL=2.899, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix, here's some software that simulates blocks on a road. Something, something, self-driving cars will become a reality in 2023. Cheers Liliana Marie Prikler (5): gnu: openscenegraph: Use modern package style. gnu: openscenegraph: Add output for plugins. gnu: Add open-simulation-interface. gnu: Add python-open-simulation-interface. gnu: Add esmini. gnu/local.mk | 2 + gnu/packages/graphics.scm | 54 +- .../patches/esmini-no-clutter-log.patch | 30 + .../patches/esmini-use-pkgconfig.patch | 541 ++++++++++++++++++ gnu/packages/simulation.scm | 108 ++++ 5 files changed, 726 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/esmini-no-clutter-log.patch create mode 100644 gnu/packages/patches/esmini-use-pkgconfig.patch base-commit: 9e9204958d3e0ecfe8fd024d8f06068b84f52ba1 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 05:00:57 2022 Received: (at 59800) by debbugs.gnu.org; 3 Dec 2022 10:00:57 +0000 Received: from localhost ([127.0.0.1]:51488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKK-0007NX-Rl for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:57 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:38447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKK-0007NN-0H for 59800@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:56 -0500 Received: by mail-ed1-f68.google.com with SMTP id c66so3174151edf.5 for <59800@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=npFcJV2fEkqq9t2tKrCJFzN2LIHFCgQ/c9aRJTA09Ww=; b=JfLxNgCNswes1AzD5aE72o0A2qkDdldEyc2YAhzRQAiYgEJRcYBYxDMwYVlGUly8Co hQ/fm3voMCBqhl+4x6+DOytFzJ68Cx0K4rdJAfnVBqaZUfCNgPWZ8kKt9OBV2oR1eHm7 Wg8067I/UcqFK9B6Qtf2JqqxjpQl8KlRhOJUQEvRIsYkZEGmdrtF9NQwqHZd7OJEOpTi JzQDAIjyGIasM+gqFD9urT2r5m5B0IedBm6SOvW0a00EfVxx6aplh59NHjH9A5Vjt617 jHxBSvx8t5Rsl5vPsGW763DyjARDlj50vS/kFI4Md7IOssEhvc9xlMcDbyTko6J5ugFu IXoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=npFcJV2fEkqq9t2tKrCJFzN2LIHFCgQ/c9aRJTA09Ww=; b=0V0IC7b52oDL5Wn5bMO+t2248T6lM9HkkccN7lWy+DFEzYgRrWapta6MpsZlY5bxGo 8soTEW+2crYOxFEvu7gm6qWjdnHqaWnaiG5YbtpZC7nitlFhhNv5fjCQcgRHzY584mDp CGSJ+9jo5548yLg1cA3W/Fevo4V7idsUEVRpsPjSDBgMbR4xMxPUBR9n73UFPVyJHXIY lJl8QJKVHf3zQzlbvjbrsJoRsD/84avkOm0PYG3YRBnOw2ke3ir39lD11l93VpT1UTh+ Api+d536IH9JLjf31pQscPLumnm690PbFTtF6jjlcnzuhnOdWemI1AZCdyO73/nAA58Z 08RQ== X-Gm-Message-State: ANoB5pn1cE3APMG6OL0c9k/RLv+fHRa/wrT7KVfuQs0TinpTUaGi0+aq nyBBRryHxDeUVepxnrU/X22QPglk98Q= X-Google-Smtp-Source: AA0mqf4sBNmm0DcCMTU3VcAnSmYCrf2WzM3woeK7gfir5pUHGvPBKRXUPevPHP06IxGCFKFwRhev6w== X-Received: by 2002:aa7:d7d4:0:b0:46b:7f11:10a4 with SMTP id e20-20020aa7d7d4000000b0046b7f1110a4mr18116455eds.59.1670061650536; Sat, 03 Dec 2022 02:00:50 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t15-20020aa7d4cf000000b0046c53c3b2dfsm906869edr.38.2022.12.03.02.00.49 for <59800@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:50 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:12:15 +0100 Subject: [PATCH 1/5] gnu: openscenegraph: Use modern package style. to: 59800@debbugs.gnu.org Content-Transfer-Encoding: 7bit Message-ID: <7324733de60f8653c1b364c7825e69ec21cba00a.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59800 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graphics.scm (openscenegraph)[arguments]: Convert to list of G-Expressions. --- gnu/packages/graphics.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 60c6a979c5..4193c2949b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1292,14 +1292,15 @@ (define-public openscenegraph `((upstream-name . "OpenSceneGraph"))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no test target available - ;; Without this flag, 'rd' will be added to the name of the - ;; library binaries and break linking with other programs. - #:build-type "Release" - #:configure-flags - (list (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib64")))) + (list + #:tests? #f ; no test target available + ;; Without this flag, 'rd' will be added to the name of the + ;; library binaries and break linking with other programs. + #:build-type "Release" + #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_RPATH=" + #$output "/lib:" + #$output "/lib64")))) (native-inputs (list pkg-config unzip)) (inputs -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 05:01:00 2022 Received: (at 59800) by debbugs.gnu.org; 3 Dec 2022 10:01:00 +0000 Received: from localhost ([127.0.0.1]:51493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKO-0007Nt-36 for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:01:00 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:41539) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKK-0007NO-LC for 59800@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:57 -0500 Received: by mail-ej1-f67.google.com with SMTP id vp12so16852794ejc.8 for <59800@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=CjmdZU5sCDxbin49D2po2CemVrbZ12BtPgtv3MekVyA=; b=FprXs4mbowh7en+TSgr3cerJF4FrjeP7cUDP0gXE6KTs4YcWf1vBM77dE3m4hivDPj hbNaU28gL+3RvR4/7G9oqfLEgtiYPl15LWbW+IKo3Pe4dOuaLoMAVDEIvgrPg/eihOqU B8s2pigR3Qh+apoD9QcgWIK53fzubeM6maubtnE+8V6JNWILdY12Nxctr0/s/GP7GvYN 7KjdqBYf3jYeKBWAPEQKoowedQEILhjakPWnQLkBvNUfD2JPG2z5qpjxa6Tsu/h4MHr+ bfIC2wmfD4wNQVJ18wjYbTT8yUSfx9m1oxDLo7tCMZZZF0MzNvWyfot6wPTYge36ny6s ZQPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CjmdZU5sCDxbin49D2po2CemVrbZ12BtPgtv3MekVyA=; b=kcYwoDO6xf6vC7RmNtE4Z7xdO/jWeLPAOWEGQHLODlS269Deymg+qdm5MnRZ/PqHQi wrBddMe2T82iMdw0s8HmH39mU48GQCxiJ8ch6WZ6N9cdwSVaE4Hdhy8HqqPAMCFcH4N6 j0LFHcqV2OoCHdZDi5+Z+0tPinFjGiZcyiYsleIp/EM4P3ul0BYWqr91I9Rb5eYbDe/b BJ7dd0t2eRzMsD0KeR/IDsHcObvY/Gqh+whLolgr/b1KHZsbp070zVzvOkOC5ZgjddMc pYwz/Isto72fBO78p2M9ezxn3NjzkV2U71rddgcxdNVk7/iMhadrY+1S7RNm9BuUX6bY SjiQ== X-Gm-Message-State: ANoB5pk+J52xK41JatZMCMNQs+NiqKx7fSL2nMCGzOLa6dXDMcJyI5sE 6PfC9MeavpgwRHG/akg7eXl+v6Nh51g= X-Google-Smtp-Source: AA0mqf6tKE88dk3GHmYr5KyG+GzZ9o3+EPpZ3PTdc+05QxOh8dbbe51ur5wiCST70BkUFahHHze0EA== X-Received: by 2002:a17:906:1310:b0:7c0:c5e9:634d with SMTP id w16-20020a170906131000b007c0c5e9634dmr5238238ejb.220.1670061651159; Sat, 03 Dec 2022 02:00:51 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t15-20020aa7d4cf000000b0046c53c3b2dfsm906869edr.38.2022.12.03.02.00.50 for <59800@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:50 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:13:50 +0100 Subject: [PATCH 2/5] gnu: openscenegraph: Add output for plugins. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 to: 59800@debbugs.gnu.org Content-Transfer-Encoding: 8bit Message-ID: <7be02d37bc51f8e11d1d5fe187692f9cb67d5d4a.camel@gmail.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59800 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This makes it so that other packages can find plugins via pkg-config and link to them in the usual manner. * gnu/packages/graphics.scm (openscenegraph)[outputs]: Add “pluginlib”. [properties]: Add output synopsis for “pluginlib”. [arguments]<#:modules>: Use (ice-9 regex). <#:phases>: Add ‘copy-plugins’. --- gnu/packages/graphics.scm | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4193c2949b..b892e44f72 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1289,8 +1289,10 @@ (define-public openscenegraph (base32 "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1")) (file-name (git-file-name name version)))) (properties - `((upstream-name . "OpenSceneGraph"))) + `((upstream-name . "OpenSceneGraph") + (output-synopsis "pluginlib" "Plugins as shared libraries"))) (build-system cmake-build-system) + (outputs (list "out" "pluginlib")) (arguments (list #:tests? #f ; no test target available @@ -1300,7 +1302,40 @@ (define-public openscenegraph #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_RPATH=" #$output "/lib:" - #$output "/lib64")))) + #$output "/lib64")) + #:modules `((guix build cmake-build-system) + (guix build utils) + (ice-9 regex)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'copy-plugins + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (pluginlib (assoc-ref outputs "pluginlib"))) + (mkdir-p (string-append pluginlib "/lib/pkgconfig")) + (with-directory-excursion (string-append out "/lib/osgPlugins-" + #$version) + (for-each + (lambda (lib) + (let ((blib (basename lib)) + (m (string-match "([^/]*)\\.so$" lib))) + (symlink (canonicalize-path lib) + (string-append pluginlib "/lib/lib" blib)) + (call-with-output-file (string-append + pluginlib + "/lib/pkgconfig/" + (match:substring m 1) ".pc") + (lambda (port) + (format port "libdir=~a/lib~%" pluginlib) + (newline port) + (format port "Name: ~a~%" (match:substring m 1)) + (format port "Version: ~a~%" #$version) + (display "Description: A plugin for openscenegraph\n" + port) + (display "Requires: openscenegraph\n" port) + (format port "Libs: -L${libdir} -l~a~%" + (match:substring m 1)))))) + (find-files "." "\\.so"))))))))) (native-inputs (list pkg-config unzip)) (inputs -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 05:01:00 2022 Received: (at 59800) by debbugs.gnu.org; 3 Dec 2022 10:01:00 +0000 Received: from localhost ([127.0.0.1]:51495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKO-0007Nv-Cu for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:01:00 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:36756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKL-0007NP-BK for 59800@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:57 -0500 Received: by mail-ed1-f65.google.com with SMTP id v8so9480524edi.3 for <59800@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=PbXI5aHAr/JWZVvE0y+K/dKdatkZr8GDiTOlomraUS0=; b=TzyYOCX00ZroL1TWYfhMzNpVDhFNIGrwSkBBKT7Stdn3j2LeLGYvcnreE5C7qs0gaV N5nxuYPvBwI1vQudx6D2+rxfM3/aPcmzqhu52q+CSNf5rFUDd5pL2gNOMJxDbl81qdeJ BJrbSti5GS0CzO4Sz9QXugek8+YfrEYvVG2o/sT8IW1sjV4E60D2LKKhZVDjvIDIE36Y qAUQrguSdyS+FD2nJzhV9XCBou/SvM2iCefdHC65XTTS2KEwVBDlToFbdUqrZXJlag6h 6aeFCNhR0+aBuYCfKZ05IXrPBnd9YfdDEyXQ5uN5OGYaTamitARXC63cb6Mx8dRGKucm 71Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PbXI5aHAr/JWZVvE0y+K/dKdatkZr8GDiTOlomraUS0=; b=yFwcIh7nweXmYVby6+ZahYwZDA+SWgTWBqSPIwjgYiVWdlvnZvX8ICO/ksvWD8wd/r 3aiLIU0qUr94jS3y2AELGi4ouEJ407uB/28ggAzBkfV+SQ96j4MH/OL9kTA1bG+VPPor Rg21NGFjlKUv8AZ5oHftWdq5ifdiOHnzDiCG/bBFrO2d/QuN1IiwUbheMVRxy9Gamvf5 dmXGXf03u708XEtrhfP600M+9XQ//BgcmhQ+AdRp1wCyuuE1imEjR5ru5T00gesdGD6/ u4GrAau21fRIg5wNUX63NCbF2eptAAdgciCk5Upci88Z9Yz5xgK9dOEfUbgAENNJa34Z BMVg== X-Gm-Message-State: ANoB5pnNucryx0QwwRb+H1Y0ZoKjhFhM2jih28g0AIHIFMstS0nCMhmr h+BNf/2Eds2H7dN8dj468+Khywk7PY0= X-Google-Smtp-Source: AA0mqf6hFP8Petp5o2dNYL+i5O4HlUuoaGwDjRHtiVNj/DdShRcc79f6MJUjd+5RsRE/ZtMjFom3HQ== X-Received: by 2002:aa7:d659:0:b0:46b:1687:2e5d with SMTP id v25-20020aa7d659000000b0046b16872e5dmr26044177edr.136.1670061651773; Sat, 03 Dec 2022 02:00:51 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t15-20020aa7d4cf000000b0046c53c3b2dfsm906869edr.38.2022.12.03.02.00.51 for <59800@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:51 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:16:28 +0100 Subject: [PATCH 3/5] gnu: Add open-simulation-interface. to: 59800@debbugs.gnu.org Content-Transfer-Encoding: 7bit Message-ID: <87dc4cb77cf3d897e3abd7c85d4496e014a3e7f4.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59800 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/simulation.scm (open-simulation-interface): New variable. --- gnu/packages/simulation.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 256e404970..1cbbc7c960 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -252,6 +252,38 @@ (define-public openfoam (license license:gpl3+) (home-page "https://openfoam.org"))) +(define-public open-simulation-interface + (package + (name "open-simulation-interface") + (version "3.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/" + "OpenSimulationInterface/" + "open-simulation-interface")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09vclrvsawx608kk0vnzywr71xn11qzwxzh2j508zjfn0kvhyx7q")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f ; tests are for the python package + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("-targets\\.cmake") "_targets.cmake"))))))) + (native-inputs (list protobuf)) + (home-page + "https://github.com/OpenSimulationInterface/open-simulation-interface") + (synopsis "Generic interface for environmental perception") + (description "The Open Simulation Interface is a generic interface based on +Google's protocol buffers for the environmental perception of automated driving +functions in virtual scenarios.") + (license license:mpl2.0))) + (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 05:01:01 2022 Received: (at 59800) by debbugs.gnu.org; 3 Dec 2022 10:01:01 +0000 Received: from localhost ([127.0.0.1]:51497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKO-0007O3-O7 for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:01:01 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:39433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKL-0007NQ-Rc for 59800@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:58 -0500 Received: by mail-ed1-f65.google.com with SMTP id f7so9430712edc.6 for <59800@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=SafluY7igOnPIAwaq+s6yXl0hV+BzI2Am7/5uxM6HWk=; b=JjTPIxIYbH0sWGg4LDpv0Q8ZZ+5bTvcwNSRiJR5jRdc9Ij8Zx4GM7Z2Wds5lS7wCx4 MhsEsB5mEvFSPhR2/f/fGdyhpvKE2fzXSgPKDOxgko0Yvx6KVtALAWDe/k5erKO7YSMu Br9JGv+dNNpKCcce9pvIckzgyAyaP9clqtdZLprko5Eu5/xU94E1ahGIvqYkZEuWiGXU bkDtn7MyyExgMhlCOWxbg2NkIcYyGYfzLE1dpkjipwU7klTQHyxxjceMWsVsuptIB60P I0z85aoyOq5PrBxvYt+YcMLz83QpTwEiVDYbbEpKmPcZ+vjlmBCrU6F75AJ8QjffHCw5 jPWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SafluY7igOnPIAwaq+s6yXl0hV+BzI2Am7/5uxM6HWk=; b=c1bMzwQlbReRr9DP/HU8AgXc7Z9+KdEOh8X9VOsxNx097z0KzlAzNcOunPRa+MYQ+u QouYj9pPP2Pc37lxGCf9HjnB5RIaLntI8c7uHCMGadmYCI+Xh4MscgedEkfM/7piomdC VONzHmZWz2U405mygbGu6CS4YRIdIcqWpab7QA4XoBdEQ6AOXZNpOvvpqtkFkpMcXSAW ldNCJ576UVtI10Mcbu9tGbvkx90kaRQsY7yBXY9Z8WsH9KSivKB+FljO39/DD08Lgv8w 9qXfTnqKGIu+3USRzPBXwWIwIQdb5/+JBILDaj+330ig29Cmogf9+hqq3XLfcoOQcq0z PKnw== X-Gm-Message-State: ANoB5pm6GGs1OmRW5SZI4UvUzx68OXhiC9pTMw+//sIRhmVQRA518/qc 43Ktx6rMrdoJvO67PC8VOm3Zjzg/t2w= X-Google-Smtp-Source: AA0mqf4jvxDTcqj/7ACONEuXd1Go+joyS57/9TOdkFGfVSmP0lODchkrfpUA2gH6WAJl1gL/OyL8Lg== X-Received: by 2002:a05:6402:114f:b0:462:1e07:1dd7 with SMTP id g15-20020a056402114f00b004621e071dd7mr68159508edw.293.1670061652374; Sat, 03 Dec 2022 02:00:52 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t15-20020aa7d4cf000000b0046c53c3b2dfsm906869edr.38.2022.12.03.02.00.51 for <59800@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:52 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:16:38 +0100 Subject: [PATCH 4/5] gnu: Add python-open-simulation-interface. to: 59800@debbugs.gnu.org Content-Transfer-Encoding: 7bit Message-ID: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59800 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/simulation.scm (python-open-simulation-interface): New variable. --- gnu/packages/simulation.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 1cbbc7c960..4fdf99d9d4 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -284,6 +284,11 @@ (define-public open-simulation-interface functions in virtual scenarios.") (license license:mpl2.0))) +(define-public python-open-simulation-interface + (package/inherit open-simulation-interface + (build-system python-build-system) + (arguments '()))) + (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 05:01:18 2022 Received: (at 59800) by debbugs.gnu.org; 3 Dec 2022 10:01:18 +0000 Received: from localhost ([127.0.0.1]:51499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKU-0007P7-AE for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:01:18 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:46787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKM-0007NR-UV for 59800@debbugs.gnu.org; Sat, 03 Dec 2022 05:01:00 -0500 Received: by mail-ej1-f68.google.com with SMTP id bj12so16821985ejb.13 for <59800@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=l8DSdAvJ8RZUJLjMmAU7DQAHbs3f+u4eOxayeBqRZ6w=; b=iphkCsA2xu7sJNMtn/L8pyFqnDcQPYSFjyB1koW+nbkpLO7z+iwaOoocs98/cYyBs9 AbMPU+P9DJODVD2hFkvzsSSoeCHLoHH3sJeqdgwv6AiS3MA4BTsB/wsfX6z6M4Ng1K12 +I0qiaKSNbFrSwmwtDS4CyNFE0Ig/LcNYboGhariRhC4HvAk0C9mMzKybCf0JokqX0zA Q273nNVtPnzGgr/t3skdVP/SrEsdeHX9MreJr1xHmDEMKdz2pA4ffpLyvhkFc1SKmdH8 kVpb1IvLEm8zDvii3aPl78cbD5sqPlz6N85ANVzG0xWUHL9WIju9xGVCOmmPA5TFb8AR PjyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l8DSdAvJ8RZUJLjMmAU7DQAHbs3f+u4eOxayeBqRZ6w=; b=hHgJfviCMg5p3zzMHeqdyvfY/Q6SxVnkUZFz+CZPDLB7WCH7sIF1Z4RXAou0fGRx+K 5dRrU143DSIxOczJAA6qqtDIttiJdXkeUvVOjWLLKkbtCOGjBQnIM88Ew66hbMrKzIMv qeijOUplOtmCpjpC9R3MpE1smCVnlgfWYRE77N9Y0ZKSijC8ZtxElLq2cR/dwxH6Kk1g pwnore9aMeu1l3wcEZjT71MHx1QMALnEE+S0awdQInF9GuiC3AJDzQfgv1svViHLYeCa dlyeLIQddR7hYvY2sCiZKnezFAjPFOZ7NhShCxTJWe4ANlS6Kbp/7cTi37l33RBstvbc xUmA== X-Gm-Message-State: ANoB5pnGtis/rGiDvgzNL3tSqETafIrXr03GFppy8thZPgv4PgN4k0ou vX5KNWmvKn/+GuzREtpC2hMLBeVUAtA= X-Google-Smtp-Source: AA0mqf4T+5RQsxOzBFrUPyVLgnMCCwskS6H3qKiVsVMi9kyfiYvysGKMMmLy1SuW3y0VVN0UtRtTaw== X-Received: by 2002:a17:906:22d0:b0:7b2:a7aa:173d with SMTP id q16-20020a17090622d000b007b2a7aa173dmr3973051eja.140.1670061653055; Sat, 03 Dec 2022 02:00:53 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t15-20020aa7d4cf000000b0046c53c3b2dfsm906869edr.38.2022.12.03.02.00.52 for <59800@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:52 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:04:27 +0100 Subject: [PATCH 5/5] gnu: Add esmini. to: 59800@debbugs.gnu.org Content-Transfer-Encoding: 7bit Message-ID: <8960045e7a304fbb449f814cda3ee4d09500211d.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59800 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/esmini-no-clutter-log.patch: New file. * gnu/packages/patches/esmini-use-pkgconfig.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them here. * gnu/packages/simulation.scm (esmini): New variable. --- gnu/local.mk | 2 + .../patches/esmini-no-clutter-log.patch | 30 + .../patches/esmini-use-pkgconfig.patch | 541 ++++++++++++++++++ gnu/packages/simulation.scm | 71 +++ 4 files changed, 644 insertions(+) create mode 100644 gnu/packages/patches/esmini-no-clutter-log.patch create mode 100644 gnu/packages/patches/esmini-use-pkgconfig.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1bfbe28bde..8069cedcb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1075,6 +1075,8 @@ dist_patch_DATA = \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ + %D%/packages/patches/esmini-no-clutter-log.patch \ + %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ diff --git a/gnu/packages/patches/esmini-no-clutter-log.patch b/gnu/packages/patches/esmini-no-clutter-log.patch new file mode 100644 index 0000000000..0920244f78 --- /dev/null +++ b/gnu/packages/patches/esmini-no-clutter-log.patch @@ -0,0 +1,30 @@ +Don't clutter /tmp with logs. + +--- + EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp +index 56c655dc..2750f5a6 100644 +--- a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp ++++ b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp +@@ -1013,14 +1013,8 @@ void Logger::OpenLogfile(std::string filename) + file_.open(filename.c_str()); + if (file_.fail()) + { +- const char* filename_tmp = std::tmpnam(NULL); +- printf("Cannot open log file: %s in working directory. Trying system tmp-file: %s\n", +- SE_Env::Inst().GetLogFilePath().c_str(), filename_tmp); +- file_.open(filename_tmp); +- if (file_.fail()) +- { +- printf("Also failed to open log file: %s. Continue without logfile, still logging to console.\n", filename_tmp); +- } ++ printf("Cannot open log file: %s in working directory. Continuing without logfile, still logging to console.\n", ++ filename.c_str()); + } + } + #endif +-- +2.38.1 + diff --git a/gnu/packages/patches/esmini-use-pkgconfig.patch b/gnu/packages/patches/esmini-use-pkgconfig.patch new file mode 100644 index 0000000000..73e1b50015 --- /dev/null +++ b/gnu/packages/patches/esmini-use-pkgconfig.patch @@ -0,0 +1,541 @@ +Find dependencies via pkg-config. + +--- + CMakeLists.txt | 16 +- + .../Applications/esmini-dyn/CMakeLists.txt | 5 +- + .../Applications/esmini/CMakeLists.txt | 1 + + EnvironmentSimulator/CMakeLists.txt | 296 +----------------- + .../Modules/Controllers/ControllerSumo.cpp | 1 - + .../Modules/RoadManager/CMakeLists.txt | 8 +- + .../Modules/ScenarioEngine/CMakeLists.txt | 15 +- + 7 files changed, 23 insertions(+), 319 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 156d9448..10ec48f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ else() + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) + endif() + ++include(FindPkgConfig) + + project (EnvironmentSimulator) + +@@ -33,15 +34,10 @@ else () + set (LINUX false) + endif () + +-if (LINUX OR APPLE OR MINGW OR MSVC) +- set(INSTALL_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin") +-else () +- message(FATAL_ERROR "Unrecognized platform therefore there isn't an installation directory. Stopping the cmake process.") +-endif () +- + set(INSTALL_DIRECTORY_CODE_EXAMPLES "${CMAKE_HOME_DIRECTORY}/code-examples-bin") + +-set(PUGIXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/pugixml") ++find_package(pugixml) ++ + set(EXPR_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/expr") + if(MSVC) + set(DIRENT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/dirent/win") +@@ -61,10 +57,14 @@ set(ENABLE_SANITIZERS False CACHE BOOL "Enable sanitizers (Only valid for Linux + + + if (USE_OSG) ++ pkg_check_modules(OSG REQUIRED openscenegraph osgdb_jpeg osgdb_osg ++ osgdb_serializers_osg ++ osgdb_serializers_osgsim) + add_definitions(-D_USE_OSG) + endif (USE_OSG) + + if (USE_OSI) ++ find_package(open_simulation_interface REQUIRED) + add_definitions(-D_USE_OSI) + endif (USE_OSI) + +@@ -73,6 +73,7 @@ if (USE_SUMO) + endif (USE_SUMO) + + if (USE_GTEST) ++ find_package(GTest REQUIRED) + add_definitions(-D_USE_GTEST) + endif (USE_GTEST) + +@@ -90,5 +91,4 @@ if( NOT EXISTS "test/OSC-ALKS-scenarios/.git" ) + endif() + + # Add variables to global scope, e.g. when esmini is used as submodule +-set(PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR} CACHE INTERNAL "") + set(EXPR_INCLUDE_DIR ${EXPR_INCLUDE_DIR} CACHE INTERNAL "") +diff --git a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt +index 83d89420..e15062d3 100644 +--- a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt ++++ b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt +@@ -1,7 +1,7 @@ + + include_directories ( + ${SCENARIOENGINE_DLL_INCLUDE_DIR} +- ${COMMON_MINI_INCLUDE_DIR} ++ ${COMMON_MINI_INCLUDE_DIR} + ${OSI_INCLUDE_DIR} + ) + +@@ -19,11 +19,12 @@ link_directories( ${OSI_DIR}/lib ) + add_executable ( ${TARGET} ${SOURCES} ${INCLUDES} ) + + +-target_link_libraries ( ++target_link_libraries ( + ${TARGET} + esminiLib + CommonMini + ${TIME_LIB} ++ pugixml::pugixml + project_options + ) + +diff --git a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt +index 6890c26a..a088ebdc 100644 +--- a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt ++++ b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt +@@ -44,6 +44,7 @@ target_link_libraries ( + ${sumo_libs} + ${TIME_LIB} + ${SOCK_LIB} ++ pugixml::pugixml + project_options + ) + +diff --git a/EnvironmentSimulator/CMakeLists.txt b/EnvironmentSimulator/CMakeLists.txt +index 157e8fe0..e771231a 100644 +--- a/EnvironmentSimulator/CMakeLists.txt ++++ b/EnvironmentSimulator/CMakeLists.txt +@@ -1,7 +1,3 @@ +- +-set ( FILE_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day) +-set ( MODEL_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day) +- + set ( VIEWER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/ViewerBase" ) + set ( PLAYER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/PlayerBase" ) + set ( ROADMANAGER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/RoadManager" ) +@@ -17,88 +13,12 @@ set ( CONTROLLERS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/Controllers") + + # OpenSceneGraph package adapted for this project + set ( OSG_VERSION "osg161" ) +-set ( OSG_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OpenSceneGraph" ) +-set ( OSI_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OSI" ) +-set ( SUMO_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/SUMO" ) + + # GoogleTest package + set ( GTEST_VERSION "1.10.1" ) +-set ( GTEST_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/googletest" ) + + set( CMAKE_VERBOSE_MAKEFILE true ) + +-if ( ${FILE_STORAGE} STREQUAL "dropbox" ) +- if (APPLE) +- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/d0czj6b89p9jyvv/OpenSceneGraph_mac.7z?dl=1 ) +- set ( OSI_PACKAGE_URL https://www.dropbox.com/s/m62v19gp0m73dte/osi_mac.7z?dl=1 ) +- set ( SUMO_PACKAGE_URL https://www.dropbox.com/s/0x8kwztk7nmacs1/sumo_mac.7z?dl=1 ) +- elseif (LINUX) +- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/4ug0gmkgdavzyb4/osg_linux_glibc_2_31_gcc_7_5_0.7z?dl=1 ) +- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/kwtdg0c1c8pawa1/osi_linux.7z?dl=1 ) +- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/gfwtqd3gf76f86a/sumo_linux.7z?dl=1 ) +- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/si7jsjjsy5bpoym/googletest_linux.7z?dl=1 ) +- elseif (MSVC) +- set ( OSG_PACKAGE_URL https://dl.dropboxusercontent.com/s/e95hnoo782p40uc/OpenSceneGraph_v10.7z?dl=1 ) +- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/an58ckp2qfx5069/osi_v10.7z?dl=1 ) +- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/5jtpnnd61wonxuh/sumo_v10.7z?dl=1 ) +- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/aaiehwzc6woqbc6/googletest_v10.7z?dl=1 ) +- elseif (MINGW) +- message("MinGW, enforcing slimmed esmini") +- else () +- message ("Unsupported configuration") +- endif () +-elseif ( ${FILE_STORAGE} STREQUAL "google" ) +- if (APPLE) +- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1mfn_vrcXBoFBekR_t8RXTWB4sD59JD7p&export=download ) +- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1UVzO8cPQaDU9KVn9v2v8Suj0uUw1dzYI&export=download ) +- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1FAve0-MlJPv6lUZy0HvriZI7xstLAzvX&export=download ) +- elseif (LINUX) +- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Ya1bLp_0-qqlhs67WAwbGW7l37wqP3o2&export=download ) +- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Q8O9YciIC0BPEszIKtQ2UW9KcVRZS4iB&export=download ) +- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1m4znxNIXapP0D-l21oIm2l7L5ti-JbZH&export=download ) +- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Hyr9eJX2GmgpYwZhx14xOoXlZ2j-FY_p&export=download ) +- elseif (MSVC) +- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1RTag0aUn_pJPK697j0-E72ABW10wZvOm&export=download ) +- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1pcQcVHUESOk2Wmi-zUA7uzdxxE6iwRJx&export=download ) +- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=18PhbSLyvs0IGWTAY3YBoYzpVnMFPbOuR&export=download ) +- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1So-3gtrmEdW9RhEvVQisj1QFksHM_otU&export=download ) +- elseif (MINGW) +- message("MinGW, enforcing slimmed esmini") +- else () +- message ("Unsupported configuration") +- endif () +-elseif ( ${FILE_STORAGE} STREQUAL "esmini" ) +- if (APPLE) +- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_mac.7z ) +- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_mac.7z ) +- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_mac.7z ) +- elseif (LINUX) +- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osg_linux_glibc_2_31_gcc_7_5_0.7z ) +- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_linux.7z ) +- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_linux.7z ) +- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_linux.7z ) +- elseif (MSVC) +- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_v10.7z ) +- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_v10.7z ) +- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_v10.7z ) +- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_v10.7z ) +- elseif (MINGW) +- message("MinGW, enforcing slimmed esmini") +- else () +- message ("Unsupported configuration") +- endif () +-else () +- Message("Unknown storage type: " ${FILE_STORAGE}) +-endif() +- +-if ( ${MODEL_STORAGE} STREQUAL "dropbox" ) +- set ( MODELS_PACKAGE_URL https://dl.dropboxusercontent.com/s/5gk8bvgzqiaaoco/models.7z?dl=0 ) +-elseif ( ${MODEL_STORAGE} STREQUAL "google" ) +- set ( MODELS_PACKAGE_URL https://drive.google.com/u/1/uc?id=1c3cqRzwY41gWXbg0rmugQkL5I_5L6DH_&export=download ) +-elseif ( ${MODEL_STORAGE} STREQUAL "esmini" ) +- set ( MODELS_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD779364751/models/models.7z ) +-endif() +- + if (APPLE) + set ( EXT_DIR_NAME "mac" ) + set ( TIME_LIB "" ) +@@ -127,21 +47,8 @@ set ( OSI_DIR "${OSI_BASE_DIR}/${EXT_DIR_NAME}" ) + set ( SUMO_DIR "${SUMO_BASE_DIR}/${EXT_DIR_NAME}" ) + set ( GTEST_DIR "${GTEST_BASE_DIR}/${EXT_DIR_NAME}" ) + +-set ( OSG_INCLUDE_DIR +- "${OSG_DIR}/build/include" +- "${OSG_DIR}/include" +-) +-set ( OSG_LIBRARIES_PATH +- "${OSG_DIR}/lib" +- "${OSG_DIR}/lib/osgPlugins-3.6.5" +-) +- + set ( OSI_INCLUDE_DIR "${OSI_DIR}/include" ) +-if (DYN_PROTOBUF) +- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib-dyn" ) +-else () +- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" ) +-endif (DYN_PROTOBUF) ++set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" ) + + set ( SUMO_INCLUDE_DIR "${SUMO_DIR}/include" ) + set ( SUMO_LIBRARIES_PATH "${SUMO_DIR}/lib" ) +@@ -153,74 +60,6 @@ link_directories(${OSG_LIBRARIES_PATH} ${OSI_LIBRARIES_PATH} ${SUMO_LIBRARIES_PA + + if(APPLE) + SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -std=c++14 -pthread -fPIC -flto -DGL_SILENCE_DEPRECATION -Wl,-dead_strip") +- +- set ( OSG_LIBRARIES +- osg +- osgViewer +- osgDB +- osgdb_serializers_osgsim +- osgdb_serializers_osg +- osgGA +- osgText +- osgSim +- osgdb_osg +- osgdb_jpeg +- osgUtil +- osgAnimation +- osg +- OpenThreads +- jpeg +- "-framework OpenGL" +- "-framework Cocoa" +- dl +- z +- ) +- +- if (DYN_PROTOBUF) +- set ( OSI_LIBRARIES +- open_simulation_interface +- protobuf +- ) +- else () +- set ( OSI_LIBRARIES +- open_simulation_interface_pic +- protobuf +- ) +- endif (DYN_PROTOBUF) +- +- +- set ( SUMO_LIBRARIES +- optimized libsumostatic debug libsumostaticd +- optimized netload debug netloadd +- optimized traciserver debug traciserverd +- optimized libsumostatic debug libsumostaticd +- optimized utils_vehicle debug utils_vehicled +- optimized utils_distribution debug utils_distributiond +- optimized utils_shapes debug utils_shapesd +- optimized utils_options debug utils_optionsd +- optimized utils_xml debug utils_xmld +- optimized utils_geom debug utils_geomd +- optimized utils_common debug utils_commond +- optimized utils_iodevices debug utils_iodevicesd +- optimized utils_traction_wire debug utils_traction_wired +- optimized utils_emissions debug utils_emissionsd +- optimized microsim_engine debug microsim_engined +- optimized microsim_lcmodels debug microsim_lcmodelsd +- optimized microsim_devices debug microsim_devicesd +- optimized microsim_trigger debug microsim_triggerd +- optimized microsim_output debug microsim_outputd +- optimized microsim_transportables debug microsim_transportablesd +- optimized microsim_actions debug microsim_actionsd +- optimized microsim_traffic_lights debug microsim_traffic_lightsd +- optimized microsim debug microsimd +- optimized mesosim debug mesosimd +- optimized foreign_phemlight debug foreign_phemlightd +- optimized foreign_tcpip debug foreign_tcpipd +- optimized microsim_cfmodels debug microsim_cfmodelsd +- optimized zlibstatic debug zlibstaticd +- optimized xerces-c_3 debug xerces-c_3D +- "-framework CoreServices" +- ) + + elseif(LINUX) + +@@ -251,82 +90,8 @@ elseif(LINUX) + SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -pthread -fPIC -Wl,-strip-all") + endif() + +- set ( OSG_LIBRARIES +- optimized osg debug osgd +- optimized osgViewer debug osgViewerd +- optimized osgDB debug osgDBd +- optimized osgdb_serializers_osgsim debug osgdb_serializers_osgsimd +- optimized osgdb_serializers_osg debug osgdb_serializers_osgd +- optimized osgGA debug osgGAd +- optimized osgText debug osgTextd +- optimized osgSim debug osgSimd +- optimized osgdb_osg debug osgdb_osgd +- optimized osgdb_jpeg debug osgdb_jpegd +- optimized osgUtil debug osgUtild +- optimized osgAnimation debug osgAnimationd +- optimized osg debug osgd +- optimized OpenThreads debug OpenThreadsd +- optimized jpeg debug jpegd +- +- GL +- X11 +- Xrandr +- dl +- z +- Xinerama +- fontconfig +- ) +- +- if (DYN_PROTOBUF) +- set ( OSI_LIBRARIES +- optimized open_simulation_interface debug open_simulation_interfaced +- optimized protobuf debug protobufd +- ) +- else () +- set ( OSI_LIBRARIES +- optimized open_simulation_interface_pic debug open_simulation_interface_picd +- optimized protobuf debug protobufd +- ) +- endif (DYN_PROTOBUF) +- +- set ( SUMO_LIBRARIES +- optimized libsumostatic debug libsumostaticd +- optimized netload debug netloadd +- optimized traciserver debug traciserverd +- optimized libsumostatic debug libsumostaticd +- optimized utils_vehicle debug utils_vehicled +- optimized utils_distribution debug utils_distributiond +- optimized utils_shapes debug utils_shapesd +- optimized utils_options debug utils_optionsd +- optimized utils_xml debug utils_xmld +- optimized utils_geom debug utils_geomd +- optimized utils_common debug utils_commond +- optimized utils_iodevices debug utils_iodevicesd +- optimized utils_traction_wire debug utils_traction_wired +- optimized utils_emissions debug utils_emissionsd +- optimized microsim_engine debug microsim_engined +- optimized microsim_lcmodels debug microsim_lcmodelsd +- optimized microsim_devices debug microsim_devicesd +- optimized microsim_trigger debug microsim_triggerd +- optimized microsim_output debug microsim_outputd +- optimized microsim_transportables debug microsim_transportablesd +- optimized microsim_actions debug microsim_actionsd +- optimized microsim_traffic_lights debug microsim_traffic_lightsd +- optimized microsim debug microsimd +- optimized mesosim debug mesosimd +- optimized foreign_phemlight debug foreign_phemlightd +- optimized foreign_tcpip debug foreign_tcpipd +- optimized microsim_cfmodels debug microsim_cfmodelsd +- optimized zlibstatic debug zlibstaticd +- optimized xerces-c_3 debug xerces-c_3D +- ) +- +- set (GTEST_LIBRARIES +- optimized gmock debug gmockd +- optimized gmock_main debug gmock_maind +- optimized gtest debug gtestd +- optimized gtest_main debug gtest_maind +- ) ++ set ( OSI_LIBRARIES open_simulation_interface::open_simulation_interface ) ++ set ( SUMO_LIBRARIES sumocpp tracicpp ) + + elseif(MSVC) + +@@ -510,61 +275,6 @@ FOREACH(subdir ${SUBDIRS}) + endif () + ENDFOREACH() + +- +-# +-# Download library and content binary packets +-# +- +-function (download_and_extract url target_folder target_filename) +- message (STATUS "downloading ${target_filename} ...") +- file (DOWNLOAD ${url} ${target_folder}/${target_filename} STATUS DOWNLOAD_STATUS) +- +- if(DOWNLOAD_STATUS AND NOT DOWNLOAD_STATUS EQUAL 0) +- message(FATAL_ERROR "FAILED to download ${target_filename} (Status: ${DOWNLOAD_STATUS})") +- endif() +- +- execute_process (COMMAND sleep 1) # allow for file to be completely flushed +- +- message (STATUS "extracting ${target_filename} ... ") +- execute_process (COMMAND ${CMAKE_COMMAND} -E tar xfz ${target_filename} WORKING_DIRECTORY ${target_folder} RESULT_VARIABLE STATUS) +- +- if(STATUS AND NOT STATUS EQUAL 0) +- message(FATAL_ERROR "FAILED to unpack ${target_filename}") +- endif() +- +- file (REMOVE ${target_folder}/${target_filename}) +-endfunction (download_and_extract) +- +-# download OpenSceneGraph +-set ( OSG_PACKAGE_FILENAME "osg.7z" ) +-if (DEFINED OSG_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSG_DIR} )) +- download_and_extract( ${OSG_PACKAGE_URL} ${OSG_BASE_DIR} ${OSG_PACKAGE_FILENAME} ) +-endif() +- +-# download OSI +-set ( OSI_PACKAGE_FILENAME "osi.7z" ) +-if (DEFINED OSI_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSI_DIR} )) +- download_and_extract( ${OSI_PACKAGE_URL} ${OSI_BASE_DIR} ${OSI_PACKAGE_FILENAME} ) +-endif() +- +-# download SUMO +-set ( SUMO_PACKAGE_FILENAME "sumo.7z" ) +-if (DEFINED SUMO_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${SUMO_DIR} )) +- download_and_extract( ${SUMO_PACKAGE_URL} ${SUMO_BASE_DIR} ${SUMO_PACKAGE_FILENAME} ) +-endif() +- +-# download googletest +-if(NOT (APPLE OR MINGW)) # not available for Mac yet +- set ( GTEST_PACKAGE_FILENAME "googletest.7z" ) +- if (DEFINED GTEST_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${GTEST_DIR} )) +- download_and_extract( ${GTEST_PACKAGE_URL} ${GTEST_BASE_DIR} ${GTEST_PACKAGE_FILENAME} ) +- endif() +-endif() +- +-if (DEFINED MODELS_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${MODELS_DIR} )) +- download_and_extract(${MODELS_PACKAGE_URL} ${MODELS_BASE_DIR} ${MODELS_PACKAGE_FILENAME}) +-endif() +- + add_subdirectory(Applications/odrplot) + add_subdirectory(Applications/replayer) + +diff --git a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp +index 4c701d94..cb5de5bb 100644 +--- a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp ++++ b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp +@@ -16,7 +16,6 @@ + #include "ScenarioGateway.hpp" + #include "pugixml.hpp" + +-#include + #include + #include + #include +diff --git a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt +index e4fad5f1..32d7a79c 100644 +--- a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt ++++ b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt +@@ -2,7 +2,7 @@ + include_directories ( + ${PUGIXML_INCLUDE_DIR} + ${COMMON_MINI_INCLUDE_DIR} +- ${ROADMANAGER_INCLUDE_DIR} ++ ${ROADMANAGER_INCLUDE_DIR} + ) + + set ( SOURCES +@@ -11,8 +11,6 @@ set ( SOURCES + LaneIndependentRouter.cpp + ) + +-set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp) +- + SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL}) + + set ( INCLUDES +@@ -25,6 +23,6 @@ if(MSVC) + add_definitions("/wd4482") + endif() + +-add_library ( RoadManager STATIC ${SOURCES} ${SRC_ADDITIONAL} ${INCLUDES} ) ++add_library ( RoadManager STATIC ${SOURCES} ${INCLUDES} ) + +-target_link_libraries ( RoadManager CommonMini project_options) +\ No newline at end of file ++target_link_libraries ( RoadManager CommonMini pugixml::pugixml project_options) +diff --git a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt +index aec86ad6..86da77c1 100644 +--- a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt ++++ b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt +@@ -5,7 +5,7 @@ include_directories ( + ${ROADMANAGER_INCLUDE_DIR} + ${COMMON_MINI_INCLUDE_DIR} + ${CONTROLLERS_INCLUDE_DIR} +- ${REPLAY_INCLUDE_DIR} ++ ${REPLAY_INCLUDE_DIR} + ${RDB_INCLUDE_DIR} + ${OSI_INCLUDE_DIR} + ${SUMO_INCLUDE_DIR} +@@ -20,20 +20,15 @@ if (NOT USE_OSI) + list(REMOVE_ITEM SRC_SOURCEFILES "${CMAKE_CURRENT_LIST_DIR}/SourceFiles/OSIReporter.cpp") + endif (NOT USE_OSI) + +-set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp ) +- + SOURCE_GROUP(OSCTypeDefs FILES ${SRC_OSCTYPEDEFS}) + SOURCE_GROUP("Source Files" FILES ${SRC_SOURCEFILES}) + SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL}) + +-add_library ( ScenarioEngine STATIC +- ${SRC_OSCTYPEDEFS} +- ${SRC_SOURCEFILES} +- ${SRC_ADDITIONAL} ++add_library ( ScenarioEngine STATIC ++ ${SRC_OSCTYPEDEFS} ++ ${SRC_SOURCEFILES} + ) + + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +-target_link_libraries(ScenarioEngine PRIVATE project_options) +- +- ++target_link_libraries(ScenarioEngine PRIVATE pugixml::pugixml project_options) +-- +2.38.1 + diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 4fdf99d9d4..6179d7a1ea 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -47,6 +47,7 @@ (define-module (gnu packages simulation) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-science) @@ -289,6 +290,76 @@ (define-public python-open-simulation-interface (build-system python-build-system) (arguments '()))) +(define-public esmini + (package + (name "esmini") + (version "2.27.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/esmini/esmini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "esmini-use-pkgconfig.patch" + "esmini-no-clutter-log.patch")) + (modules '((guix build utils) (ice-9 ftw))) + (snippet + #~(with-directory-excursion "externals" + (for-each + (lambda (dir) (unless (member dir '("." ".." "expr")) + (delete-file-recursively dir))) + (scandir ".")))) + (sha256 + (base32 + "07ccydz7kxy5jc52f8fmxg4nkr1spshfnpzcv0wgd5lqz9ghjahz")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DDYN_PROTOBUF=TRUE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_HOME_DIRECTORY\\}/bin") + (string-append (assoc-ref outputs "out") "/bin"))) + (substitute* "EnvironmentSimulator/CMakeLists.txt" + (("\\$\\{OSI_DIR\\}/(include|lib)(-dyn)?" all what) + (search-input-directory + inputs + (string-append what "/osi" + #$(version-major + (package-version + (this-package-input + "open-simulation-interface")))))) + (("\\$\\{SUMO_BASE_DIR\\}/\\$\\{EXT_DIR_NAME\\}") + #$(this-package-input "sumo"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (with-directory-excursion "EnvironmentSimulator/Unittest/" + (for-each invoke (find-files "_test$"))))) + (add-after 'install 'move-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/lib")) + (with-directory-excursion (string-append out "/bin") + (for-each + (lambda (f) + (rename-file f (string-append out "/lib/" + (basename f)))) + (find-files "." "\\.so$"))))))))) + (inputs (list mesa + openscenegraph `(,openscenegraph "pluginlib") + open-simulation-interface + protobuf pugixml sumo)) + (native-inputs (list googletest pkg-config)) + (home-page "https://github.com/esmini/esmini") + (synopsis "Basic OpenSCENARIO player") + (description "@command{esmini} is a tool to play OpenSCENARIO files. +It is provided as both a standalone application and a shared library and has +some support for generating and analysing traffic scenarios..") + (license license:mpl2.0))) + (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 12 02:54:43 2023 Received: (at 59800-done) by debbugs.gnu.org; 12 Feb 2023 07:54:43 +0000 Received: from localhost ([127.0.0.1]:43956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR7C7-0006jO-HN for submit@debbugs.gnu.org; Sun, 12 Feb 2023 02:54:43 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:40471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR7C5-0006j1-T4 for 59800-done@debbugs.gnu.org; Sun, 12 Feb 2023 02:54:42 -0500 Received: by mail-ed1-f67.google.com with SMTP id fi26so9102509edb.7 for <59800-done@debbugs.gnu.org>; Sat, 11 Feb 2023 23:54:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=qwhUIUyNAJHZZYALVoH1XZ4XIMV0DmmeLzWws4n/Gsk=; b=YoveF6rxToD201LkeDc4lGqfPiGzDedJvw0wdKLCYP+IU3LYQdxgnnFJbgRy4aWm3z w6/III7hVRKeEyT63AIVwv4R5QLXlP+DIWtBJxKoY3eekuw131ocNroZZg+NgBlQB+Ax KJmlsU+hrK52dd5dWil81dchIySs03JwY8OCZTOjPKOGj1KjgmJi/EiZqsG4AtU/NhjW GhUDQ/QBetQ9YrTpnnwaYSoiakeWc9h2HMTjx5FQidb9sHBs8lMGPINXhiR5wCmyLwk/ 6fUHCWdTElQ+72uGskQMr5XehY8up5R9vaBTmo7MqNGJhDdbAVsIWgoiLPqKlZYNR9UJ IDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qwhUIUyNAJHZZYALVoH1XZ4XIMV0DmmeLzWws4n/Gsk=; b=pERzwR5PXZe35NmUGN9r5kIl7Am3QB8BV5IOYZzT4K+xsm3iR82z/89rRVM4JQDrvD z8nBNdCrQ5dlcalKDLmY4oW0nSQOpxpaP96KZSTvMaNbSJq4agkkhAYa/Nr/HE80siQp utpGhiEXMaE4atQGjWFZIklg61bn7XN1qajvg7gLBv0pKQfi66CJutYGXJr3aqM9u2Zt PxVrf7eSXhEBCiodWMmdn7R73VHzph7EzfyV3gld6hq143KgNge4RKMLbYtIEzhZCQJF l+reteCJj+wWQGMRlOSsXyNLOQ9fl+Xz5VPqjJYtq3RM2iFq05zTyROtTpwipfW69E3p 2oiA== X-Gm-Message-State: AO0yUKVnucS/lQ95kCX36gYRD4jYtaTq12lKoMfipVj+0Y9epHqfWX5w 1/QeSvh9GeBynFNYBAVYGKu39ItYem18sg== X-Google-Smtp-Source: AK7set82BmAya1uEGof9RtAv4V3Y8zV4MjqMzovJ/cwIY6kQswbCKrmwqpWON5BhUn6nVcZ8NE/lVw== X-Received: by 2002:a50:d5c2:0:b0:4ac:c4c2:1c51 with SMTP id g2-20020a50d5c2000000b004acc4c21c51mr513914edj.27.1676188476189; Sat, 11 Feb 2023 23:54:36 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id dk19-20020a0564021d9300b0049e09105705sm4688748edb.62.2023.02.11.23.54.35 for <59800-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 23:54:35 -0800 (PST) Message-ID: <036dd417e4ec72e1c36e99876e7bf3bfd21baad4.camel@gmail.com> Subject: Re: [PATCH 5/5] gnu: Add esmini. From: Liliana Marie Prikler To: 59800-done@debbugs.gnu.org Date: Sun, 12 Feb 2023 08:54:34 +0100 In-Reply-To: <8960045e7a304fbb449f814cda3ee4d09500211d.camel@gmail.com> References: <8960045e7a304fbb449f814cda3ee4d09500211d.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Samstag, dem 03.12.2022 um 10:04 +0100 schrieb Liliana Marie Prikler: > * gnu/packages/patches/esmini-no-clutter-log.patch: New file. > * gnu/packages/patches/esmini-use-pkgconfig.patch: New file. [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.208.67 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.67 listed in list.dnswl.org] X-Debbugs-Envelope-To: 59800-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Samstag, dem 03.12.2022 um 10:04 +0100 schrieb Liliana Marie Prikler: > * gnu/packages/patches/esmini-no-clutter-log.patch: New file. > * gnu/packages/patches/esmini-use-pkgconfig.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add them here. > * gnu/packages/simulation.scm (esmini): New variable. > --- And they're pushed. From unknown Sun Aug 10 07:38:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 12 Mar 2023 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator