commit: 0cd2719ace6d12772eb3fa7ae9f41687adb95e8f Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sun Jan 14 12:11:36 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Jan 14 12:11:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd2719a
media-sound/din: bump to 58.1 + scrubbed patches Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/din/Manifest | 1 + media-sound/din/din-58.1.ebuild | 57 ++++++++++++++++++++++ .../din/files/din-48-fix-random-constants.patch | 2 - media-sound/din/files/din-55-makefile.patch | 2 - ...n-55-makefile.patch => din-58.1-makefile.patch} | 6 +-- 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest index 22c6d19cf8a5..80ca8b237bd5 100644 --- a/media-sound/din/Manifest +++ b/media-sound/din/Manifest @@ -1 +1,2 @@ DIST din-57.tar.gz 3693381 BLAKE2B b9e56c067830f3e164ac6e3e2d7a189569d5abf25ca3281491ad3ed29155a6e85fef5d7d4336d918104df3a8156f60c61294856665e775a8ef3c593bd17f08b7 SHA512 03dfa45fb8c58f3f8dc739ec3c4c31029c544d9f0b1cf3dbae61643e5accd951ad65ebf19c078bfb1d30d3a8ccea7ffec2f1cb44f38bab1b07cfd2071361590c +DIST din-58.1.tar.gz 3689591 BLAKE2B 2ccb48fed8aa16edb53cf6643b63a842c28cd700621d2273a94913ab7a6ae8b50da72c3509a8b9b6189fcd4beaa5afbfa3a92430acb18c4cc9a7cfb057209c29 SHA512 ee2d63309347167af3b4e41a0ad3ce1faad727a4e079cd9e63d402b680144aed81dbee9d38bc517acbb30a1c9af18b726841d0c94d96cbfb2b1581da98af21c1 diff --git a/media-sound/din/din-58.1.ebuild b/media-sound/din/din-58.1.ebuild new file mode 100644 index 000000000000..96e21a3778e0 --- /dev/null +++ b/media-sound/din/din-58.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edos2unix xdg + +DESCRIPTION="a software musical instrument and audio synthesizer" +HOMEPAGE="https://dinisnoise.org/"; +SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa jack" + +RDEPEND=" + dev-lang/tcl:0= + media-libs/libsdl:= + virtual/glu + virtual/opengl + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +BDEPEND=" + virtual/pkgconfig +" + +REQUIRED_USE="|| ( alsa jack )" + +PATCHES=( + "${FILESDIR}/${PN}-58.1-makefile.patch" + "${FILESDIR}/${PN}-48-fix-random-constants.patch" +) + +src_prepare() { + default + + edos2unix pixmaps/${PN}.desktop + + use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking") + + eautoreconf +} + +src_configure() { + # Jack takes over alsa. + local sound_engine + + use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA" + + econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__" +} diff --git a/media-sound/din/files/din-48-fix-random-constants.patch b/media-sound/din/files/din-48-fix-random-constants.patch index 8e60204ad429..aef491fe5709 100644 --- a/media-sound/din/files/din-48-fix-random-constants.patch +++ b/media-sound/din/files/din-48-fix-random-constants.patch @@ -1,5 +1,3 @@ -diff --git a/src/random.h b/src/random.h -index d5a2bc6..38f0d14 100644 --- a/src/random.h +++ b/src/random.h @@ -16,8 +16,8 @@ diff --git a/media-sound/din/files/din-55-makefile.patch b/media-sound/din/files/din-55-makefile.patch index 5ce81bd0c1f8..9466a35e5a02 100644 --- a/media-sound/din/files/din-55-makefile.patch +++ b/media-sound/din/files/din-55-makefile.patch @@ -1,5 +1,3 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 1c54f03..db187eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ diff --git a/media-sound/din/files/din-55-makefile.patch b/media-sound/din/files/din-58.1-makefile.patch similarity index 60% copy from media-sound/din/files/din-55-makefile.patch copy to media-sound/din/files/din-58.1-makefile.patch index 5ce81bd0c1f8..37e24b966eec 100644 --- a/media-sound/din/files/din-55-makefile.patch +++ b/media-sound/din/files/din-58.1-makefile.patch @@ -1,13 +1,11 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 1c54f03..db187eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ #dinincludedir = $(pkgsrcdir) --AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" +-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\" -LIBS += -ltcl8.6 -lSDL -lGL -lpthread -lasound -+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" ++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\" +LIBS += -ltcl -lSDL -lGL -lpthread -lasound bin_PROGRAMS = din
