From nobody Thu May 25 08:15:16 2023 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 4QRgpX6BrCz4CqdR; Thu, 25 May 2023 08:15: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 4QRgpX5ggdz3KT8; Thu, 25 May 2023 08:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685002516; 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=5NsCoZghBHm0AG5cgR1jXZ+5P1umJH8eKTNncuS6/FY=; b=r0D0CO8Ymq6v9DPbCdl5prxzm6vMUcgJRC5GUQ+RIlOYABl6a6a3O+DHksV9v1fpElNMTV kYqsFX99gGBE6leJosFfmEFZpuZH6xasr/kf6MnQttJJ66YXffkOJyQW7gbCIAcUNSTBHY L8qzVazfsDml148v+fvVn2TSh44DuKLD508QhsL/8juSDz8IOofQYTN2Ig0UthguTBHKS6 3Ez4FjyjVflRNFJcVh20Uu1HelcIMPfexyN3iYqmyAeOAooKoyIgWMvCIloPKCH7LKTPYP GDL9vybImOVd4vbo4vjdq+3JVsRDz6YuIiGp4/3ExZhQrmF/88jiSEJFJ3VCzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685002516; 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=5NsCoZghBHm0AG5cgR1jXZ+5P1umJH8eKTNncuS6/FY=; b=xpiTwyloRW3f7yn/R0e98Dh+I2sRePJfrZ1mF/LoONmuvGr8g4yKKr6m3asRV9RHYHsyYV mLHdud1wLrjKENewlVPCIbZkUYtxWI8iYYevo6aS2Ab3lLt66kO0CW8WQrebRNYp4tIcQs JOJ5OYiGeC7z3Tnt3MzDRuS/v1isfpBTPcw8NHtGt/ScCG+h2J85Kay9DAr0+g8r8o+b7a mcsiRRl9C3N3tCicl3FLTtLAdIClUN8NzuoqB2JtiNWkJW9Obt2ZelvVZ0DbDUWjJs51Ho HlA/tOqYr4FHWpALgy06JrcYl7kk9iO+YOfgdPF9//LNW+hHZ2B6QGcZjlET/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685002516; a=rsa-sha256; cv=none; b=ScNoyITCka5Fln5shMmKm6XcRPKGAR08zIjjfTlSgVy69LLgZPv/XZQKZ3Etk50Tk8WAdD 5XqHcc7vQdmtRa2DVeiMsApf36CTBPC2x+yxmBroOT6bp0Lq0kUBbZc+ayyzyzsnNEBiwi 0AZuk+KSff+8eeHNaQa2w/dHNIWCa/edl3P3aVlFCLHYT2tRlnLlyQs7du5EQwYycP18dR k6ZPQeEAuaPTL3HZpX3hKoANrFJ53uCb+VXY1ko4a2gUgmN//6EwW0xEYrn+npYw3yudzp Q1jMhfuE/bUhRkTaZNHl0iY5SKtdMOin1rxeoJB4nepFZT7Ngz06SqSYob2OAA== 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 4QRgpX4lNDzHGN; Thu, 25 May 2023 08:15: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 34P8FGHC052977; Thu, 25 May 2023 08:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P8FG9h052976; Thu, 25 May 2023 08:15:16 GMT (envelope-from git) Date: Thu, 25 May 2023 08:15:16 GMT Message-Id: <202305250815.34P8FG9h052976@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: e316451d37e1 - main - emulators/ppsspp: unbreak on DragonFly after deb6e280f48b 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e316451d37e1454bd32e03d3a0ffb0b094ceb63f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e316451d37e1454bd32e03d3a0ffb0b094ceb63f commit e316451d37e1454bd32e03d3a0ffb0b094ceb63f Author: Jan Beich AuthorDate: 2023-05-25 08:07:16 +0000 Commit: Jan Beich CommitDate: 2023-05-25 08:14:26 +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 --- 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 2c74a66afe6e..ac9b10457aff 100644 --- a/emulators/ppsspp/files/patch-ffmpeg5 +++ b/emulators/ppsspp/files/patch-ffmpeg5 @@ -94,15 +94,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