[proaudio] proaudio/proaudio: [3202] workaround to satisfy portage, proaudio and audio-overlay with lash |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3202
Author: dominique
Date: 2020-11-01 23:02:41 +0100 (Sun, 01 Nov 2020)
Log Message:
-----------
workaround to satisfy portage, proaudio and audio-overlay with lash
Modified Paths:
--------------
trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST
trunk/overlays/proaudio/media-sound/lash/Manifest
trunk/overlays/proaudio/profiles/package.mask
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/ladish/
trunk/overlays/proaudio/media-sound/ladish/Manifest
trunk/overlays/proaudio/media-sound/ladish/files/
trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch
trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-configure-libdir.patch
trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-gui-resources-only-when-enabled.patch
trunk/overlays/proaudio/media-sound/ladish/files/ladish-9999-gui-resources-only-when-enabled.patch
trunk/overlays/proaudio/media-sound/ladish/files/ladish-configure-gladish.patch
trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild
trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild
trunk/overlays/proaudio/media-sound/ladish/metadata.xml
trunk/overlays/proaudio/media-sound/lash/lash-9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/lash/files/
trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild
Modified: trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST
===================================================================
--- trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST 2020-10-25 08:34:49 UTC (rev 3201)
+++ trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST 2020-11-01 22:02:41 UTC (rev 3202)
@@ -915,7 +915,7 @@
#------- media-sound/jmeters --------
- jmeters-0.4.1 arch: ~amd64 ~x86
+ jmeters-0.4.1-r1 arch: ~amd64 ~x86
Description: A jack multichannel audio level meter app
featuring correct ballistics for both the
VU and the PPM
@@ -923,7 +923,7 @@
#------- media-sound/jkmeter --------
- jkmeter-0.6.1 arch: ~amd64 ~x86
+ jkmeter-0.6.1-r1 arch: ~amd64 ~x86
Description: Jkmeter is a combined RMS/digital peak meter
based on the ideas of mastering guru Bob Katz
@@ -1061,13 +1061,6 @@
Homepage: http://aqualung.factorial.hu/
-#------- media-sound/jack_mixer --------
- jack_mixer-10 arch: ~amd64 ~x86
- jack_mixer-9999 arch: ~amd64 ~x86
- Description: JACK audio mixer using GTK2 interface.
- Homepage: http://home.gna.org/jackmixer/
-
-
#------- media-sound/smack --------
smack-0.2.1 arch: amd64 x86
smack-0.3 arch: amd64 x86
@@ -1077,7 +1070,7 @@
#------- media-sound/ebumeter --------
- ebumeter-0.2.0 arch: ~amd64 ~x86
+ ebumeter-0.2.0-r1 arch: ~amd64 ~x86
Description: Loudness measurement according to EBU-R128
Homepage: http://kokkinizita.linuxaudio.org/linuxaudio
@@ -1124,19 +1117,11 @@
#------- media-sound/lash --------
- lash-9998 arch: ~amd64 ~x86
- Description: Temporary wrapper for liblash (lash) and
- ladish
- Homepage: http://proaudio.tuxfamily.org/
+ lash-9999 arch: -> live ebuild: [svn|cvs|...]<-
+ Description: LASH Audio Session Handler
+ Homepage: unknown
-#------- media-sound/jackmix --------
- jackmix-0.4.2-r1 arch: ~amd64 ~x86
- jackmix-0.4.2 arch: ~amd64 ~x86
- Description: A mixer app for jack
- Homepage: http://www.arnoldarts.de/JackMix%3Aintro
-
-
#------- media-sound/buzztard --------
buzztard-0.6.0 arch: ~amd64 ~x86
buzztard-9999 arch: -> live ebuild: [svn|cvs|...]<-
@@ -1234,7 +1219,7 @@
#------- media-sound/jnoisemeter --------
- jnoisemeter-0.1.0 arch: ~x86
+ jnoisemeter-0.1.0-r1 arch: ~x86
Description: Jnoisemeter is a small app designed to measure
audio test signals and in particular noise signals
@@ -1282,8 +1267,7 @@
#------- media-sound/aliki --------
- aliki-0.2.0 arch: ~amd64 ~x86
- aliki-0.3.0 arch: ~amd64 ~x86
+ aliki-0.3.0-r1 arch: ~amd64 ~x86
Description: An integrated system for Impulse Response
measurements
Homepage: http://kokkinizita.linuxaudio.org/linuxaudio/
@@ -1310,22 +1294,12 @@
#------- media-sound/ambdec --------
- ambdec-0.7.1 arch: ~x86 ~amd64
+ ambdec-0.7.1-r1 arch: ~x86 ~amd64
Description: An Ambisonic decoder for first and second
order
Homepage: http://kokkinizita.linuxaudio.org/linuxaudio
-#------- media-sound/jace --------
- jace-0.0.2 arch: x86
- jace-0.0.3 arch: x86
- jace-0.1.0 arch: x86 ~amd64
- jace-0.2.0 arch: x86 ~amd64
- Description: JACE is a Convolution Engine for JACK and
- ALSA
- Homepage: http://www.audiodef.com/gentoo/proaudio/
-
-
#------- media-sound/gxmms2 --------
gxmms2-0.7.1 arch: ~amd64 ~x86 ~ppc
Description: A GTK2 based XMMS2 client, written in C.
@@ -1355,6 +1329,14 @@
Homepage: http://www.notam02.no/arkiv/src
+#------- media-sound/ladish --------
+ ladish-1-r1 arch: ~amd64
+ ladish-9999 arch: ~amd64
+ Description: LADI Session Handler - a session management
+ system for JACK applications
+ Homepage: https://github.com/LADI/ladish
+
+
#------- media-sound/sweep --------
sweep-0.9.1-r1 arch: alpha amd64 ppc sparc x86
sweep-0.9.1 arch: alpha amd64 ppc sparc x86
@@ -1381,8 +1363,8 @@
#------- media-sound/tutka --------
- tutka-0.12.5 arch: ~amd64 ~ppc x86
- tutka-9999 arch: -> live ebuild: [svn|cvs|...]<-
+ tutka-1.1.2 arch: ~amd64 ~x86
+ tutka-9999 arch: ~amd64 ~x86
Description: A free (as in freedom) tracker style MIDI
sequencer for GNU/Linux
Homepage: http://www.nongnu.org/tutka
@@ -1546,15 +1528,6 @@
Homepage: http://www.alsaplayer.org/
-#------- media-sound/idjc --------
- idjc-0.8.17 arch: ~x86 ~amd64
- idjc-9999 arch: -> live ebuild: [svn|cvs|...]<-
- Description: Internet DJ Console has 2 media players,
- jingles, crossfader, VoIP and streaming
-
- Homepage: http://idjc.sourceforge.net/
-
-
#------- media-sound/jackmixdesk --------
jackmixdesk-0.3_p4 arch: ~amd64 ~ppc ~x86
jackmixdesk-9999 arch: ~amd64 ~ppc ~x86
@@ -1673,12 +1646,6 @@
Homepage: http://www.frinika.com
-#------- media-sound/lash-original --------
- lash-original-0.6.0_rc2-r1 arch: ~amd64 ~ppc ~x86
- Description: LASH Audio Session Handler
- Homepage: http://www.nongnu.org/lash/
-
-
#------- media-sound/jack_snapshot --------
jack_snapshot-0.0.4 arch: ~amd64 ~x86
Description: Tool for storing/restoring jack connections
@@ -1727,7 +1694,7 @@
#------- media-sound/japa --------
- japa-0.8.4 arch: ~amd64 ~x86
+ japa-0.8.4-r1 arch: ~amd64 ~x86
Description: JAPA is a perceptual analyzer for JACK and
ALSA
Homepage: http://kokkinizita.linuxaudio.org/linuxaudio/
@@ -1754,15 +1721,8 @@
Homepage: http://delysid.org/yatm.html
-#------- media-sound/boodler --------
- boodler-2.0.4-r1 arch: ~amd64 ~x86
- Description: Tool for creating soundscapes -- continuous,
- infinitely varying streams of sound
- Homepage: http://boodler.org/
-
-
#------- media-sound/yass --------
- yass-0.0.2 arch: ~x86 ~amd64
+ yass-0.0.2-r1 arch: ~x86 ~amd64
Description: Yet Another Scrolling Scope features jack
input, variable scrolling speed and automatic
gain control
@@ -1800,7 +1760,7 @@
#------- media-sound/zita-rev1 --------
- zita-rev1-0.2.2 arch: ~amd64 ~x86
+ zita-rev1-0.2.2-r1 arch: ~amd64 ~x86
Description: Zita-rev1 is a reworked version of the reverb
originally developed for Aeolus
Homepage: http://kokkinizita.linuxaudio.org/linuxaudio/
@@ -1814,7 +1774,7 @@
#------- media-sound/zita-at1 --------
- zita-at1-0.6.2 arch: ~amd64 ~x86
+ zita-at1-0.6.2-r1 arch: ~amd64 ~x86
Description: An autotuner, normally used to correct the
pitch of a voice singing (slightly) out of
tune
@@ -1850,13 +1810,6 @@
Homepage: http://jackctlmmc.sourceforge.net/
-#------- media-sound/cadence --------
- cadence-99999 arch: -> live ebuild: [svn|cvs|...]<-
- Description: Collection of tools useful for audio production
-
- Homepage: https://github.com/falkTX/Cadence
-
-
#------- media-sound/supercollider --------
supercollider-3.6.3 arch: ~x86 ~amd64
supercollider-3.6.5 arch: ~x86 ~amd64
@@ -1948,12 +1901,6 @@
Homepage: http://www.physics.adelaide.edu.au/~jwoithe
-#------- virtual/liblash --------
- liblash-1 arch: ~amd64 ~ppc ~x86
- Description: Virtual for LASH library
- Homepage:
-
-
#------- x11-libs/qwt --------
qwt-9999 arch: -> live ebuild: [svn|cvs|...]<-
Description: 2D plotting library for Qt4
Added: trunk/overlays/proaudio/media-sound/ladish/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/Manifest (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/Manifest 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,9 @@
+AUX ladish-1-add-includes-for-getrlimit.patch 612 BLAKE2B 249120238c8e485d09f98a6d81f0f6dd432fdd223e39f59f6af84844f5987f1618f457bd8e8bc95d3f1df08521b0a31174b9ccf3d3b2e701055f9971fe4872b1 SHA512 82956d30e2a88a9b6b29f44409b5b52c9585f8403a418432c332700505edb5cada9135891908e0d529ac69357988fd04f285dd402886852b4386efd54b7332c0
+AUX ladish-1-configure-libdir.patch 1114 BLAKE2B 576768236b361e4e5ba1c0964e72df8d50e25f08993464244ac735d0b5961625961d113d5cbaadf2a0cbb6c2b30c66e6c609933e93f1ec7ede15e09d4ab9dcec SHA512 964cd77a1cfb8630759b38f5d0d6ab725e2125bbb723b0c6168721c89e7262b53cc4f6e5a3845aea4ca56dace35a33f2e8f81b95cc5e51e0a9d63807bc019dce
+AUX ladish-1-gui-resources-only-when-enabled.patch 2398 BLAKE2B 03ef6dd7530c0d38cbcb8c2a2f0363c94632e43a751c7e68851d2d7c227b176c1a18fc432089bf479ead486a835100dfb49335d2d2b34b4db3429164de50a3c0 SHA512 0cfa33298fc0bd95fc30f81199f0b20b4312c4d8d8fef8bf6dcc2d2edd95943c2126b71eb403938e430de17b0dc3a4b91081bd77dfb3ebb25ad7127803531a5b
+AUX ladish-9999-gui-resources-only-when-enabled.patch 2388 BLAKE2B 713ec8fbf794059c5917069c57e365b719e98554429b819ce1ba49fcd246fd92becd68c2c45c404a719ee31397169737ca946f49dbe7905b9d9be61ba9cc0aeb SHA512 2696381dca91248b9c514cd6d32aca457889f007046bc9332e1eb4c0c5fa4d15eb3060a37173d3415d2560e2ac6abe6811d750e18d739b5e047ff72888167769
+AUX ladish-configure-gladish.patch 1243 BLAKE2B ad3d5cc234d385241b8fc166e09c845fd6483af94d2b1a5797d922c5d8b986664a36da1597dd0d13a8a0666f1a12fe1d20853a7c8a795ee31e390861e6e66a38 SHA512 4221d2fa01d08538f0dfb785e8eb1b964f30a32b03397b09241cc9cec7bdea6b0b860c931ebdc292b1eb3b17c4dbb1d224e05a67c2009241d5dc9e29081df0ad
+DIST ladish-1.tar.gz 686288 BLAKE2B 7a3a39cf259ef57232dda50664dc4d9c57ae6f8e501d03a2d286e00451c2f99ba3130492e36132b127a868461c6a1518286d721224610060752fa5eb0b9b4cc1 SHA512 b01e24cd79c2711139c9d46c9bff4687049c3a735562a7f48a387103eec25c0222e935b90fb4eb2d3fc24629e417dab0c5aac215cbbca659ac49a2e802d1fd10
+EBUILD ladish-1-r1.ebuild 1632 BLAKE2B 4120e8277d07a96a5b15d94dc0b7e4360ba1998e59d629f0b4688dac8e3e44b9d0e2af795607dfafd050e6ce9508899bd1a60542463129da9202b17d55f8fe0b SHA512 3aa198fc7e87a8b68c1609dbebb75d2d387e2dc224404dea39e6ba1aeddc4aad48107dce63f7aecb313d9d6b063f517901740e653bdf585e165a0d8f8916cb45
+EBUILD ladish-9999.ebuild 1529 BLAKE2B 790f7452b98e43c8900d76eda5371e25ad854ba30de71bda067c91802313bb960fbd7f30ec0d0cb26164b868fb39a18238822c9b177fbdc06592c7285f56c306 SHA512 31dd0ab776a104490d222ba81ec83c059029c4410d5d400a9b9acbd80754c3c444807728d037a618e86e736f4a4539f5e39fd2ddaa6c7c5127d4e9a2425e427e
+MISC metadata.xml 276 BLAKE2B 4c1ad52a5a99e0c98d2a4bbb13b89c7e54e576f03137606c4e63767d272f1cbd9c00386d414d08a873d3a26adfc98feed12254df4a25e12fd34c710f03e0c000 SHA512 2055795479a728df97ff1a8f70b98b4205e963424198a6de09f482f424fd563192a365fd4857452221de7502823da35cafa673c1f80fffdcade05f9c6876fbc0
Added: trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,25 @@
+From a2a17cd39220e2013d3402b06a53f5a46492aa00 Mon Sep 17 00:00:00 2001
+From: Nedko Arnaudov <nedko@xxxxxxxxxxxxx>
+Date: Sun, 7 Oct 2012 14:06:04 +0300
+Subject: [PATCH] add includes for getrlimit
+
+---
+ daemon/loader.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemon/loader.c b/daemon/loader.c
+index b9fe6f1c..37fb94fa 100644
+--- a/daemon/loader.c
++++ b/daemon/loader.c
+@@ -34,6 +34,8 @@
+ #include <fcntl.h>
+ #include <pty.h> /* forkpty() */
+ #include <sys/wait.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+
+ #include "loader.h"
+ #include "../proxies/conf_proxy.h"
+--
+2.13.0
+
Added: trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-configure-libdir.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-configure-libdir.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-configure-libdir.patch 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,23 @@
+diff --git a/wscript b/wscript
+index 333522e9..a7594716 100644
+--- a/wscript
++++ b/wscript
+@@ -54,6 +54,7 @@ def options(opt):
+ opt.add_option('--distname', type='string', default=None, help="Name for the distribution tarball")
+ opt.add_option('--distsuffix', type='string', default="", help="String to append to the distribution tarball name")
+ opt.add_option('--tagdist', action='store_true', default=False, help='Create of git tag for distname')
++ opt.add_option('--libdir', type='string', default=None, help='Define lib dir')
+ if parallel_debug:
+ opt.load('parallel_debug')
+
+@@ -132,7 +133,10 @@ def configure(conf):
+ else:
+ conf.env['DBUS_SERVICES_DIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'share', 'dbus-1', 'services')
+
+- conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib')
++ if Options.options.libdir:
++ conf.env['LIBDIR'] = Options.options.libdir
++ else:
++ conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib')
+
+ conf.env['BUILD_DOXYGEN_DOCS'] = Options.options.doxygen
Added: trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-gui-resources-only-when-enabled.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-gui-resources-only-when-enabled.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/ladish-1-gui-resources-only-when-enabled.patch 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,55 @@
+From 1df687a4069a8f55ed5cc4001d9c3ad2dff59d1b Mon Sep 17 00:00:00 2001
+From: Simon van der Veldt <simon.vanderveldt@xxxxxxxxx>
+Date: Wed, 23 Sep 2020 21:02:00 +0200
+Subject: [PATCH] wscript: Only install gladish resources when GUI is enabled
+
+---
+ wscript | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/wscript b/wscript
+index 296a8522..8f1d7499 100644
+--- a/wscript
++++ b/wscript
+@@ -592,24 +592,24 @@ def build(bld):
+
+ # GtkBuilder UI definitions (XML)
+ bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
+-
+- bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
+
+- # 'Desktop' file (menu entry, icon, etc)
+- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644)
++ # 'Desktop' file (menu entry, icon, etc)
++ bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644)
++
++ # Icons
++ icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
++ for icon_size in icon_sizes:
++ bld.path.ant_glob('art/' + icon_size + '/apps/*.png')
++ bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png')
+
+- # Icons
+- icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
+- for icon_size in icon_sizes:
+- bld.path.ant_glob('art/' + icon_size + '/apps/*.png')
+- bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png')
++ status_images = []
++ for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
++ status_images.append("art/status_" + status + ".png")
+
+- status_images = []
+- for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
+- status_images.append("art/status_" + status + ".png")
++ bld.install_files('${DATA_DIR}', status_images)
++ bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png")
+
+- bld.install_files('${DATA_DIR}', status_images)
+- bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png")
++ bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
+ bld.install_files('${DATA_DIR}', ["AUTHORS", "README", "NEWS"])
+ bld.install_as('${DATA_DIR}/COPYING', "gpl2.txt")
+
+--
+2.26.2
+
Added: trunk/overlays/proaudio/media-sound/ladish/files/ladish-9999-gui-resources-only-when-enabled.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/ladish-9999-gui-resources-only-when-enabled.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/ladish-9999-gui-resources-only-when-enabled.patch 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,53 @@
+From 89bf2533a902b962f1154be3b6e67999c3f57dfb Mon Sep 17 00:00:00 2001
+From: Simon van der Veldt <simon.vanderveldt@xxxxxxxxx>
+Date: Wed, 23 Sep 2020 21:22:34 +0200
+Subject: [PATCH] wscript: Only install gladish resources when GUI is enabled
+
+---
+ wscript | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/wscript b/wscript
+index a7594716..5f482003 100644
+--- a/wscript
++++ b/wscript
+@@ -634,23 +634,23 @@ def build(bld):
+ # GtkBuilder UI definitions (XML)
+ bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
+
+- bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
++ # 'Desktop' file (menu entry, icon, etc)
++ bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644)
+
+- # 'Desktop' file (menu entry, icon, etc)
+- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644)
++ # Icons
++ icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
++ for icon_size in icon_sizes:
++ bld.path.ant_glob('art/' + icon_size + '/apps/*.png')
++ bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png')
+
+- # Icons
+- icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
+- for icon_size in icon_sizes:
+- bld.path.ant_glob('art/' + icon_size + '/apps/*.png')
+- bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png')
++ status_images = []
++ for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
++ status_images.append("art/status_" + status + ".png")
+
+- status_images = []
+- for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
+- status_images.append("art/status_" + status + ".png")
++ bld.install_files('${DATA_DIR}', status_images)
++ bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png")
+
+- bld.install_files('${DATA_DIR}', status_images)
+- bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png")
++ bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
+ bld.install_files('${DATA_DIR}', ["AUTHORS", "README", "NEWS"])
+ bld.install_as('${DATA_DIR}/COPYING', "gpl2.txt")
+
+--
+2.26.2
+
Added: trunk/overlays/proaudio/media-sound/ladish/files/ladish-configure-gladish.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/files/ladish-configure-gladish.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/files/ladish-configure-gladish.patch 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,22 @@
+diff --git a/wscript b/wscript
+index a7594716..5f96cd30 100644
+--- a/wscript
++++ b/wscript
+@@ -46,6 +46,7 @@ def options(opt):
+ opt.load('boost')
+ opt.load('python')
+ opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config')
++ opt.add_option('--enable-gladish', action='store_true', default=False, help='Build gladish')
+ opt.add_option('--enable-liblash', action='store_true', default=False, help='Build LASH compatibility library')
+ opt.add_option('--enable-pylash', action='store_true', default=False, help='Build python bindings for LASH compatibility library')
+ opt.add_option('--debug', action='store_true', default=False, dest='debug', help="Build debuggable binaries")
+@@ -205,8 +206,7 @@ def configure(conf):
+ mandatory = False,
+ errmsg="not found, see http://boost.org/")
+
+- conf.env['BUILD_GLADISH'] = build_gui
+-
++ conf.env['BUILD_GLADISH'] = Options.options.enable_gladish
+ conf.env['BUILD_LIBLASH'] = Options.options.enable_liblash
+ conf.env['BUILD_PYLASH'] = Options.options.enable_pylash
+ if conf.env['BUILD_PYLASH'] and not conf.env['BUILD_LIBLASH']:
Added: trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# python2_7 is dead but waf-utils need it
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic waf-utils python-single-r1
+
+DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
+HOMEPAGE="https://github.com/LADI/ladish"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/LADI/${PN}.git"
+ KEYWORDS=""
+ EGIT_SUBMODULES=()
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/LADI/ladish/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+IUSE="debug doc +lash -python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python? ( lash ) "
+
+RDEPEND="media-libs/alsa-lib
+ media-sound/jack2[dbus]
+ sys-apps/dbus
+ dev-libs/expat"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS README NEWS )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-configure-gladish.patch"
+ "${FILESDIR}/${P}-configure-libdir.patch"
+ "${FILESDIR}/${P}-add-includes-for-getrlimit.patch"
+ "${FILESDIR}/${P}-gui-resources-only-when-enabled.patch"
+)
+
+src_prepare()
+{
+ sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
+ append-cxxflags '-std=c++11'
+ default
+}
+
+src_configure() {
+ local -a mywafconfargs=(
+ --distnodeps
+ $(usex debug --debug '')
+ $(usex doc --doxygen '')
+ $(usex lash '--enable-liblash' '')
+ $(usex python '--enable-pylash' '')
+ )
+ waf-utils_src_configure "${mywafconfargs[@]}"
+}
+
+src_install() {
+ use doc && HTML_DOCS="${S}/build/default/html/*"
+ waf-utils_src_install
+# python_fix_shebang "${ED}"
+}
Added: trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# python2_7 is dead
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic waf-utils python-single-r1
+
+DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
+HOMEPAGE="https://github.com/LADI/ladish"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/LADI/${PN}.git"
+ KEYWORDS=""
+ EGIT_SUBMODULES=()
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/LADI/ladish/archive/${P}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+IUSE="debug doc +lash -python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python? ( lash ) "
+
+RDEPEND="media-libs/alsa-lib
+ media-sound/jack2[dbus]
+ sys-apps/dbus
+ dev-libs/expat"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS README NEWS )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-configure-gladish.patch"
+ "${FILESDIR}/${P}-gui-resources-only-when-enabled.patch"
+)
+
+src_prepare()
+{
+ sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
+ append-cxxflags '-std=c++11'
+ default
+}
+
+src_configure() {
+ local -a mywafconfargs=(
+ --distnodeps
+ $(usex debug --debug '')
+ $(usex doc --doxygen '')
+ $(usex lash '--enable-liblash' '')
+ $(usex python '--enable-pylash' '')
+ )
+ waf-utils_src_configure "${mywafconfargs[@]}"
+}
+
+src_install() {
+ use doc && HTML_DOCS="${S}/build/default/html/*"
+ waf-utils_src_install
+# python_fix_shebang "${ED}"
+}
Added: trunk/overlays/proaudio/media-sound/ladish/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/metadata.xml (rev 0)
+++ trunk/overlays/proaudio/media-sound/ladish/metadata.xml 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>simon.vanderveldt+audio-overlay@xxxxxxxxx</email>
+ <name>Simon van der Veldt</name>
+ </maintainer>
+</pkgmetadata>
Modified: trunk/overlays/proaudio/media-sound/lash/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/Manifest 2020-10-25 08:34:49 UTC (rev 3201)
+++ trunk/overlays/proaudio/media-sound/lash/Manifest 2020-11-01 22:02:41 UTC (rev 3202)
@@ -1,7 +1,3 @@
-AUX lash-original-0.6.0_rc2-aclocal.patch 906 BLAKE2B 6db707a58bc96348286f03df3e777bde5b6f7f401f976f08b8083e4647083faa78915d3ea0c3ccec846fbe41d558b6a94cd4b7dee539fd0aa06bce539cc88fea SHA512 619019974fb3a68190a8571668919480a78272077916cb50f18b00f6b12dd8e1c515bfee74eaf39cf0626355966843c3af98ff9c4793d1ded141f56919c25317
-AUX lash-original-0.6.0_rc2-include.patch 503 BLAKE2B 6d1b437b23e41f156660139a4b1643de41b1b6dd3a773c371e7882334b6a46320a1c201c29704902f3e58e5e5388a5b889be8bbf9c66d963e5294a2e8d2b4bae SHA512 495f24b0acc18ed67e029d1dd47ab187db5319fde2b7a8af01d5b65728c7ba3e8fecc510648427a539ea09ec17dc8813498b5ae0d7bfbdb3b7295e6b15d6cca3
-AUX lash-original-0.6.0_rc2-underlinking.patch 860 BLAKE2B d6359cb21d66e501529bd25ef5c4990d19154c5abc94bd304cdcb56bd44a6976efb93ea2f61c4b8a010e079d892f82ae7deb6cd8785cbcedf9bdd29b712d1c3e SHA512 524703cf135cc9d2654fdffc9a1ec73998a76140f4c74738464b6d92bb44eafe4ae30b8aaf59a3edc4b9356d73f63e83f38fc6690dfd8fd46c6c6201d0b00380
-DIST lash-0.6.0~rc2.tar.bz2 431891 BLAKE2B 37ea1f428f70b6ecbe723e0ab5f7009be120f680c03e89d405ad957ac5bfad16ad611e93d9fe37249cbc574f88ad75a1234cf726c64700985d8b8e53debff295 SHA512 704e24ccadccb469e820be5fb58dd4d953a8fc2903cd857a290267a87dda596639ec381d5cb7cdfcd715df7d98d6570e52731bddd17f8a3425edd8b699632401
-EBUILD lash-0.6.0_rc2-r1.ebuild 2436 BLAKE2B c0f0a40107966ac607dfc29338397d010a360eee12fde6bb680e14d089aa44cd179f0b66f24da8dc07fea163ac7c0cb38c7279cb4b16926a70fbbd9a6d9c7b84 SHA512 5d3ffbfaf03806ab89fe5a62a398fcbc69b07ee40f8ba5523f1a31a3a30611538b75c07c8bdab01a2715dd8d007ba7f491323266ab5a7c3f448a1820950612c3
+EBUILD lash-9999.ebuild 219 BLAKE2B f6f4d31fd9229037f51cefef5619b34a2d4b0f0912655f03e4885778e95fb3f2dd7402e97bc4009d93c2ba3963d019ab3b70347992354a1a80cc89bb9184576f SHA512 177b630e9d9ca2e82ad9b6cb18b92f30544a52ed198d21e655c5113ddd99e9748187f07f461369c848df56a2f9a3992cd4ddc04bf6f99bcce3aefc1d8d74b24d
MISC ChangeLog 2683 BLAKE2B 0a3e75b13d4d751e46f2b11c5f4429f5e66f1beddb28e4f9b15e0b3f47bcb1c7c2e0518f6af0552c886ea9db9ace8b7cd2490286e9d3eae5e54afb4d853ff7bc SHA512 cd3ec60feff061c1d53fc9901b9c35e40362dec897a6e2f2c11b4eb9cf88ae3d5331b771de11276b22dd73606055ff567228a2cb2e121578efee00951a95ee4a
MISC metadata.xml 261 BLAKE2B ab09b95e48499595f240d83a5a2328b206d5983b57bbd4f6a0ba5f695a5be713ca35aaa6106a06a83a2e471d646e2ae12069c0779178823f1f9f30bd234a1dfe SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1
Deleted: trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild 2020-10-25 08:34:49 UTC (rev 3201)
+++ trunk/overlays/proaudio/media-sound/lash/lash-0.6.0_rc2-r1.ebuild 2020-11-01 22:02:41 UTC (rev 3202)
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1 multilib-minimal
-
-MY_PV="${PV/_/~}"
-MY_PN="${PN/-original/}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="LASH Audio Session Handler"
-HOMEPAGE="http://www.nongnu.org/lash/"
-SRC_URI="http://download.savannah.gnu.org/releases/${MY_PN}/${MY_P}.tar.bz2"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa debug gtk python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libxml2
- virtual/jack
- >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
- alsa? ( media-libs/alsa-lib )
- gtk? ( x11-libs/gtk+:2 )
- python? ( ${PYTHON_DEPS} )
- || ( sys-libs/readline:* dev-libs/libedit )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_PN}-0.6.0.594"
-
-PATCHES=(
- "${FILESDIR}"/${P}-aclocal.patch
- "${FILESDIR}"/${P}-include.patch
- "${FILESDIR}"/${P}-underlinking.patch
-)
-
-pkg_setup() {
- use python && python_single-r1_pkg_setup
-}
-
-src_prepare() {
- sed -i \
- -e '/texi2html/s:-number:&-sections:' \
- docs/Makefile.am || die #422045
-
- default
- AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
- # Generation of docs does no longer work. Hard disable it.
- export ac_cv_prog_lash_texi2html="no" #422045
-
- local myeconf=()
- if ! multilib_is_native_abi || ! use python; then
- myconf+=( --without-python )
- fi
-
- if ! multilib_is_native_abi; then
- # disable remaining configure checks
- myconf+=(
- JACK_CFLAGS=' '
- JACK_LIBS=' '
- XML2_CFLAGS=' '
- XML2_LIBS=' '
-
- v1_cv_lib_readline=no
- )
- fi
-
- ECONF_SOURCE=${S}
-
- econf \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable debug) \
- $(multilib_native_use_with alsa) \
- $(multilib_native_use_with gtk gtk2) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -C liblash
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- # headers
- emake -C lash DESTDIR="${D}" install
- # library
- emake -C liblash DESTDIR="${D}" install
- # pkg-config
- emake DESTDIR="${D}" install-pkgconfogDATA
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all # --all for _lash.la in python directory
- use python && python_optimize
-}
Added: trunk/overlays/proaudio/media-sound/lash/lash-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lash/lash-9999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/lash/lash-9999.ebuild 2020-11-01 22:02:41 UTC (rev 3202)
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit
+
+DESCRIPTION="LASH Audio Session Handler"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="media-sound/ladish"
Modified: trunk/overlays/proaudio/profiles/package.mask
===================================================================
--- trunk/overlays/proaudio/profiles/package.mask 2020-10-25 08:34:49 UTC (rev 3201)
+++ trunk/overlays/proaudio/profiles/package.mask 2020-11-01 22:02:41 UTC (rev 3202)
@@ -3,6 +3,10 @@
# NOTE: Please add your entry at the top!
#
+# Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx> (1 Nov 2020)
+# workaound to use ladish and satisfy portage
+<=media-sound/lash-9997
+
# Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx> (16 Nov 2016)
# TODO: fis the ebuild to use qt5 instead of qt4
=media-sound/qtractor-9999