You are not logged in.
- Topics: Active | Unanswered
#1 2005-04-28 20:04:45
- Snowman
- Developer/Forum Fellow
- From: Montreal, Canada
- Registered: 2004-08-20
- Posts: 5,212
[NEW] moreamp : audio player with impressive equalizer
I have submitted moreamp to AUR. It depends on mpeg4ip and portaudio which are both in AUR. Enjoy 8)
P.S.: Here's the PKGBUILDs and patch:
# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
pkgname=moreamp
pkgver=0.1.11
pkgrel=1
pkgdesc="MoreAmp is an audio player with an impressive equalizer."
url="http://sourceforge.net/projects/moreamp/"
license=""
depends=('wxgtk' 'mpeg4ip' 'libmad' 'flac' 'portaudio' 'cdparanoia')
makedepends=('wxgtk' 'mpeg4ip' 'libmad' 'flac' 'portaudio' 'cdparanoia')
source=(http://dl.sourceforge.net/moreamp/MoreAmp-0.1.11-src.tar.gz moreamp.patch)
md5sums=('6d0a1c65c8612ec5e05520d217290aca' 'e9a0a42226c835609d96d4888e845a9d')
build() {
cd $startdir/src/MoreAmp-0.1.11
patch -Np1 -i ../moreamp.patch || return 1
./configure --prefix=/usr --with-mad=system --with-lame=system --with-id3tag=system --with-vorbis=system --with-flac=system --with-faad=system --with-faac=system --with-mp4v2=system --with-mp4v2enc=system --with-portaudio=system --with-cdparanoia=system
make || return 1
install -d $startdir/pkg/usr/bin
install -d $startdir/pkg/usr/share/pixmaps
install -m755 moreamp $startdir/pkg/usr/bin/moreamp
install -m644 src/MoreAmpIcon.xpm $startdir/pkg/usr/share/pixmaps/MoreAmpIcon.xpm
}diff -Naur MoreAmp-0.1.11-orig/src/maApp.cpp MoreAmp-0.1.11/src/maApp.cpp
--- MoreAmp-0.1.11-orig/src/maApp.cpp 2005-04-24 19:16:52.000000000 -0400
+++ MoreAmp-0.1.11/src/maApp.cpp 2005-04-24 20:08:34.000000000 -0400
@@ -45,6 +45,7 @@
#ifdef __MAUNIX__
#include <unistd.h>
+ #include <stdlib.h>
#include <sys/stat.h>
#endif
@@ -900,10 +901,15 @@
#endif
#if defined(__MAUNIX__)
- // on unix wxGetCwd() doesn't seem to
- wxFileName f(g_theApp->argv[0]);
- strcpy(g_homedir, f.GetPath(wxPATH_GET_VOLUME).c_str());
- wxSetWorkingDirectory(g_homedir);
+ // this sets g_homedir to the user's home dir
+ char *p;
+ if ((p = getenv("HOME")))
+ strcpy(g_homedir, p);
+ else
+ {
+ ShowErr("OnInit getenv(HOME) failed, cannot continue");
+ return FALSE;
+ }
#endif
#if defined(__MAOSX__)
diff -Naur MoreAmp-0.1.11-orig/src/maPlayer.c MoreAmp-0.1.11/src/maPlayer.c
--- MoreAmp-0.1.11-orig/src/maPlayer.c 2005-04-24 19:16:52.000000000 -0400
+++ MoreAmp-0.1.11/src/maPlayer.c 2005-04-24 20:32:19.000000000 -0400
@@ -2272,8 +2272,18 @@
seekperiod = TITLEPERIOD; // 1000
}
+#if defined(__MAWIN__)
+ if (WaitCancel(0))
+ goto errorret;
+ Sleep(loopwait);
+#elif defined(__MAUNIX__)
+ if (WaitCancel(0))
+ goto errorret;
+ usleep(loopwait * 1000); // redefine SEEKWAIT and TITLEWAIT to avoid this mult
+#else // __MAOSX__ __MAOS9__
if (WaitCancel(loopwait))
- goto errorret;
+ goto errorret;
+#endif
now = maGetLocalTimeMillis();
@@ -8912,11 +8922,19 @@
g_fifoready = 1;
while (g_fifoready && maFifoToOutput())
{
-#ifndef __MAOS9__
- while(g_pause)
- if (WaitCancel(100))
- break;
+#if defined(__MAWIN__)
+ while(g_pause && !WaitCancel(0))
+ Sleep(100);
+#elif defined(__MAUNIX__)
+ while(g_pause && !WaitCancel(0))
+ usleep(100000);
+#elif defined(__MAOSX__)
+ while(g_pause)
+ if (WaitCancel(100))
+ break;
+ // nothing for __MAOS9__
#endif
+
}
}
@@ -8940,11 +8958,19 @@
{
if (g_state.stop)
return 1;
-#ifndef __MAOS9__
+#if defined(__MAWIN__)
+ while(g_pause && !WaitCancel(0))
+ Sleep(100);
+#elif defined(__MAUNIX__)
+ while(g_pause && !WaitCancel(0))
+ usleep(100000);
+#elif defined(__MAOSX__)
while(g_pause)
- if (WaitCancel(100))
- break;
+ if (WaitCancel(100))
+ break;
+ // nothing for __MAOS9__
#endif
+
}
if (g_state.stop)# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
pkgname=mpeg4ip
pkgver=1.2
pkgrel=1
pkgdesc="MP4 support"
url="http://mpeg4ip.sourceforge.net/"
depends=('ffmpeg' 'gtk2' 'libid3tag' 'id3lib')
source=(http://dl.sourceforge.net/sourceforge/mpeg4ip/$pkgname-$pkgver.tar.gz)
md5sums=('d9c687ec1aaddf17f6462ed5bd35e5d3')
build() {
cd $startdir/src/$pkgname-$pkgver
./bootstrap --prefix=/usr
make || return 1
make DESTDIR=$startdir/pkg install
# removing include files provided by faad2
rm $startdir/pkg/usr/include/{mp4,mp4av,mp4av_aac,mp4av_adts,mp4av_audio,mp4av_hinters,mp4av_mp3,mp4av_mpeg3,mp4av_mpeg4,mpeg4ip}.h
}# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
pkgname=portaudio
pkgver=19
pkgrel=1
pkgdesc="PortAudio is a free, cross platform, open-source, audio I/O library"
url="http://www.portaudio.com/"
license=""
depends=('jack-audio-connection-kit')
makedepends=('jack-audio-connection-kit')
source=(http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz)
md5sums=('6dd968c9860af90e82195a1d4e21150f')
build() {
cd $startdir/src/$pkgname
./configure --prefix=/usr
make || return 1
install -d $startdir/pkg/usr/{lib,include}
make PREFIX=$startdir/pkg/usr install
}Offline
#2 2005-04-28 21:13:16
- polarrr
- Member
- Registered: 2004-09-12
- Posts: 110
Re: [NEW] moreamp : audio player with impressive equalizer
I just noticed the "impressive equalizer" bit 
I got patch error in the beginning
==> tar --use-compress-program=gzip -xf MoreAmp-0.1.11-src.tar.gz
tar: A lone zero block at 151277
==> Starting build()...
patching file src/maApp.cpp
Hunk #2 FAILED at 901.
1 out of 2 hunks FAILED -- saving rejects to file src/maApp.cpp.rej
patching file src/maPlayer.c
Hunk #1 FAILED at 2272.
Hunk #2 FAILED at 8922.
Hunk #3 FAILED at 8958.
3 out of 3 hunks FAILED -- saving rejects to file src/maPlayer.c.rej
==> ERROR: Build Failed. Aborting...Maybe it's just a matter of patch lines..gonna change it and see
Offline
#3 2005-04-28 21:59:28
- Snowman
- Developer/Forum Fellow
- From: Montreal, Canada
- Registered: 2004-08-20
- Posts: 5,212
Re: [NEW] moreamp : audio player with impressive equalizer
Download the patch from AUR and let me know if it work. The one in this thread might have problems with spaces replacing tabs, etc.
Offline
#4 2005-04-28 22:12:31
- polarrr
- Member
- Registered: 2004-09-12
- Posts: 110
Re: [NEW] moreamp : audio player with impressive equalizer
This one is from AUR patch.
==> tar --use-compress-program=gzip -xf MoreAmp-0.1.11-src.tar.gz
tar: A lone zero block at 151277
==> Starting build()...
patching file src/maApp.cpp
patching file src/maPlayer.c
Hunk #1 FAILED at 2272.
Hunk #2 FAILED at 8922.
Hunk #3 FAILED at 8958.
3 out of 3 hunks FAILED -- saving rejects to file src/maPlayer.c.rej
==> ERROR: Build Failed. Aborting...
Offline
#5 2005-04-28 22:24:58
- Snowman
- Developer/Forum Fellow
- From: Montreal, Canada
- Registered: 2004-08-20
- Posts: 5,212
Re: [NEW] moreamp : audio player with impressive equalizer
Remove the src directory from your build directory and try again. I just downloaded the tarball from AUR and the patching works. :?
If you still have problem, post the src/maPlayer.c.rej file.
Offline
#6 2005-04-28 22:33:38
- polarrr
- Member
- Registered: 2004-09-12
- Posts: 110
Re: [NEW] moreamp : audio player with impressive equalizer
Yup got it working. Kind of strange. I deleted src every time I tried to rebuild it and it kept giving me patch errors. So I deleted the whole directory, started it all over again and got it working 
Thank you
Offline
#7 2005-04-28 22:37:47
- Snowman
- Developer/Forum Fellow
- From: Montreal, Canada
- Registered: 2004-08-20
- Posts: 5,212
Re: [NEW] moreamp : audio player with impressive equalizer
Glad that it work.
Offline