From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 97CD642702 for ; Wed, 25 May 2022 22:53:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 767C868B58E; Thu, 26 May 2022 01:53:33 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2084.outbound.protection.outlook.com [40.92.89.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A98368B561 for ; Thu, 26 May 2022 01:53:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bdbq2eqvtyE863N21ujhNMHvFrVFoeQgUibPfoHa5WiqnCla2ujh1811NMeJhxwmAkUKYQDHOuOTMxr9itiCU7RIfYabVkdZwW7dHB53kvMZfsRvf2rGL6f+0LjfxO5Lmyiyi1ZR+pz7zxWdsPSySQd5eb2rHBUwauTxA14LqQqo7VhHXHRlpCCEaCYlzy13kgCbMDw6hE4QGQJ3FA83Eh6RdTda2krR+28Ro4uhGXyNoIveQX8ZJgJr+tANHWjqU7NgKS1NUeO9KHiSlaogSEmFFgGb5xMkZr5fOhpcllNtMl6XmwgPRkNZzS8cLKEl57qbEL4UQDRMuAdOOoLpPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=x0/LBdj8CbOCW2SxB67S7ISvhaXwxDGU8TWOFTn0Zww=; b=jhWi0FknWLVtoDNPe44SyycyNTBbRvNXH1bobOfRVSPK/9fSY/or5Q72u7Fxg7E46MwW7R+R/d4yM/gHHmTWmwxnYG4MmeoOYTfdb03DNAbv8AD3ytQoY6voLCsmRbfdVoh8yRt27Mru6djvgfdyeVhD30Sg3/FlEX6NsKcVglrann2DyHleL19sZZhrBBZQ41w6blrBXvlkqKZhzQUwBFz9o5+pUbDh/BqeVLMgr1rfZCcBjvCdFuRJpX+f0Zpfpof9hihlHmFEQ0pCkRQvL1hLAJnOYxQCxrEHHwSTCGLnlDBlAYAGBLpITXZ2nrf/udADw1L7f4799wjJkur0Hw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x0/LBdj8CbOCW2SxB67S7ISvhaXwxDGU8TWOFTn0Zww=; b=TBtIJpQmAOqCnwdoUjaU/TW2ARIIjBKPRoV51kw2OpI3d9sgJc/8rsaiUF1XEeUK7PZkuIn+g4gkw2IZ44dR+PMNTESB8YzQyypLMB6xvkDhcf4jo5TphZYFYnapfdt+QquUxo59ZWjdEM4nzeuQ4RkQr2QZW++54m9vMdwydmSFOOpxbaJ51RUfkJMsFlcMnmymZP44XgXvsKDH5AyC3NhDU5Df3bYep9lg1TMh90sa+QEkaSaYTKcUEUZstJFLYQ1StgCDuqVIV/DMAxeRr6lnWTn5jk51f+BTpvCTkGe4vVqQ93Owt9x+/JZxuQexfkn7yY4wbVdlbIHB2r+xMg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB6PR0101MB2438.eurprd01.prod.exchangelabs.com (2603:10a6:4:32::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 25 May 2022 22:53:26 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5273.023; Wed, 25 May 2022 22:53:26 +0000 Message-ID: Date: Thu, 26 May 2022 00:53:24 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220525151555.GY396728@pb2> From: Andreas Rheinhardt In-Reply-To: <20220525151555.GY396728@pb2> X-TMN: [yihuxFrFrqlFc57riuq9GX+AXo+AUvJs] X-ClientProxiedBy: ZR0P278CA0193.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::23) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <03ee63df-36e7-c2ff-e1f2-88aa8c7145c8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f4e5a55-a93c-491d-0664-08da3ea160bc X-MS-TrafficTypeDiagnostic: DB6PR0101MB2438:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z00MK+1kl6CpfF8wpYGThy2ZaudHwZwVX7HYRRnuNDhEpbvZRmlvomX1hMoawREsfsuxFHeEF4R467QNZMuw1eyRzcSV2rKO5/ZwbDhtkswk/lRL7RE6R32eFTGX97sZb9qVG8IV8FlFcP5AQl0hoKN9bSRtubNXexqFbaFg/KHgHmyfRPWTnZp4YOH+fpVRnhtDskH8vQxc+hwLB2x5sYfWkEIsOmgicgqTrBPJ2aJOofphRiShrCDxseKfDjc7SkFQEQGQplSDy6lQjO18TNvZ3gp1nSb+9Nwliyu13Fma6nXQgOWlfMVvWzPH2WML0taSc2PyricePxBCTxXMQyPcxi2+D8GDihr6TR+kgG17+Zc8b7y2FZBkvyQlfc42wlxxMHHHjHZVWjpvm1KU7i/54OTc44mqHbdJ1qYONiothju52mryE7C/yWIjFLJCj9xsq9nSGgSdJ4Yi49Dr8jtFskpnbzyNHkiiXmbU4hg9e8Fz35/xYjDiXJzffaTronW+nVgs6KGNdxFag+dAf/wBftYiLHwwnOLSmfuhVIRHdyrC41r28tPwyeM7cGpNkyoNdQaDlkwO1sWF9ZDOY8FewkgpHRg/1lyPjmCyIe06KrgLUCj2QK/oyTt2TQt81+0u2ms0W+t9gKt8wzur4qaZCxQrBSpRVZHxP1TuxZs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?STlxMFd4N0huNktWYzZqbWdiZTk4ZW1NbXVMT0VOKzlSKzR4N0ZRNmdXU0VI?= =?utf-8?B?TldVaHRQeW5MaWtTZVIycnYzRnpwcGg1azJiQWx2MytiaHVzZUFuZnJpcVps?= =?utf-8?B?cDBqam5vWHA3TjJLMVEzdjBkcEZSYmEvWjlUUGtxZGtmMlhtelhBNld4Mmpj?= =?utf-8?B?bGhHWktXbms1dFV5NUJRS1FuOWZzTW43bnJxekhaV01MTEt5bENMNlBoekJ4?= =?utf-8?B?aUd5dlJ2UFp1OVJMMTZHSHpxbE40akRLY1dObVRQekRLOU1jbDZpTFZ3QUYx?= =?utf-8?B?Q1lMekdXUTBYQWRtK0pGaUNweUFjL3pTMnBpeVBLcUJKUmdmNndWL0REUjNl?= =?utf-8?B?K0J1RXZTdEUwOERnYU02K2JXTzVVREtrTmFLT2NVZHRDd1ozbU5lUWl0bXI4?= =?utf-8?B?a09lc2F6WHpVVzlSdUFGTzZ5dkNlTklhb3JyQkZneklaQjVndlhmV3VkNk5J?= =?utf-8?B?UkdyeXlMODBTMzN3U1ZXS0dlMmdieTFieXAyL1h4aytyZllqMzVyRk5PTDhx?= =?utf-8?B?ZEg5K2dMR0MyL1ZuNUhSWEF4cVh4a2tJdVhJd2F2b29sNjlpUHpFOU9XaUMr?= =?utf-8?B?WHpZaG9oVFFWU3dkWGdiaUYwMkx3WHZoUklNMk1ZbGhjVXJqWEJVUEpRUkRF?= =?utf-8?B?MTBPcTczRWJFT2U0cFcrN3JhSXNURGdOekZ1MnR4eUsxdVNvUTNKN1pWaHZj?= =?utf-8?B?dHR1SU5oeEpxbXRDK0N5eUcxaDUwQlMraUU5OFA2c2dxUHdJSkFZOW0xUFYr?= =?utf-8?B?T3QvREppc3NMODQ4K2hPUGZxNDljampJeVBuWEs3bzZUdVhQWjdTbUFncUNl?= =?utf-8?B?d1hKWDJ0RmJrK2dETWJSSkFhSmFzRytyQTZvVXVZNkFBbE0rL1hVVytiR2o4?= =?utf-8?B?SHU2Yk5mWjB2ejljNmJzSDhIY0FDVW1GVHR4ZlVEK0FwVVMxVVpScnQvL2ZR?= =?utf-8?B?OTEydTkwK0JsMC9Pd2w1M3IwbDFySTNKN2F5MzhYZkR2MU1HazV3R0JzMXVB?= =?utf-8?B?TlJ5S3YwZ0tvVnF3SEZFZHk3RlhMQXh6SHpVYWtKRWYxcVV0cXJUYjcxdDQw?= =?utf-8?B?SElIWUdBUnRHV0hwWUNnQklMUXpFMVhLNnJjcUN3blc5Sm13b3hEU3ZkdTZi?= =?utf-8?B?ZHVMUFN2U3RjMlc5U2E0SmkzV0dmT3JYYzN2NzNrR3c2eUYwR2p5NnpZdjJu?= =?utf-8?B?a0RqdEFwaUZqViswVHlNUk9mMUYxVC9yK0NPZHliTHl0aXpucnAvTVdDOFlD?= =?utf-8?B?QjlPcWlVWEV3WFR4b09DL0dQdk1GQVFydnRFcmp6SE1qcXFqdVU3MFNWaE9H?= =?utf-8?B?ejF5SFROeUd0d2pGdmJXQUQxVVRrcGJXR3NlRHlYUWNCSVlkcHY1U0M5Q3J2?= =?utf-8?B?bVR4MmNoMkY1VnBBdDM1OHZ2UWc0VVBKTnVISGJBYVFrT3ZJbC9rL2UzZHow?= =?utf-8?B?WlQ5WUkxalB2OVFJVzQ0V201S3JYQU5LQjIyZU5xS2VXNm5UMHRHQUVJMXA4?= =?utf-8?B?VWJ3VUI2OS9WNWhLdjBzU2xWcEFIemFkUWdtSlJxS3NwRnp6RFJvNDFtdTN1?= =?utf-8?B?dVFadHBINlNXRDVsMkdOZTV5dDREUVQ0Sk1TNlN2Q1pycHZuRmVnUDBCTnRk?= =?utf-8?B?RHZMcUtSNTRST2RjK1lPblh1L3ZnRSsrL3VNNHFTVEpsaE5GREVvWTRvQTFX?= =?utf-8?B?Umk5MkRjclA3YnQ0dG53b2VuNEM2czRjQ2N5OWw4am1UTHJWWEUwMEw5TG1w?= =?utf-8?B?cjZDUklKNnVqaEk4QkVlekVyWWdlVmxlWDU1Z3RKQWE0VU9ETnRGYjhKT1Ru?= =?utf-8?B?enJkT1pRWkdrVkRtVkhtbmNRbEVyQ0N1bEJwSFJhcmQrYU1CWFVlZjM5UGhx?= =?utf-8?B?V2xENFJXMHFPY0wybDY3SlBXQVVhRHdrRkVxSmM5NGFMVkd3cnR6SWtPSVdX?= =?utf-8?B?QnV4bTJnUkxYTDJwdzNQbnR4QVN4NnZBUVUyMkNGeGdIUlVNVURLcWxjOHZQ?= =?utf-8?B?ZjZFalEzS0p3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f4e5a55-a93c-491d-0664-08da3ea160bc X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 22:53:26.2750 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0101MB2438 Subject: Re: [FFmpeg-devel] [PATCH v4] libx264: Set min build version to 158 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Michael Niedermayer: > On Wed, May 25, 2022 at 11:05:39AM +0000, Matt Oliver wrote: >> From: Matt Oliver >> >> Was "[PATCH] libx264: Do not explicitly set X264_API_IMPORTS" >> >> Setting X264_API_IMPORTS only affects msvc builds and it breaks >> linking to static builds (although is required for shared builds). >> This flag is set by x264 in its pkgconfig as required since build >> 158 (a615f027ed172e2dd5380e736d487aa858a0c4ff) from July 2019. >> So this patch updates configure to require a newer x264 build that >> correctly sets the imports flag. >> >> The requirement for 158 is applied for msvc builds only, >> no change is made for all other cases. >> >> Co-authored-by: softworkz >> Signed-off-by: softworkz >> Signed-off-by: Matt Oliver >> --- >> libx264: Set min build version to 158 >> >> I'm submitting this patch on behalf of Matt with his permission. >> >> There was agreement that the >= 158 version requirement should be >> applied to MSVC builds only. >> >> v2: restrict the version requirement to msvc builds >> v3: fix unintended author change >> v4: add missing braces >> >> Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v4 >> Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-30/softworkz/submit_x264_api_imports_matt-v4 >> Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 >> >> Range-diff vs v3: >> >> 1: 374130a09e ! 1: 0d1bee35b0 libx264: Set min build version to 158 >> @@ configure: enabled libvpx && { >> - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && >> - check_cpp_condition libx262 x264.h "X264_MPEG2" >> +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && >> -+ require_cpp_condition libx264 x264.h "X264_BUILD >= 158" || >> -+ { "$toolchain" != msvc && require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; } >> ++ { require_cpp_condition libx264 x264.h "X264_BUILD >= 158" || >> ++ { "$toolchain" != msvc && require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; }; } >> enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && >> require_cpp_condition libx265 x265.h "X265_BUILD >= 70" >> enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" >> >> >> configure | 8 +++----- >> libavcodec/libx264.c | 4 ---- >> 2 files changed, 3 insertions(+), 9 deletions(-) >> >> diff --git a/configure b/configure >> index f115b21064..129473c75c 100755 >> --- a/configure >> +++ b/configure >> @@ -6656,11 +6656,9 @@ enabled libvpx && { >> enabled libwebp && { >> enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion >> enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } >> -enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || >> - { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && >> - warn "using libx264 without pkg-config"; } } && >> - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && >> - check_cpp_condition libx262 x264.h "X264_MPEG2" >> +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && >> + { require_cpp_condition libx264 x264.h "X264_BUILD >= 158" || >> + { "$toolchain" != msvc && require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; }; } > > On ubuntu LTS: > > ERROR: X264_BUILD >= 158 not satisfied > > If you think configure made a mistake, make sure you are using the latest > version from Git. If the latest version fails, report the problem to the > ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.libera.chat. > Include the log file "ffbuild/config.log" produced by configure as this will help > solve the problem. > That is because require_cpp_condition has a "|| die "ERROR: $condition not satisfied" at the end, so ordinary short-circuiting logic does not apply. require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { "$toolchain" != msvc || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } would avoid this and might actually work. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".