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 7976243280 for ; Thu, 26 May 2022 11:20:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 673AC68B553; Thu, 26 May 2022 14:20:27 +0300 (EEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2027.outbound.protection.outlook.com [40.92.41.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 387AF68B453 for ; Thu, 26 May 2022 14:20:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=apD4VP/tbzaD2HoLdRd6uwzszbe485JOh2yPjH8jQwOJwh35mv4xeaMjFrF7lIjKuQ0pQ8R4BXOET4zbu4aNklKZJOxRCDo1fcYi3lDsd8z1vm7RUeRrgNs8kuuoVvOyXbCoidVx2G/JRMRzoDiEqk/JKmfr0x5hfb2NY7ht4980VFz4mATL6Acl43e82KXWJDAxbzn9eCHgBPZKYaRSjyzKPoeIalsTzDNzhiZy9hZut/7A7Pb/PVGT8BhgF7raUHiD6rjqLgQlnCJF/P9S8cB0qV68KC2OOeWOf7yKBD+HA5MJ5Qy8QsU/G88Ogl14QVU1L+1YtZwFfbcep2/s+A== 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=8t0stPw++uFbyFGcyczKqTGIjf9IM7V5aSVGt+GVwnU=; b=ToHnho5RSZW6R89UWox4YFqq57E/Cky2BByeIcMvyOZs+eGr4CT7F8kQqM9+mExKp1nQd7k6tzNCuB8/EGiWPJntBtkqoITli++9xn9PF5rEUOPfVFp7f+7UrwxxlpiTCOUAIaC92v8KxRcj9qEkDJDy/AILFgipojW1QtWYyxXPEI6zOjY8kYkQL/NORCKGlteJ16y+iPrwd4LJf1/aNXrwibgy0YfsvUnJ0dqdqVR6DJuWotoyACRjkpe/dEFjT52OxWznSTSd4pKhIoyPNi/HyBRMPdhpwb66WMNHEnGLRm/ZXM2SgrlQOLD+jAa+IHLjx7mndHq9+JX5G5mHmA== 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=8t0stPw++uFbyFGcyczKqTGIjf9IM7V5aSVGt+GVwnU=; b=n3Jz2ly+Yjh4IAQkAu9fD39EsEJYkDOvb+jSrJ00J1vRMFFSyEfSCunO2UjGuBO0Xviagn19GR6AAW6oTCCZhs+ssgdfv8h23Rh3MM25hH7VdqP1v0gvmlDQhP3kKzJYICVmAJhvCCVmqZOxM+5L86EYHh1JuYX9FTXM3SEAqRBOU4ynk46n4Cv/upjW2JnPjdIgRzQlLYnrzpRduK5R9b/7BPcIEjvuS46gSg6YaM7O8dW0p3NqlpYeB36TkrLl4a90GZwmjG3RV5i9FOyO7qRGSFipeixD49qaDPzE90gWvXn60JKrfnmbyVbmU38fdk7uEEqmvdennWYGDn3ELw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by BL3P223MB0084.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:34e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Thu, 26 May 2022 11:20:16 +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; Thu, 26 May 2022 11:20:16 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v5] libx264: Set min build version to 158 Thread-Index: AQHYcNIp9LY8PzlwB0+U15unC0bQjK0w+zSAgAAFlnA= Date: Thu, 26 May 2022 11:20:16 +0000 Message-ID: References: <20220526105033.GE396728@pb2> In-Reply-To: <20220526105033.GE396728@pb2> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [Zh6d5odxuqmIyNKEmej1Ro0Vt3oshBJa] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b88fbbab-62bd-4ffe-6c95-08da3f09b5f1 x-ms-traffictypediagnostic: BL3P223MB0084:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: y/3nxRqNd+9Ys6lCsRBzw7rVNT0gRsmYSifH/beWc7T++xqfyVbw6TQkPbA8YKCKAwFp9976gULREzjBy6ht2ecpt0H+YY7S0hqtWScz1tAOVNAwJ+WvFAjHio5EaRqbt3ScJ/hpQ3R5D+MjpW0hKfJun9zW7wk2j5GHAiItmaRa4vPX0q745zPz3m3dvKXMpTOa5/+J+LvEJs04Tiix9Ng4l4CESSScw2/AkitFDI3Gtrq5zcAqzXcqW6c+hvrplHgGmMsIdZBf5f0DzqLNiwdgm223YJ3/1KrSZOsyfwBXgxZcgPOTLSv20ClbwgpuH57ZsRlId/gX5pDUYVP6j0nMKBp56XxFivhj761MVDUkJpaYcswpO9VsdgeEvkI4GJkKnjZdj/ScB6bDhOccOB9cUIPO/5wnKqrZXdwcPIlgIM54tlnth/S6mj3KlLjrNGKOwEr2qSE1svnNsnHrfQY9dMUS9EI2YbPCSXs/N5UG31yCUI9xsOJIo1FSoH4DYEHZuHjvlCQBFI8yRD/S8Jwg2cFXWAShqq6V5A/4ydiPKokRXqd9gFNUIkyvYOu4rvrYb6uMpc+nsKDa0JIGbhlHwQ3CUy2648J8phpKQj+Ls2PvXMucpmJMp4D0nltBKEIF8RuhcacZXWoXIJ59hAMyCx+icZThwEXrHOxus+M= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?MHcwSzZxeXQzdk5namFkRlF6Z0RtY2RMRGhLVmVINWhRb3NNeTFUcGxFMkU4?= =?utf-8?B?S3ZTU0kwaDc0ZG1YRlgrY1pmbFBkL3duald3MTNaOGE1Vm1Va2dyajZNK1pJ?= =?utf-8?B?NnVraFFReGQ5SzRuZnB0SDkwbWV2cVNydUpySUhYQW5uZEVYMENhNEpibkpD?= =?utf-8?B?ZEF2MVB1NERVeVJBbXBLL3FIbnNyUDE0Q0dkb2YyMVcvMG92TWh2OTI2bXEy?= =?utf-8?B?Sy9hZ1dUSDRTQWpiN2tLelhBN2lmL2tza0dHQnVCWno4TWd2L1NFZEduZzNn?= =?utf-8?B?cXcwalErdThUSkIxQlpvTW5rOS9NTVJWcE9SLzlGY0tFYkY2emdkVHNkZDhr?= =?utf-8?B?YSs1MGVTd1JoaGdQM0U4dUcrMzgrKzVnWVd4OVlMVmF2VHJ5amM4cEYxcWRt?= =?utf-8?B?YXR0dGhmOXRCOXpGRzNKbGE5VjA3TjhTSVk2V1VOZnlpb3doSUJDODl6clpL?= =?utf-8?B?MFkxVGVhZ0JDUjJQd3Jtb3pjMS9YNSt1blc2eWJxbmZESkdFb2NSaFdaYlV3?= =?utf-8?B?Y3hqemErNEh6R0RkNndFTGx1MFI4Sm9aWnRLeExmcFExc0lia1ZSU05Rd25l?= =?utf-8?B?U3A3VzBIdlpvTXhPQzF2RlB1S2M1djhtcldIcmE3QU50L1M1ZnJvc3kzMURr?= =?utf-8?B?SnFPMHBZL1Fwa0cxeldhanFQZmhSWk1wTGdiQ1dqcFNaRXJoRVZFVVZndjBq?= =?utf-8?B?ZUM0c3d5TzFpZ2c1RGkrd3pOVmkvek4rNHhpdTdpeVJzcytCNGhoKzVaY3Z6?= =?utf-8?B?OEJrTVRIa2cySE5nTHN1TlBFellPcktya0J2cFBrbmhNeVRqYmtTM3M5ODh2?= =?utf-8?B?S25BRUVIRXlxK05jRVlyd2VHM3E3ZHZqUkNBNVN4N3RYSjVUV2NORUlmZ1pw?= =?utf-8?B?d0ZkbmVNeVFjSStrR0hCSFUyVW1QQ05pbW9QQ2ZyUU1vS1lzQ3NWTWo2a2Y1?= =?utf-8?B?L2RHczd3UmdQZ0pkajArWUE0bnRjT3FqNTlMejdvU0ZzRlVad2FoWEhwZFVp?= =?utf-8?B?NXN4M1lHeWIvTkkxWnB6RFI2Nko1dDdnbm8rUWJkVWVLL3Y2MHJJYm5aWThw?= =?utf-8?B?bmt3VlB2b0J4d3JrenlrdEhJbG1wRWgxRFNiRHE2MUI4cGJpUnpYOFpkUmxL?= =?utf-8?B?aDhPTjMyM2pTWVBETmF6ZFRXR040OFNONFJuOU5ZZEJjY1dzM0Jnc3NJTk44?= =?utf-8?B?d2FZemd4aTU2MzhvZ2xGMmJ6VklKYi9wR0M0RUhEV1QxTTVGU3N0U083TUQv?= =?utf-8?B?YU1xamoyL2VESk9SZURKUVovUmlnT0JWandxQWlob2RyNkNxZVNIZTJZWWlk?= =?utf-8?B?ajgyZjN4MVAzNmdTOFQrTXZ1WUFDMGRLdDZCT3VNRmhwVm9GN0ZCMGl6SEpX?= =?utf-8?B?R2QrVmQ0d1Q0M0FNS2svVzJkdjArQkp5QmFvMjBhRUxqaVVhZnFYOW9ZTDJB?= =?utf-8?B?cExwQTd4eTVvSXUrZTlRcU1paDlVVTN2NDdnRHFxakp1NGZsL3NlSFNKekJB?= =?utf-8?B?bjZqRDBsRjIyNVAxZkpRMVYvc21JRjlTTTh5cmlzdXh3MWhkaXhWclZFUjhp?= =?utf-8?B?VGZVTlQzTTFzb1JXcVNnRW4xMllvSlNVVkZITjdZMmhmT3JNUkdJOWtmc1pm?= =?utf-8?B?cEVid0dPMmV6c1MvZDVLWTAvVkVTZnJrM2lKRkV4NEJMVkRyVkxVQ2ZvTUFQ?= =?utf-8?B?OUdkN3BFQktsNktKZDlhbGtyYWE2UnI2aDE3MTVlaDQ5R2VLTXdEU29sYU9j?= =?utf-8?B?Skw4OTdsNmJhbzVHK2VwM0dHcUQ3VXJiUXljMmRRV3ZwTGR0T3h3ZU0yejEz?= =?utf-8?B?QzJqTHNaME5xZnBxQ25kMVRpS2lrWHNvYXdyUERCZG1JL1NFVTF6WHNSTVZo?= =?utf-8?B?cHRnOFh2bHVuYStIUlVISlZHK3FCYkZIeVloc25DZCtBRDNncjdwa2F1bGxH?= =?utf-8?Q?Q0UDNTmu7Io=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: b88fbbab-62bd-4ffe-6c95-08da3f09b5f1 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 May 2022 11:20:16.5463 (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: BL3P223MB0084 Subject: Re: [FFmpeg-devel] [PATCH v5] 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 Michael > Niedermayer > Sent: Thursday, May 26, 2022 12:51 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v5] libx264: Set min build version to > 158 > > On Thu, May 26, 2022 at 07:28:10AM +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 > > v5: fixed condition (again ;-) > > > > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr- > ffstaging-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v5 > > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr- > ffstaging-30/softworkz/submit_x264_api_imports_matt-v5 > > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 > > > > Range-diff vs v4: > > > > 1: 0d1bee35b0 ! 1: 8c4fe7ffc2 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 >= 118" && { > > ++ "$toolchain" != msvc || > require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } > > 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..e46d362b04 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 >= 118" && { > > + "$toolchain" != msvc || > require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } > > 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: 6663: ./configure: : Permission denied > ERROR: X264_BUILD >= 158 not satisfied Thanks! I installed x264 and could reproduce. Seems it need to go into square brackets: enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } Seems to work in all cases. Does that make sense? Thanks, 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".