From 6ad6ca8e14e3e412e053f04edc4b919bae83939a Mon Sep 17 00:00:00 2001 From: Nicole O'Connor Date: Sat, 16 Nov 2024 19:06:05 -0800 Subject: [PATCH] gzdoom 4.13.2: zmusic version bump --- games-fps/gzdoom/gzdoom-4.13.2.ebuild | 11 ++++- games-util/libx52/libx52-0.3.2.ebuild | 16 ++++++++ media-libs/zmusic/Manifest | 2 + media-libs/zmusic/zmusic-1.1.14.ebuild | 56 ++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 games-util/libx52/libx52-0.3.2.ebuild create mode 100644 media-libs/zmusic/Manifest create mode 100644 media-libs/zmusic/zmusic-1.1.14.ebuild diff --git a/games-fps/gzdoom/gzdoom-4.13.2.ebuild b/games-fps/gzdoom/gzdoom-4.13.2.ebuild index 0a6f744..b02680a 100644 --- a/games-fps/gzdoom/gzdoom-4.13.2.ebuild +++ b/games-fps/gzdoom/gzdoom-4.13.2.ebuild @@ -21,7 +21,7 @@ DEPEND=" media-libs/libsdl2[gles2?,opengl,vulkan?] media-libs/libvpx:= media-libs/openal - media-libs/zmusic + >=media-libs/zmusic-1.1.14 sys-libs/zlib media-libs/libwebp gtk? ( x11-libs/gtk+:3 )" @@ -39,6 +39,15 @@ src_prepare() { if ! use non-free ; then rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die fi + { + echo "// 0" + echo "// The above line prevents UpdateRevision.cmake from replacing this file." + echo "// This file was generated by the Gentoo ebuild." + echo + echo "#define GIT_DESCRIPTION \"g${PV}\"" + echo "#define GIT_HASH \"0\"" + echo "#define GIT_TIME \"\"" + } > "${S}/src/gitinfo.h" || die cmake_src_prepare } diff --git a/games-util/libx52/libx52-0.3.2.ebuild b/games-util/libx52/libx52-0.3.2.ebuild new file mode 100644 index 0000000..ef65b41 --- /dev/null +++ b/games-util/libx52/libx52-0.3.2.ebuild @@ -0,0 +1,16 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Driver and support software for Saitek X52 HOTAS" +HOMEPAGE="https://github.com/nirenjan/libx52" +SRC_URI="https://github.com/nirenjan/libx52/releases/download/v${PV}/libx52_${PV}.orig.tar.gz" + +LICENSE="" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest new file mode 100644 index 0000000..3c29a78 --- /dev/null +++ b/media-libs/zmusic/Manifest @@ -0,0 +1,2 @@ +DIST zmusic-1.1.14.zip 3071871 BLAKE2B 7313c3b59313c3444d6fe4b0e3fb960d09527d28a896f63a607d3e8ccbd318cc85b6cb53c3bd4be2d51d6edda69645a2b722341dfb013a1a25322c71e579448a SHA512 23722b5a5f4c526dc72dcc731cae7db298505e47d33104d94fa26879813069f16e0d7cb1f43ced169555bb2fb735d07b99fcc6ea8f85c5635bc38fa354e6c982 +EBUILD zmusic-1.1.14.ebuild 1346 BLAKE2B 741e03d3b56bc2ab5f7a33118aa42759955b207c15c66d849adb795bec4ce53b021c68801c53e2c45ccc79aefd1d3c0a9176a1e3ebf7ba5de943f63eb6f15c68 SHA512 52c1b2e9d5f8bebe5222b118e08707e7bdc020df4619f6e57284ddc4b2a14dbd74820dc1e9eb4de8e1149e199c9e7d442edfe2ec45cba684dd8f0116043097e9 diff --git a/media-libs/zmusic/zmusic-1.1.14.ebuild b/media-libs/zmusic/zmusic-1.1.14.ebuild new file mode 100644 index 0000000..56938c6 --- /dev/null +++ b/media-libs/zmusic/zmusic-1.1.14.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +MY_PN="ZMusic" +DESCRIPTION="GZDoom's music system as a standalone library" +HOMEPAGE="https://github.com/ZDoom/ZMusic" +SRC_URI="https://github.com/ZDoom/ZMusic/archive/refs/tags/${PV}.zip -> ${P}.zip" + +LICENSE="BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="alsa fluidsynth mpg123 +sndfile" + +DEPEND=" + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth:= ) + mpg123? ( media-sound/mpg123 ) + sndfile? ( media-libs/libsndfile )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + rm -rf licenses || die + cmake_src_prepare +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/860117 + # https://github.com/ZDoom/ZMusic/issues/56 + filter-lto + + local mycmakeargs=( + -DFORCE_INTERNAL_ZLIB=OFF + -DFORCE_INTERNAL_GME=ON + -DDYN_FLUIDSYNTH=OFF + -DDYN_SNDFILE=OFF + -DDYN_MPG123=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" + -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" + -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" + -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" + -DBUILD_SHARED_LIBS=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install +}