| [proaudio] [1949] seq24-0.9.2: version bump. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1949
Author: keenblade
Date: 2011-04-29 00:03:52 +0200 (Fri, 29 Apr 2011)
Log Message:
-----------
seq24-0.9.2: version bump. A new patch from upstream for lash
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/seq24/ChangeLog
trunk/overlays/proaudio/media-sound/seq24/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.9.2-lash-fix.diff
trunk/overlays/proaudio/media-sound/seq24/seq24-0.9.2.ebuild
Modified: trunk/overlays/proaudio/media-sound/seq24/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/ChangeLog 2011-04-28 08:45:00 UTC (rev 1948)
+++ trunk/overlays/proaudio/media-sound/seq24/ChangeLog 2011-04-28 22:03:52 UTC (rev 1949)
@@ -1,7 +1,13 @@
# ChangeLog for media-sound/seq24
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*seq24-0.9.2 (28 Apr 2011)
+
+ 28 Apr 2011; Hakan Demiralp <keenblade@xxxxxxxxxxxxx +seq24-0.9.2.ebuild,
+ +files/seq24-0.9.2-lash-fix.diff:
+ version bump. A new patch from upstream for lash
+
04 Aug 2009; Dominique Michel; <dominique@xxxxxxxxxxxxx>;
Removed alsa-lib midi USE check
Modified: trunk/overlays/proaudio/media-sound/seq24/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/Manifest 2011-04-28 08:45:00 UTC (rev 1948)
+++ trunk/overlays/proaudio/media-sound/seq24/Manifest 2011-04-28 22:03:52 UTC (rev 1949)
@@ -5,8 +5,11 @@
AUX seq24-0.8.7.olivier.patch 30802 RMD160 f5f1c89c450f105481afaf5af9cf266f83d9fc58 SHA1 696e0921f25b2b8e07eef410ac7b16d3a5835e55 SHA256 eca19d6d017fdad07e8870ac9001125172b794eb2f321c85647a584c09879c98
AUX seq24-0.8.7.olivier2.patch 47109 RMD160 bf853107670de5b79dfc734c1c1a93ff19768b9d SHA1 83679034e6ec12e2ce7eeb31a7b112dfd7007d72 SHA256 50f39e209be96091e59b00f97243123d629a669ac04c1dbb64baa4ce0719f0b4
AUX seq24-0.8.7.prio.diff 3013 RMD160 66cae26eede06323cd03896a634a946a34ad0aaf SHA1 d98ad460499f780457a643c488f0f46b81e66a2e SHA256 b801e9256bfc17b3995f846c74f2b672c6d4a7ee1b71def16d1a070a45bf0310
+AUX seq24-0.9.2-lash-fix.diff 6491 RMD160 a605150e3b5ed9e2bf9113c0cb474914dce3e4f5 SHA1 054bd171e9a8d4e34ee42038679c1385744874b7 SHA256 4f16164b7856b24bc711faa287cb8d4e8e79b23c6a0220218ac3ccdb840b49fa
AUX seq24.png 1327 RMD160 ea0847e38413ad332ce3ef62b747f6a194214473 SHA1 fb92c157664fcd3de61ca60b72dfa0221fc12b1e SHA256 f1add80cac5ccd8708269b41fd03cdcb3da7b2824e208cf466156acc3867db65
DIST seq24-0.8.7.tar.gz 194461 RMD160 16d9ba737023eb2d7dccf5d9de604287812b929a SHA1 a6c611740a14c72681615b99c35afae3d7e3d69f SHA256 fba9c547999c2fa68c993bf2e367087343ec2948cd1172d447e008e1fa52b3ee
+DIST seq24-0.9.2.tar.bz2 213059 RMD160 bc2b2712a3a3da900438972a78f3348af9f242f8 SHA1 3fa279136f2de684569bf79cbdd2cbcd463f1450 SHA256 dbcfd18b7744ae739717588dd71a9923e5c08cf8fe1d3e71c897515cab875b0a
EBUILD seq24-0.8.7.ebuild 1673 RMD160 998d160e0fabc8848f0c2e843b36f5d0aee2615f SHA1 81206a34984a8cceab93790064d65abd9a917f85 SHA256 d9e44e7188c29d287c465ca287b1dbb411d287d4b1e27723c45da6ea2c3af41e
-MISC ChangeLog 900 RMD160 904bf1fc1b19046d119e744c32e1f2c4295724d3 SHA1 b842781f7f143b4b20a8e7899afadf90584ca3fb SHA256 2d55c4cf13082a92e116684cc7e0b1ca55eacb702258814d4e22d4be302a7c84
+EBUILD seq24-0.9.2.ebuild 1129 RMD160 1c8b6e302fb09c2e00e5533184d3235f1f0b6495 SHA1 c8a231b3acd9e232f5822512e2ac64e29dd52b8f SHA256 9048c50d67e6add688ebdb6ab9f6205435f852503bb1138e8bd2fadbbf979d51
+MISC ChangeLog 1092 RMD160 0decacebbc199ec5a64f9d13ba68746448a25351 SHA1 231c4d2b875ed55574b34ec07b19e84ee87c6848 SHA256 0668c13e51be1e0e90b609c6db3022d07bb58205ff270409f6e4ea9f656fd701
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.9.2-lash-fix.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.9.2-lash-fix.diff (rev 0)
+++ trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.9.2-lash-fix.diff 2011-04-28 22:03:52 UTC (rev 1949)
@@ -0,0 +1,245 @@
+=== modified file 'src/lash.cpp'
+--- old/src/lash.cpp 2010-11-23 18:54:26 +0000
++++ new/src/lash.cpp 2011-01-04 16:25:39 +0000
+@@ -29,17 +29,9 @@
+ lash::lash(int *argc, char ***argv)
+ {
+ #ifdef LASH_SUPPORT
+- m_lash_args = lash_extract_args(argc, argv);
+-#endif // LASH_SUPPORT
+-}
+-
+-
+-void lash::init(perform* perform)
+-{
+-#ifdef LASH_SUPPORT
+- m_perform = perform;
+-
+- m_client = lash_init(m_lash_args, PACKAGE_NAME,
++ m_perform = NULL;
++
++ m_client = lash_init(lash_extract_args(argc, argv), PACKAGE_NAME,
+ LASH_Config_File, LASH_PROTOCOL(2, 0));
+
+ if (m_client == NULL) {
+@@ -65,9 +57,10 @@
+
+
+ void
+-lash::start()
++lash::start(perform* perform)
+ {
+ #ifdef LASH_SUPPORT
++ m_perform = perform;
+ /* Process any LASH events every 250 msec (arbitrarily chosen interval) */
+ Glib::signal_timeout().connect(sigc::mem_fun(*this, &lash::process_events), 250);
+ #endif // LASH_SUPPORT
+
+=== modified file 'src/lash.h'
+--- old/src/lash.h 2010-11-23 18:54:26 +0000
++++ new/src/lash.h 2011-01-04 16:25:39 +0000
+@@ -43,7 +43,6 @@
+ #ifdef LASH_SUPPORT
+ perform *m_perform;
+ lash_client_t *m_client;
+- lash_args_t *m_lash_args;
+
+ bool process_events();
+ void handle_event(lash_event_t* conf);
+@@ -54,13 +53,12 @@
+ public:
+ lash(int *argc, char ***argv);
+
+- void init(perform* perform);
+ void set_alsa_client_id(int id);
+- void start();
++ void start(perform* perform);
+ };
+
+
+-/* global lash driver, defined in seq24.cpp */
++/* global lash driver, defined in seq24.cpp and used in midibus.cpp*/
+ extern lash *lash_driver;
+
+
+
+=== modified file 'src/midibus.cpp'
+--- old/src/midibus.cpp 2010-11-23 21:33:18 +0000
++++ new/src/midibus.cpp 2011-01-04 15:56:40 +0000
+@@ -877,11 +877,11 @@
+
+ /* set up our clients queue */
+ m_queue = snd_seq_alloc_queue( m_alsa_seq );
+-#endif
+ #ifdef LASH_SUPPORT
+ /* notify lash of our client ID so it can restore connections */
+ lash_driver->set_alsa_client_id(snd_seq_client_id(m_alsa_seq));
+ #endif
++#endif
+ }
+
+
+
+=== modified file 'src/perform.cpp'
+--- old/src/perform.cpp 2010-11-23 21:33:18 +0000
++++ new/src/perform.cpp 2011-01-03 18:11:51 +0000
+@@ -1342,6 +1342,7 @@
+ stats_last_clock_us= (last.tv_sec * 1000000) + (last.tv_nsec / 1000);
+ #else
+ /* get start time position */
++ /* timeGetTime() returns a "DWORD" type (= unsigned long)*/
+ last = timeGetTime();
+
+ if ( global_stats )
+
+=== modified file 'src/seq24.cpp'
+--- old/src/seq24.cpp 2010-11-23 21:41:44 +0000
++++ new/src/seq24.cpp 2011-01-04 16:25:39 +0000
+@@ -108,12 +108,66 @@
+ * GTK+. */
+ Gtk::Main kit(argc, argv);
+
+- /* Init the lash driver (strips lash specific command line
+- * arguments, but does not connect to daemon) */
++ /*prepare global MIDI definitions*/
++ for ( int i=0; i<c_maxBuses; i++ )
++ {
++ for ( int j=0; j<16; j++ )
++ global_user_midi_bus_definitions[i].instrument[j] = -1;
++ }
++
++ for ( int i=0; i<c_max_instruments; i++ )
++ {
++ for ( int j=0; j<128; j++ )
++ global_user_instrument_definitions[i].controllers_active[j] = false;
++ }
++
++
++ /* Init the lash driver (strip lash specific command line
++ * arguments and connect to daemon) */
+ #ifdef LASH_SUPPORT
+ lash_driver = new lash(&argc, &argv);
+ #endif
+
++ /* the main performance object */
++ /* lash must be initialized here because mastermidibus uses the global
++ * lash_driver variable*/
++ perform p;
++
++ /* read user preferences files */
++ if ( getenv( HOME ) != NULL )
++ {
++ Glib::ustring home( getenv( HOME ));
++ last_used_dir = home;
++ Glib::ustring total_file = home + SLASH + config_filename;
++
++ if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
++ {
++ printf( "Reading [%s]\n", total_file.c_str());
++
++ optionsfile options( total_file );
++
++ if ( !options.parse( &p ) ){
++ printf( "Error Reading [%s]\n", total_file.c_str());
++ }
++ }
++
++ total_file = home + SLASH + user_filename;
++ if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
++ {
++ printf( "Reading [%s]\n", total_file.c_str());
++
++ userfile user( total_file );
++
++ if ( !user.parse( &p ) ){
++ printf( "Error Reading [%s]\n", total_file.c_str());
++ }
++ }
++
++ }
++ else
++ printf( "Error calling getenv( \"%s\" )\n", HOME );
++
++
+ /* parse parameters */
+ int c;
+
+@@ -229,65 +283,14 @@
+ } /* end while */
+
+
+- /*prepare global MIDI definitions*/
+- for ( int i=0; i<c_maxBuses; i++ )
+- {
+- for ( int j=0; j<16; j++ )
+- global_user_midi_bus_definitions[i].instrument[j] = -1;
+- }
+-
+- for ( int i=0; i<c_max_instruments; i++ )
+- {
+- for ( int j=0; j<128; j++ )
+- global_user_instrument_definitions[i].controllers_active[j] = false;
+- }
+-
+-
+- /* the main performance object */
+- perform p;
+-
+- p_font_renderer = new font();
+-
+-
+- if ( getenv( HOME ) != NULL )
+- {
+- Glib::ustring home( getenv( HOME ));
+- last_used_dir = home;
+- Glib::ustring total_file = home + SLASH + config_filename;
+-
+- if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
+- {
+- printf( "Reading [%s]\n", total_file.c_str());
+-
+- optionsfile options( total_file );
+-
+- if ( !options.parse( &p ) ){
+- printf( "Error Reading [%s]\n", total_file.c_str());
+- }
+- }
+-
+- total_file = home + SLASH + user_filename;
+- if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
+- {
+- printf( "Reading [%s]\n", total_file.c_str());
+-
+- userfile user( total_file );
+-
+- if ( !user.parse( &p ) ){
+- printf( "Error Reading [%s]\n", total_file.c_str());
+- }
+- }
+-
+- }
+- else
+- printf( "Error calling getenv( \"%s\" )\n", HOME );
+-
+ p.init();
+ p.launch_input_thread();
+ p.launch_output_thread();
+ p.init_jack();
+
+
++ p_font_renderer = new font();
++
+ mainwnd seq24_window( &p );
+ if (optind < argc)
+ {
+@@ -299,8 +302,7 @@
+
+ /* connect to lash daemon and poll events*/
+ #ifdef LASH_SUPPORT
+- lash_driver->init(&p);
+- lash_driver->start();
++ lash_driver->start(&p);
+ #endif
+ kit.run(seq24_window);
+
+
Copied: trunk/overlays/proaudio/media-sound/seq24/seq24-0.9.2.ebuild (from rev 1948, trunk/overlays/proaudio/media-sound/seq24/seq24-0.8.7.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/seq24-0.9.2.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/seq24/seq24-0.9.2.ebuild 2011-04-28 22:03:52 UTC (rev 1949)
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+RESTRICT="mirror"
+DESCRIPTION="Seq24 is a loop based MIDI sequencer with focus on live performances."
+HOMEPAGE="https://edge.launchpad.net/seq24/";
+SRC_URI="http://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2";
+
+IUSE="jack lash"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-libs/alsa-lib
+ >=dev-cpp/gtkmm-2.4:2.4
+ >=dev-libs/libsigc++-2.2:2
+ jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+ lash? ( || ( >=media-sound/lash-0.5 media-sound/ladish ) )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+}
+src_prepare() {
+
+ epatch "${FILESDIR}/${P}-lash-fix.diff"
+}
+
+src_configure() {
+ econf \
+ $(use_enable jack) \
+ $(use_enable lash) \
+ || die
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog README RTC SEQ24
+ newicon src/pixmaps/seq24_32.xpm seq24.xpm
+ make_desktop_entry "${PN}" "SEQ24" "${PN}" "AudioVideo;Audio;Sequencer"
+}