Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sound
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5843
Added Files:
moc.info moc.patch
Log Message:
new package moc 2.4.4 from Requests
https://sourceforge.net/p/fink/package-requests/983/
--- NEW FILE: moc.patch ---
diff -ruN moc-2.4.4-orig/configure moc-2.4.4/configure
--- moc-2.4.4-orig/configure 2009-01-04 03:28:51.000000000 -0500
+++ moc-2.4.4/configure 2013-06-14 17:25:41.000000000 -0400
@@ -7337,7 +7337,7 @@
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ export_dynamic_flag_spec=''
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience
'"$wlarc"'--no-whole-archive'
@@ -13929,7 +13929,7 @@
;;
esac
-LDFLAGS="$LDFLAGS -export-dynamic"
+LDFLAGS="$LDFLAGS"
{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
diff -ruN moc-2.4.4-orig/main.c moc-2.4.4/main.c
--- moc-2.4.4-orig/main.c 2006-02-12 06:55:10.000000000 -0500
+++ moc-2.4.4/main.c 2013-06-14 17:25:04.000000000 -0400
@@ -264,38 +264,40 @@
printf (PACKAGE_STRING"\n"
"Usage:\n"
"%s [OPTIONS]... [FILE]...\n"
-"-V --version Print program version and exit.\n"
-"-h --help Print usage and exit.\n"
+"-V --version Print program version and exit.\n"
+"-h --help Print usage and exit.\n"
#ifndef NDEBUG
-"-D --debug Turn on logging to a file.\n"
+"-D --debug Turn on logging to a file.\n"
#endif
-"-S --server Run only the server.\n"
-"-F --foreground Run server in foreground, log to stdout.\n"
-"-R --sound-driver NAME Use the specified sound driver (oss, alsa, jack,
null).\n"
-"-m --music-dir Start in MusicDir.\n"
-"-a --append Append the files/directories/playlists passed in\n"
-" the command line to playlist and exit.\n"
-"-c --clear Clear the playlist and exit.\n"
-"-p --play Start playing from the first item on the playlist.\n"
-"-l --playit Play files given on command line without modifing
the\n"
-" playlist.\n"
-"-s --stop Stop playing.\n"
-"-f --next Play next song.\n"
-"-r --previous Play previous song.\n"
-"-x --exit Shutdown the server.\n"
-"-T --theme theme Use selected theme file (read from ~/.moc/themes if\n"
-" the path is not absolute.\n"
-"-C --config FILE Use the specified config file instead of the
default.\n"
-"-M --moc-dir DIR Use the specified MOC directory instead of the
default.\n"
-"-P --pause Pause.\n"
-"-U --unpause Unpause.\n"
-"-G --toggle-pause Toggle between play/pause.\n"
-"-y --sync Synchronize the playlist with other clients.\n"
-"-n --nosync Don't synchronize the playlist with other clients.\n"
-"-A --ascii Use ASCII characters to draw lines.\n"
-"-i --info Print the information about the currently played
file.\n"
-"-e --recursively Alias for -a.\n"
-"-k --seek N Seek by N seconds (can be negative).\n"
+"-S --server Run only the server.\n"
+"-F --foreground Run server in foreground, log to stdout.\n"
+"-R --sound-driver NAME Use the specified sound driver (oss, alsa, jack,
null).\n"
+"-j --autostart-jackd Start jackd on server init, and close it on
server exit.\n"
+"-J --no-autostart-jackd Do not start jackd on server init, and not close
it on server exit.\n"
+"-m --music-dir Start in MusicDir.\n"
+"-a --append Append the files/directories/playlists passed
in\n"
+" the command line to playlist and exit.\n"
+"-c --clear Clear the playlist and exit.\n"
+"-p --play Start playing from the first item on the
playlist.\n"
+"-l --playit Play files given on command line without
modifing the\n"
+" playlist.\n"
+"-s --stop Stop playing.\n"
+"-f --next Play next song.\n"
+"-r --previous Play previous song.\n"
+"-x --exit Shutdown the server.\n"
+"-T --theme theme Use selected theme file (read from ~/.moc/themes
if\n"
+" the path is not absolute.\n"
+"-C --config FILE Use the specified config file instead of the
default.\n"
+"-M --moc-dir DIR Use the specified MOC directory instead of the
default.\n"
+"-P --pause Pause.\n"
+"-U --unpause Unpause.\n"
+"-G --toggle-pause Toggle between play/pause.\n"
+"-y --sync Synchronize the playlist with other clients.\n"
+"-n --nosync Don't synchronize the playlist with other
clients.\n"
+"-A --ascii Use ASCII characters to draw lines.\n"
+"-i --info Print the information about the currently played
file.\n"
+"-e --recursively Alias for -a.\n"
+"-k --seek N Seek by N seconds (can be negative).\n"
, prg_name);
}
@@ -410,6 +412,8 @@
{ "info", 0, NULL, 'i' },
{ "recursively", 0, NULL, 'e' },
{ "seek", 1, NULL, 'k' },
+ { "autostart-jackd", 0, NULL, 'j' },
+ { "no-autostart-jackd", 0, NULL, 'J' },
{ 0, 0, 0, 0 }
};
int ret, opt_index = 0;
@@ -420,7 +424,7 @@
options_init ();
while ((ret = getopt_long(argc, argv,
- "VhDSFR:macpsxT:C:M:PUynArfiGelk:",
+ "VhDSFR:macpsxT:C:M:PUynArfiGelk:jJ",
long_options, &opt_index)) != -1) {
switch (ret) {
case 'V':
@@ -446,6 +450,14 @@
option_set_str ("SoundDriver", optarg);
option_ignore_config ("SoundDriver");
break;
+ case 'j':
+ option_set_int ("AutoStartJackd", 1);
+ option_ignore_config ("AutoStartJackd");
+ break;
+ case 'J':
+ option_set_int ("AutoStartJackd", 0);
+ option_ignore_config ("AutoStartJackd");
+ break;
case 'm':
option_set_int ("StartInMusicDir", 1);
option_ignore_config ("StartInMusicDir");
diff -ruN moc-2.4.4-orig/options.c moc-2.4.4/options.c
--- moc-2.4.4-orig/options.c 2007-05-22 14:24:34.000000000 -0400
+++ moc-2.4.4/options.c 2013-06-14 17:25:07.000000000 -0400
@@ -172,8 +172,8 @@
option_add_int ("SyncPlaylist", 1);
option_add_int ("InputBuffer", 512);
option_add_int ("Prebuffering", 64);
- option_add_str ("JackOutLeft", "alsa_pcm:playback_1");
- option_add_str ("JackOutRight", "alsa_pcm:playback_2");
+ option_add_str ("JackOutLeft", "system:playback_1");
+ option_add_str ("JackOutRight", "system:playback_2");
option_add_int ("ASCIILines", 0);
option_add_str ("FastDir1", NULL);
option_add_str ("FastDir2", NULL);
@@ -217,6 +217,10 @@
option_add_int ("SetXtermTitle", 1);
option_add_int ("PlaylistFullPaths", 1);
option_add_int ("Allow24bitOutput", 0);
+
+ // Option to start Jackd on server init
+ option_add_int ("AutoStartJackd", 1);
+
}
/* Return 1 if a parameter to an integer option is valid. */
@@ -243,6 +247,7 @@
|| !strcasecmp(name, "SetXtermTitle")
|| !strcasecmp(name, "PlaylistFullPaths")
|| !strcasecmp(name, "Allow24bitOutput")
+ || !strcasecmp(name, "AutoStartJackd")
) {
if (!(val == 1 || val == 0))
return 0;
diff -ruN moc-2.4.4-orig/server.c moc-2.4.4/server.c
--- moc-2.4.4-orig/server.c 2006-02-12 06:55:10.000000000 -0500
+++ moc-2.4.4/server.c 2013-06-14 17:25:04.000000000 -0400
@@ -48,6 +48,7 @@
#define SERVER_LOG "mocp_server_log"
#define PID_FILE "pid"
+#define JACKD_PATH "@FINK_PREFIX@/bin/jackd"
struct client
{
@@ -324,6 +325,34 @@
if (listen(server_sock, 1) == -1)
fatal ("listen() failed: %s", strerror(errno));
+
+ /******* JACKd init ********/
+ if(options_get_int ("AutoStartJackd")){
+ int res;
+ pid_t pid;
+
+ pid = fork();
+ if (pid == (pid_t)-1) {
+ perror("I can't start JACK\n");
+ res=1;
+ }
+ if (pid == 0) {
+ printf("Starting JACKd");
+ execl(JACKD_PATH,JACKD_PATH,"-R","-T","--silent","-d",
"coreaudio",0);
+
+ _exit(1);
+ }
+ else{
+ res=0;
+ }
+
+ if(!res){
+ sleep(1);
+ }
+ }
+ /***************************************/
+
+
audio_initialize ();
tags_cache_init (&tags_cache, options_get_int("TagsCacheSize") * 1024);
tags_cache_load (&tags_cache, create_file_name("tags_cache"));
--- NEW FILE: moc.info ---
Package: moc
Version: 2.4.4
Revision: 1
Description: Console audio player
License: GPL
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
Depends: <<
jack-shlibs,
libcurl4-shlibs,
libflac8,
libiconv,
libid3tag-shlibs,
libmad-shlibs,
libmpcdec5-shlibs,
libncursesw5-shlibs,
libogg-shlibs,
libsamplerate0-shlibs,
libsndfile1-shlibs,
libspeex1-shlibs,
libtool2-shlibs,
libvorbis0-shlibs,
taglib-shlibs
<<
BuildDepends: <<
fink-package-precedence,
jack-dev,
libcurl4,
libflac8-dev,
libiconv-dev,
libid3tag,
libmad,
libmpcdec5,
libncurses5,
libncursesw5,
libogg,
libsamplerate0-dev,
libsndfile1-dev,
libspeex1,
libtool2,
libvorbis0,
pkgconfig,
taglib
<<
Source: http://ftp.daper.net/pub/soft/%n/stable/%n-%v.tar.bz2
Source-MD5: 647c770a5542a4ae5437386807a89796
Source-Checksum: SHA1(e56ee13aa17c177f0afc42efe3804ebbbf46d4db)
PatchFile: %n.patch
PatchFile-MD5: 5a94568681dac3c706aa4a9238920ff2
PatchScript: <<
sed 's|@FINK_PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
ConfigureParams: --enable-dependency-tracking
CompileScript: <<
%{default_script}
fink-package-precedence .
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README THANKS TODO
Homepage: http://moc.daper.net/
DescDetail: <<
MOC (music on console) is a console audio player for LINUX/UNIX
designed to be powerful and easy to use.
You just need to select a file from some directory using the menu
similar to Midnight Commander, and MOC will start playing all files
in this directory beginning from the chosen file. There is no need
to create playlists as in other players.
However if you want to combine some files from one or more directories
on one playlist, you can still do it. The playlist will be remembered
between runs or you can save it as an m3u file and load it whenever you
want.
Need the console where MOC is running for more important things? Need to
close the X terminal emulator? You don't have to stop listening to the
music - just press q and the interface will be detached leaving the
server running. You can reattach it later, or you can attach one interface
in the console, and another in the X terminal emulator, no need to switch
just to play another file.
<<
DescUsage: <<
mocp uses jackd as the default audio server. To automatically start the
jackd server,
mocp -j [-m MUSIC DIR]
When finished: 'q' to disconnect the frontend, and then 'mocp -x' to kill
the server.
Config file goes in ~/.moc/config. See %p/share/doc/moc/config.example
for a sample file.
<<
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
