Patch Detail
Show a patch.
GET /api/1.1/patches/17707/?format=api
{ "id": 17707, "url": "https://patchwork.libcamera.org/api/1.1/patches/17707/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17707/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20221027224135.348115-6-nicholas@rothemail.net>", "date": "2022-10-27T22:41:30", "name": "[libcamera-devel,v4,05/10] android: remove references to std::filesystem", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "39a0acbe7683c5532be79d0181ca3a1e09bfad14", "submitter": { "id": 97, "url": "https://patchwork.libcamera.org/api/1.1/people/97/?format=api", "name": "Nicolas Dufresne via libcamera-devel", "email": "libcamera-devel@lists.libcamera.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17707/mbox/", "series": [ { "id": 3581, "url": "https://patchwork.libcamera.org/api/1.1/series/3581/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3581", "date": "2022-10-27T22:41:26", "name": "[libcamera-devel,v4,01/10] ipa: workaround libcxx duration limitation", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3581/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17707/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17707/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 69FE5C3286\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 27 Oct 2022 22:41:52 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F195C62FBD;\n\tFri, 28 Oct 2022 00:41:51 +0200 (CEST)", "from mail-oa1-x36.google.com (mail-oa1-x36.google.com\n\t[IPv6:2001:4860:4864:20::36])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1A60A62FAF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 28 Oct 2022 00:41:45 +0200 (CEST)", "by mail-oa1-x36.google.com with SMTP id\n\t586e51a60fabf-13ae8117023so4284217fac.9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 Oct 2022 15:41:45 -0700 (PDT)", "from nroth-pc.attlocal.net\n\t([2600:1700:20:20c0:6a4b:7aa7:dda2:75cb])\n\tby smtp.gmail.com with ESMTPSA id\n\tr20-20020a056830419400b006619533d1ddsm976825otu.76.2022.10.27.15.41.43\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 27 Oct 2022 15:41:43 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1666910512;\n\tbh=mEKe8DObtbMqMeq0QJ40bRzbuB1kkOYMwsT2S+BAfQ8=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=cgvEuKn1SnXleOdySAWDK8FgQENKgspURVWMVxnSx7dmmumplhrGZttez6hebLM81\n\tRP8b5Ix57fYn3y2dwYxw2skL2hlruvFjgWMNGz9Fr4fZYK2FVIpuS+HsJySzAbKJ7j\n\t2IilmklhxYPVbEBN+TwXsIaGYGDSoey2KyJ8R5bpwabOjwXstUfWHFSb8sTlILLFwv\n\t2yd2JI3UjUN+ikByWE7ko7SLwCNGefUm+2zE1Fq8JHZug4kvEje4kjf2krYm7GAZgp\n\t/tJ93+fvvHyFU4V4KlOo33VKofIeSa77iUIrK0fr4Y1RGdn6XPTV9gYo8M+q0/0ZaH\n\tSxJntTwsh7sIg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=rothemail-net.20210112.gappssmtp.com; s=20210112;\n\th=content-transfer-encoding:mime-version:reply-to:references\n\t:in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject\n\t:date:message-id:reply-to;\n\tbh=qBhDf4OV6leDFFlgV+VCdce9GMxAf96qbwkaTsSXnsg=;\n\tb=ETeviXuFhfv7Lwelcv33NjG7NpQ0Ewzl6Umg+I6UOv7Pb2kPMYyx8s6aq0LZKrSAmV\n\tvQ1W6GDSBWXEFpM+s1zVVS0iEsx6gmyritk+IMQ75b6hWbnhFHcRTvpy4EsRoYfLoZeO\n\tW1wysqHi7pH4KPwhp3PTNei28x+x1W2HvHvilcnXPSgtK8bhACtkFwyNQYu5SKgv+OCv\n\tPV0IPFQIZK6S2xg5FoF0hs2QjkqDH8gplHmDcSKCP3dH1JMKMPYz1tqM7XMFObSLbpa0\n\tZmnyRFXu0OxjCfB6oUgrJsb63yKfmHqLDo10/FucUu29bq1s8Rnh/71eLgDB/Ia6JPca\n\tuC/A==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=rothemail-net.20210112.gappssmtp.com\n\theader.i=@rothemail-net.20210112.gappssmtp.com header.b=\"ETeviXuF\"; \n\tdkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:reply-to:references\n\t:in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state\n\t:from:to:cc:subject:date:message-id:reply-to;\n\tbh=qBhDf4OV6leDFFlgV+VCdce9GMxAf96qbwkaTsSXnsg=;\n\tb=Dc6uAN2JOZ3R3YTPqmKfI99bcuUxQTJgI2Hu9/XlSMXDppglvOEQluYTq9k7WVY9h5\n\tYZwt/npFbCkr7qWdqjX6LbzOzsYbYiuGf0WRaj8joZymSnzrbymcdXd4v9advlSGLQJL\n\tczM3jVyRxMYSrTziiKwa1qcaNIK7aZONbu2zjWpjKPCIPOV8/+JfwRfs9cnXXMK8AyMC\n\tNKGByuN8g/CpTX+P3v3bIPSdQ2sX0NGzEK+C90CD7Z3iO7eIVaJxFDs7H4aC2UIU8hTZ\n\tsnlYsTpsfiT3EzTagqq9SRk7AoFwOLA0+3HMdhYCl3/wcjmqPbXZ8F/JvlbMNqAq2nUS\n\tVoww==", "X-Gm-Message-State": "ACrzQf3nh538o/30an/ZkOY0cpViYlFCfvg0le2hOUlPuyaE6gq5vXO+\n\tsl9TXhqI7Uy96io1NbaJkrBbkiI1RoGP21x4", "X-Google-Smtp-Source": "AMsMyM4NfmVmYPvJRhw9zJCJt3VWr5OAZ58XLzI6F5ROeeuWPBpW5oP4+wn9MQS4MX8ISs01Bblp6w==", "X-Received": "by 2002:a05:6870:d14f:b0:13c:673d:6799 with SMTP id\n\tf15-20020a056870d14f00b0013c673d6799mr1785508oac.149.1666910503548; \n\tThu, 27 Oct 2022 15:41:43 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 27 Oct 2022 17:41:30 -0500", "Message-Id": "<20221027224135.348115-6-nicholas@rothemail.net>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20221027224135.348115-1-nicholas@rothemail.net>", "References": "<20221027224135.348115-1-nicholas@rothemail.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 05/10] android: remove references to\n\tstd::filesystem", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Nicholas Roth via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "libcamera-devel@lists.libcamera.org", "Cc": "nicholas@rothemail.net", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Nicholas Roth <nicholas@rothemail.net>\n\nAndroid 11's toolchain does not support std::filesystem, but\ncamera_hal_config.cpp currently uses it. Remove references to\nstd::filesystem in order to support Android <= 11.\n\nThis adds a very small difference in behaviour, as File::exist() will\nreturn true for special files (pipes, character or block devices, ...)\nwhile std::filesystem::is_regular_file() doesn't, but I consider this\nto be a corner case that doesn't matter much.\n\nSigned-off-by: Nicholas Roth <nicholas@rothemail.net>\n---\n src/android/.camera_hal_config.cpp.swp | Bin 0 -> 16384 bytes\n src/android/camera_hal_config.cpp | 9 ++++-----\n 2 files changed, 4 insertions(+), 5 deletions(-)\n create mode 100644 src/android/.camera_hal_config.cpp.swp", "diff": "diff --git a/src/android/.camera_hal_config.cpp.swp b/src/android/.camera_hal_config.cpp.swp\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..e6b7220ae345f309242d3d97dd369fe783e65ed6\nGIT binary patch\nliteral 16384\n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\nPK!gP7+;cZs4r~7c$v(c4\n\nliteral 0\nHcmV?d00001\n\ndiff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp\nindex bacfe4b9..0e7cde63 100644\n--- a/src/android/camera_hal_config.cpp\n+++ b/src/android/camera_hal_config.cpp\n@@ -6,7 +6,6 @@\n */\n #include \"camera_hal_config.h\"\n \n-#include <filesystem>\n #include <stdlib.h>\n #include <string>\n \n@@ -160,15 +159,15 @@ CameraHalConfig::CameraHalConfig()\n */\n int CameraHalConfig::parseConfigurationFile()\n {\n-\tstd::filesystem::path filePath = LIBCAMERA_SYSCONF_DIR;\n-\tfilePath /= \"camera_hal.yaml\";\n-\tif (!std::filesystem::is_regular_file(filePath)) {\n+\tstd::string filePath = LIBCAMERA_SYSCONF_DIR \"/camera_hal.yaml\";\n+\n+\tFile file(filePath);\n+\tif (!file.exists()) {\n \t\tLOG(HALConfig, Debug)\n \t\t\t<< \"Configuration file: \\\"\" << filePath << \"\\\" not found\";\n \t\treturn -ENOENT;\n \t}\n \n-\tFile file(filePath);\n \tif (!file.open(File::OpenModeFlag::ReadOnly)) {\n \t\tint ret = file.error();\n \t\tLOG(HALConfig, Error) << \"Failed to open configuration file \"\n", "prefixes": [ "libcamera-devel", "v4", "05/10" ] }