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 F406E43234 for ; Wed, 25 May 2022 09:54:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE03F68B527; Wed, 25 May 2022 12:54:01 +0300 (EEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2058.outbound.protection.outlook.com [40.92.23.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C92168B509 for ; Wed, 25 May 2022 12:53:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c5c/OfAMk1TlG8ee7ll3utP+5RonDe8kLrxqmHGONMA0GALTr52+KrPK0djw3cs+YQyNDDRVGAmodwA4VMJRZxgacooRSe0/CKySr9QW/cgbRVB9MlA6//MXZVUD8iLNMYLM3Pl/2y5rk01p+IosH8n7VY4ixru3/IoZaNog/qT4q3+UZles+CU+zeprQKrhzoFB/P0dXoPvbAB+k9rMCPulmXUOqOkt56EEBSO2D8vwh0TI7nwYMVaY4fk1i8iQ0nSAIiRceDFWX3HzXY3rit+mx2Iq5glyjQ8l+L+Hn9Jfo+XBeel7oY0B2Z1ZGskrOTzvEY8wOzjzdRT83O4NMw== 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=basyU4fgDXdkeTO4NMReiQSLFBTiIiGozOZEHvo1Im8=; b=hxFajNbmJFZZMd5cSnmkytXB5hlsa4m5Nn58g284KaGEx5usF86fDcAsId5HFNZWcRTI5LeUYx5OIm7mb/gYTzmKEHg1BcCfUXpwyBpNskDnUMYxSdUzbf757alaQLOWlHkYiI2RF/C1MTud1u1AiwXP5sWnwFhE9Qy93pRtQumsWsVK2uoZOC5vFMSlw+mcq75ZiI+fIGEvl5NxdV7c4Mn0kXkW5hWJsspYM+hVSLDs/viZ0kvydalzaX2Qoc510KYGQSjF1gUEieKPeMjsfDqZsdAlukYkVejL4j6rPA8K4imJdWA089brxt/0gFnGDao4czyPvZGQJQcbKHfCiw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=basyU4fgDXdkeTO4NMReiQSLFBTiIiGozOZEHvo1Im8=; b=kqbtxshmxAJ+8OnXlX0gd+e0LLWq1/NyKYPkpiSelPSsE1bwIFzqJe2p0yDJn58B1QvfTr6aMBHOy7DcuIalpB/xIQngXWF47mvMu6SK4pljEUgt6pQO/YwOeJOYbHes5lWK9aRWC9Co7GeNVFtgrWfZMQrHvhoGEGuYLAEwJ2GsmJ6mq3YQwW3t2dc7rntqnUwVpoRpDwiJI4+MH//tuj0SOvybFii2SQNWPp3Auhgpnz2lqeVx4xpo0UAfmX0GradY6dhQbB0Az+C7rjIuTNrHVthxLzVcScIHJz2UWkzhrgRpfqiD4Xzak5fQ+d81qSEM9XA/KpzCCJlrsxjJ1A== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by BL3P223MB0195.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:34c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Wed, 25 May 2022 09:53:51 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::f144:21f9:cdb1:5c8a]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::f144:21f9:cdb1:5c8a%7]) with mapi id 15.20.5293.013; Wed, 25 May 2022 09:53:51 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v3] libx264: Set min build version to 158 Thread-Index: AQHYcBq1oMcPLo73E0+iJBiJHu460K0vVj6AgAABM1A= Date: Wed, 25 May 2022 09:53:51 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [RYE/hiWmrSBa404rWwEI07FoWs88DsfG] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d3fd17d0-66bb-466f-a168-08da3e347905 x-ms-traffictypediagnostic: BL3P223MB0195:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xnQWBnrqoTbnmexDtw47ITBpHxw2bOdm6YYQWx/EbnRxFTGe1iYBC13jnV7PVb9uD3OMpNgzCOrcS1KXsEkSqreqrNSOci30iBlbkmEnMdztDCc/bqxy653H2+/In6APeS8DQ9iGrqJSaXCrInBXK16PVjJ/FT8xzjgNgAeu5kQd+GfqOwnma71r6G5TJkdEDXwKIZR6wol79EuAEeCmf0N8msyPW7K3Rd3Uo4UKTsweMFpXHChbh5DvAmBSxDYQWhKshwytEqwiZ8t/OLRuRunXrZbPzS0bgJiYb7G2wlUtYg+0E007+y6bNr3Z8Ot64oSBsL2ao7Aa0mIV+GGJbugYq7yZ1udo77nyD2t7HM/xLHm3KfQ/ssTKSc4yxqcCeqwGzQI1+hjLqHMzQ2LkpK3SChKeolf9wQmEyKYJVE6x11quvvB1YkIFw9y8Kdwh8vbtzqhmABGzVnaf9khAw2pvpw5OngJj/qh1vqr+ADao7g9hb40qP4Qt4YPRsR64mJzCvxJ+jZGE0xqubxzfdukt1UPmPOz5nxI3v8UBmfZWTckuOjqvjui5x2pprl9VdMa71cYPXrj+jlWDuVG5k1wEdea/QMZAixfwe//LzVIlZeGuQeCRoSf3NfokyB9gjv/Y51LADsp03iBZfWXXat1OpAO+0ONJfXDiE85HpHE= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?VnVCUm1oNXRIMkVES20yUW1QNERYR2cyT3hzZnNzUzhuY3BkWkZSN0F0SG5N?= =?utf-8?B?NndtV1R0T3lCVWpMOW16VzNwd09EQ0hKUTJhRW1wUktjUWl6dTY1SWJXekhs?= =?utf-8?B?WGpodGt0SUYrY2lpR0VQY2pMZS8rTVdEemdxelFiRmo0ZkNrdVdUaGNkQ3Zj?= =?utf-8?B?ZjFNUjZaNi9haEdJQ2RncTdRYjVjRll5T1lwZ0xpT3hPUmloQnB2OWNzU28z?= =?utf-8?B?Tiswdm1VNXhFVkZsMkpNSi9BSG9TTnQvS2FhQm1RSjhKQXJXTFViR1FxbW5z?= =?utf-8?B?QjIyYVVRemZzb2h5dnhXeEUvajBURGlIVXk4OTViWkZGRFFuMld6bVVUUk9H?= =?utf-8?B?aFFpbG5JTzFtbitYak9Mc3hDdVdLUHdzZ2ZrclNIaFBGMDdPU3RwK0dsa0FC?= =?utf-8?B?eTM4SVk2SmNrQnY5czU2SHRjY0lsWTE5M0R2b0xrVUsxYkQ1SHdpcFRMWkxx?= =?utf-8?B?T0U3UkxhYThkWVNZR2pJOUZqM2hLaXVLZEl3T2oyUk44YlZzbW5abVNSUVNi?= =?utf-8?B?UkxLZlYwTXJ0UjEyLytwbHpoa01MaHh3MjlrbXhob3FmcFEzMXY1d3RDUi96?= =?utf-8?B?K0JEaERrdDVzd2p2dm04K3E3cHZDSlNWWDluVld3bFFTOVR2ZnRKVlhNVVJi?= =?utf-8?B?dUlIc0t2SktjMFc3a3ZDRGNnakk4dkRwNkpoeUdJZkk4SHNIZlF5ZElzQTlu?= =?utf-8?B?QnFPVlIzY3dvVW1mb0JlQlRxVWtGLzZFYzB4dWljOXQ3ekJhWkNLYU8rNG51?= =?utf-8?B?blRLTm44M2pFMlM2NmdmT1N4eG5PLzNMOVh5MGdpanB2VktSN2k3MkVJeklE?= =?utf-8?B?WG0vQzR4S3hXQ21TTmprNUF4ZEdISjFFYWx4bmxpMzhyUzRIREpuaC9LSHRH?= =?utf-8?B?STg4cUtiUWk2a2taUlZWTUJicnNFdTNsaXlDSzRVTnduZ2kvalpZVUZZTHRs?= =?utf-8?B?K0VtZVFCUmgyRE8rcjBTSFd2RU5iWXBrUW5YU2F4NDRZRTkvNklPSmIzczFD?= =?utf-8?B?VmU2M2Q4SmIzNVR3Wkd4UlE4aEFQZ0V1bW9ZRzhOaUlJa0d4U0dxeEM4ODlW?= =?utf-8?B?bkNWWVhITERCa3d2T1I3eHJ0NW1ZZGxJVUFidkN3ZExBZXFLaTUyRkI0dCtR?= =?utf-8?B?UWNVZm5sYXQ5Z3VsbjBmYnZFRFdBakdNVEFpYlVtRDJmc3BDNEF3SnNydVgr?= =?utf-8?B?TmlVQnprakJOWnRtbFNsd2VhSW9CV2ZFYXFTM3FtSDFTRTVDQWFoZGF6bXdr?= =?utf-8?B?LzJlaXArQklHa0k4UHAvd3E1emllV1Z5eXFHa01PbzJhVFVmeDBoQmhaQlE4?= =?utf-8?B?enJ1Yk5scUhpc2RvWXRTMzRLSi80SHBuc2tFUnNWRktuWjdWenlJdDNWM1NM?= =?utf-8?B?YTJqMXgwN2VHNjI5QU85eVUvTENremp5emVzZDd1VTBacTM5eXUzLytpc3h4?= =?utf-8?B?Z2hUeGcvclIvQVBDTUFjMUU1eG1aUHFGNHJucVFwRTBqUWtXVFY4R0wrK1hw?= =?utf-8?B?MjFFdkdlZ29EMFB2b3NsNkY3cXJxRC9aM3FhWk9jZ3lLRTJGMDYwN1FmUm9l?= =?utf-8?B?dW02enVXMHl0WjIxTkFkUC9MZ3JWUXNrNmxmNUNYOEZ6aEtacUtLMmxva2dT?= =?utf-8?B?eDdZYXE3OGJEL2xORUp4RzFoNExZcjJrMTNpUkxBTEdac2JRU3BWeUFCZ3NV?= =?utf-8?B?TkFQM20yM3dPaUZoZzFKQkVNS1JFcDdvNm5RaTdxYmNvTmVpYzh2K0tFdnFT?= =?utf-8?B?UmZaTDIxZlVWK283dEMxK1crS2hsNS9oQ2ZKa2RuZnRtcnRNdzBTZkJmbVcz?= =?utf-8?B?REtod3QxMHFQZ2FhYVlJVWlJMlA0VTNHN2xSa1N1ZmhDYVF2dW9hUDBUVElR?= =?utf-8?B?b1JRS05NWkc5VGIwYXZ0M3lRY0ViczRPeVk1Q2tmTUYyQ2p1S0xoOXhqVERv?= =?utf-8?Q?gWf3fV0kb0M=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: d3fd17d0-66bb-466f-a168-08da3e347905 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 May 2022 09:53:51.5824 (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: BL3P223MB0195 Subject: Re: [FFmpeg-devel] [PATCH v3] 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Andreas > Rheinhardt > Sent: Wednesday, May 25, 2022 11:39 AM > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v3] libx264: Set min build version to > 158 > > Matt Oliver: > > 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 > > > > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr- > ffstaging-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v3 > > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr- > ffstaging-30/softworkz/submit_x264_api_imports_matt-v3 > > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 > > > > Range-diff vs v2: > > > > 1: 1696684de3 ! 1: 374130a09e libx264: Set min build version to 158 > > @@ > > ## Metadata ## > > -Author: softworkz > > +Author: Matt Oliver > > > > ## Commit message ## > > libx264: Set min build version to 158 > > > > > > configure | 8 +++----- > > libavcodec/libx264.c | 4 ---- > > 2 files changed, 3 insertions(+), 9 deletions(-) > > > > diff --git a/configure b/configure > > index f115b21064..9de9b7763a 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"; } > > IIRC this is equivalent to > > { 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"; } > > which is not whan you want as the ""$toolchain" != msvc && > require_cpp_condition libx264 x264.h "X264_BUILD >= 118";" is executed > even if libx264 is not even enabled. Thanks. So what I want is probably to enclose the two OR terms in curly braces, like this? 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"; }; } sw _______________________________________________ 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".