| [proaudio] proaudio/proaudio: [3131] cadence: use python-single-r1; add skip stripping patch; various fixes; make repoman to be happy |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3131
Author: dominique
Date: 2018-05-01 13:28:13 +0200 (Tue, 01 May 2018)
Log Message:
-----------
cadence: use python-single-r1; add skip stripping patch; various fixes; make repoman to be happy
Modified Paths:
--------------
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/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/cadence/files/
trunk/overlays/proaudio/media-sound/cadence/files/cadence-add-skip-stripping.patch
Modified: trunk/overlays/proaudio/media-sound/cadence/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/ChangeLog 2018-04-29 23:52:08 UTC (rev 3130)
+++ trunk/overlays/proaudio/media-sound/cadence/ChangeLog 2018-05-01 11:28:13 UTC (rev 3131)
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/jackminimix
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+ 1 May 2018; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ cadence-9999: use python-single-r1 instead of forcin a python3 version
+ +files/cadence-add-skip-stripping.patch: patch from audio-overlay, updated
+ it to apply with last git code
+ metadata.xml: add a2jmidid USE description
+
*cadence-9999 (30 Apr 2018)
30 Apr 2018; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
Modified: trunk/overlays/proaudio/media-sound/cadence/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/Manifest 2018-04-29 23:52:08 UTC (rev 3130)
+++ trunk/overlays/proaudio/media-sound/cadence/Manifest 2018-05-01 11:28:13 UTC (rev 3131)
@@ -1,3 +1,4 @@
-EBUILD cadence-99999.ebuild 2478 BLAKE2B 77bce8050b11df388db70ac9c4794b120a63a569270fcd4291297720994b9f5f1b382bc767b15461798c61adfac8b3c5daadd23d60f8dc18016de82b569dafbc SHA512 6c1e2713dc72d173b6c04646cab08174e02ea362b972d2b80725279f5724719dfd8d5e7272d4cc587c0edd47dfe6835e34a9af287bde6141e75839958e1f0e9e
-MISC ChangeLog 395 BLAKE2B fdabbaf9a967f34339255d922e1ae66d21f2eb357620e8ecdbd5d66ac079c289ced15ec37df2b5edcddb1011550aaec7a0b805393813e527f34ffb12ee964f51 SHA512 a5832729437f14d8fe89dff90a87c6997be570d7d9cca9cc92f696a4242f15da00b62e3659f3a50cd6c7d8e99f87fce532b3a48996a6785f82c369420a4bc309
-MISC metadata.xml 261 BLAKE2B ab09b95e48499595f240d83a5a2328b206d5983b57bbd4f6a0ba5f695a5be713ca35aaa6106a06a83a2e471d646e2ae12069c0779178823f1f9f30bd234a1dfe SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1
+AUX cadence-add-skip-stripping.patch 2639 BLAKE2B 0a6aa5b687749b609d4678efdefb427efda47db498b5b8bbee9f25f6bda04c38a50588a512e1179822fa34bd7ee32b2fb5d30c6a991aeb05f7ee0e88e1d40425 SHA512 3f733268ab86c55ef13709c88c606fac86383535ed880213f4176cb150e0fadf7727b36393b5980c95276f78bae0a42a5de25b820eeab6034100f37152dc45ac
+EBUILD cadence-99999.ebuild 2783 BLAKE2B dbc4bf48346c4139f797d588a2151c9695f50a1b018e4ca576ea5c5c9507d35b24ea7ae725fa12c79d10f723f61be87e3eab27fcf164120cae9957b324b867a5 SHA512 fb1859007af9c9a8a9b38370dd28595c4fccbe61b56e1c55c0bdc7ba09e7e4be155b3ca6bd725ef6292e44d5718fccb179dc3dcbbfbf12c1ae874a0cda09598c
+MISC ChangeLog 695 BLAKE2B a8bdac4e50249ac182d0447a80fa0f55fad9a071c46a6351e14b43c8295a210bd0bdf78f046c99cdfded1fa88539f3897df16375c9ae6d7d20c8f03b8a8e6814 SHA512 20a850b2490ed644c2afc4126c53385baeacb99666664ec82ce45d71c1e90a016496ec5a0788ffbc85e1fa20d8879051bc8ee0cb8a9bc9ffb2d8adab7d5f7c5b
+MISC metadata.xml 335 BLAKE2B dec1aa4c7f36a24932383018471a16a165f34ec4e91b2da03a529a17aef1fe0e99b9d577fa3a52eff8b6df7ba771cfa0dd5e693987bbdedca59a80e0c8c82711 SHA512 66c8d1d8b8f46a1267577aec9f84499c690d5e16449d546c2c21998a0df01d338a2bdf7c0544bbb27b6a56222e05b8c1a14b1ea1546713985e239cc8b283a155
Modified: trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild 2018-04-29 23:52:08 UTC (rev 3130)
+++ trunk/overlays/proaudio/media-sound/cadence/cadence-99999.ebuild 2018-05-01 11:28:13 UTC (rev 3131)
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+# we use python3.5 as it is the default in gentoo
PYTHON_COMPAT=( python3_{4,5,6} )
-inherit gnome2 git-r3 python-r1
+inherit gnome2 git-r3 python-single-r1
DESCRIPTION="Collection of tools useful for audio production"
HOMEPAGE="https://github.com/falkTX/Cadence";
@@ -17,8 +18,9 @@
IUSE="a2jmidid opengl -pulseaudio"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="virtual/jack
- dev-python/PyQt5[dbus,opengl?]
+RDEPEND="${PYTHON_DEPS}
+ virtual/jack
+ dev-python/PyQt5[dbus,opengl?,${PYTHON_USEDEP}]
dev-qt/qtcore:5
dev-qt/qtgui:5
a2jmidid? ( media-sound/a2jmidid )
@@ -25,28 +27,27 @@
opengl? ( dev-qt/qtopengl:5 )
pulseaudio? ( media-sound/pulseaudio[jack] )"
DEPEND="${RDEPEND}
- dev-python/dbus-python"
+ dev-python/dbus-python[${PYTHON_USEDEP}]"
+PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
+
src_prepare() {
- # Fis install location
- sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:" -e 's/DESTDIR =/DESTDIR ?=/' Makefile || die "sed Makefile failed"
- # Prefer to have all audio software into the Audio menu
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 as PyQr5 is using it
- sed -i -e 's/python3/python3.5/' data/cadence || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/cadence-aloop-daemon || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/cadence-jacksettings || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/cadence-logs || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/cadence-render || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/cadence-session-start || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/catarina || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/catia || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/claudia || die "sed failed"
- sed -i -e 's/python3/python3.5/' data/claudia-launcher || 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
}
@@ -54,6 +55,23 @@
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 "${D}/usr/bin/cadence-pulse2jack" || die "rm pulse2jack failed"
+ rm -rf "${D}/usr/bin/cadence-pulse2loopback" || die "rm pulse2loopback failed"
+ fi
+}
+
pkg_postint() {
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-05-01 11:28:13 UTC (rev 3131)
@@ -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
+
Modified: trunk/overlays/proaudio/media-sound/cadence/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/cadence/metadata.xml 2018-04-29 23:52:08 UTC (rev 3130)
+++ trunk/overlays/proaudio/media-sound/cadence/metadata.xml 2018-05-01 11:28:13 UTC (rev 3131)
@@ -5,4 +5,7 @@
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>
+ <use>
+ <flag name="a2jmidid">Enable a2jmidid integration</flag>
+ </use>
</pkgmetadata>