gryf/gryf-overlay
1
0
Fork 0
mirror of https://github.com/gryf/gryf-overlay.git synced 2025-12-27 00:42:32 +01:00
Code Issues Projects Releases Wiki Activity

Added new ebuild for Gnome Commander

Browse Source 
Added ebuild for moc with patch for sidplay song change
This commit is contained in:
root
2010-09-28 21:03:15 +02:00
parent 3a47b794bd
commit b257fe1d20
7 changed files with 594 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-misc/gnome-commander/Manifest
View File

@@ -1,2 +1,4 @@
DIST gnome-commander-1.2.6.tar.bz2 2281176 RMD160 80960ef664a67f144ec9d672557a82ba621d6182 SHA1 594af93be968cbbfaedbbd1e5862f79f45e49f1f SHA256 0f7272b71ad60eccc08ad70d3eace182786e5eaf38c4cabac5ab693ffc088b33
DIST gnome-commander-1.2.8.8.tar.bz2 3523946 RMD160 9eac3e6a4058b43c63b86f6fdd27098d722fc3b2 SHA1 0b448cff83590b857be5b21a2a008b4355f481a2 SHA256 5016e109bb10583fba789f8be988a68a832484a354e577eac9731a6a927233f5
EBUILD gnome-commander-1.2.6.ebuild 1379 RMD160 cc0fb5584c24a17abb1aceae4968051645fde66f SHA1 a39a4622e49d90884948e17bc5a504c8bc90be89 SHA256 17cad076de9e314d52d7f9206bc0e7ccb1649f41e6205022cb94afaab1f98059
EBUILD gnome-commander-1.2.8.8.ebuild 1379 RMD160 cc0fb5584c24a17abb1aceae4968051645fde66f SHA1 a39a4622e49d90884948e17bc5a504c8bc90be89 SHA256 17cad076de9e314d52d7f9206bc0e7ccb1649f41e6205022cb94afaab1f98059

61
app-misc/gnome-commander/gnome-commander-1.2.8.8.ebuild Normal file
View File

@@ -0,0 +1,61 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# $Header:
inherit gnome2 flag-o-matic
DESCRIPTION="A full featured, dual-pane file manager for Gnome2"
HOMEPAGE="http://www.nongnu.org/gcmd/"
SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.2/${P}.tar.bz2";
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
LICENSE="GPL-2"
IUSE="doc exif gsf id3 python"
SLOT="0"
USE_DESC="
exif: add support for Exif and IPTC
gsf: add support for OLE, OLE2 and ODF
id3: add support for ID3, Vorbis, FLAC and APE
python: add support for python plugins"
RDEPEND=">=x11-libs/gtk+-2.8.0
>=dev-libs/glib-2.6.0
>=gnome-base/libgnomeui-2.4.0
>=gnome-base/libgnome-2.4.0
>=gnome-base/gnome-vfs-2.0
|| (
app-admin/gamin
app-admin/fam
)
exif? ( >=media-gfx/exiv2-0.14 )
gsf? ( >=gnome-extra/libgsf-1.12.0 )
id3? ( >=media-libs/taglib-1.4 )
python? ( >=dev-lang/python-2.4 )"
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig"
DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
pkg_setup() {
G2CONF=" ${G2CONF}
$(use_with exif exiv2)
$(use_with gsf libgsf)
$(use_with id3 taglib)
$(use_enable python python)"
filter-ldflags -Wl,--as-needed
}

328
media-sound/moc/ChangeLog Normal file
View File

@@ -0,0 +1,328 @@
# ChangeLog for media-sound/moc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.82 2010/07/18 12:28:48 nixnut Exp $
18 Jul 2010; <nixnut@gentoo.org> moc-2.5.0_alpha4.ebuild:
ppc stable #316643
24 May 2010; Pacho Ramos <pacho@gentoo.org> moc-2.5.0_alpha4.ebuild:
stable amd64, bug 316643
24 May 2010; Raúl Porcel <armin76@gentoo.org> moc-2.5.0_alpha4.ebuild:
alpha/sparc stable wrt #316643
12 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
moc-2.5.0_alpha4.ebuild:
x86 stable wrt bug #316643
11 May 2010; Brent Baude <ranger@gentoo.org> moc-2.5.0_alpha4.ebuild:
stable ppc64, bug 316643
22 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
moc-2.5.0_alpha4.ebuild:
TagLib is required for Musepack support wrt #312783 by Christian
Glindkamp.
06 Mar 2010; Raúl Porcel <armin76@gentoo.org> moc-2.5.0_alpha3-r3.ebuild:
alpha stable
05 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
moc-2.5.0_alpha4.ebuild:
Missing USE musepack (alpha4 has SV8 API support).
*moc-2.5.0_alpha4 (14 Dec 2009)
14 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+moc-2.5.0_alpha4.ebuild:
Version bump wrt #296910, thanks to Petr Pisar for reporting.
04 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
moc-2.5.0_alpha3-r3.ebuild, -files/moc-2.5.0_alpha3-libmpcdecsv7.patch:
Remove media-libs/libmpcdecsv7 support, because it can't decode SV8 format
and doesn't pass ./configure with Autoconf >= 2.65.
23 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
moc-2.5.0_alpha3-r3.ebuild:
Remove media-libs/ao depend wrt #290223.
25 Sep 2009; Dawid Węgliński <cla@gentoo.org>
moc-2.5.0_alpha3-r3.ebuild:
Stable on amd64 (bug #281606)
24 Sep 2009; Raúl Porcel <armin76@gentoo.org> moc-2.5.0_alpha3-r3.ebuild:
sparc stable wrt #281606
31 Aug 2009; Brent Baude <ranger@gentoo.org> moc-2.5.0_alpha3-r3.ebuild:
stable ppc64, bug 281606
29 Aug 2009; nixnut <nixnut@gentoo.org> moc-2.5.0_alpha3-r3.ebuild:
ppc stable #281606
16 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
moc-2.5.0_alpha3-r3.ebuild:
stable x86, bug 281606
*moc-2.5.0_alpha3-r3 (26 Jul 2009)
26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+moc-2.5.0_alpha3-r3.ebuild, +files/moc-2.5.0_alpha3-libmpcdecsv7.patch:
Use transition package media-libs/libmpcdecsv7 instead of
media-libs/libmpcdec for Musepack support.
28 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
moc-2.5.0_alpha3-r2.ebuild:
Keyworded on alpha, bug #274846
11 May 2009; Samuli Suominen <ssuominen@gentoo.org>
files/moc-2.5.0_alpha3-ffmpegheaders.patch:
Extend ffmpeg patch wrt #258890, thanks to Mateusz Baran.
17 Jul 2008; Markus Rothe <corsair@gentoo.org> moc-2.5.0_alpha3-r2.ebuild:
Stable on ppc64; bug #230826
14 Jul 2008; nixnut <nixnut@gentoo.org> moc-2.5.0_alpha3-r2.ebuild:
Stable on ppc wrt bug 230826
06 Jul 2008; Friedrich Oslage <bluebird@gentoo.org>
moc-2.5.0_alpha3-r2.ebuild:
Stable on sparc, bug #230826
06 Jul 2008; Dawid Węgliński <cla@gentoo.org>
moc-2.5.0_alpha3-r2.ebuild:
Stable on x86 (bug #230826)
05 Jul 2008; Santiago M. Mola <coldwind@gentoo.org>
moc-2.5.0_alpha3-r2.ebuild:
amd64 stable wrt bug #230826
05 Jul 2008; Samuli Suominen <ssuominen@gentoo.org>
+files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch,
moc-2.5.0_alpha3-r2.ebuild:
Fix default configuration layout (upstream), thanks to Emil Karlson and
Silvence, bug 230395.
*moc-2.5.0_alpha3-r2 (08 May 2008)
08 May 2008; Samuli Suominen <ssuominen@gentoo.org>
+files/moc-2.5.0_alpha3-libtool22.patch, +moc-2.5.0_alpha3-r2.ebuild:
Add missing AC_PROG_CXX and use system ltdl for libtool-2.2.
10 Apr 2008; Samuli Suominen <ssuominen@gentoo.org>
moc-2.5.0_alpha3-r1.ebuild:
DEPEND dev-util/pkgconfig because eautoreconf fails without pkg.m4 wrt
#216940, thanks to bonsaikitten and aballier.
08 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+files/moc-2.5.0_alpha3-ffmpegheaders.patch, moc-2.5.0_alpha3-r1.ebuild:
add a patch to build with new ffmpeg headers layout
08 Apr 2008; Raúl Porcel <armin76@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
sparc stable wrt #215722
07 Apr 2008; Markus Rothe <corsair@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
Stable on ppc64; bug #215722
03 Apr 2008; Brent Baude <ranger@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
stable ppc, bug 215722
02 Apr 2008; Markus Meier <maekke@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
x86 stable, bug #215722
21 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
-moc-2.5.0_alpha3.ebuild, moc-2.5.0_alpha3-r1.ebuild:
amd64 stable
09 Mar 2008; Alexis Ballier <aballier@gentoo.org>
moc-2.5.0_alpha3-r1.ebuild:
Include libFLAC.m4 in a separate tarball to avoid autotools failures, bug
#212584
*moc-2.5.0_alpha3-r1 (05 Mar 2008)
05 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
+files/moc-2.5.0_alpha3-faad2.patch, +moc-2.5.0_alpha3-r1.ebuild:
aac USE for media-libs/faad2 by Hendrik Iben, bug 211805.
*moc-2.5.0_alpha3 (01 Mar 2008)
01 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
-files/moc-2.4.1+flac-1.1.3.patch, -moc-2.4.1.ebuild, -moc-2.4.2.ebuild,
+moc-2.5.0_alpha3.ebuild:
Version bump wrt #211805, thanks to Hendrik Iben.
05 Dec 2007; Ferris McCormick <fmccor@gentoo.org> moc-2.5.0_alpha2.ebuild:
Sparc stable --- Bug #200134 --- works fine.
24 Nov 2007; nixnut <nixnut@gentoo.org> moc-2.5.0_alpha2.ebuild:
Stable on ppc wrt bug 200134
24 Nov 2007; Dawid Węgliński <cla@gentoo.org> moc-2.5.0_alpha2.ebuild:
Stable on x86 (bug #200134)
24 Nov 2007; Markus Rothe <corsair@gentoo.org> moc-2.5.0_alpha2.ebuild:
Stable on ppc64; bug #200134
24 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> moc-2.5.0_alpha2.ebuild:
Timidity plug-in needs Timidity++ installed for timidity.cfg.
23 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> moc-2.5.0_alpha2.ebuild:
amd64 stable wrt #200134
07 Aug 2007; Samuli Suominen <ssuominen@gentoo.org>
+files/moc-2.5.0_alpha2-endianess.patch, moc-2.5.0_alpha2.ebuild:
Apply endianess fixes from bug 169785, by Damian Pietras, Elimar Riesebieter
and Hendrik Iben.
*moc-2.5.0_alpha2 (30 Jul 2007)
30 Jul 2007; Samuli Suominen <ssuominen@gentoo.org>
+moc-2.5.0_alpha2.ebuild:
Version bump for bug 169785, thanks to Hendrik Iben for reporting.
13 Jun 2007; Alexis Ballier <aballier@gentoo.org> -moc-2.1.4-r1.ebuild,
-moc-2.2.0-r1.ebuild:
cleanup old versions
*moc-2.4.2 (13 Jun 2007)
13 Jun 2007; Alexis Ballier <aballier@gentoo.org> +moc-2.4.2.ebuild:
version bump, bug #181932
22 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> moc-2.4.1.ebuild:
ppc stable, bug #175145
22 Apr 2007; Markus Rothe <corsair@gentoo.org> moc-2.4.1.ebuild:
Stable on ppc64; bug #175145
19 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> moc-2.4.1.ebuild:
Marked stable on amd64 for bug #175145
19 Apr 2007; Christian Faulhammer <opfer@gentoo.org> moc-2.4.1.ebuild:
stable x86, bug 175145
18 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> moc-2.4.1.ebuild:
Stable on sparc wrt #175145
22 Jan 2007; Markus Rothe <corsair@gentoo.org> moc-2.4.1.ebuild:
Added ~ppc64
05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> moc-2.1.4-r1.ebuild,
moc-2.2.0-r1.ebuild, moc-2.3.0.ebuild, moc-2.3.2.ebuild, moc-2.3.3.ebuild,
moc-2.4.0.ebuild, moc-2.4.1.ebuild:
Convert to use elog.
18 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+files/moc-2.4.1+flac-1.1.3.patch, moc-2.4.1.ebuild:
Add patch from Josh Coalson to be able to build with flac 1.1.3
*moc-2.4.1 (07 Nov 2006)
07 Nov 2006; Alexis Ballier <aballier@gentoo.org> +moc-2.4.1.ebuild:
Version bump, wrt to bug #153327
20 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> moc-2.2.0-r1.ebuild,
moc-2.3.0.ebuild, moc-2.3.2.ebuild, moc-2.3.3.ebuild, moc-2.4.0.ebuild:
Depend on 1.1.2 version of flac, as the 1.1.3 version changes API.
27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-moc-2.1.4-r1,
files/digest-moc-2.2.0-r1, files/digest-moc-2.3.0, files/digest-moc-2.3.2,
files/digest-moc-2.3.3, Manifest:
Fixing SHA256 digest, pass four
11 Mar 2006; <nixnut@gentoo.org> moc-2.4.0.ebuild:
Added ~ppc. Bug #104975
27 Feb 2006; Jason Wever <weeve@gentoo.org> moc-2.4.0.ebuild:
Added ~sparc keyword wrt bug #104975.
*moc-2.4.0 (24 Feb 2006)
24 Feb 2006; Patrick McLean <chutzpah@gentoo.org>
+files/2.4.0-endianess.patch, +moc-2.4.0.ebuild:
Version bump (bug #123620). Added ffmpeg USE flag. This also should fix bug
#121687.
15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> moc-2.3.2.ebuild,
moc-2.3.3.ebuild:
Fix USE flags. Bug #122872.
*moc-2.3.3 (18 Jan 2006)
18 Jan 2006; Chris White <chriswhite@gentoo.org> +moc-2.3.3.ebuild:
Version bump to 2.3.3. Fixes various memory leaks and works towards closing
bug #104975.
*moc-2.3.2 (01 Jan 2006)
01 Jan 2006; Chris White <chriswhite@gentoo.org>
+files/moc-2.3.2-configure.patch, +moc-2.3.2.ebuild:
Added 2.3.2 with -* keywords for bug #104975. Marked ~x86 arch.
02 Dec 2005; Chris White <chriswhite@gentoo.org>
-files/moc-2.3.1-configure.patch, -moc-2.3.1.ebuild:
Remove 2.3.1.
14 Jul 2005; David Holm <dholm@gentoo.org> moc-2.3.0.ebuild:
Added to ~ppc.
*moc-2.3.0 (13 Jul 2005)
13 Jul 2005; Jonathan Smith <smithj@gentoo.org> +moc-2.3.0.ebuild:
#98736: version bump
*moc-2.2.0-r1 (18 Apr 2005)
18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
-files/moc-1.1.0-gcc3.patch, -files/moc-1.1.0-gcc34.patch,
-moc-1.1.0.ebuild, +moc-2.1.4-r1.ebuild, -moc-2.1.4.ebuild,
+moc-2.2.0-r1.ebuild, -moc-2.2.0.ebuild:
neither a binary nor a symlink named moc gets installed any longer, fixes bug
#76702. also did some cleanup and moved oggvorbis useflag to vorbis, oggvorbis
is deprecated.
29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> moc-2.2.0.ebuild:
introduced support for the flac useflag, fixes #86226
*moc-2.2.0 (27 Feb 2005)
27 Feb 2005; Karol Wojtaszek <sekretarz@gentoo.org> +moc-2.2.0.ebuild:
Version bump, bug #83402
*moc-2.1.4 (21 Jan 2005)
21 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +moc-2.1.4.ebuild:
new version released. fixes #76588.
11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
Added media-libs/libid3tag to depend to fix bug #74533. Thanks go to Pinky
<master_up@post.cz> for the fix.
18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
Stable amd64, x86.
23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
Added to ~sparc.
16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+files/moc-1.1.0-gcc34.patch, moc-1.1.0.ebuild:
Ebuild cleanup. Added gcc-3.4 fix thanks to James
<James@superbug.demon.co.uk> in bug #71139. Added to ~amd64.
24 Sep 2004; Sven Wegener <swegener@gentoo.org> moc-1.1.0.ebuild:
Fixed CVS keyword replacement.
31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> moc-1.1.0.ebuild:
Stable x86. Added inherit eutils and removed explicit S=.
28 Oct 2003; Martin Holzer <mholzer@gentoo.org> moc-1.1.0.ebuild:
more config through IUSE. Closes #31568.
19 Oct 2003; Martin Holzer <mholzer@gentoo.org> moc-1.1.0.ebuild,
files/moc-1.1.0-gcc3.patch:
Adding gcc3 patch. Closes #31399.
*moc-1.1.0 (26 Jun 2003)
26 Jun 2003; robh <robh@gentoo.org> moc-1.1.0.ebuild:
Initial version. Thanks to Matthew Rickard, closes #12042

5
media-sound/moc/Manifest Normal file
View File

@@ -0,0 +1,5 @@
AUX moc-2.5.0-alpha4_sid_seek.diff 3287 RMD160 65431fcb33b190aabb6b04c78036ddabf5908dce SHA1 e7532b2353e351edaab35054a1857291e2eda1d6 SHA256 6f270bf07fde706afeeedc8d691b4a5412fa7c3292c1d0ab6eaec9039a80941a
DIST moc-2.5.0-alpha4.tar.bz2 520919 RMD160 d2dec23ad586b35a7350bacfb3eb9b3033abbfc4 SHA1 ca55b3bed0f3f3f352ca43078208ab63e20f40fc SHA256 a1ece00c17ce0ebbd387c0412b08f038dd07cf226726c26367cbc982ce3363b4
EBUILD moc-2.5.0_alpha4-r10.ebuild 2096 RMD160 643594f85f4e613a12a6e3c7219d1f1b9c36b09d SHA1 46a5bf77387fe5b2f1df612ecaea9fa7789b5712 SHA256 92a2ad2c3ac479930d8069dd539bc0f960a412cf354d28a2f2ca963a434bc5c4
MISC ChangeLog 11517 RMD160 1cea6440d17a5b3237c9c7cfb952c7e3d297bf06 SHA1 da0dafac6bebe25c03dd67814ec6a90ec4a27ac1 SHA256 396a7f84c0380097ca383b5de90f4e64df8128f873febf9b7b563717c0cf3429
MISC metadata.xml 244 RMD160 0f687a8096aa4afe69e958cf8cc4eb62361694d2 SHA1 14fe5a7bc2710d0240e9208786b24f409e71b179 SHA256 3f55674c364d24e3977d896f3bc95745716c55817511c3fc7282523da0aca164

116
media-sound/moc/files/moc-2.5.0-alpha4_sid_seek.diff Normal file
View File

@@ -0,0 +1,116 @@
diff -ur moc-2.5.0-alpha4_orig/decoder_plugins/sidplay2/sidplay2.cc moc-2.5.0-alpha4/decoder_plugins/sidplay2/sidplay2.cc
--- moc-2.5.0-alpha4_orig/decoder_plugins/sidplay2/sidplay2.cc 2007-06-16 13:22:18.000000000 +0200
+++ moc-2.5.0-alpha4/decoder_plugins/sidplay2/sidplay2.cc 2010-09-28 19:25:18.000000000 +0200
@@ -34,6 +34,23 @@
static int playSubTunes;
+namespace
+{
+ int get_current_subtune_begin_time(sidplay2_data *data)
+ {
+ if(data->currentSong == data->timeStart)
+ return 0;
+
+ return data->subtune_end_times[data->currentSong-2];
+ }
+
+ int get_current_subtune_length(sidplay2_data *data)
+ {
+ return data->subtune_end_times[data->currentSong-1]
+ - get_current_subtune_begin_time(data);
+ }
+}
+
static sidplay2_data * make_data()
{
pthread_mutex_lock(&player_select_mutex);
@@ -240,7 +257,7 @@
s2d->songs = st->getInfo().songs;
- s2d->sublengths = new int [s2d->songs];
+ s2d->subtune_end_times = new int [s2d->songs];
s2d->startSong = st->getInfo().startSong;
@@ -276,12 +293,12 @@
dl = minLength;
s2d->length += dl;
- s2d->sublengths[s-1] = dl;
+ s2d->subtune_end_times[s-1] = s2d->length;
}
else
{
s2d->length += defaultLength;
- s2d->sublengths[s-1] = defaultLength;
+ s2d->subtune_end_times[s-1] = s2d->length;
}
}
@@ -324,8 +341,8 @@
if(data->tune!=NULL)
delete data->tune;
- if(data->sublengths!=NULL)
- delete data->sublengths;
+ if(data->subtune_end_times!=NULL)
+ delete data->subtune_end_times;
free(data);
}
@@ -435,9 +452,20 @@
* generic seeking can't be done because the tune has to
* be played until the position (needs CPU)...
* */
-extern "C" int sidplay2_seek (void *void_data ATTR_UNUSED, int sec ATTR_UNUSED)
+extern "C" int sidplay2_seek (void *void_data, int sec)
{
- return -1;
+ struct sidplay2_data *data = (struct sidplay2_data *)void_data;
+
+ if (data->currentSong >= data->timeEnd)
+ {
+ return -1;
+ }
+
+ data->player->stop();
+ data->currentSong++;
+ data->tune->selectSong(data->currentSong);
+ data->player->load(data->tune);
+ return get_current_subtune_begin_time(data);
}
extern "C" int sidplay2_decode (void *void_data, char *buf, int buf_len,
@@ -447,7 +475,7 @@
int seconds = data->player->time() / data->player->timebase();
- int currentLength = data->sublengths[data->currentSong-1];
+ int currentLength = get_current_subtune_length(data);
if(seconds >= currentLength)
{
@@ -458,9 +486,6 @@
data->currentSong++;
data->tune->selectSong(data->currentSong);
data->player->load(data->tune);
-
- currentLength = data->sublengths[data->currentSong-1];
- seconds = 0;
}
sound_params->channels = data->channels;
diff -ur moc-2.5.0-alpha4_orig/decoder_plugins/sidplay2/sidplay2.h moc-2.5.0-alpha4/decoder_plugins/sidplay2/sidplay2.h
--- moc-2.5.0-alpha4_orig/decoder_plugins/sidplay2/sidplay2.h 2007-04-02 22:00:32.000000000 +0200
+++ moc-2.5.0-alpha4/decoder_plugins/sidplay2/sidplay2.h 2010-09-28 19:25:18.000000000 +0200
@@ -67,7 +67,7 @@
sid2_config_t cfg;
ReSIDBuilder *builder;
int length;
- int *sublengths;
+ int *subtune_end_times;
int songs;
int startSong;
int currentSong;

8
media-sound/moc/metadata.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sound</herd>
<use>
<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
</use>
</pkgmetadata>

74
media-sound/moc/moc-2.5.0_alpha4-r10.ebuild Normal file
View File

@@ -0,0 +1,74 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha4.ebuild,v 1.8 2010/07/18 12:28:48 nixnut Exp $
EAPI=2
inherit eutils
MY_P=${P/_/-}
DESCRIPTION="Music On Console - ncurses interface for playing audio files"
HOMEPAGE="http://moc.daper.net"
SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
IUSE="oss alsa aac jack mad vorbis flac wavpack sndfile modplug musepack
timidity sid ffmpeg speex libsamplerate curl debug"
RDEPEND=">=sys-libs/db-4
alsa? ( media-libs/alsa-lib )
aac? ( media-libs/faad2 )
jack? ( media-sound/jack-audio-connection-kit )
mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
vorbis? ( >=media-libs/libvorbis-1 )
flac? ( media-libs/flac )
wavpack? ( >=media-sound/wavpack-4.31 )
sndfile? ( >=media-libs/libsndfile-1 )
modplug? ( >=media-libs/libmodplug-0.7 )
musepack? ( >=media-sound/musepack-tools-444-r1
>=media-libs/taglib-1.3.1 )
timidity? ( media-libs/libtimidity media-sound/timidity++ )
sid? ( >=media-libs/libsidplay-2 )
ffmpeg? ( media-video/ffmpeg )
speex? ( >=media-libs/speex-1 )
libsamplerate? ( >=media-libs/libsamplerate-0.1 )
curl? ( >=net-misc/curl-7.12.2 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}/${MY_P}_sid_seek.diff"
}
src_configure() {
econf \
--without-rcc \
$(use_with alsa) \
$(use_with oss) \
$(use_with aac) \
$(use_with jack) \
$(use_with mad mp3) \
$(use_with musepack) \
$(use_with vorbis) \
$(use_with flac) \
$(use_with wavpack) \
$(use_with sndfile) \
$(use_with modplug) \
$(use_with timidity) \
$(use_with sid sidplay2) \
$(use_with ffmpeg) \
$(use_with speex) \
$(use_with libsamplerate samplerate) \
$(use_with curl) \
$(use_enable debug)
}
src_install () {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
rm -rf "${D}"/usr/share/doc/${PN}
}