Restore gladish build, remove obsolete ebuild
This commit is contained in:
parent
1a4a784f64
commit
856fbdaf94
|
|
@ -1,2 +0,0 @@
|
|||
DIST ladish-1-waf-2.0.22 106401 BLAKE2B 5d2919c55aec971b01ac1a2b30db805e05cb150cc694989e195cc498190a6a4b49d19d52c2e76c9d3261a555a7119fba8116a2d5f4a903767f4b41fd855308a0 SHA512 e5e2f5cef4fbfdda46515afc978a27bf8550a16e166a1083550dcc4aad0dd44f10225467aba2de4f5dba44f4cd50322cf556aa0242af4ebc8d26d0de5195fcb2
|
||||
DIST ladish-1.tar.gz 686288 BLAKE2B 7a3a39cf259ef57232dda50664dc4d9c57ae6f8e501d03a2d286e00451c2f99ba3130492e36132b127a868461c6a1518286d721224610060752fa5eb0b9b4cc1 SHA512 b01e24cd79c2711139c9d46c9bff4687049c3a735562a7f48a387103eec25c0222e935b90fb4eb2d3fc24629e417dab0c5aac215cbbca659ac49a2e802d1fd10
|
||||
|
|
@ -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']:
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8,9} )
|
||||
PYTHON_REQ_USE='threads(+)'
|
||||
|
||||
inherit flag-o-matic python-single-r1 waf-utils
|
||||
|
||||
DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
|
||||
HOMEPAGE="https://ladish.org"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.nedk.org/lad/ladish.git"
|
||||
KEYWORDS=""
|
||||
EGIT_SUBMODULES=()
|
||||
else
|
||||
inherit vcs-snapshot
|
||||
SRC_URI="https://github.com/LADI/ladish/archive/${P}.tar.gz
|
||||
https://git.nedk.org/lad/ladish.git/plain/waf?id=f15b80e6394ba0cbb4b76aa1b32071bfb971a8fa -> ${P}-waf-2.0.22"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
RESTRICT="mirror"
|
||||
|
||||
IUSE="debug doc lash"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="media-libs/alsa-lib
|
||||
media-sound/jack2[dbus]
|
||||
sys-apps/dbus
|
||||
dev-libs/expat
|
||||
lash? ( !media-sound/lash )
|
||||
${PYTHON_DEPS}"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen )
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS=( AUTHORS README NEWS )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-python3.patch"
|
||||
"${FILESDIR}/${P}-disable-gladish.patch"
|
||||
"${FILESDIR}/${P}-configure-libdir.patch"
|
||||
"${FILESDIR}/${P}-add-includes-for-getrlimit.patch"
|
||||
)
|
||||
|
||||
src_prepare()
|
||||
{
|
||||
sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
|
||||
append-cxxflags '-std=c++11'
|
||||
|
||||
cp "${DISTDIR}/ladish-1-waf-2.0.22" ./waf || die
|
||||
chmod +x ./waf || die
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local -a mywafconfargs=(
|
||||
--distnodeps
|
||||
$(usex debug --debug '')
|
||||
$(usex doc --doxygen '')
|
||||
$(usex lash '--enable-liblash' '')
|
||||
)
|
||||
waf-utils_src_configure "${mywafconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && HTML_DOCS="${S}/build/default/html/*"
|
||||
waf-utils_src_install
|
||||
python_fix_shebang "${ED}"
|
||||
}
|
||||
|
|
@ -14,18 +14,19 @@ if [[ ${PV} == *9999 ]]; then
|
|||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.nedk.org/lad/ladish.git"
|
||||
KEYWORDS=""
|
||||
EGIT_SUBMODULES=()
|
||||
else
|
||||
inherit vcs-snapshot
|
||||
SRC_URI="https://github.com/LADI/ladish/archive/${P}.tar.gz
|
||||
https://git.nedk.org/lad/ladish.git/plain/waf -> ${P}-waf-2.0.22"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
EGIT_SUBMODULES=()
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
RESTRICT="mirror"
|
||||
|
||||
IUSE="debug doc lash"
|
||||
IUSE="debug doc lash gtk"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="media-libs/alsa-lib
|
||||
|
|
@ -33,6 +34,13 @@ RDEPEND="media-libs/alsa-lib
|
|||
sys-apps/dbus
|
||||
dev-libs/expat
|
||||
lash? ( !media-sound/lash )
|
||||
gtk? (
|
||||
dev-libs/glib
|
||||
dev-libs/dbus-glib
|
||||
x11-libs/gtk+:2
|
||||
dev-cpp/gtkmm:2.4
|
||||
>=dev-cpp/libgnomecanvasmm-2.6.0
|
||||
)
|
||||
${PYTHON_DEPS}"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen )
|
||||
|
|
@ -41,7 +49,7 @@ DEPEND="${RDEPEND}
|
|||
DOCS=( AUTHORS README NEWS )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-disable-gladish.patch"
|
||||
"${FILESDIR}/${PN}-configure-gladish.patch"
|
||||
)
|
||||
|
||||
src_prepare()
|
||||
|
|
@ -56,6 +64,7 @@ src_configure() {
|
|||
--distnodeps
|
||||
$(usex debug --debug '')
|
||||
$(usex doc --doxygen '')
|
||||
$(usex gtk '--enable-gladish' '')
|
||||
$(usex lash '--enable-liblash' '')
|
||||
)
|
||||
waf-utils_src_configure "${mywafconfargs[@]}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue