From nobody Mon Sep 19 07:43:16 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MWGr45Gnnz4cxsJ; Mon, 19 Sep 2022 07:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MWGr44lLSz3r5F; Mon, 19 Sep 2022 07:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663573396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gMkaglxcG9fO3roZF4tQ8ke+dUOgUBvnphe/OiHkhso=; b=EIcdZQy0GIUN+rxgbSRlMQkwQhaGo4WrXPD9FdazJ89KvX7XitHquieC0rD1VJYZKjvt4O dogfKEHefU5OFJ7smQ46p3Eu0g51nKYtbzeYC8i7Q1gTgobPQ3ztehNVjPlkc7mYThp20h 8iaSUFMEULnCGpi/8W4XtuanUnbhz+Y5exc8EPXnT/UEaWXNU6DM+K9YPtKBak5Xki/JcP +kG0/ePb6DaLVozPQlS4wiBLIhYaMAYzy1hQfgm1Ed2QzN7gamTqbNv4O5Egr89ZrnSy3t 1MPj5HU1y4GUmPn9CxUSJ7AswVL+XpZ2eNdIshv5U25f0Jk4b9Zw44RErX59BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MWGr43p6DzJt1; Mon, 19 Sep 2022 07:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28J7hGKv055492; Mon, 19 Sep 2022 07:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28J7hGQw055491; Mon, 19 Sep 2022 07:43:16 GMT (envelope-from git) Date: Mon, 19 Sep 2022 07:43:16 GMT Message-Id: <202209190743.28J7hGQw055491@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 906df1b6f258 - main - multimedia/ffmpeg: fix build with SDL option enabled List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 906df1b6f2587c491a86391cea3f1870b0e16977 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663573396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gMkaglxcG9fO3roZF4tQ8ke+dUOgUBvnphe/OiHkhso=; b=O+Q0iSxv5Pj+BV/AZ/ROXGBN1lEHxo27rpK6BNOu6dzFZdDYP2Uq5FccI2slFm1eEDCN4a eEwUIBqg4QiFa7LC2gy9bjqXz56f9Z2jU4k+y+61vapT7fMntyHQ3/xAYenD0J63WjTPju SQpWO0XZBeITv3MeMbHay+6BsmheR9gKzBkyDVeno/CgAjWR1aWa0W72ELH818J+Avkalt Nct0ocNWj9m3JlWdTkzumRP87OAWT5X+i/HlHWfL4uDiPOizk0qHO/yiUSW6K97DMpTv9l KSYsLeYkJ2M1tkU7L5jnttQNzgW8NFHvxl+a0P5RR2H+dU/PHcR24ewHwwC4fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663573396; a=rsa-sha256; cv=none; b=L43WHVQvnUl8r9RFhntC3arjHRaBchJq796UNuo59uu1AbBrHjRvQ1AXdIXV2+JbokDMcx BnpLVTJBekfpnW1nONRfGLyUoYck5Fk4UyX9nirITRIhfSKji42/WVoOMUbAmIwodaF7xO dRvKEQSlhTxYjqBv6oSvtg4muARwrJE0YtQ28UWkQ7a6GLUq8kYb+e+bbQ82FXfsfS0Opc zRP1dRlkzoMdpulDI6KXqpqXkmweBU2vqGB+JOH4vuOKRFbG6lZNlE4mx5GGVxjUvMCF8q WLA1iwtggSAId0RnGvBp9+93AxwT6GvNviDjbdEdPJG7jlr/2NMNYSga7L91Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=906df1b6f2587c491a86391cea3f1870b0e16977 commit 906df1b6f2587c491a86391cea3f1870b0e16977 Author: Martin Neubauer AuthorDate: 2022-09-19 07:38:15 +0000 Commit: Stefan Eßer CommitDate: 2022-09-19 07:42:43 +0000 multimedia/ffmpeg: fix build with SDL option enabled Since this is a patch that has already applied to the ffmpeg upstream, we should either apply this patch or upgrade to an fixed upstream version, see: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/e5163b1d3438 This issue has existed for some time and despite the port being upgraded in between, therefore I'll commit the patch under the "just fix it" exception granted by portmgr, it can be removed by the maintainers when ffmpeg is upgraded to a fixed version. PR: 266299 Reported by: m.ne@gmx.net (Martin Neubauer) Approved by: portmgr (implicit) --- multimedia/ffmpeg/files/patch-configure | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index c801515bbac4..ce54ab1bd8f2 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -15,3 +15,12 @@ cpu="generic" intrinsics="none" +@@ -6736,7 +6736,7 @@ fi + + if enabled sdl2; then + SDL2_CONFIG="${cross_prefix}sdl2-config" +- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent ++ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent + if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + sdl2_cflags=$("${SDL2_CONFIG}" --cflags) + sdl2_extralibs=$("${SDL2_CONFIG}" --libs)