From nobody Thu May 25 08:21:46 2023 X-Original-To: dev-commits-ports-all@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 4QRgy24XBqz4Cr6H; Thu, 25 May 2023 08:21:46 +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 4QRgy23cKXz3Kn9; Thu, 25 May 2023 08:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685002906; 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=XCnWjMqm4fHJdVkzUNKtsynL4FUx4N7g4qRlcoJYroc=; b=W6g50pQP+YO3wR1fAreyd7OpLQ26D4VotKCyXcj/lFpjYXABjeDhH5jo695bmYyQoNkJ2Q afMz0UojtfEFS0B3pYsQ/us/vpd/d9eZkpc8CvnQ6EHY5alTAqR17jZA6N/45TPDP5qmcI sPKsxqPvZa/l3/4a2jLUTOitsPWmCW54ujxkTRv3EYBSMptMoRSVAG2jFuT/Ihlz2k/us3 H/nDdDWzCai7ZjLKhXShGdr254b9wiyFeuhDulIieRp1T+pzLTGE523PJOzxCcDK7/HPxd D11uHTgj+d6fUSbdFn53h0FDrlf8FmjOSMBIGdJR7GXgBgnjGjHVY0Jua56yqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685002906; 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=XCnWjMqm4fHJdVkzUNKtsynL4FUx4N7g4qRlcoJYroc=; b=L4bg0jsb2jcWRkIw48hCy2EFXHr7Tr03svbLIXANMDcQ6drHRY6mAH7+NIhU8dCUMBIOjN EhgCYC4L2kVbCXMT2GJdrZw9NAszEsJF+4i+xXTSwZyEQ8Zq/1HXMjscVLRdKQKrLoxfU1 CaxlX3z2h6kvnseFL4a/WZAd4gHDHeoTLp1I+3Xyd0MGMCdEYKW88yLOqvoGp4B3eSc54C tsZxrylash70eLmo7TuLGg8gQPezt3Xqz+1TCz1VMpprq8CpEuvTLbOohahJHps6QHzBSD rF4BA/B81B798XPeHLvVJInKKH97+y08Hi4chthKQ4Gy5gWQRRiWworji4A39g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685002906; a=rsa-sha256; cv=none; b=LeEmS6IUJr1RcPuI1IRHF9UjlPAVb+oe74/mVUyZhfcFXOxzA6yF97W724tzqroOWlkh9q 3gcqKT3XqhSuNbWkM6Z7Tqgfvd4P4voby0jNTVJ6uYRLP+tVO1ujHNVyES1XZdZcMR6dp5 qegkZq7zNHVC1Y9IQMBodUH9Luf7GXHuUyKX/T3Ep0Fs5TZzZ1wlE9T5Yd5a6HEXBZBfHj +hnRkqOSipZrT8btDhTZjwlHDAemhUedIMubWUykPafY5yAAk/IB2voAU7Q/ZIkbYLajsb qi/I8D9jZiKLHLmcjq+tMlWkG0cwl6hrFRrddgcHBcpTJEvV9tjv+ai777DH1A== 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 4QRgy22ftWzHSH; Thu, 25 May 2023 08:21:46 +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 34P8Lkwq065119; Thu, 25 May 2023 08:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P8Lk4m065118; Thu, 25 May 2023 08:21:46 GMT (envelope-from git) Date: Thu, 25 May 2023 08:21:46 GMT Message-Id: <202305250821.34P8Lk4m065118@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 291cb55ec4ba - 2023Q2 - emulators/ppsspp: unbreak on DragonFly after deb6e280f48b List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 291cb55ec4bafd94fea343686c4b50f94fd61000 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=291cb55ec4bafd94fea343686c4b50f94fd61000 commit 291cb55ec4bafd94fea343686c4b50f94fd61000 Author: Jan Beich AuthorDate: 2023-05-25 08:07:16 +0000 Commit: Jan Beich CommitDate: 2023-05-25 08:15:42 +0000 emulators/ppsspp: unbreak on DragonFly after deb6e280f48b In file included from Core/HLE/sceAudiocodec.cpp:25: Core/HW/SimpleAudioDec.h:26:1: error: 'const' can only be specified for objects and functions const struct AVCodec; ^~~~~ Reported by: DPorts (cherry picked from commit e316451d37e1454bd32e03d3a0ffb0b094ceb63f) --- emulators/ppsspp/files/patch-ffmpeg5 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/emulators/ppsspp/files/patch-ffmpeg5 b/emulators/ppsspp/files/patch-ffmpeg5 index 051628becfe7..5af6a6c489b6 100644 --- a/emulators/ppsspp/files/patch-ffmpeg5 +++ b/emulators/ppsspp/files/patch-ffmpeg5 @@ -86,15 +86,6 @@ https://github.com/hrydgard/ppsspp/issues/15308 #include "libavutil/samplefmt.h" --- Core/HW/SimpleAudioDec.h.orig 2023-01-03 10:14:31 UTC +++ Core/HW/SimpleAudioDec.h -@@ -23,7 +23,7 @@ struct AVFrame; - #include "Core/HLE/sceAudio.h" - - struct AVFrame; --struct AVCodec; -+const struct AVCodec; - struct AVCodecContext; - struct SwrContext; - @@ -78,7 +78,7 @@ class SimpleAudio { (private) int wanted_resample_freq; // wanted resampling rate/frequency