| [proaudio] [1063] * copy ardour-2.0.99992 to 2.1.9999 to avoid weird unmasking with 2. 1 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1063
Author: gimpel
Date: 2007-12-18 13:11:14 +0000 (Tue, 18 Dec 2007)
Log Message:
-----------
* copy ardour-2.0.99992 to 2.1.9999 to avoid weird unmasking with 2.1
Note: they are exactly the same.
* add vamp-plugin-sdk and fftw3 to DEPEND so rubberband is built
(currently uses internal one). Finally a high quality time stretch! :)
* move rubberband to media-libs
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/rubberband/ChangeLog
trunk/overlays/proaudio/media-libs/rubberband/Manifest
trunk/overlays/proaudio/media-sound/ardour/ChangeLog
trunk/overlays/proaudio/media-sound/ardour/Manifest
trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild
trunk/overlays/proaudio/media-sound/musescore/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/rubberband/
trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild
trunk/overlays/proaudio/media-sound/musescore/metadata.xml
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/rubberband/
Copied: trunk/overlays/proaudio/media-libs/rubberband (from rev 1062, trunk/overlays/proaudio/media-sound/rubberband)
Modified: trunk/overlays/proaudio/media-libs/rubberband/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/rubberband/ChangeLog 2007-12-17 15:03:40 UTC (rev 1062)
+++ trunk/overlays/proaudio/media-libs/rubberband/ChangeLog 2007-12-18 13:11:14 UTC (rev 1063)
@@ -2,6 +2,9 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Dec 2007; <tom@xxxxxxxxxx> ++:
+ rename category to media-libs
+
17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
added a changelog
Modified: trunk/overlays/proaudio/media-libs/rubberband/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/rubberband/Manifest 2007-12-17 15:03:40 UTC (rev 1062)
+++ trunk/overlays/proaudio/media-libs/rubberband/Manifest 2007-12-18 13:11:14 UTC (rev 1063)
@@ -1,4 +1,4 @@
DIST rubberband-1.0.1.tar.bz2 83620 RMD160 5d43ad769f4d6db667122610f7db97e645a583a8 SHA1 ba9ef643fdfa56d8976bf1417f7ddc0cd723623a SHA256 10a80d4b2e8320c6ecb6ce203461ff02e43a0654d6975072ec4d13b9599df212
EBUILD rubberband-1.0.1.ebuild 935 RMD160 95cd39ebce068332724406cd0b2f9d2b0fb6242d SHA1 c102ac98b17b0b19d92a04dc5ef3ab015637d98b SHA256 c9b0dd4f16892c85bdace6442f2ab119341bd585f365de8ffc818df7cf58967e
-MISC ChangeLog 210 RMD160 844b13b0d6cd9cfb8cd096e7a98a0b167c3940ea SHA1 4f6be4745c63825439208ea301889f8a3c7120fb SHA256 c15c39dbbb71f17b33a653e2a62551fd94701643e8d42b5b5e44a9fde59a81f2
+MISC ChangeLog 279 RMD160 67c11f6b0f67e8684372f0c84cbd07213eca51f4 SHA1 d38adeebd7672a5808cb0bfa89ec73914b887b34 SHA256 97fb2fa4d3e96019b15ca302a7073cdceaffe8e416412a7bb64fadbba4c54ebf
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified: trunk/overlays/proaudio/media-sound/ardour/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ChangeLog 2007-12-17 15:03:40 UTC (rev 1062)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog 2007-12-18 13:11:14 UTC (rev 1063)
@@ -2,6 +2,11 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Dec 2007; <tom@xxxxxxxxxx> ardour-2.0.99992.ebuild,
+ +ardour-2.1.9999.ebuild:
+ copy 2.0.99992 to 2.1.9999 to avoid weird unmasking with 2.1
+ add media-libs/rubberband to depend for sys-libs
+
16 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+files/ardour-2.0.3-cflags.patch, -files/ardour-vst-support_1_1.patch,
+files/ardour-2.0.3-sndfile-external.patch,
Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest 2007-12-17 15:03:40 UTC (rev 1062)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest 2007-12-18 13:11:14 UTC (rev 1063)
@@ -4,8 +4,9 @@
DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
DIST ardour-2.1.tar.bz2 2788128 RMD160 70796eb07911c5301049fb2d2749cbaa7a04ba4d SHA1 fcfb1230b9e7ec42c0044be89a6e25aa31a75658 SHA256 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
EBUILD ardour-2.0.5.ebuild 3902 RMD160 139933a4a239d1d12b004e140da6c69346cb06f8 SHA1 a2a1a47c3ec4a17a7c688e2b04c3aae6cbe2f4c0 SHA256 1d02353f3fb20d0624d9dbb4bb9a580a4d8d9d9f3b39931de08c97e558cae819
-EBUILD ardour-2.0.99992.ebuild 5360 RMD160 0cb731324105985e3772c440f01dfb512d685be7 SHA1 020b4d10954d8d07e0beaa44764846d256d124f6 SHA256 933fd31c13c7da266590d76c7f2285daebd1accd55fb26b27a6264d095a8fcd3
+EBUILD ardour-2.0.99992.ebuild 3646 RMD160 c0d3e9c7c838f3e3a61d1dde3b39f37351631f13 SHA1 3c1fc5f54b6e433955bebb902cea7bb416e42ce1 SHA256 1ec0f871cb085a8621dcdf3e258f8b791d820910e787b9abaf98c7d86fee16af
+EBUILD ardour-2.1.9999.ebuild 3657 RMD160 13bc36b3207ae75ac50c5899adb5bbc440e37f06 SHA1 c264d55b2205977e3c75106986116519492f6649 SHA256 05c21f3ab57d610c49253876612919832b7d32887d61367bdee192674b5a0052
EBUILD ardour-2.1.ebuild 4207 RMD160 fb80363e05ac455d6224f564af0b7b119f99ca0e SHA1 ddab253a349144274613efcff40e49ab0f325ac3 SHA256 c246e28107380d279b07c59c3a3d8166f6e1ed3afe2b88739b907bfb79e13013
EBUILD ardour-99992.ebuild 5122 RMD160 199a759ac74262b96780cf61867b85d13c77b4b3 SHA1 fe87ad7d60b96b85eddf884e7d0d425434e9a8b3 SHA256 594cbd4e091f1c86d50188f5242787a7de6ee198724fd2d3a637c21ba6079365
-MISC ChangeLog 603 RMD160 3b1ec2f28f4528471ed272f799fea37faf63249e SHA1 3942cb2c46b33440014ab818d304028a8f5f9250 SHA256 f18a0067a30db613511b2a105f1be46ba13ac626617a47a3f2d916fe9996a94e
+MISC ChangeLog 802 RMD160 4daf4cf4c4e08bd93a1b76884d27a1aaaaf238f0 SHA1 8714d3ebcfb38f0251f456aea7800bc4b44d6897 SHA256 076d877804f589eae9c27f8143a77288959dd9abbc2d1d38e82fc21db8e37ba8
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild 2007-12-17 15:03:40 UTC (rev 1062)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild 2007-12-18 13:11:14 UTC (rev 1063)
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit eutils fetch-tools scons-ccache subversion
+inherit eutils fetch-tools scons-ccache subversion vst
ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/2.0-ongoing";
DESCRIPTION="multi-track hard disk recording software"
@@ -27,9 +27,9 @@
>=dev-libs/glib-2.10
>=x11-libs/gtk+-2.6
>=media-sound/jack-audio-connection-kit-0.100.0
- !=media-sound/ardour2-9*
- vst? ( >=app-emulation/wine-0.9.5 )
>=gnome-base/libgnomecanvas-2.0
+ media-libs/vamp-plugin-sdk
+ =sci-libs/fftw-3*
sys-libs? ( >=dev-libs/libsigc++-2.0
>=dev-cpp/glibmm-2.4
>=dev-cpp/cairomm-1.0
@@ -39,9 +39,8 @@
>=dev-cpp/libgnomecanvasmm-2.12.0
>=media-libs/libsndfile-1.0.16
>=media-libs/libsoundtouch-1.0 )"
-
- # sys-libs/gdbm # no longer needed?!
-
+ # currently internal rubberband is used
+ # that needs fftw3 and vamp-sdk, but it rocks, so enable by default
DEPEND="${RDEPEND}
>=dev-libs/boost-1.33.1
sys-devel/bison
@@ -49,9 +48,7 @@
sys-devel/automake
>=dev-util/pkgconfig-0.8.0
>=dev-util/scons-0.96.1
- nls? ( >=sys-devel/gettext-0.12.1 )
- vst? ( app-arch/zip
- =media-libs/vst-sdk-2.3* )"
+ nls? ( >=sys-devel/gettext-0.12.1 )"
S="${WORKDIR}/ardour2"
@@ -59,12 +56,6 @@
einfo "this ebuild fetches from the svn maintaince"
einfo "ardour-2.0.XXX branch"
# issue with ACLOCAL_FLAGS if set to a wrong value
- if [ "${#ACLOCAL_FLAGS}" -gt "0" ];then
- ewarn "check your profile settings:"
- ewarn "There is no need to set the ACLOCAL_FLAGS"
- ewarn "environment variable so we unset it"
- unset ACLOCAL_FLAGS
- fi
if use sys-libs;then
ewarn "You are trying to use the system libraries"
ewarn "instead the ones provided by ardour"
@@ -80,40 +71,28 @@
fi
epause 3s
fi
+
+ if use amd64 && use vst; then
+ eerror "${P} currently does not compile with VST support on amd64!"
+ eerror "Please unset VST useflag."
+ die
+ fi
}
src_unpack(){
# abort if user answers no to distribution of vst enabled binaries
- if use vst;then agree_vst || die "you can not distribute ardour with vst support" ;fi
+ if use vst; then
+ agree_vst || die "you can not distribute ardour with vst support"
+ fi
subversion_src_unpack
- #fetch_tarball_cmp "${URL}"
- #unpack "${URL##*/}"
cd ${S}
# hack to use the sys-lib for sndlib also
use sys-libs && epatch "${FILESDIR}/ardour-syslib_mod2.patch"
- # change template dir to not overwrite ardour1 stuff
- sed -i -e 's:\(share\)/ardour/\(templates\):\1/ardour2/\2:g' templates/SConscript || die "changing template names failed"
add_ccache_to_scons
- # ################
- # adjust files for vst support
- if use vst;then
- # delete vst question
- touch ${S}/.personal_use_only
-
- # fix vst header
- sed -ie 's@vstsdk2.3/source/common/aeffectx.h@/usr/include/vst/aeffectx.h@g' libs/fst/SConscript || die "change vst-header location"
- #symlink the include vst include files
- vst_tmp_dir="vstsdk2.3/source/common"
- mkdir -p ${vst_tmp_dir}
- cp -r /usr/include/vst/./ ${vst_tmp_dir}
- zip -0r libs/fst/vstsdk2.3.zip vstsdk2.3 &>/dev/null
- #/usr/include/vst/ libs/fst
- #ln -s ${DISTDIR}/vstsdk2.3.zip /libs/fst/
- fi
- # ###############
+ ardour_vst_prepare
}
src_compile() {
@@ -121,6 +100,7 @@
mkdir -p ${D}
local myconf=""
+ (use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
! use altivec; myconf="${myconf} ALTIVEC=$?"
! use debug; myconf="${myconf} ARDOUR_DEBUG=$?"
! use nls; myconf="${myconf} NLS=$?"
@@ -132,44 +112,17 @@
einfo "${myconf}"
cd ${S}
- scons ${myconf} -j2 || die "compilation failed"
+ scons ${myconf} ${MAKEOPTS} || die "compilation failed"
}
src_install() {
scons DESTDIR="${D}" install || die "make install failed"
if use vst;then
- newbin vst/ardour_vst.exe.so ardour2.exe.so
- newbin vst/ardour_vst ardour2
- fperms 644 /usr/bin/ardour2.exe.so
- sed -i -e'/^appname/'i"export\ LD_LIBRARY_PATH=\"/usr/lib/ardour2/:\$LD_LIBRARY_PATH\"" ${D}/usr/bin/ardour2
-
- # fix ardour file_name
- sed -i -e 's@ardour_vst@ardour2@' ${D}/usr/bin/ardour2
- else
- # fix ardour path
- sed -i -e 's:'${D}'::g' ${D}/usr/bin/ardour2
+ mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
fi
- cd DOCUMENTATION/
- for i in `find -iname 'CVS'`;do rm -rf ${i};done
- cd - &>/dev/null
dodoc DOCUMENTATION/*
-}
-agree_vst() {
- local ANSWER="no"
- einfo "Are you building Ardour for personal use (rather than distribution to others)? [yes/no]: "
- read ANSWER
- if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "yes" ];then
- einfo "OK, VST support will be enabled"
- # delete question from SConscript
- #sed -i -e '/Make\ sure\ they/,/print\ \"OK,\ VST\ support\ will\ be\ enabled\"/d' "${S}"/SConstruct || die " failed to del vst question"
- else
- eerror "You cannot build Ardour with VST support for distribution to others"
- eerror "It is a violation of several different licenses"
-
- eerror "use: USE=-vst emerge $P"
- eerror "to disable vst support"
- return 1
- fi
+ doicon "${S}/icons/icon/ardour_icon_mac.png"
+ make_desktop_entry ardour2 Ardour2 ardour_icon_mac.png "AudioVideo;Audio"
}
Added: trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild 2007-12-18 13:11:14 UTC (rev 1063)
@@ -0,0 +1,128 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils fetch-tools scons-ccache subversion vst
+
+ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/2.0-ongoing";
+DESCRIPTION="multi-track hard disk recording software"
+HOMEPAGE="http://ardour.org/";
+SRC_URI=""
+URL="http://ardour.org/files/releases/${PN}.tar.bz2";
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls debug sse altivec vst sys-libs"
+
+RDEPEND=">=media-libs/liblrdf-0.4.0
+ >=media-libs/raptor-1.2.0
+ >=media-libs/libart_lgpl-2.3.16
+ >=media-libs/ladspa-sdk-1.12
+ >=media-libs/libsamplerate-0.0.14
+ media-libs/liblo
+ >=dev-libs/libxml2-2.5.7
+ dev-libs/libxslt
+ >=dev-libs/glib-2.10
+ >=x11-libs/gtk+-2.6
+ >=media-sound/jack-audio-connection-kit-0.100.0
+ >=gnome-base/libgnomecanvas-2.0
+ media-libs/vamp-plugin-sdk
+ =sci-libs/fftw-3*
+ sys-libs? ( >=dev-libs/libsigc++-2.0
+ >=dev-cpp/glibmm-2.4
+ >=dev-cpp/cairomm-1.0
+ >=dev-cpp/gtkmm-2.8
+ >=dev-libs/atk-1.6
+ >=x11-libs/pango-1.4
+ >=dev-cpp/libgnomecanvasmm-2.12.0
+ >=media-libs/libsndfile-1.0.16
+ >=media-libs/libsoundtouch-1.0 )"
+ # currently internal rubberband is used
+ # that needs fftw3 and vamp-sdk, but it rocks, so enable by default
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.33.1
+ sys-devel/bison
+ sys-devel/autoconf
+ sys-devel/automake
+ >=dev-util/pkgconfig-0.8.0
+ >=dev-util/scons-0.96.1
+ nls? ( >=sys-devel/gettext-0.12.1 )"
+
+S="${WORKDIR}/ardour2"
+
+pkg_setup(){
+ einfo "this ebuild fetches from the svn maintaince"
+ einfo "ardour-2.0.XXX branch"
+ # issue with ACLOCAL_FLAGS if set to a wrong value
+ if use sys-libs;then
+ ewarn "You are trying to use the system libraries"
+ ewarn "instead the ones provided by ardour"
+ ewarn "No upstream support for doing so. Use at your own risk!!!"
+ ewarn "To use the ardour provided libs remerge with:"
+ ewarn "USE=\"-sys-libs\" emerge =${P}"
+
+ if ! built_with_use dev-cpp/gtkmm accessibility;then
+ eerror "To be able to use the USE flag 'sys-libs'"
+ eerror "you need to have dev-cpp/gtkmm"
+ eerror "emerged with the USE flag 'accessibility'"
+ die "dev-cpp/gtkmm is not built with the 'accessibility' USE flag"
+ fi
+ epause 3s
+ fi
+
+ if use amd64 && use vst; then
+ eerror "${P} currently does not compile with VST support on amd64!"
+ eerror "Please unset VST useflag."
+ die
+ fi
+}
+
+src_unpack(){
+ # abort if user answers no to distribution of vst enabled binaries
+ if use vst; then
+ agree_vst || die "you can not distribute ardour with vst support"
+ fi
+ subversion_src_unpack
+ cd ${S}
+
+ # hack to use the sys-lib for sndlib also
+ use sys-libs && epatch "${FILESDIR}/ardour-2.0.3-sndfile-external.patch"
+
+ add_ccache_to_scons
+
+ ardour_vst_prepare
+}
+
+src_compile() {
+ # Required for scons to "see" intermediate install location
+ mkdir -p ${D}
+
+ local myconf=""
+ (use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
+ ! use altivec; myconf="${myconf} ALTIVEC=$?"
+ ! use debug; myconf="${myconf} ARDOUR_DEBUG=$?"
+ ! use nls; myconf="${myconf} NLS=$?"
+ ! use vst; myconf="${myconf} VST=$?"
+ ! use sys-libs; myconf="${myconf} SYSLIBS=$?"
+ ! use sse; myconf="${myconf} USE_SSE_EVERYWHERE=$? BUILD_SSE_OPTIMIZATIONS=$?"
+ # static settings
+ myconf="${myconf} PREFIX=/usr KSI=0" # NLS=0"
+ einfo "${myconf}"
+
+ cd ${S}
+ scons ${myconf} ${MAKEOPTS} || die "compilation failed"
+}
+
+src_install() {
+ scons DESTDIR="${D}" install || die "make install failed"
+ if use vst;then
+ mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
+ fi
+
+ dodoc DOCUMENTATION/*
+
+ doicon "${S}/icons/icon/ardour_icon_mac.png"
+ make_desktop_entry ardour2 Ardour2 ardour_icon_mac.png "AudioVideo;Audio"
+}
Modified: trunk/overlays/proaudio/media-sound/musescore/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/musescore/Manifest 2007-12-17 15:03:40 UTC (rev 1062)
+++ trunk/overlays/proaudio/media-sound/musescore/Manifest 2007-12-18 13:11:14 UTC (rev 1063)
@@ -1,3 +1,4 @@
DIST mscore-0.7.0.1.tar.bz2 7623226 RMD160 165f9070eacb02b1e81bcc47638167df36c88c1e SHA1 858792ab4e0caeafda4d8746aa8d7c011e29d13c SHA256 827d6b79fc7c05f29ac67eb72b7482ff3159ddf164f9bb76fd884897a4b1eeed
EBUILD musescore-0.7.0.1.ebuild 1568 RMD160 00a19014ad2f6edbb508c1097e766e9a4d6ca88f SHA1 6b49730e15977cf2584ee962671d85b721307797 SHA256 064ae6a0f70a519f3e7c1bf960086bb5afcdcab4014f867d3b609e0795552294
MISC ChangeLog 227 RMD160 87d23c99b2641eec9a6a3043645f88ed18cfe1eb SHA1 21f07a4ee7bc973320affa13bf0e48b28a6aa7f2 SHA256 3cc528d0db04f0981a8e7c04d96054e56f086bf67ad6ee3d7c09560b4450e70f
+MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-sound/musescore/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/musescore/metadata.xml (rev 0)
+++ trunk/overlays/proaudio/media-sound/musescore/metadata.xml 2007-12-18 13:11:14 UTC (rev 1063)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <herd>no-herd</herd>
+ <maintainer>
+ <email>proaudio@xxxxxxxxxxxxx</email>
+ <name>pro-audio overlay team</name>
+ </maintainer>
+</pkgmetadata>