From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 989F2138334 for ; Thu, 5 Sep 2019 20:21:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F25CE07A7; Thu, 5 Sep 2019 20:21:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35F66E07A7 for ; Thu, 5 Sep 2019 20:21:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE6D134AD02 for ; Thu, 5 Sep 2019 20:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CD02780 for ; Thu, 5 Sep 2019 20:20:59 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1567714828.657a8f058b0cf5ee648ea8376ed7c73bbae83c45.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/, games-fps/gzdoom/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/gzdoom/Manifest games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch games-fps/gzdoom/gzdoom-4.1.3.ebuild X-VCS-Directories: games-fps/gzdoom/files/ games-fps/gzdoom/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 657a8f058b0cf5ee648ea8376ed7c73bbae83c45 X-VCS-Branch: master Date: Thu, 5 Sep 2019 20:20:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a307d266-b9bd-4d8c-bb68-52f26308e6f1 X-Archives-Hash: 19a34a1d61f43aa7219234bf3bc39c74 commit: 657a8f058b0cf5ee648ea8376ed7c73bbae83c45 Author: William Breathitt Gray gmail com> AuthorDate: Sat Aug 31 11:25:49 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Sep 5 20:20:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657a8f05 games-fps/gzdoom: Drop old Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: William Breathitt Gray gmail.com> Signed-off-by: James Le Cuirot gentoo.org> games-fps/gzdoom/Manifest | 1 - .../gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch | 28 ---------- .../files/gzdoom-4.1.3-install_soundfonts.patch | 34 ------------ games-fps/gzdoom/gzdoom-4.1.3.ebuild | 62 ---------------------- 4 files changed, 125 deletions(-) diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index d7ccd5b9e28..1a1880d9565 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,2 +1 @@ -DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch deleted file mode 100644 index 1ae12a832b4..00000000000 --- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt -Date: 2018-10-16 14:29:56.900427855 +0200 - -Make the build work with fluidsynth 2.x. - ---- - src/sound/mididevices/music_fluidsynth_mididevice.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp -=================================================================== ---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp -+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp -@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD - #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f - #define FLUID_CHORUS_DEFAULT_SPEED 0.3f - #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f --#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE - - #endif - -+#ifndef FLUID_CHORUS_DEFAULT_TYPE -+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE -+#endif -+ - // TYPES ------------------------------------------------------------------- - - // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch deleted file mode 100644 index 1fe0b99d9a8..00000000000 --- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Thu, 13 Jun 2019 18:01:08 +0900 -Subject: [PATCH] Install soundfonts and WOPL/WOPN banks - -The INSTALL_SOUNDFONT_PATH cache entry is used to configure the -installation directory. ---- - src/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bb16f39e..4ff15062d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD - ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $/fm_banks/gs-by-papiezak-and-sneakernets.wopn - ) - -+if( WIN32 ) -+ set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) -+else() -+ set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) -+endif() -+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks" -+ DESTINATION ${INSTALL_SOUNDFONT_PATH} -+ COMPONENT "Soundfont resources") -+ - if( CMAKE_COMPILER_IS_GNUCXX ) - # GCC misoptimizes this file - set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" ) --- -2.21.0 - diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild deleted file mode 100644 index 242bd4e9287..00000000000 --- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils desktop xdg - -DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" -HOMEPAGE="https://zdoom.org" -SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk gtk2 openmp" - -DEPEND=" - media-libs/libsdl2[opengl] - media-libs/libsndfile - media-libs/openal - media-sound/fluidsynth:= - media-sound/mpg123 - sys-libs/zlib - virtual/jpeg:0 - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-g${PV}" -PATCHES=( - "${FILESDIR}/${P}-fluidsynth2.patch" - "${FILESDIR}/${P}-install_soundfonts.patch" -) - -src_prepare() { - rm -rf docs/licenses || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" - -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" - -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" - -DDYN_FLUIDSYNTH=OFF - -DDYN_OPENAL=OFF - -DDYN_SNDFILE=OFF - -DDYN_MPG123=OFF - -DNO_GTK="$(usex !gtk)" - -DNO_OPENAL=OFF - -DNO_OPENMP="$(usex !openmp)" - ) - cmake-utils_src_configure -} - -src_install() { - newicon src/posix/zdoom.xpm "${PN}.xpm" - make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" - cmake-utils_src_install -}