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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F31D158086 for ; Thu, 28 Oct 2021 14:08:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89F6BE0894; Thu, 28 Oct 2021 14:08:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60EEAE0894 for ; Thu, 28 Oct 2021 14:08:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F070343A74 for ; Thu, 28 Oct 2021 14:08:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7646178 for ; Thu, 28 Oct 2021 14:08:07 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1635430082.edc0cb213cb45a4aa72db0e0ffb8ab44dd810eab.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/din/Manifest media-sound/din/din-50.2.ebuild media-sound/din/files/din-49.1-makefile.patch media-sound/din/files/din-50.2-gcc11-rename-identifier.patch X-VCS-Directories: media-sound/din/files/ media-sound/din/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: edc0cb213cb45a4aa72db0e0ffb8ab44dd810eab X-VCS-Branch: master Date: Thu, 28 Oct 2021 14:08:07 +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: 4e15caf0-72de-4b8e-949e-2507b77f892d X-Archives-Hash: 8501986b9374de88d991d83bbce4383f commit: edc0cb213cb45a4aa72db0e0ffb8ab44dd810eab Author: Miroslav Šulc gentoo org> AuthorDate: Thu Oct 28 14:08:02 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Oct 28 14:08:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc0cb21 media-sound/din: removed obsolete 50.2 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/din/Manifest | 1 - media-sound/din/din-50.2.ebuild | 58 ---------------------- media-sound/din/files/din-49.1-makefile.patch | 14 ------ .../files/din-50.2-gcc11-rename-identifier.patch | 41 --------------- 4 files changed, 114 deletions(-) diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest index e93a4b9f388..ec20699aba9 100644 --- a/media-sound/din/Manifest +++ b/media-sound/din/Manifest @@ -1,2 +1 @@ -DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498 DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f diff --git a/media-sound/din/din-50.2.ebuild b/media-sound/din/din-50.2.ebuild deleted file mode 100644 index 31e46f32335..00000000000 --- a/media-sound/din/din-50.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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}-49.1-makefile.patch" - "${FILESDIR}/${PN}-48-fix-random-constants.patch" - "${FILESDIR}/${PN}-50.2-gcc11-rename-identifier.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-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch deleted file mode 100644 index 0a96d894c2c..00000000000 --- a/media-sound/din/files/din-49.1-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index c7cc5ce..2b07a9b 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@\" --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@\" -+LIBS += -ltcl -lSDL -lGL -lpthread -lasound - - bin_PROGRAMS = din - din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp diff --git a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch b/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch deleted file mode 100644 index 8245a5cb021..00000000000 --- a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/787185 - -From 9ea918cfdfcd99fbcac64a820ddbaefb562c11a0 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 14 Jun 2021 15:06:58 +0000 -Subject: [PATCH] src/help.h: Rename __help identifier -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -__help is reserved, so we need to rename it to fix a build failure with GCC 11: - - "In addition to the names documented in this manual, reserved names include all - external identifiers (global functions and variables) that begin with an - underscore (‘_’) and all identifiers regardless of use that begin with either - two underscores or an underscore followed by a capital letter are reserved names." - -- glibc manual, 1.3.3 Reserved Names - -Signed-off-by: Sam James ---- - src/help.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/help.h b/src/help.h -index ae0954b..af7f178 100644 ---- a/src/help.h -+++ b/src/help.h -@@ -5,8 +5,8 @@ - * For more information, please visit https://dinisnoise.org/ - */ - --#ifndef __help --#define __help -+#ifndef DIN_help -+#define DIN_help - #include - #include - struct help { --- -2.32.0 -