[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2022-11-10 Thread Miroslav Šulc 
commit: 865256856e55673e95ff1bebb2fc036da87369d2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Nov 11 07:24:01 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 11 07:24:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86525685

media-sound/din: dropped obsolete 54

Bug: https://bugs.gentoo.org/880705
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest|  1 -
 media-sound/din/din-54.ebuild   | 57 -
 media-sound/din/files/din-52-makefile.patch | 14 ---
 3 files changed, 72 deletions(-)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 3ed6659c7173..5f5caf546b33 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,2 +1 @@
-DIST din-54.tar.gz 3710611 BLAKE2B 
2a7540d9a413c0f83b2cfc7373b1c0fdd40012ae725f162810e4d3165e3bc669661860fd653eaed8c7f2eeed7f015ff50ce6082ce8de04bd035bf395ca018d6a
 SHA512 
8831e6d838ba06373b13574701929f96a508f2899618509b3e79f23cb0aa11c34b347fa00b4fa765a7668c7db54733be2c9146b8e783d3fe07e3ea4ce2707bd8
 DIST din-55.tar.gz 3711327 BLAKE2B 
2c6ba4a877c512a950fb7c731f20d285019da1c7cd4ab5c7ff8d75e3c25eaa4ea08ca865b37e12fa1cefc1175baaa1c7ce27a44c7fa7c0b6c59b0ccbf6ab7a39
 SHA512 
432a53e71d1cf96c9ed62694fb23d1264d2e80b34620ebf0f1f33f3d4787cc7358c42038b2a45aa9d3ba9f59828eaaebd521a046fd5a51919a13f1bffad16a22

diff --git a/media-sound/din/din-54.ebuild b/media-sound/din/din-54.ebuild
deleted file mode 100644
index a12ad9ed2cc6..
--- a/media-sound/din/din-54.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 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}-52-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-52-makefile.patch 
b/media-sound/din/files/din-52-makefile.patch
deleted file mode 100644
index 3205bb973fb7..
--- a/media-sound/din/files/din-52-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 120bfa6..b3f4cd2 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 autoflip.cc 
autorotator.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 defvelaccel.cc delay.cc 
din.cc din_info.cc drawrrow.cc drone.cc eval.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 p
 lus_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

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2021-10-28 Thread Miroslav Šulc 
commit: edc0cb213cb45a4aa72db0e0ffb8ab44dd810eab
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Oct 28 14:08:02 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Oct 28 14:08:02 2021 +
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..000
--- 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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-11-16 Thread Miroslav Šulc 
commit: 859f4fb57cd0a59714e9e031ebbb3f9701c67878
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Nov 16 08:36:20 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov 16 08:36:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=859f4fb5

media-sound/din: bump to 49.1

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest  |  1 +
 media-sound/din/din-49.1.ebuild   | 57 +++
 media-sound/din/files/din-49.1-makefile.patch | 14 +++
 3 files changed, 72 insertions(+)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 4d6a905d587..20326d09758 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1 +1,2 @@
 DIST din-48.tar.gz 3673917 BLAKE2B 
90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1
 SHA512 
3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
+DIST din-49.1.tar.gz 3677087 BLAKE2B 
7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf
 SHA512 
8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04

diff --git a/media-sound/din/din-49.1.ebuild b/media-sound/din/din-49.1.ebuild
new file mode 100644
index 000..08b3a14fa0f
--- /dev/null
+++ b/media-sound/din/din-49.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils 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}/${P}-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-49.1-makefile.patch 
b/media-sound/din/files/din-49.1-makefile.patch
new file mode 100644
index 000..0a96d894c2c
--- /dev/null
+++ b/media-sound/din/files/din-49.1-makefile.patch
@@ -0,0 +1,14 @@
+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

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-11-16 Thread Miroslav Šulc 
commit: 8bb8dc0bcd4fbe0f2733f034c9ad49e30543fceb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Nov 16 08:25:11 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov 16 08:26:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb8dc0b

media-sound/din: removed obsolete 47.1

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest   |  1 -
 media-sound/din/din-47.1.ebuild| 57 --
 .../files/din-43.0.1-fix-random-constants.patch| 15 --
 media-sound/din/files/din-47.1-makefile.patch  | 12 -
 4 files changed, 85 deletions(-)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index b67fa2f8d7e..4d6a905d587 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,2 +1 @@
-DIST din-47.1.tar.gz 3667502 BLAKE2B 
21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786
 SHA512 
883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17
 DIST din-48.tar.gz 3673917 BLAKE2B 
90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1
 SHA512 
3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940

diff --git a/media-sound/din/din-47.1.ebuild b/media-sound/din/din-47.1.ebuild
deleted file mode 100644
index a67d55f2e19..000
--- a/media-sound/din/din-47.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils 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}/${P}-makefile.patch"
-   "${FILESDIR}/${PN}-43.0.1-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-43.0.1-fix-random-constants.patch 
b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
deleted file mode 100644
index 29f75d35f49..000
--- a/media-sound/din/files/din-43.0.1-fix-random-constants.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/random.h b/include/random.h
-index 99d79fb..91ed250 100644
 a/include/random.h
-+++ b/include/random.h
-@@ -16,8 +16,8 @@
- const int N = 624;
- const int M = 397;
- const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
--const int UPPER_MASK = 0x8000; /* most significant w-r bits */
--const int LOWER_MASK = 0x7fff; /* least significant r bits */
-+const unsigned int UPPER_MASK = 0x8000; /* most significant w-r bits */
-+const unsigned int LOWER_MASK = 0x7fff; /* least significant r bits */
- 
- static unsigned int mt[N]; /* the array for the state vector  */
- static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */

diff --git a/media-sound/din/files/din-47.1-makefile.patch 
b/media-sound/din/files/din-47.1-makefile.patch
deleted file mode 100644
index 62e7229f0f5..000
--- a/media-sound/din/files/din-47.1-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b24e856..a624610 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -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 = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ 
-D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- AM_CFLAGS = -I ../include
- bin_PROGRAMS = din

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-09-14 Thread Miroslav Šulc 
commit: d8d904cad8a59070471356715387c328647f9e7d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Sep 14 07:43:46 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Sep 14 07:43:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d904ca

media-sound/din: bump to 48

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest   |  1 +
 media-sound/din/din-48.ebuild  | 57 ++
 .../din/files/din-48-fix-random-constants.patch| 15 ++
 media-sound/din/files/din-48-makefile.patch| 14 ++
 4 files changed, 87 insertions(+)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index ca7e7fae441..b67fa2f8d7e 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1 +1,2 @@
 DIST din-47.1.tar.gz 3667502 BLAKE2B 
21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786
 SHA512 
883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17
+DIST din-48.tar.gz 3673917 BLAKE2B 
90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1
 SHA512 
3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940

diff --git a/media-sound/din/din-48.ebuild b/media-sound/din/din-48.ebuild
new file mode 100644
index 000..14fecc8a11c
--- /dev/null
+++ b/media-sound/din/din-48.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils 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}/${P}-makefile.patch"
+   "${FILESDIR}/${P}-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
new file mode 100644
index 000..8e60204ad42
--- /dev/null
+++ b/media-sound/din/files/din-48-fix-random-constants.patch
@@ -0,0 +1,15 @@
+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 @@
+ const int N = 624;
+ const int M = 397;
+ const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
+-const int UPPER_MASK = 0x8000; /* most significant w-r bits */
+-const int LOWER_MASK = 0x7fff; /* least significant r bits */
++const unsigned int UPPER_MASK = 0x8000; /* most significant w-r bits */
++const unsigned int LOWER_MASK = 0x7fff; /* least significant r bits */
+ 
+ static unsigned int mt[N]; /* the array for the state vector  */
+ static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */

diff --git a/media-sound/din/files/din-48-makefile.patch 
b/media-sound/din/files/din-48-makefile.patch
new file mode 100644
index 000..5a37359106d
--- /dev/null
+++ b/media-sound/din/files/din-48-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index df480f2..d665bbf 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

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-08-11 Thread Miroslav Šulc 
commit: 6fe7cc4054ee2be2790768cc8675ec902eb8c3b5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug 11 15:24:36 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug 11 15:24:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe7cc40

media-sound/din: removed obsolete 44.0.2

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest|  1 -
 media-sound/din/din-44.0.2.ebuild   | 57 -
 media-sound/din/files/din-44.0.2-makefile.patch | 12 --
 3 files changed, 70 deletions(-)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 8e825b63116..ca7e7fae441 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,2 +1 @@
-DIST din-44.0.2.tar.gz 3652445 BLAKE2B 
2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c
 SHA512 
a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8
 DIST din-47.1.tar.gz 3667502 BLAKE2B 
21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786
 SHA512 
883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17

diff --git a/media-sound/din/din-44.0.2.ebuild 
b/media-sound/din/din-44.0.2.ebuild
deleted file mode 100644
index a67d55f2e19..000
--- a/media-sound/din/din-44.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils 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}/${P}-makefile.patch"
-   "${FILESDIR}/${PN}-43.0.1-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-44.0.2-makefile.patch 
b/media-sound/din/files/din-44.0.2-makefile.patch
deleted file mode 100644
index c8f60c2210e..000
--- a/media-sound/din/files/din-44.0.2-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0e614a4..f9699d0 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -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 = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ 
-D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- AM_CFLAGS = -I ../include
- bin_PROGRAMS = din

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-07-08 Thread Miroslav Šulc 
commit: 7209098eb990cabfdeafbecf34e8f0530ae4a92f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jul  8 08:51:18 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jul  8 08:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7209098e

media-sound/din: bump to 47.1

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest  |  1 +
 media-sound/din/din-47.1.ebuild   | 57 +++
 media-sound/din/files/din-47.1-makefile.patch | 12 ++
 3 files changed, 70 insertions(+)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index b4876fadda2..8e825b63116 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1 +1,2 @@
 DIST din-44.0.2.tar.gz 3652445 BLAKE2B 
2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c
 SHA512 
a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8
+DIST din-47.1.tar.gz 3667502 BLAKE2B 
21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786
 SHA512 
883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17

diff --git a/media-sound/din/din-47.1.ebuild b/media-sound/din/din-47.1.ebuild
new file mode 100644
index 000..cde6724c7e0
--- /dev/null
+++ b/media-sound/din/din-47.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils 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}/${P}-makefile.patch"
+   "${FILESDIR}/${PN}-43.0.1-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-47.1-makefile.patch 
b/media-sound/din/files/din-47.1-makefile.patch
new file mode 100644
index 000..62e7229f0f5
--- /dev/null
+++ b/media-sound/din/files/din-47.1-makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b24e856..a624610 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-AM_CXXFLAGS = -I ../include -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 = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ 
-D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ AM_CFLAGS = -I ../include
+ bin_PROGRAMS = din

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-02-11 Thread Miroslav Šulc 
commit: fcf42a15dafa227b0e6e20a8f4135111770435b2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Feb 11 23:43:59 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Feb 11 23:44:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf42a15

media-sound/din: bump to 44.0.2

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest|  1 +
 media-sound/din/din-44.0.2.ebuild   | 57 +
 media-sound/din/files/din-44.0.2-makefile.patch | 12 ++
 3 files changed, 70 insertions(+)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 5ece22527cd..946941fad63 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1 +1,2 @@
 DIST din-43.0.1.tar.gz 3644254 BLAKE2B 
6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6
 SHA512 
14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
+DIST din-44.0.2.tar.gz 3652445 BLAKE2B 
2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c
 SHA512 
a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8

diff --git a/media-sound/din/din-44.0.2.ebuild 
b/media-sound/din/din-44.0.2.ebuild
new file mode 100644
index 000..db092ac76e7
--- /dev/null
+++ b/media-sound/din/din-44.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="http://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}/${P}-makefile.patch"
+   "${FILESDIR}/${PN}-43.0.1-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-44.0.2-makefile.patch 
b/media-sound/din/files/din-44.0.2-makefile.patch
new file mode 100644
index 000..c8f60c2210e
--- /dev/null
+++ b/media-sound/din/files/din-44.0.2-makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0e614a4..f9699d0 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-AM_CXXFLAGS = -I ../include -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 = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ 
-D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ AM_CFLAGS = -I ../include
+ bin_PROGRAMS = din

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2020-01-16 Thread Tim Harder 
commit: a9defe39eaa029cefaf196badf96363ed80d961b
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Jan 16 12:24:11 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Jan 16 12:24:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9defe39

media-sound/din: remove old

Signed-off-by: Tim Harder  gentoo.org>

 media-sound/din/Manifest |  1 -
 media-sound/din/din-5.2.1.ebuild | 37 
 media-sound/din/files/din-5.2.1-desktop.patch|  8 -
 media-sound/din/files/din-5.2.1-makefile.patch   | 10 ---
 media-sound/din/files/din-5.2.1-tcl.patch| 11 ---
 media-sound/din/files/fix-random-constants.patch | 30 ---
 6 files changed, 97 deletions(-)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index a31e79724f2..5ece22527cd 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,2 +1 @@
 DIST din-43.0.1.tar.gz 3644254 BLAKE2B 
6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6
 SHA512 
14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
-DIST din-5.2.1.tar.gz 321269 BLAKE2B 
eb3b3ebad7a973dfc9bd4d6edbcc83e545c5e11c564a4f592ddef996e971c52fd8b4508933d76dd6964fcbaf5eebe5f0230171eef6466d63540c01918a946379
 SHA512 
0fa7de383c869f9f55ee055f821f3b541ca7df83d61f9bdb6b9e0227a724abe098073985cb4f3eb381199d4baa84d9ee2b86b74614e11cb8b58b119230ca3c09

diff --git a/media-sound/din/din-5.2.1.ebuild b/media-sound/din/din-5.2.1.ebuild
deleted file mode 100644
index 592a773fe05..000
--- a/media-sound/din/din-5.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="http://dinisnoise.org/;
-SRC_URI="https://din.googlecode.com/files/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-lang/tcl:0=
-   media-libs/liblo
-   media-sound/jack-audio-connection-kit
-   net-libs/libircclient
-   sci-libs/fftw:3.0
-   virtual/opengl
-   x11-libs/libX11"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-makefile.patch
-   epatch "${FILESDIR}"/${P}-tcl.patch
-   epatch "${FILESDIR}"/${P}-desktop.patch
-   epatch "${FILESDIR}"/fix-random-constants.patch
-
-   # force script to be regenerated so it uses the right data path
-   rm data/checkdotdin || die
-
-   eautoreconf
-}

diff --git a/media-sound/din/files/din-5.2.1-desktop.patch 
b/media-sound/din/files/din-5.2.1-desktop.patch
deleted file mode 100644
index e9bd7a62bc5..000
--- a/media-sound/din/files/din-5.2.1-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
 din-5.2.1/data/din.desktop
-+++ din-5.2.1/data/din.desktop
-@@ -8,4 +8,4 @@
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;Audio;Midi;Music;
-+Categories=AudioVideo;Audio;Midi;Music;

diff --git a/media-sound/din/files/din-5.2.1-makefile.patch 
b/media-sound/din/files/din-5.2.1-makefile.patch
deleted file mode 100644
index 1f79f82ce49..000
--- a/media-sound/din/files/din-5.2.1-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 din-5.2.1/src/Makefile.am
-+++ din-5.2.1/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include 
-I /usr/local/include -I /opt/include -I/usr/include/tcl8.5 
-I/usr/local/include/tcl8.5 -I /opt/include/tcl8.5 -I ../include  -Wall -O3
--LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -L/usr/lib/tcl8.5 
-L/usr/local/lib/tcl8.5 -L /opt/lib/tcl8.5 -L /usr/lib -L /opt/lib -L 
/usr/local/lib -ltcl8.5 -lGL -lircclient -lrt -lX11
-+AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include 
-I ../include  -Wall
-+LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -ltcl -lGL -lircclient -lrt 
-lX11
- 
- bin_PROGRAMS = din
- 

diff --git a/media-sound/din/files/din-5.2.1-tcl.patch 
b/media-sound/din/files/din-5.2.1-tcl.patch
deleted file mode 100644
index a5582f1bba1..000
--- a/media-sound/din/files/din-5.2.1-tcl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 din-5.2.1/configure.ac
-+++ din-5.2.1/configure.ac
-@@ -3,7 +3,7 @@
- AC_CONFIG_SRCDIR([configure.ac])
- AC_PROG_CXX
- AC_CHECK_HEADERS([GL/gl.h],AC_MSG_NOTICE([+++ Found OpenGL 
+++]),[AC_MSG_ERROR([!!! Please install OpenGL !!!])])
--AC_CHECK_HEADERS([tcl.h] [tcl8.5/tcl.h],AC_MSG_NOTICE([+++ Found Tcl 8.5 
+++]),[AC_MSG_WARN([!!! Is Tcl 8.5 installed? !!!])])
-+AC_CHECK_HEADERS([tcl.h], AC_MSG_NOTICE([+++ Found Tcl 
+++]),[AC_MSG_ERROR([!!! Please install Tcl !!!])])
- AC_CHECK_HEADERS([libircclient/libircclient.h],,[AC_MSG_ERROR([!!! Please

[gentoo-commits] repo/gentoo:master commit in: media-sound/din/files/, media-sound/din/

2019-12-17 Thread Miroslav Šulc 
commit: 4044db3b1b9750f4386445662ae0dbd5609b6b07
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Dec 17 17:00:15 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Dec 17 17:01:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4044db3b

media-sound/din: bump

1) eapi7
2) updated and organized deps
3) introduced alsa and jack use flags
4) updated relevant patches

based on ebuild update by Samuel Bauer  yahoo.fr>

Closes: https://bugs.gentoo.org/699358
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/din/Manifest   |  1 +
 media-sound/din/din-43.0.1.ebuild  | 56 ++
 .../files/din-43.0.1-fix-random-constants.patch| 15 ++
 media-sound/din/files/din-43.0.1-makefile.patch| 12 +
 4 files changed, 84 insertions(+)

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index df912614e3d..a31e79724f2 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1 +1,2 @@
+DIST din-43.0.1.tar.gz 3644254 BLAKE2B 
6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6
 SHA512 
14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
 DIST din-5.2.1.tar.gz 321269 BLAKE2B 
eb3b3ebad7a973dfc9bd4d6edbcc83e545c5e11c564a4f592ddef996e971c52fd8b4508933d76dd6964fcbaf5eebe5f0230171eef6466d63540c01918a946379
 SHA512 
0fa7de383c869f9f55ee055f821f3b541ca7df83d61f9bdb6b9e0227a724abe098073985cb4f3eb381199d4baa84d9ee2b86b74614e11cb8b58b119230ca3c09

diff --git a/media-sound/din/din-43.0.1.ebuild 
b/media-sound/din/din-43.0.1.ebuild
new file mode 100644
index 000..891e798c769
--- /dev/null
+++ b/media-sound/din/din-43.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="http://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"
+
+BDEPEND="
+   app-text/dos2unix
+   virtual/pkgconfig
+"
+CDEPEND="dev-lang/tcl:0=
+   media-libs/libsdl:=
+   virtual/opengl
+   alsa? ( media-libs/alsa-lib )
+   jack? ( virtual/jack )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   dev-libs/boost
+"
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+   "${FILESDIR}/${P}-makefile.patch"
+   "${FILESDIR}/${P}-fix-random-constants.patch"
+)
+
+src_prepare() {
+   default
+
+   dos2unix pixmaps/${PN}.desktop || die "Failed to fix desktop file"
+
+   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-43.0.1-fix-random-constants.patch 
b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
new file mode 100644
index 000..29f75d35f49
--- /dev/null
+++ b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
@@ -0,0 +1,15 @@
+diff --git a/include/random.h b/include/random.h
+index 99d79fb..91ed250 100644
+--- a/include/random.h
 b/include/random.h
+@@ -16,8 +16,8 @@
+ const int N = 624;
+ const int M = 397;
+ const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
+-const int UPPER_MASK = 0x8000; /* most significant w-r bits */
+-const int LOWER_MASK = 0x7fff; /* least significant r bits */
++const unsigned int UPPER_MASK = 0x8000; /* most significant w-r bits */
++const unsigned int LOWER_MASK = 0x7fff; /* least significant r bits */
+ 
+ static unsigned int mt[N]; /* the array for the state vector  */
+ static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */

diff --git a/media-sound/din/files/din-43.0.1-makefile.patch 
b/media-sound/din/files/din-43.0.1-makefile.patch
new file mode 100644
index 000..f3a8116571c
--- /dev/null
+++ b/media-sound/din/files/din-43.0.1-makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcbd601..12ca52b 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-AM_CXXFLAGS = -I ../include -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 = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ 
-D __SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ AM_CFLAGS = -I ../include
+ bin_PROGRAMS = din