| [proaudio] proaudio/proaudio: [3145] Reimpèort cadence because cadence from audio-pro fail with PyQt5 not found |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3145
Author: dominique
Date: 2018-08-27 13:08:01 +0200 (Mon, 27 Aug 2018)
Log Message:
-----------
Reimpèort cadence because cadence from audio-pro fail with PyQt5 not found
Modified Paths:
--------------
trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST
trunk/overlays/proaudio/00-PACKAGES-LIST
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/cadence/
trunk/overlays/proaudio/media-sound/cadence/ChangeLog
trunk/overlays/proaudio/media-sound/cadence/Manifest
trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild
trunk/overlays/proaudio/media-sound/cadence/files/
trunk/overlays/proaudio/media-sound/cadence/files/cadence-add-skip-stripping.patch
trunk/overlays/proaudio/media-sound/cadence/metadata.xml
Modified: trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST
===================================================================
--- trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST 2018-08-22 10:56:11 UTC (rev 3144)
+++ trunk/overlays/proaudio/00-DETAILED-PACKAGES-LIST 2018-08-27 11:08:01 UTC (rev 3145)
@@ -1681,13 +1681,6 @@
Homepage: http://home.earthlink.net/~gmoonlit/raton/raton.html
-#------- media-sound/jmess --------
- jmess-1.0.1 arch: ~amd64 ~x86
- Description: JMess can save/load an XML file with all
- the current jack connections
- Homepage: https://ccrma.stanford.edu/groups/soundwire/software/jmess/
-
-
#------- media-sound/jack-tools --------
jack-tools-20101210-r1 arch: ~amd64 ~x86
jack-tools-20131226 arch: ~amd64 ~x86
@@ -1969,6 +1962,13 @@
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
Modified: trunk/overlays/proaudio/00-PACKAGES-LIST
===================================================================
--- trunk/overlays/proaudio/00-PACKAGES-LIST 2018-08-22 10:56:11 UTC (rev 3144)
+++ trunk/overlays/proaudio/00-PACKAGES-LIST 2018-08-27 11:08:01 UTC (rev 3145)
@@ -71,6 +71,7 @@
media-sound/zita-at1
media-sound/rakarrack
media-sound/jackctlmmc
+media-sound/cadence
media-sound/supercollider
dev-libs/hidapi
dev-libs/libwhy
Added: trunk/overlays/proaudio/media-sound/cadence/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/ChangeLog (rev 0)
+++ trunk/overlays/proaudio/media-sound/cadence/ChangeLog 2018-08-27 11:08:01 UTC (rev 3145)
@@ -0,0 +1,22 @@
+# ChangeLog for media-sound/jackminimix
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+
+ 2 May 2018; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ cadence-9999: fix the shebangs of the pyton files for consistency.
+
+ 1 May 2018; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ cadence-9999: use python-single-r1 instead of forcing a python3 version,
+ add ladish USE flag
+ +files/cadence-add-skip-stripping.patch: patch from audio-overlay, updated
+ it to apply with last git code
+ metadata.xml: add a2jmidid and ladish USE descriptions
+
+*cadence-9999 (30 Apr 2018)
+
+ 30 Apr 2018; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ Renamed to cadence. Updated to work with python3.5 and PyQt5.
+
+*Cadence-9999 (14 Sep 2017)
+
+ 14 Sep 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ Initial commit
Added: trunk/overlays/proaudio/media-sound/cadence/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/Manifest (rev 0)
+++ trunk/overlays/proaudio/media-sound/cadence/Manifest 2018-08-27 11:08:01 UTC (rev 3145)
@@ -0,0 +1,4 @@
+AUX cadence-add-skip-stripping.patch 2639 BLAKE2B 0a6aa5b687749b609d4678efdefb427efda47db498b5b8bbee9f25f6bda04c38a50588a512e1179822fa34bd7ee32b2fb5d30c6a991aeb05f7ee0e88e1d40425 SHA512 3f733268ab86c55ef13709c88c606fac86383535ed880213f4176cb150e0fadf7727b36393b5980c95276f78bae0a42a5de25b820eeab6034100f37152dc45ac
+EBUILD cadence-99999.ebuild 3445 BLAKE2B ae0633f2f565ec51758dc73f0813af1724880837cd6b01bf15f0ab0dd0793f31fe92f894bd3178d12049cfb1b9be44299237c78852c1af239a8214287be8a819 SHA512 18219686730e4ece88732f1096372826b18edfe10175e2854f53964e429900b2b94453d6355b69cb405720aecdc8bea599cfb2b4b7f3b3bd5c0238a5c98686d8
+MISC ChangeLog 872 BLAKE2B 1097ad6ee1e069a3db39e118b230df4b520f06fb1d8d660ea7b15554c363cb9ab9bc38842679a4b52977edc423294d711844613d58bbb2c4bae208afe995edc0 SHA512 8208c7ae75ad7256a1a99604987ab833c302e2e07934ce65a125e0dbff7474b6ee374ae87590ea490fd49ac3778490adbbbc8ea4285f6726f756003a60d88200
+MISC metadata.xml 414 BLAKE2B 1ad7c81eab10b764027fe66fd6e4675f580b40f2b8135ece60486e708d42f70afad01212b861a8e9da70e21c0da38ab05f856c91811dbc491cf55e4daf5880e4 SHA512 e955b683ce61a95627b205c906f03fd9b939dccb248a285b6eebb7d54ede201ec8ab07c1758a3b323320e56ffaea3d5ea7467a4f3b0e1d88a427117b75b1e4d6
Added: trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild 2018-08-27 11:08:01 UTC (rev 3145)
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit gnome2 git-r3 python-single-r1
+
+DESCRIPTION="Collection of tools useful for audio production"
+HOMEPAGE="https://github.com/falkTX/Cadence";
+EGIT_REPO_URI="https://github.com/falkTX/${PN}.git";
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="a2jmidid ladish opengl -pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ virtual/jack
+ dev-python/PyQt5[dbus,opengl?,${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ a2jmidid? ( media-sound/a2jmidid )
+ ladish? ( >=media-sound/ladish-9999 )
+ opengl? ( dev-qt/qtopengl:5 )
+ pulseaudio? ( media-sound/pulseaudio[jack] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
+
+src_prepare() {
+ sed -i -e '/Categories/q' data/cadence.desktop || die "sed failed"
+ sed -i -e 's/Categories=AudioVideo;AudioEditing;Qt;/Categories=AudioVideo;Audio;Engineering;/' data/cadence.desktop || die "sed failed"
+ sed -i -e 's/Categories=AudioVideo;AudioEditing;Qt;/Categories=AudioVideo;Audio;Engineering;/' data/catia.desktop || die "sed failed"
+ sed -i -e 's/Categories=AudioVideo;AudioEditing;Qt;/Categories=AudioVideo;Audio;Engineering;/' data/claudia-launcher.desktop || die "sed failed"
+ sed -i -e 's/Categories=AudioVideo;AudioEditing;Qt;/Categories=AudioVideo;Audio;Engineering;/' data/claudia.desktop || die "sed failed"
+ # Fix python to python3.5
+ sed -i -e "s/python3/${EPYTHON}/" data/cadence || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/cadence-aloop-daemon || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/cadence-jacksettings || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/cadence-logs || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/cadence-render || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/cadence-session-start || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/catarina || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/catia || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/claudia || die "sed failed"
+ sed -i -e "s/python3/${EPYTHON}/" data/claudia-launcher || die "sed failed"
+ default
+}
+
+src_configure() {
+ echo "Nothing to configure"
+}
+
+src_compile() {
+ myemakeargs=(
+ PREFIX="/usr"
+ SKIP_STRIPPING=true
+ )
+ emake "${myemakeargs[@]}"
+}
+
+src_install() {
+ emake PREFIX="/usr" DESTDIR="${D}" install
+
+ if use !pulseaudio; then
+ rm -rf "${ED}usr/bin/cadence-pulse2jack" || die "rm pulse2jack failed"
+ rm -rf "${ED}usr/bin/cadence-pulse2loopback" || die "rm pulse2loopback failed"
+ rm -rf "${ED}usr/share/cadence/pulse2jack" || die "rm cadence pulse2jack failed"
+ rm -rf "${ED}usr/share/cadence/pulse2loopback" || die "rm cadence pulse2loopback failed"
+ fi
+ if use !ladish; then
+ rm -rf "${ED}usr/bin/claudia-launcher" || die "rm claudia-launcher failed"
+ rm -rf "${ED}usr/bin/claudia" || die "rm claudia failed"
+ rm -rf "${ED}usr/share/cadence/icons/claudia-hicolor/" || die "claudia-hicolor failed"
+ rm -rf "${ED}usr/share/applications/claudia.desktop" || die "claudia.desktop failed"
+ rm -rf "${ED}usr/share/applications/claudia-launcher.desktop" || die "claudia-launcher.desktop failed"
+ fi
+ python_fix_shebang "${ED}"usr/share/cadence/src
+}
+
+pkg_postint() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
Added: trunk/overlays/proaudio/media-sound/cadence/files/cadence-add-skip-stripping.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/files/cadence-add-skip-stripping.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/cadence/files/cadence-add-skip-stripping.patch 2018-08-27 11:08:01 UTC (rev 3145)
@@ -0,0 +1,80 @@
+From 5ce075b3a15482917aab6f6ac19c71ea52e53975 Mon Sep 17 00:00:00 2001
+From: Simon van der Veldt <simon.vanderveldt@xxxxxxxxx>
+Date: Sat, 3 Jun 2017 13:27:04 +0200
+Subject: [PATCH] Add SKIP_STRIPPING option to Makefiles to allow disabling
+ stripping of binaries
+
+---
+ c++/Makefile.mk | 6 ++++--
+ c++/jackmeter/Makefile | 4 ++--
+ c++/xycontroller/Makefile | 4 ++--
+ 3 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/c++/Makefile.mk b/c++/Makefile.mk
+index cc733ff..f8433a6 100644
+--- a/c++/Makefile.mk
++++ b/c++/Makefile.mk
+@@ -10,7 +10,6 @@ CXX ?= g++
+ AR ?= ar
+ CC ?= gcc
+ CXX ?= g++
+-STRIP ?= strip
+ WINDRES ?= windres
+
+ # --------------------------------------------------------------
+@@ -20,7 +19,6 @@ DEBUG ?= false
+ ifeq ($(DEBUG),true)
+ BASE_FLAGS = -O0 -g -Wall -Wextra
+ BASE_FLAGS += -DDEBUG
+-STRIP = true # FIXME
+ else
+ BASE_FLAGS = -O2 -ffast-math -mtune=generic -msse -mfpmath=sse -Wall -Wextra
+ BASE_FLAGS += -DNDEBUG
+@@ -34,6 +32,10 @@ ifneq ($(DEBUG),true)
+ BUILD_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT
+ endif
+
++ifneq ($(SKIP_STRIPPING),true)
++LINK_FLAGS += -Wl,--strip-all
++endif
++
+ # --------------------------------------------------------------
+
+ # Currently broken
+diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile
+index ede9178..a6ec57d 100644
+--- a/c++/jackmeter/Makefile
++++ b/c++/jackmeter/Makefile
+@@ -31,10 +31,10 @@ OBJS = \
+ all: cadence-jackmeter
+
+ cadence-jackmeter: $(FILES) $(OBJS)
+- $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@
++ $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@
+
+ cadence-jackmeter.exe: $(FILES) $(OBJS) icon.o
+- $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@
++ $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@
+
+ # --------------------------------------------------------------
+
+diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile
+index af57a05..7ba35e6 100644
+--- a/c++/xycontroller/Makefile
++++ b/c++/xycontroller/Makefile
+@@ -35,10 +35,10 @@ OBJS = xycontroller.o \
+ all: cadence-xycontroller
+
+ cadence-xycontroller: $(FILES) $(OBJS)
+- $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@ && $(STRIP) $@
++ $(CXX) $(OBJS) $(LINK_FLAGS) -ldl -o $@
+
+ cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o
+- $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@ && $(STRIP) $@
++ $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -limm32 -lole32 -luuid -lwinspool -lws2_32 -mwindows -o $@
+
+ # --------------------------------------------------------------
+
+--
+2.13.0
+
Added: trunk/overlays/proaudio/media-sound/cadence/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/metadata.xml (rev 0)
+++ trunk/overlays/proaudio/media-sound/cadence/metadata.xml 2018-08-27 11:08:01 UTC (rev 3145)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="project">
+ <email>proaudio@xxxxxxxxxxxxx</email>
+ <name>pro-audio overlay team</name>
+ </maintainer>
+ <use>
+ <flag name="a2jmidid">Enable a2jmidid integration</flag>
+ <flag name="ladish">Enable instalation of Xlaudia, a LADISH front-end</flag>
+ </use>
+</pkgmetadata>