From owner-svn-ports-head@freebsd.org Sat Mar 13 06:37:34 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20BBE56B4C5; Sat, 13 Mar 2021 06:37:34 +0000 (UTC) (envelope-from swills@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 4DyCfL5C3Tz4Svg; Sat, 13 Mar 2021 06:37:30 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC7E225E23; Sat, 13 Mar 2021 06:37:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12D6bS70062520; Sat, 13 Mar 2021 06:37:28 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12D6bSah062517; Sat, 13 Mar 2021 06:37:28 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202103130637.12D6bSah062517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 13 Mar 2021 06:37:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568235 - in head/games/dunelegacy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/games/dunelegacy: . files X-SVN-Commit-Revision: 568235 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Mar 2021 06:37:34 -0000 Author: swills Date: Sat Mar 13 06:37:28 2021 New Revision: 568235 URL: https://svnweb.freebsd.org/changeset/ports/568235 Log: games/dunelegacy: convert from REINPLACE_CMD to patch files Added: head/games/dunelegacy/files/patch-src_FileClasses_music_DirectoryPlayer.cpp (contents, props changed) head/games/dunelegacy/files/patch-src_FileClasses_music_XMIPlayer.cpp (contents, props changed) Modified: head/games/dunelegacy/Makefile (contents, props changed) Modified: head/games/dunelegacy/Makefile ============================================================================== --- head/games/dunelegacy/Makefile Sat Mar 13 06:37:22 2021 (r568234) +++ head/games/dunelegacy/Makefile Sat Mar 13 06:37:28 2021 (r568235) @@ -1,4 +1,3 @@ -# Created by: Steve Wills # $FreeBSD$ PORTNAME= dunelegacy @@ -18,9 +17,5 @@ USES= autoreconf compiler:c++11-lib pkgconfig sdl tar GNU_CONFIGURE= yes USE_SDL= sdl2 mixer2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -post-patch: - @${REINPLACE_CMD} -e 's|MIX_INIT_FLUIDSYNTH|MIX_INIT_MID|g' \ - ${WRKSRC}/src/FileClasses/music/*.cpp .include Added: head/games/dunelegacy/files/patch-src_FileClasses_music_DirectoryPlayer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dunelegacy/files/patch-src_FileClasses_music_DirectoryPlayer.cpp Sat Mar 13 06:37:28 2021 (r568235) @@ -0,0 +1,11 @@ +--- src/FileClasses/music/DirectoryPlayer.cpp.orig 2016-11-20 14:57:02 UTC ++++ src/FileClasses/music/DirectoryPlayer.cpp +@@ -61,7 +61,7 @@ DirectoryPlayer::DirectoryPlayer() : MusicPlayer(setti + + music = nullptr; + +- Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG); ++ Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG); + } + + DirectoryPlayer::~DirectoryPlayer() { Added: head/games/dunelegacy/files/patch-src_FileClasses_music_XMIPlayer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dunelegacy/files/patch-src_FileClasses_music_XMIPlayer.cpp Sat Mar 13 06:37:28 2021 (r568235) @@ -0,0 +1,11 @@ +--- src/FileClasses/music/XMIPlayer.cpp.orig 2016-11-17 23:06:11 UTC ++++ src/FileClasses/music/XMIPlayer.cpp +@@ -32,7 +32,7 @@ + XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) { + music = nullptr; + +- if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) { ++ if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) { + SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError()); + } + }