From 79639176d5692262a4bac00eac1592d855605f34 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 23 Oct 2011 21:59:51 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- media-sound/ardour/ChangeLog | 8 +- media-sound/ardour/ardour-2.8.11-r20.ebuild | 87 -------------- .../ardour/files/ardour-2.8.11-gcc46.patch | 29 ----- .../ardour/files/ardour-2.8.11-ldpath.patch | 27 ----- .../ardour/files/ardour-2.8.11-raptor2.patch | 57 --------- .../ardour/files/ardour-2.8.11-syslibs.patch | 110 ------------------ .../ardour/files/ardour-2.8.11-type.patch | 11 -- media-sound/rosegarden/ChangeLog | 6 +- .../rosegarden/rosegarden-10.04.2.ebuild | 67 ----------- .../rosegarden/rosegarden-10.10.ebuild | 69 ----------- 10 files changed, 12 insertions(+), 459 deletions(-) delete mode 100644 media-sound/ardour/ardour-2.8.11-r20.ebuild delete mode 100644 media-sound/ardour/files/ardour-2.8.11-gcc46.patch delete mode 100644 media-sound/ardour/files/ardour-2.8.11-ldpath.patch delete mode 100644 media-sound/ardour/files/ardour-2.8.11-raptor2.patch delete mode 100644 media-sound/ardour/files/ardour-2.8.11-syslibs.patch delete mode 100644 media-sound/ardour/files/ardour-2.8.11-type.patch delete mode 100644 media-sound/rosegarden/rosegarden-10.04.2.ebuild delete mode 100644 media-sound/rosegarden/rosegarden-10.10.ebuild diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog index 614d05f3ce5e..775a7a82f9b2 100644 --- a/media-sound/ardour/ChangeLog +++ b/media-sound/ardour/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/ardour # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.99 2011/09/28 22:48:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.100 2011/10/23 21:56:49 ssuominen Exp $ + + 23 Oct 2011; Samuli Suominen + -ardour-2.8.11-r20.ebuild, -files/ardour-2.8.11-gcc46.patch, + -files/ardour-2.8.11-ldpath.patch, -files/ardour-2.8.11-raptor2.patch, + -files/ardour-2.8.11-syslibs.patch, -files/ardour-2.8.11-type.patch: + old 28 Sep 2011; Samuli Suominen ardour-2.8.12.ebuild: Use gentoo mirrors. diff --git a/media-sound/ardour/ardour-2.8.11-r20.ebuild b/media-sound/ardour/ardour-2.8.11-r20.ebuild deleted file mode 100644 index b79c41f70396..000000000000 --- a/media-sound/ardour/ardour-2.8.11-r20.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r20.ebuild,v 1.2 2011/09/04 12:30:34 aballier Exp $ - -EAPI=4 -inherit eutils flag-o-matic toolchain-funcs scons-utils - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="http://ardour.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="altivec curl debug nls lv2 sse" - -RDEPEND="media-libs/aubio - media-libs/liblo - lv2? ( >=media-libs/slv2-0.6.1 ) - sci-libs/fftw:3.0 - media-libs/freetype:2 - >=dev-libs/glib-2.10.1:2 - dev-cpp/glibmm:2 - >=x11-libs/gtk+-2.8.1:2 - >=dev-libs/libxml2-2.6:2 - >=media-libs/libsndfile-1.0.18 - >=media-libs/libsamplerate-0.1 - >=media-libs/rubberband-1.6.0 - >=media-libs/libsoundtouch-1.6.0 - media-libs/flac - media-libs/raptor:2 - >=media-libs/liblrdf-0.4.0-r20 - >=media-sound/jack-audio-connection-kit-0.109 - >=gnome-base/libgnomecanvas-2 - media-libs/vamp-plugin-sdk - dev-libs/libxslt - dev-libs/libsigc++:2 - >=dev-cpp/gtkmm-2.16:2.4 - >=dev-cpp/libgnomecanvasmm-2.26:2.6 - media-libs/alsa-lib - x11-libs/pango - x11-libs/cairo - media-libs/libart_lgpl - virtual/libusb:0 - curl? ( net-misc/curl )" -DEPEND="${RDEPEND} - dev-libs/boost - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-flags.patch \ - "${FILESDIR}"/${P}-syslibs.patch \ - "${FILESDIR}"/${P}-type.patch \ - "${FILESDIR}"/${P}-ldpath.patch \ - "${FILESDIR}"/${P}-raptor2.patch \ - "${FILESDIR}"/${P}-soundtouch.patch - - if [[ ($(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6) ]]; then - epatch "${FILESDIR}"/${P}-gcc46.patch - fi -} - -src_compile() { - local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0) - tc-export CC CXX - append-cxxflags -D__STDC_FORMAT_MACROS - mkdir -p "${D}" - - escons \ - DESTDIR="${D}" \ - FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \ - PREFIX=/usr \ - SYSLIBS=1 \ - $(use_scons curl FREESOUND) \ - $(use_scons debug DEBUG) \ - $(use_scons nls NLS) \ - $(use_scons lv2 LV2) -} - -src_install() { - escons install - doman ${PN}.1 - newicon icons/icon/ardour_icon_mac.png ${PN}.png - make_desktop_entry ardour2 ardour AudioVideo -} diff --git a/media-sound/ardour/files/ardour-2.8.11-gcc46.patch b/media-sound/ardour/files/ardour-2.8.11-gcc46.patch deleted file mode 100644 index 4944fd8a8e27..000000000000 --- a/media-sound/ardour/files/ardour-2.8.11-gcc46.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ardour-2.8.11.old/libs/ardour/enums.cc -+++ ardour-2.8.11/libs/ardour/enums.cc -@@ -31,7 +31,8 @@ - - using namespace std; - using namespace PBD; --using namespace ARDOUR; -+namespace ARDOUR -+{ - - void - setup_enum_writer () -@@ -362,3 +363,5 @@ setup_enum_writer () - REGISTER (_Track_FreezeState); - - } -+ -+} ---- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc -+++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc -@@ -177,7 +177,7 @@ wiimote_discovery: - std::cerr << "Wiimote: discovering, press 1+2" << std::endl; - - while (!wiimote_handle && !main_thread_quit) { -- bdaddr = *BDADDR_ANY; -+ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}}; - callback_thread_registered_for_ardour = false; - wiimote_handle = cwiid_open(&bdaddr, 0); - diff --git a/media-sound/ardour/files/ardour-2.8.11-ldpath.patch b/media-sound/ardour/files/ardour-2.8.11-ldpath.patch deleted file mode 100644 index 16e1cd3d9859..000000000000 --- a/media-sound/ardour/files/ardour-2.8.11-ldpath.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ardour-2.8.11.orig/gtk2_ardour/ardev_common.sh.in -+++ ardour-2.8.11/gtk2_ardour/ardev_common.sh.in -@@ -11,9 +11,9 @@ - echo USING OLD CLEARLOOKS - export GTK_PATH=~/.ardour2:libs/clearlooks-older - fi --export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH -+export VAMP_PATH=libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH} - --export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/rubberband:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility:$LD_LIBRARY_PATH -+export LD_LIBRARY_PATH=libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/gtkmm2ext${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - - # DYLD_LIBRARY_PATH is for darwin. - export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH ---- ardour-2.8.11.orig/gtk2_ardour/ardour.sh.in -+++ ardour-2.8.11/gtk2_ardour/ardour.sh.in -@@ -1,8 +1,8 @@ - #!/bin/sh - --export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_PATH -+export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${GTK_PATH:+:$GTK_PATH} - --export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH -+export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - # DYLD_LIBRARY_PATH is for Darwin - export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH - diff --git a/media-sound/ardour/files/ardour-2.8.11-raptor2.patch b/media-sound/ardour/files/ardour-2.8.11-raptor2.patch deleted file mode 100644 index 405e1a83e5d3..000000000000 --- a/media-sound/ardour/files/ardour-2.8.11-raptor2.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://projects.archlinux.org/svntogit/packages.git/plain/ardour/trunk/raptor2.patch - ---- SConstruct -+++ SConstruct -@@ -431,7 +431,6 @@ - 'gtk+-2.0' : '2.8.1', - 'libxml-2.0' : '2.6.0', - 'samplerate' : '0.1.0', -- 'raptor' : '1.4.2', - 'lrdf' : '0.4.0', - 'jack' : '0.109.0', - 'libgnomecanvas-2.0' : '2.0', -@@ -487,7 +486,10 @@ - - libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') - --conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) -+conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists, -+ 'CheckPKGVersion' : CheckPKGVersion } -+ ) -+ - - if conf.CheckPKGExists ('fftw3f'): - libraries['fftw3f'] = LibraryInfo() -@@ -501,6 +503,22 @@ - libraries['aubio'] = LibraryInfo() - libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') - -+raptorOK = 0 -+ -+if conf.CheckPKGExists ('raptor2'): -+ libraries['raptor'] = LibraryInfo() -+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2') -+ raptorOK = 1 -+else: -+ if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'): -+ libraries['raptor'] = LibraryInfo() -+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') -+ raptorOK = 1 -+ -+if raptorOK == 0: -+ print "Ardour requires either raptor or raptor2 to be available at build time" -+ Exit (1) -+ - env = conf.Finish () - - if env['FFT_ANALYSIS']: -@@ -570,9 +588,6 @@ - libraries['lrdf'] = LibraryInfo() - libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') - --libraries['raptor'] = LibraryInfo() --libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') -- - libraries['sndfile'] = LibraryInfo() - libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') - diff --git a/media-sound/ardour/files/ardour-2.8.11-syslibs.patch b/media-sound/ardour/files/ardour-2.8.11-syslibs.patch deleted file mode 100644 index 932bdade31f0..000000000000 --- a/media-sound/ardour/files/ardour-2.8.11-syslibs.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- ardour-2.8.11/SConstruct.orig -+++ ardour-2.8.11/SConstruct -@@ -863,40 +863,6 @@ - - prep_libcheck(env, env) - -- --# --# these are part of the Ardour source tree because they are C++ --# -- --libraries['vamp'] = LibraryInfo (LIBS='vampsdk', -- LIBPATH='#libs/vamp-sdk', -- CPPPATH='#libs/vamp-sdk') --libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk', -- LIBPATH='#libs/vamp-sdk', -- CPPPATH='#libs/vamp-sdk') -- --env['RUBBERBAND'] = False -- --conf = Configure (env) -- --if conf.CheckHeader ('fftw3.h'): -- env['RUBBERBAND'] = True -- libraries['rubberband'] = LibraryInfo (LIBS='rubberband', -- LIBPATH='#libs/rubberband', -- CPPPATH='#libs/rubberband', -- CCFLAGS='-DUSE_RUBBERBAND') --else: -- print "" -- print "-------------------------------------------------------------------------" -- print "You do not have the FFTW single-precision development package installed." -- print "This prevents Ardour from using the Rubberband library for timestretching" -- print "and pitchshifting. It will fall back on SoundTouch for timestretch, and " -- print "pitchshifting will not be available." -- print "-------------------------------------------------------------------------" -- print "" -- --conf.Finish() -- - # - # Check for libusb - -@@ -1080,10 +1046,22 @@ - # Comment the previous line and uncomment this for old versions of Debian: - #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') - -- libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', -- LIBPATH='#libs/appleutility', -- CPPPATH='#libs/appleutility') -- -+ #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', -+ # LIBPATH='#libs/appleutility', -+ # CPPPATH='#libs/appleutility') -+ -+ env['RUBBERBAND'] = True -+ env.Append (CXXFLAGS="-DUSE_RUBBERBAND") -+ libraries['rubberband'] = LibraryInfo() -+ libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband') -+ -+ libraries['vamp-sdk'] = LibraryInfo() -+ libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') -+ libraries['vamp'] = LibraryInfo() -+ libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') -+ libraries['vamphost'] = LibraryInfo() -+ libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk') -+ - coredirs = [ - 'templates', - 'manual' -@@ -1093,7 +1071,6 @@ - 'libs/pbd', - 'libs/midi++2', - 'libs/ardour', -- 'libs/vamp-sdk', - 'libs/vamp-plugins/', - # these are unconditionally included but have - # tests internally to avoid compilation etc -@@ -1109,8 +1086,7 @@ - gtk_subdirs = [ - # 'libs/flowcanvas', - 'libs/gtkmm2ext', -- 'gtk2_ardour', -- clearlooks_version -+ 'gtk2_ardour' - ] - - else: -@@ -1222,9 +1198,9 @@ - # timestretch libraries - # - --timefx_subdirs = ['libs/soundtouch'] --if env['RUBBERBAND']: -- timefx_subdirs += ['libs/rubberband'] -+#timefx_subdirs = ['libs/soundtouch'] -+#if env['RUBBERBAND']: -+# timefx_subdirs += ['libs/rubberband'] - - opts.Save('scache.conf', env) - Help(opts.GenerateHelpText(env)) -@@ -1403,7 +1379,7 @@ - for subdir in coredirs: - SConscript (subdir + '/SConscript') - --for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]: -+for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: - for subdir in sublistdir: - SConscript (subdir + '/SConscript') - diff --git a/media-sound/ardour/files/ardour-2.8.11-type.patch b/media-sound/ardour/files/ardour-2.8.11-type.patch deleted file mode 100644 index 6de9129a8e17..000000000000 --- a/media-sound/ardour/files/ardour-2.8.11-type.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ardour-2.8.11/gtk2_ardour/sfdb_freesound_mootcher.cc.orig -+++ ardour-2.8.11/gtk2_ardour/sfdb_freesound_mootcher.cc -@@ -342,7 +342,7 @@ - { - struct MemoryStruct xml_page; - xml_page.memory = NULL; -- xml_page.size = NULL; -+ xml_page.size = 0; - - std::string xmlFileName; - std::string audioFileName; diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog index 0d60e8564aaf..d1066ff7ee1a 100644 --- a/media-sound/rosegarden/ChangeLog +++ b/media-sound/rosegarden/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/rosegarden # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.87 2011/05/31 20:45:52 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.88 2011/10/23 21:59:51 ssuominen Exp $ + + 23 Oct 2011; Samuli Suominen + -rosegarden-10.04.2.ebuild, -rosegarden-10.10.ebuild: + old 31 May 2011; Markus Meier rosegarden-11.02.ebuild: x86 stable, bug #368149 diff --git a/media-sound/rosegarden/rosegarden-10.04.2.ebuild b/media-sound/rosegarden/rosegarden-10.04.2.ebuild deleted file mode 100644 index d945c09df452..000000000000 --- a/media-sound/rosegarden/rosegarden-10.04.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.04.2.ebuild,v 1.1 2010/10/24 16:05:07 ssuominen Exp $ - -EAPI=2 -inherit autotools fdo-mime multilib - -DESCRIPTION="MIDI and audio sequencer and notation editor" -HOMEPAGE="http://www.rosegardenmusic.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug lirc" - -RDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-qt3support:4 - media-libs/ladspa-sdk - x11-libs/libSM - media-sound/jack-audio-connection-kit - media-libs/alsa-lib - >=media-libs/dssi-1.0.0 - media-libs/liblo - media-libs/liblrdf - =sci-libs/fftw-3* - media-libs/libsamplerate[sndfile] - lirc? ( app-misc/lirc )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - x11-misc/makedepend" - -src_prepare() { - if ! use lirc; then - sed -i \ - -e '/AC_CHECK_HEADER/s:lirc_client.h:dIsAbLe&:' \ - -e '/AC_CHECK_LIB/s:lirc_init:dIsAbLe&:' \ - configure.ac || die - fi - - eautoreconf -} - -src_configure() { - export USER_CXXFLAGS="${CXXFLAGS}" - - local myconf - use debug && myconf="--enable-debug" - - econf \ - --with-qtdir=/usr \ - --with-qtlibdir=/usr/$(get_libdir)/qt4 \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS CONTRIBUTING README -} - -pkg_postinst() { - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_mime_database_update -} diff --git a/media-sound/rosegarden/rosegarden-10.10.ebuild b/media-sound/rosegarden/rosegarden-10.10.ebuild deleted file mode 100644 index 6f294db62976..000000000000 --- a/media-sound/rosegarden/rosegarden-10.10.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.10.ebuild,v 1.1 2011/01/13 15:28:31 ssuominen Exp $ - -EAPI=2 -inherit autotools fdo-mime multilib - -DESCRIPTION="MIDI and audio sequencer and notation editor" -HOMEPAGE="http://www.rosegardenmusic.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug lirc" - -RDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-qt3support:4 - media-libs/ladspa-sdk - x11-libs/libSM - media-sound/jack-audio-connection-kit - media-libs/alsa-lib - >=media-libs/dssi-1.0.0 - media-libs/liblo - media-libs/liblrdf - =sci-libs/fftw-3* - media-libs/libsamplerate[sndfile] - lirc? ( app-misc/lirc )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - x11-misc/makedepend" - -src_prepare() { - if ! use lirc; then - sed -i \ - -e '/AC_CHECK_HEADER/s:lirc_client.h:dIsAbLe&:' \ - -e '/AC_CHECK_LIB/s:lirc_init:dIsAbLe&:' \ - configure.ac || die - fi - - eautoreconf -} - -src_configure() { - export USER_CXXFLAGS="${CXXFLAGS}" - - local myconf - use debug && myconf="--enable-debug" - - econf \ - --with-qtdir=/usr \ - --with-qtlibdir=/usr/$(get_libdir)/qt4 \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS CONTRIBUTING README -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} -- 2.26.2