From patchwork Fri Mar 8 08:38:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 46895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp802266pzb; Fri, 8 Mar 2024 00:38:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW8lsLq8DrtN+dWH7t4RIhryBZvMa6hCRIYnO99IJUJBXsFtlUIKcV3FmzuOC74b3JY2oRPbbaT3BqgJE9yVGP34zB4P0nfyflQrQ== X-Google-Smtp-Source: AGHT+IFbjI1UmVLPrU2w+tqcbhQt+fjD7MpPEkl64pxtUjluQz3RmbrxvMAymG/ICOTGxq78gkmw X-Received: by 2002:a17:906:301a:b0:a45:cdd7:c481 with SMTP id 26-20020a170906301a00b00a45cdd7c481mr829966ejz.1.1709887129662; Fri, 08 Mar 2024 00:38:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709887129; cv=none; d=google.com; s=arc-20160816; b=SHVxGPJJYDtNfCAYXcyytvVS+rpzcW+g4XRY6gwjZ3h86gIEMQERhcXHM0mW08IAUE yVWjE507QfggCB+NbuUf0yxy23e8kfDj12BS0iH051JkyLQLbvNTtkJqwldb2gmB4nTA NpaCVgOwWjxmqv2KTa9sOMz02T92I71TssoKBnP6+FZiVEOpbximXMgYI3ZtBZ3LZxLO SzqXvKjPbxjpeeyGSvg3pqI58k2xJDxxdnjDJL7keFhOs2rsEXWTb/etpP0ohyS/ykVr E2oNkW5/jgw3KZMCUsfV1V+JggvtcijsLmslYhzHZYRyqsHGrL4Zpr1XYtxXOuB5OAtE noMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7RfmhWPzo5cY5d1NEbq04pgZW1fpBpOmIEfj3+Zbk9Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mY+cmWmzf8VpgTGiTnlwIXyxLacS1eqq/OU6v+s4I1VDBlA5eHNUz65po+e2zBYvhl YULJSe1wmwgRBNWBusvWaEVVnln1YlEdrqiWLw7kS7DBEtc59xFcG+m22V6B6g/BWepi UYnr3pNV0LANmJy7wcdFqhCRdtL9n11wO8Qpw03eQ5vG2GzjrKiq9uJ9aPlCAGZJ1dew FsmkA7/nyhDam4AR6uLi0AEdOR8kO52dw/Rt3iHKifxcPibaoL/hESLgbzThoSxFCq+W RCUE4eTXk9PEmgLnGlupN/OfzzJkZVz2c28vukaplN++h7wKd6TJmHCrmaTTnFHidbUO WrwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=PJ5Kk0+V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d19-20020a1709061f5300b00a3d991c4f5dsi7479335ejk.954.2024.03.08.00.38.49; Fri, 08 Mar 2024 00:38:49 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=PJ5Kk0+V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2088C68BF4A; Fri, 8 Mar 2024 10:38:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94F7868BF4A for ; Fri, 8 Mar 2024 10:38:38 +0200 (EET) Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2d21cdbc85bso22783501fa.2 for ; Fri, 08 Mar 2024 00:38:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1709887118; x=1710491918; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=pbYVr11YErK/feAyUE/Z5huuCdZYnniJD0pyJalNGgg=; b=PJ5Kk0+V/C41gyQ/tpfdh1dHe/bZSMPun7ru2DW+qw5JIuGZXKCX9xqEymDBJjeREO FsqcHU5CHGH96KhNZChZI95Bzzwo/LRpRMnd9XhkHfUDlIqDGmDNff6s6AL1r/5y3oIz KEWxu6fi+3MX9WMOFAL6oVWX4D+MOVxnmxKxDb/S5XyPpkiEPLxWp+Of/GRzvXTBbWBq zN0bik3SCrwfzjCMqOlM9foIIA4eqQwF9SuS7cblSsI5s9zxOtIqRTYp9zRU12FgzDjG twE3j2ucIMoFoU4hgc/Fkw+4WUcusWW3FzoKAGfkomT3LfgXwbap76xoLmmtT/zabnc2 WgRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709887118; x=1710491918; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pbYVr11YErK/feAyUE/Z5huuCdZYnniJD0pyJalNGgg=; b=OOqdkUxTPixaMcNWUcwxX86UVhHW3kdDzHk7v8c30d//GHB4N8DIw3j37ddlZSth1B Gihda+toQq6SEPsWENBQ+pR1y2tNAFVfHbP7hISiESGOJrvixlP4DtOp9dDIoSx70Emi bo5qy90BR3vaaCoBQ5lzxC6y/Bh7BQlbdTS4z98RO3nsNP8ClYz/6E+HQiySdDvoIUR0 65eSms/1Zt13iriSvl5FwSrzAx4ra5Rt1JZsdljOi8MTlnBDSfqUIFKovPHb55IFhi9w pTvB6sjzW7DY0Ns5J758sTmbBCMeCYtes3Ql6umgqSDTKeEdZQDTWdZA8lpPW5vGG8eX TWzA== X-Gm-Message-State: AOJu0YzxbBoCPUKbIYjhT1hfE/j0UXA0YVoq5xmB2lVO65NfWNNFxVMy PXRKJDv1pLu3sWnwtMtfvpHYlNn9FvTAjxeOTAuEEZ4oxJGWvi7rF0KpwhU3M5Fq7JUldIq0CC6 /CYAa X-Received: by 2002:a2e:bc1d:0:b0:2d4:123e:4f1e with SMTP id b29-20020a2ebc1d000000b002d4123e4f1emr2779632ljf.15.1709887117562; Fri, 08 Mar 2024 00:38:37 -0800 (PST) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id x18-20020a2e9dd2000000b002d11d0e37b5sm3363169ljj.130.2024.03.08.00.38.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Mar 2024 00:38:37 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 10:38:35 +0200 Message-Id: <20240308083836.47422-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] makefile: Clean up missed object files with "make clean" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: J8lNwYURwb4r In some builds, the following object files could be left behind after make clean: ./libavfilter/metal/utils.o ./libavfilter/metal/vf_yadif_videotoolbox.metallib.o ./libavcodec/x86/h26x/h2656dsp.o ./libavcodec/neon/mpegvideo.o ./ffbuild/bin2c_host.o --- ffbuild/common.mak | 2 +- libavcodec/neon/Makefile | 3 +++ libavcodec/x86/vvc/Makefile | 2 +- libavfilter/Makefile | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index ac54ac0681..87a3ffd2b0 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -140,7 +140,7 @@ else endif clean:: - $(RM) $(BIN2CEXE) + $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) %.c %.h %.pc %.ver %.version: TAG = GEN diff --git a/libavcodec/neon/Makefile b/libavcodec/neon/Makefile index 607f116a77..83c2f0051c 100644 --- a/libavcodec/neon/Makefile +++ b/libavcodec/neon/Makefile @@ -1 +1,4 @@ +clean:: + $(RM) $(CLEANSUFFIXES:%=libavcodec/neon/%) + OBJS-$(CONFIG_MPEGVIDEO) += neon/mpegvideo.o diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile index 82f281d1c7..d1623bd46a 100644 --- a/libavcodec/x86/vvc/Makefile +++ b/libavcodec/x86/vvc/Makefile @@ -1,5 +1,5 @@ clean:: - $(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) + $(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) $(CLEANSUFFIXES:%=libavcodec/x86/h26x/%) OBJS-$(CONFIG_VVC_DECODER) += x86/vvc/vvcdsp_init.o \ x86/h26x/h2656dsp.o diff --git a/libavfilter/Makefile b/libavfilter/Makefile index f6c1d641d6..994d9773ba 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -666,6 +666,7 @@ TOOLS-$(CONFIG_LIBZMQ) += zmqsend clean:: $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) \ + $(CLEANSUFFIXES:%=libavfilter/metal/%) \ $(CLEANSUFFIXES:%=libavfilter/vulkan/%) OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl)) From patchwork Fri Mar 8 08:38:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 46896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp802314pzb; Fri, 8 Mar 2024 00:38:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW0DMbL4E3FFtxKJgELgK61GzkTkgvf/XqtS3qPS3rEKI+YDli/l+XwV1+AxnfqjcpTIInyqIIFuGyie8LAM/U2w4dmRdWfl3HQlg== X-Google-Smtp-Source: AGHT+IEhuwcCKDSTkMDB3F+flMUtruwGguUES6sI88Zc/jPB58YcQVX4/Saq4dMEOIfgBh6Xtetq X-Received: by 2002:a50:c946:0:b0:568:2381:63d with SMTP id p6-20020a50c946000000b005682381063dmr1423775edh.35.1709887138113; Fri, 08 Mar 2024 00:38:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709887138; cv=none; d=google.com; s=arc-20160816; b=SBCD5+4mzzANP1zNBGddOMwXHQAjYfHeTFlsT1Ap25Ikvn1b0b0BcQTfMKHQgx2w9o oKmuJgeKRnRZAMlfjkLRjXk92/+sH+TaMgRs+VZas7qcfkushz6UunoZwX4B+hl0eAD2 KK3Y0r8mnegOsizYkIaEMK12Rs70mvBrPj+e9nVPploGBW5LAIKTH6p3bNsykN5MpVfN +rUTan2BIRJ4OV6Nmsz4M4oOQ3L66wgSZvh1P8dEvfBT8vUfJ6SA2x9+3grbq8Lp4957 +521Uy2+ZOCKKGoh1Iun5R7ToUVI1t6Pu5sEYnQFFvZoZ76xu0qkZHP20oxltdhQIStF niLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=tLAySxrmqZoLK+ekQGmhkneBYLnVawBy01/RZ7loYIE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=J9CTu81wCz42mLl2zUiBYvWtJREQ73TjY9mkDMSsXi2OLsiQp9IlKISec4i+bfa69K gNiWtHeuKY5aDrVSD2XzGP3kzXcToZdCcATZ1Tfcl71CQc7MVPW7hdHD4b7NAb4bI6AU ZaH/koAZZtJzD7j/f48ipgjN+fAPLyBijbaavqI5vLcPiR4tYQR8GGBV+5xzdm0hDw9n LM+cR+EnfB8HVzkUTXPYtU7pqwYqpQy2NY+cBjMY0fztFxuYV5mBXJNrKrqBg+3KlHdu iS4+qFU5NNWL3TzJSBXU2Rp5MOxWzy2iLtEi2XQ8NGz8imgLtqRAvvAkisBGbRiBXBEf w6Ug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=RgjrA+97; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z1-20020a056402274100b005665990e726si7848278edd.134.2024.03.08.00.38.57; Fri, 08 Mar 2024 00:38:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=RgjrA+97; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D2F068CD00; Fri, 8 Mar 2024 10:38:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 149EA68BF4A for ; Fri, 8 Mar 2024 10:38:39 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-512f892500cso639508e87.3 for ; Fri, 08 Mar 2024 00:38:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1709887118; x=1710491918; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wF2Tbwlk757xh6XnFVJ+P4RJRnp0J2CA4trUdkeZxo4=; b=RgjrA+97kQ+UF98YiSN3+SNNx+geQntxEDXhrcklut2WBRl921n1Z28+/YSzD2Csdv ql2PQ2rXqiGu1IwAqJCDK8rl5zJCslyLXyE64zJIw9CgJWX9UTCEWtXaWvhftNYEpVHH lWK5KavlfRbj2gjWHnYUtrgzpAPDXY7TYXqumZZgpPkKf5h+ANOXUMZOpmRgHJFAsB6a 5yIHYMxBtrIXQjTBtPn98NtI1y/fiaobrZVnP1LpKeOO8BJTI/LY/9LNr6NRqAs8P9AC FHVPu9ySVPS2vOYIkQDKmUiXXoNaxUBnisQPcyGrokY1hxQHkNhZtcjx86GSqjE9fCJY NlrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709887118; x=1710491918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wF2Tbwlk757xh6XnFVJ+P4RJRnp0J2CA4trUdkeZxo4=; b=jxgjFNHPGZ+NlEaX9X8fZ4RFPj9YXXQ1HEGCnbvC9Zb2Y1IdZXfjLQm3Q1aC1Z0pBu Fq5NDw3mZIKs2mvRezhiMhY2zGWQcsOmd3XTE7rjrRviSHdpdjp+5hipuIPVNep1gN/1 ENHzTUzPsqxv2iuqEEb/4A0dkdWX4s4FUeDFOUjetXjdoJ+XpI4A02a+FJ7XhZAIESak UThQ8V5DIiJJ6zyieulj8Vl9BVjkj1SoYkI7awgmFXXPxIHflAQFvrCBeXWch3xovQjT 1qJQnY1MxeSCLEeO+hGZZrQCHiA+j53j4Ste3+jtsJQ4Qfr0FpAhPHL6wg2FIk12uFt1 ZN9A== X-Gm-Message-State: AOJu0YzuSSWmTQN4Flb/xqUcIRQpOmwt+4IzfmAcNj6flSpVo5v+Jn5+ QJQuzyTsW5YxX3LuCCGfkOfn0sZhXKTI8rdF75r1wC/hxYY7vnGTpkLv/Ji5975bAawU4nKYEOr Fbvxc X-Received: by 2002:a05:6512:158b:b0:512:fce4:327b with SMTP id bp11-20020a056512158b00b00512fce4327bmr3938494lfb.39.1709887118205; Fri, 08 Mar 2024 00:38:38 -0800 (PST) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id y10-20020ac255aa000000b005132b1e65a3sm3189177lfg.71.2024.03.08.00.38.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Mar 2024 00:38:38 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 10:38:36 +0200 Message-Id: <20240308083836.47422-2-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240308083836.47422-1-martin@martin.st> References: <20240308083836.47422-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PwVKhVraWcdm This currently builds files in the libavcodec/x86/{vvc,h26x} subdirectories, which is somewhat unexpected when building for another architecture than x86. The regular arch subdirectories are handled with -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile in the toplevel Makefile. Switch this to a similar optional inclusion, using $(ARCH). --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5d99120aa9..708434ac76 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -64,7 +64,7 @@ OBJS = ac3_parser.o \ # subsystems include $(SRC_PATH)/libavcodec/vvc/Makefile -include $(SRC_PATH)/libavcodec/x86/vvc/Makefile +-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o ac3.o ac3tab.o OBJS-$(CONFIG_ADTS_HEADER) += adts_header.o mpeg4audio_sample_rates.o