| [proaudio] [1686] non-daw-9999 update, very messy |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1686
Author: gavlee
Date: 2010-05-20 17:01:40 +0200 (Thu, 20 May 2010)
Log Message:
-----------
non-daw-9999 update, very messy
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/non-daw/ChangeLog
trunk/overlays/proaudio/media-sound/non-daw/Manifest
trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/non-daw/files/
trunk/overlays/proaudio/media-sound/non-daw/files/non-daw-9999-Makefiles.patch
Modified: trunk/overlays/proaudio/media-sound/non-daw/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/ChangeLog 2010-05-19 16:03:59 UTC (rev 1685)
+++ trunk/overlays/proaudio/media-sound/non-daw/ChangeLog 2010-05-20 15:01:40 UTC (rev 1686)
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/non-daw
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 May 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> non-daw-9999.ebuild,
+ +files/non-daw-9999-Makefiles.patch:
+ try to get this thing to build. added a patch as well.
+
18 Sep 2009; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
+non-daw-9999.ebuild, +metadata.xml:
rename nondaw -> non-daw
Modified: trunk/overlays/proaudio/media-sound/non-daw/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/Manifest 2010-05-19 16:03:59 UTC (rev 1685)
+++ trunk/overlays/proaudio/media-sound/non-daw/Manifest 2010-05-20 15:01:40 UTC (rev 1686)
@@ -1,3 +1,4 @@
-EBUILD non-daw-9999.ebuild 1204 RMD160 3589e8d540502f7dfdfaa282dad4c9f2ce5bf0e3 SHA1 4e2b3fb1685423daa6dc00dc53158e9485f3f17c SHA256 5496da710b279588b6c72056e3bcf7a937b5a4f4c46292c64c5e125d8d7e5be9
-MISC ChangeLog 365 RMD160 0f8156d45b073872e5197c449c2e2f707f56e032 SHA1 62a5cf576741e8775f1e2a5ea8960de465f81d60 SHA256 8bbcd1ec753647a2bec7633425bac08d62605aa13e17a82197981f92b306662d
+AUX non-daw-9999-Makefiles.patch 2582 RMD160 f8511825c34b86a1d4ebc9a55355a22f850f4763 SHA1 831d18d6c4587f0354aa3f958eaf2d7722e6171b SHA256 c340795fa5188365af92e50736775d59b21fcd5cd07c6676a08489636858351e
+EBUILD non-daw-9999.ebuild 3123 RMD160 4b4bcbeb3a94024ffb10472f44e0dc3018353868 SHA1 788df2ed67966d2dce6abe5e26e3ad1a256d15ef SHA256 9d2d1fd4e3e00104d9b84f1588efc554b6b4b85b6687702b42d35d981c29e3ee
+MISC ChangeLog 539 RMD160 a2b88e4bc4e2cd87b42b2af0e55bdb41a430aabc SHA1 eba561837f5aad675f22441713a5a9f8307e4dea SHA256 1ad87087ddf4712c563aa3fc4acfbbb889dd09a884396f01c62422650a9b6848
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-sound/non-daw/files/non-daw-9999-Makefiles.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/files/non-daw-9999-Makefiles.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/non-daw/files/non-daw-9999-Makefiles.patch 2010-05-20 15:01:40 UTC (rev 1686)
@@ -0,0 +1,72 @@
+--- daw/mixer/doc/Makefile.old 2010-04-23 19:42:45.000000000 +0100
++++ daw/mixer/doc/Makefile 2010-04-23 19:43:38.000000000 +0100
+@@ -17,8 +17,8 @@
+ @ rm -f index.html
+
+ install:
+- @ mkdir -p $(DOCUMENT_PATH)/non-mixer
+- @ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-mixer
++ @ install -d $(DESTDIR)$(DOCUMENT_PATH)/non-mixer
++ @ install -m 644 $(OBJS) *.png mup.css ../../COPYING $(DESTDIR)$(DOCUMENT_PATH)/non-mixer
+ # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
+
+ clean:
+--- daw/mixer/Makefile.old 2010-04-23 19:36:42.000000000 +0100
++++ daw/mixer/Makefile 2010-04-23 19:38:30.000000000 +0100
+@@ -107,15 +107,15 @@
+
+ install: all
+ @ echo -n "Installing..."
+- @ install src/mixer $(prefix)/bin/non-mixer
+- @ mkdir -p $(SYSTEM_PATH)/non-mixer
+- @ mkdir -p $(PIXMAP_PATH)/non-mixer
+- @ cp pixmaps/*.png $(PIXMAP_PATH)/non-mixer
++ @ install -D -m 755 src/mixer $(DESTDIR)$(prefix)/bin/non-mixer
++ @ install -d $(DESTDIR)$(SYSTEM_PATH)/non-mixer
++ @ install -d $(DESTDIR)$(PIXMAP_PATH)/non-mixer
++ @ install -m 644 pixmaps/*.png $(DESTDIR)$(PIXMAP_PATH)/non-mixer
+ @ $(MAKE) -s -C doc install
+ @ echo "$(DONE)"
+ ifneq ($(USE_DEBUG),yes)
+ @ echo -n "Stripping..."
+- @ strip $(prefix)/bin/non-mixer
++ @ strip $(DESTDIR)$(prefix)/bin/non-mixer
+ @ echo "$(DONE)"
+ endif
+
+--- daw/timeline/doc/Makefile.old 2010-04-23 19:30:34.000000000 +0100
++++ daw/timeline/doc/Makefile 2010-04-23 19:34:26.000000000 +0100
+@@ -17,8 +17,8 @@
+ @ rm -f index.html
+
+ install:
+- @ mkdir -p $(DOCUMENT_PATH)/non-daw
+- @ cp $(OBJS) *.png mup.css ../../COPYING $(DOCUMENT_PATH)/non-daw
++ @ install -d $(DESTDIR)$(DOCUMENT_PATH)/non-daw
++ @ install -m 644 $(OBJS) *.png mup.css ../../COPYING $(DESTDIR)$(DOCUMENT_PATH)/non-daw
+ # @ ln -sf $(PIXMAP_PATH)/logo.png $(DOCUMENT_PATH)
+
+ clean:
+--- daw/timeline/Makefile.old 2010-04-23 18:16:13.000000000 +0100
++++ daw/timeline/Makefile 2010-04-23 18:37:03.000000000 +0100
+@@ -119,15 +119,15 @@
+
+ install: all
+ @ echo -n "Installing..."
+- @ install src/timeline $(prefix)/bin/non-daw
+- @ mkdir -p $(SYSTEM_PATH)/non-daw
+- @ mkdir -p $(PIXMAP_PATH)/non-daw
+- @ cp pixmaps/*.png $(PIXMAP_PATH)/non-daw
++ @ install -D -m 755 src/timeline $(DESTDIR)$(prefix)/bin/non-daw
++ @ install -d $(DESTDIR)$(SYSTEM_PATH)/non-daw
++ @ install -d $(DESTDIR)$(PIXMAP_PATH)/non-daw
++ @ install -m 644 pixmaps/*.png $(DESTDIR)$(PIXMAP_PATH)/non-daw
+ @ $(MAKE) -s -C doc install
+ @ echo "$(DONE)"
+ ifneq ($(USE_DEBUG),yes)
+ @ echo -n "Stripping..."
+- @ strip $(prefix)/bin/non-daw
++ @ strip $(DESTDIR)$(prefix)/bin/non-daw
+ @ echo "$(DONE)"
+ endif
+
Modified: trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild 2010-05-19 16:03:59 UTC (rev 1685)
+++ trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild 2010-05-20 15:01:40 UTC (rev 1686)
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=1
+
inherit git eutils
DESCRIPTION="The Non DAW is a powerful, reliable and fast modular Digital Audio Workstation system"
@@ -10,32 +12,99 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="lash"
+IUSE="debug doc"
-DEPEND=">=x11-libs/fltk-1.1.8
+DEPEND=">=x11-libs/fltk-1.1.8:1.1
+ >=media-libs/liblrdf-0.4.0
>=media-libs/libsndfile-0.18.0
- >=media-sound/jack-audio-connection-kit-0.103
- lash? ( >=media-sound/lash-0.5.4 )"
+ >=media-sound/jack-audio-connection-kit-0.103"
RDEPEND="${DEPEND}"
-src_unpack(){
- git_src_unpack || die "git clone failed."
- cd "${S}"
- # DESTDIR before prefix to stop sandbox violation
- sed -i -e 's:$(prefix):$(DESTDIR)$(prefix):g' \
- "${S}/Makefile" || die "sed of Makefile failed"
- # don't strip the binary
- sed -i -e '/strip/d' "${S}/Makefile" || die "sed of Makefile failed"
-}
+src_compile() {
+ local x
+ local debugme
+ # the components of non-daw
+ local ndc="nonlib FL timeline mixer"
-src_compile() {
- econf $(use_enable lash) || die "econf failed"
- emake || die "emake failed"
+ # patches for sandbox install violations
+ epatch "${FILESDIR}/${P}-Makefiles.patch"
+
+ # don't strip the binaries
+ sed -i -e '/strip/d' "${S}/timeline/Makefile" "${S}/mixer/Makefile" \
+ || die "sed strip fix failed"
+
+ # needs CFLAGS/CXXFLAGS work. yes, it is ugly.
+ if use debug ; then
+ debugme=yes
+ sed -i -e "/^[[:blank:]]CFLAGS/ s/-pipe//" \
+ -e "/^[[:blank:]]CFLAGS/ s/-O0/${CFLAGS}/" \
+ -e "/^[[:blank:]]CXXFLAGS/ \
+ s/\= -Wnon-virtual-dtor/\= ${CXXFLAGS} -Wnon-virtual-dtor/" \
+ "${S}/timeline/Makefile" "${S}/mixer/Makefile" \
+ "${S}/FL/Makefile" "${S}/nonlib/Makefile" \
+ || die "sed CFLAGS/CXXFLAGS for debug failed"
+ else
+ debugme=no
+ sed -i -e "/^[[:blank:]]CFLAGS/ s/-pipe -O2/${CFLAGS}/" -e \
+ "/^[[:blank:]]CXXFLAGS/ s/\= -fno-rtti/\= ${CXXFLAGS} -fno-rtti/" \
+ "${S}/timeline/Makefile" "${S}/mixer/Makefile" \
+ "${S}/FL/Makefile" "${S}/nonlib/Makefile" \
+ || die "sed CFLAGS/CXXFLAGS for non debug failed"
+ fi
+
+ # configure all components
+ for x in ${ndc} ; do
+ pushd "${x}" || die "pushd ${x} failed"
+ case "${x}" in
+ nonlib|FL)
+ # the configure scripts are hand written. at least one option is
+ # needed or they will prompt for input from stdin and pause the
+ # emerge. thus we force debug and provide our own flags with the
+ # sed mess above
+ ./configure --enable-debug="${debugme}" \
+ || die "configure ${x} failed"
+ ;;
+ timeline|mixer)
+ # only the timeline and mixer components have install scripts
+ ./configure --prefix=/usr --enable-debug="${debugme}" \
+ || die "configure ${x} failed"
+ ;;
+ *) die "no ${x} found" ;;
+ esac
+ popd
+ done
+
+ # compile all components
+ for x in ${ndc} ; do
+ pushd "${x}" || die "pushd ${x} failed"
+ emake || die "emake ${x} failed"
+ popd
+ done
}
src_install() {
- # make the bin directory or make will die because it's not found
- mkdir -p "${D}/usr/bin"
- emake DESTDIR="${D}" install || die "install failed"
- fowners root:audio "${ROOT}/usr/bin/non-daw" || die "chown failed"
+ # only the timeline and mixer components have install scripts
+ local x
+ for x in timeline mixer ; do
+ pushd "${x}" || die "pushd ${x} failed"
+ make DESTDIR="${D}" install || die "make install of ${x} failed"
+ popd
+ done
+
+ # shell script tools
+ dobin "${S}/timeline/bin/import-external-sources"
+ dobin "${S}/timeline/bin/remove-unused-sources"
+
+ # docs install
+ mv "${D}/usr/share/doc/" "${T}"
+ if use doc ; then
+ cd "${T}/doc"
+ dohtml -r non-daw
+ dohtml -r non-mixer
+ # maybe moving docs breaks "Manual" entry in Help menu but it doesn't
+ # appear to function anyway
+ #cd "${D}/usr/share/doc"
+ #dosym "${P}/html/non-daw"
+ #dosym "${P}/html/non-mixer"
+ fi
}