diff options
Diffstat (limited to 'source/ap/soma')
| -rw-r--r-- | source/ap/soma/ChangeLog.txt | 102 | ||||
| -rw-r--r-- | source/ap/soma/README | 106 | ||||
| -rw-r--r-- | source/ap/soma/slack-desc | 8 | ||||
| -rw-r--r-- | source/ap/soma/slack-desc.diff | 26 | ||||
| -rwxr-xr-x | source/ap/soma/soma.SlackBuild | 15 | ||||
| -rw-r--r-- | source/ap/soma/soma.SlackBuild.slack.diff | 49 | ||||
| -rw-r--r-- | source/ap/soma/soma.info | 11 |
7 files changed, 181 insertions, 136 deletions
diff --git a/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt index 53e0860e8..08b8cc47c 100644 --- a/source/ap/soma/ChangeLog.txt +++ b/source/ap/soma/ChangeLog.txt @@ -1,26 +1,70 @@ -====================================================== +============================================================================== +Sun 18 Nov 03:52:51 UTC 2018 +3.2.0 +Add proxy support. +============================================================================== +Fri 16 Nov 00:05:05 UTC 2018 +3.1.1 +Update README +============================================================================== +Wed 14 Nov 22:51:50 UTC 2018 +3.1.0 +Improve timeout check. +============================================================================== +Version 3.0.8 +Precreate 'soma-status'. +Fix indentation. Vim was confused. +Fix killing of orphaned mencoder process if recording failed. +============================================================================== +Version 3.0.7 +Precreate 'soma-playing'. +============================================================================== +Version 3.0.6 +Rename options.conf/stations.conf -> .new +============================================================================== +Version 3.0.5 + +Bugs fixed: + +Finally fixed the flashing window bug with newer versions of dialog. Hopefully. +Sometimes menus were broken after choosing a station from the local genre list. + +Added: + +Recording. See RECORDING.txt or 'soma --record-info | less' for detailed info. + +Changes: + +Some new stations added and dead ones removed. +Removed TAG from the SlackBuild. +Added the doinst.sh.gz from Slackware -current and adjusted the SlackBuild +according to the diff that Pat uses. +============================================================================== +Version 3.0.4 +Somebody stole the ChangeLog. +============================================================================== Version 3.0.3 Add check for empty input in text input box. -====================================================== +============================================================================== Version 3.0.2 Edit purge files function slightly. -====================================================== +============================================================================== Version 3.0.1 Add new theme. Edit purge files function slightly to make it safer. -====================================================== +============================================================================== Version 3.0.0 Fixed BBC Radio 4 and BBC Radio 4 Extra URLs. Add menu options for genres, bookmarks and themes. Add schedules and volume indicators. Add more options for timeformat, caret etc. -====================================================== +============================================================================== Version 2.13.2 Fixes for new dialog in -current. -====================================================== +============================================================================== Version 2.13.1 Bugfix where sometimes station list is broken. -====================================================== +============================================================================== Version 2.13.0 Fix another scheduler bug. Add genre support. @@ -28,17 +72,17 @@ Move Theme option to main menu. Add time format option. Updated all broken BBC URLs. Removed some broken URLs. -====================================================== +============================================================================== Version 2.12.3 Fix scheduler bug. -====================================================== +============================================================================== Version 2.12.2 Fixed some options that were zeroing out if 'back' was pressed. -====================================================== +============================================================================== Version 2.12.1 Fixed missing output devices bug. -====================================================== +============================================================================== Version 2.12.0 Stations added: @@ -65,7 +109,7 @@ starts up so fast now that you just see a flicker. Enhancements: A vast improvement in loading speed due to new method of loading station list. -====================================================== +============================================================================== Version 2.11.3 Added: ABC Oldies,http://orion.shoutca.st:8569 @@ -80,7 +124,7 @@ Floyd Too,http://cirrus.turtil.net:9001 Major code overhaul. Added more themes + themes directory. -====================================================== +============================================================================== Version 2.11.2 Added: Radio Swing @@ -92,55 +136,55 @@ WITR 89.7 KKJZ FM 4625 KHz The Buzzer -====================================================== +============================================================================== Version 2.11.1 Add 3WK and Krypton stations. -====================================================== +============================================================================== Version 2.11.0 Add SAVE_LIST_AT_QUIT option. -====================================================== +============================================================================== Version 2.10.8 Set default CACHE is blank.. -====================================================== +============================================================================== Version 2.10.7 Add CACHE option. -====================================================== +============================================================================== Version 2.10.6 Add HD BBC stations. Support for .m3u8 URLs. -====================================================== +============================================================================== Version 2.10.5 Add function to add SETVOL to config. -====================================================== +============================================================================== Version 2.10.4 Clean up Name finding code. -====================================================== +============================================================================== Version 2.10.3 Fix Names containing colons. -======================================================= +============================================================================== Version 2.10.2 Tidy menu. -======================================================= +============================================================================== Version 2.10.1 Fix bug in mixer selection. -======================================================== +============================================================================== Version 2.10.0 Changed dialog theme back to original way. Added a 'greenrc' theme. -======================================================== +============================================================================== Version 2.9.2 Update stations URLS. Remove dead. -======================================================== +============================================================================== Version 2.9.1 Better station parsing. -======================================================== +============================================================================== Version 2.9.0 Add keyboard sortcuts for volume: keys 1-0 = 10% 20% ... 100% This volume is saved and reapplied on startup. Added a few new somafm stations and a couple of talk radio stations -========================================================= +============================================================================== Version 2.8.9 Use ~/.soma/dialogrc-$VERSION. Some fixes to the station 'tuner' function. -========================================================= +============================================================================== diff --git a/source/ap/soma/README b/source/ap/soma/README index d63eb8d36..20299b6f7 100644 --- a/source/ap/soma/README +++ b/source/ap/soma/README @@ -1,74 +1,102 @@ Soma - a dialog internet radio player -For help/usage see soma -h +Soma is an internet stream audio player. Any URL playable by mplayer +with or without the -playlist option should work. Extra stations can +be added in ~/.soma/stations.conf. -Soma started off as a way to play .pls playlists from SomaFM but can -also play .ram playlists too. In fact any url playable by mplayer -using the -playlist option should work. Extra stations can be added -in ~/.soma/stations.conf (up to 200). +Startup Flags: -Soma uses mplayer to play the streams and aplay to detect cards for -mixer so mplayer and alsa-utils need to be installed. + soma -l Go straight to bookmarks list + soma -b Go straight to stations browser for genre + soma -B Go straight to all stations browser + soma -g Go straight to local genre browser + soma -G Go straight to global genre browser + soma -d To start in debug mode + soma -h Help + soma --record-info Detailed recording info + + Config Files and Directories: + + User: Global: + + ~/.soma/options.conf /etc/soma/options.conf + ~/.soma/stations.conf /etc/soma/stations.conf + ~/.soma/themes/*rc /etc/soma/themes/*rc + ~/.soma/genres/*.conf /etc/soma/genres/*.conf + ~/.soma/bookmarks.conf + ~/.soma/schedules.conf + ~/.soma/recordings/ Key commands supported in status window: -( Volume -5 -) Volume +5 -1 - 0 Volume 10%, 20%, ... 100% (saved) -Space Pause/Play -d Disconnect/Reconnect -a Add schedule -b Station browser -m Mute toggle -s Scheduler -q Quit + 1 - 0 Volume 10% - 100% () Volume -5/+5 + Space Pause ` Volume 0 + a Add schedule A Toggle audio codec info + b Station browser (genre) B Station browser (all) + d Disconnect/Reconnect/Play/Stop D Toggle debug mode + g List genres h List local genres + j Add station to current genre k Bookmark current station + l Open bookmark list m Toggle mute + o Options menu q Quit + s Scheduler menu S Toggle schedules on/off + t Change theme ? Show keys + + Recording: -There are 3 config files: + r Open recording menu R Start/Stop recording -~/.soma/themes/*rcrc Specify the dialog colours. -~/.soma/options.conf A few extra options. -~/.soma/stations.conf User station list. +Dashboard indicators: -There are also: +[S] Schedules are set [-] Schedules are temporarily disabled +[R] A recording is in progress [0-100] Volume or [M] Mute -/etc/soma/options.conf Default options. -/etc/soma/themes/*rc Dialog configs. -/etc/soma/stations.conf Default station list. +Config Files: + +User: Global: + +~/.soma/options.conf /etc/soma/options.conf +~/.soma/stations.conf /etc/soma/stations.conf +~/.soma/bookmarks.conf /etc/soma/themes/*rc +~/.soma/themes/*rc /etc/soma/genres/*.conf +~/.soma/genres/*.conf +~/.soma/schedules.conf Stations should be added to the user list like this: Name,URL -You cannot use a comma , in the name or URL +You cannot use a comma , in the name or the URL. + +User stations are listed before global in all stations list. Custom genre and +theme files can be made and will be listed along with the default set. -I would be glad of any exra radio urls emailed to me so I can add to +I would be glad of any extra radio urls emailed to me so I can add to the default list. NOTES: -The Jack and NAS options for output device will only work if MPlayer is -built against them. +The Jack and NAS options for output device will only work if MPlayer is built +against them. -When changing/selecting soundcard output device you must press space on -the option. Just scrolling down and hitting Enter does nothing. +When changing/selecting soundcard output device you must press space on the +option. Just scrolling down and hitting Enter does nothing. BUGS: -Soma may induce the side effects of general well-being and profound -spiritual satisfaction. +Soma may induce the side effects of general well-being and profound spiritual +satisfaction. http://en.wikipedia.org/wiki/Soma http://en.wikipedia.org/wiki/Soma_(Brave_New_World) REAL BUGS: -Some people might find screen messes up the dialog colours. If you -have this line in ~/.screenrc: +Some people might find screen messes up the dialog colours. If you have this +line in ~/.screenrc: attrcolor b ".I" -You might want to comment it out and try again as it seems to turn off -the bold attribute. +You might want to comment it out and try again as it seems to turn off the bold +attribute. See the screen man page for more info. -Please mail me at dave@dawoodfall.net for new radio urls or bug -reports etc. +Please mail me at dave@dawoodfall.net for new radio urls or bug reports etc. diff --git a/source/ap/soma/slack-desc b/source/ap/soma/slack-desc index 1130b4403..8b4868ff0 100644 --- a/source/ap/soma/slack-desc +++ b/source/ap/soma/slack-desc @@ -6,12 +6,12 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -soma: Soma - a command line/dialog internet radio player +soma: soma (a dialog/MPlayer internet radio player and recorder) soma: -soma: Soma is a frontend for mplayer to play radio playlists pls,m3u and -soma: ram. More will be added as it progresses. +soma: Soma handles playing any internet audio stream supported by MPlayer. +soma: It also supports playlists such as pls,m3u and ram. soma: -soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma +soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma soma: soma: soma: diff --git a/source/ap/soma/slack-desc.diff b/source/ap/soma/slack-desc.diff new file mode 100644 index 000000000..8e7d18007 --- /dev/null +++ b/source/ap/soma/slack-desc.diff @@ -0,0 +1,26 @@ +--- slack-desc.orig 2018-11-15 18:52:49.000000000 -0600 ++++ slack-desc 2018-11-28 16:37:00.644976546 -0600 +@@ -1,17 +1,17 @@ + # HOW TO EDIT THIS FILE: +-# The "handy ruler" below makes it easier to edit a package description. Line ++# The "handy ruler" below makes it easier to edit a package description. Line + # up the first '|' above the ':' following the base package name, and the '|' +-# on the right side marks the last column you can put a character in. You must +-# make exactly 11 lines for the formatting to be correct. It's also ++# on the right side marks the last column you can put a character in. You must ++# make exactly 11 lines for the formatting to be correct. It's also + # customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +-soma: Soma - a dialog/mplayer internet radio player and recorder. ++soma: soma (a dialog/MPlayer internet radio player and recorder) + soma: +-soma: Soma handles playing any internet audio stream supported by mplayer. ++soma: Soma handles playing any internet audio stream supported by MPlayer. + soma: It also supports playlists such as pls,m3u and ram. + soma: +-soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma ++soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma + soma: + soma: + soma: diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild index d8c6e961e..94250798e 100755 --- a/source/ap/soma/soma.SlackBuild +++ b/source/ap/soma/soma.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for soma # (C) 2010 David Woodfall <dave@dawoodfall.net> -# TMPROOT modification (C) Patrick Volkerding with thanks +# Modifications (C) Patrick Volkerding # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,10 +25,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=soma -VERSION=${VERSION:-3.0.4} +VERSION=${VERSION:-3.2.0} ARCH=noarch BUILD=${BUILD:-1} -#TAG=${TAG:-daw} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -62,17 +61,15 @@ mkdir -p $PKG/usr/bin $PKG/etc/soma/themes \ $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION install -m 755 soma $PKG/usr/bin/soma -install -m 644 options.conf $PKG/etc/soma/options.conf.new -install -m 644 stations.conf $PKG/etc/soma/stations.conf.new +install -m 644 options.conf.new $PKG/etc/soma +install -m 644 stations.conf.new $PKG/etc/soma install -m 644 themes/* $PKG/etc/soma/themes install -m 644 genres/* $PKG/etc/soma/genres -cp -a \ - $CWD/README $CWD/ChangeLog.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} diff --git a/source/ap/soma/soma.SlackBuild.slack.diff b/source/ap/soma/soma.SlackBuild.slack.diff deleted file mode 100644 index 71dfbcd0d..000000000 --- a/source/ap/soma/soma.SlackBuild.slack.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- soma.SlackBuild.orig 2018-03-05 23:58:06.000000000 -0600 -+++ soma.SlackBuild 2018-06-04 23:45:17.325657453 -0500 -@@ -22,13 +22,22 @@ - # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -+cd $(dirname $0) ; CWD=$(pwd) -+ - PRGNAM=soma - VERSION=${VERSION:-3.0.4} - ARCH=noarch - BUILD=${BUILD:-1} --TAG=${TAG:-daw} -+#TAG=${TAG:-daw} -+ -+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -+# the name of the created package would be, and then exit. This information -+# could be useful to other scripts. -+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then -+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}" -+ exit 0 -+fi - --CWD=$(pwd) - TMP=${TMP:-/tmp/daw} - PKG=$TMP/package-$PRGNAM - OUTPUT=${OUTPUT:-/tmp} -@@ -53,8 +62,8 @@ - $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION - - install -m 755 soma $PKG/usr/bin/soma --install -m 644 options.conf $PKG/etc/soma --install -m 644 stations.conf $PKG/etc/soma -+install -m 644 options.conf $PKG/etc/soma/options.conf.new -+install -m 644 stations.conf $PKG/etc/soma/stations.conf.new - install -m 644 themes/* $PKG/etc/soma/themes - install -m 644 genres/* $PKG/etc/soma/genres - -@@ -62,8 +71,8 @@ - $CWD/README $CWD/ChangeLog.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION - --cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - cat $CWD/slack-desc > $PKG/install/slack-desc -+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - - cd $PKG --/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} -+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info index 82cd97821..9064b6f13 100644 --- a/source/ap/soma/soma.info +++ b/source/ap/soma/soma.info @@ -1,11 +1,10 @@ PRGNAM="soma" -VERSION="3.0.4" -HOMEPAGE="http://www.dawoodfall.net/slackbuilds/noversion/soma/" -DOWNLOAD="http://www.dawoodfall.net/slackbuilds/noversion/soma/soma-3.0.4.tar.gz" -MD5SUM="f99857601879ab2a651f298304069716" +VERSION="3.2.0" +HOMEPAGE="http://dawoodfall.net/slackbuilds/noversion/soma/" +DOWNLOAD="http://unrealize.co.uk/source/soma-3.2.0.tar.gz" +MD5SUM="9a24b9dcb2a604c26cc32767758dfdc1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -MAIL="dave@dawoodfall.net" -APPROVED="Me!" +EMAIL="dave@dawoodfall.net" |