summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/pianobar/Makefile.diff21
-rw-r--r--audio/pianobar/pianobar.SlackBuild2
-rw-r--r--audio/pianobar/pianobar.info6
-rw-r--r--audio/pianobar/pianobarctl20
4 files changed, 34 insertions, 15 deletions
diff --git a/audio/pianobar/Makefile.diff b/audio/pianobar/Makefile.diff
index 2faefac08d..2756b57cfd 100644
--- a/audio/pianobar/Makefile.diff
+++ b/audio/pianobar/Makefile.diff
@@ -1,7 +1,7 @@
-diff -ru pianobar-2011.07.09-orig/Makefile pianobar-2011.07.09/Makefile
---- pianobar-2011.07.09-orig/Makefile 2011-07-09 04:40:54.000000000 -0400
-+++ pianobar-2011.07.09/Makefile 2011-07-09 23:23:28.000000000 -0400
-@@ -7,13 +7,7 @@
+diff -Naur pianobar-2013.09.15-orig/Makefile pianobar-2013.09.15/Makefile
+--- pianobar-2013.09.15-orig/Makefile 2013-09-15 09:54:04.000000000 -0400
++++ pianobar-2013.09.15/Makefile 2013-09-27 23:54:19.406220780 -0400
+@@ -7,20 +7,7 @@
MANDIR:=${PREFIX}/share/man
DYNLINK:=0
@@ -10,9 +10,16 @@ diff -ru pianobar-2011.07.09-orig/Makefile pianobar-2011.07.09/Makefile
- CFLAGS=-O2 -DNDEBUG
-endif
-ifeq (${CC},cc)
-- CC=c99
+- OS := $(shell uname)
+- ifeq (${OS},Darwin)
+- CC=gcc -std=c99
+- else ifeq (${OS},FreeBSD)
+- CC=cc -std=c99
+- else
+- CC=c99
+- endif
-endif
+CFLAGS+=-std=c99 -O2 -DNDEBUG
- PIANOBAR_DIR=src
- PIANOBAR_SRC=\
+ PIANOBAR_DIR:=src
+ PIANOBAR_SRC:=\
diff --git a/audio/pianobar/pianobar.SlackBuild b/audio/pianobar/pianobar.SlackBuild
index 6266231621..8423cc4ee3 100644
--- a/audio/pianobar/pianobar.SlackBuild
+++ b/audio/pianobar/pianobar.SlackBuild
@@ -4,7 +4,7 @@
# Written by Phillip Warner <pc_warner@yahoo.com>
PRGNAM=pianobar
-VERSION=${VERSION:-2012.12.01}
+VERSION=${VERSION:-2013.09.15}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/audio/pianobar/pianobar.info b/audio/pianobar/pianobar.info
index 388ab82678..43f1ed96f5 100644
--- a/audio/pianobar/pianobar.info
+++ b/audio/pianobar/pianobar.info
@@ -1,8 +1,8 @@
PRGNAM="pianobar"
-VERSION="2012.12.01"
+VERSION="2013.09.15"
HOMEPAGE="http://6xq.net/projects/pianobar/"
-DOWNLOAD="http://6xq.net/static/projects/pianobar/pianobar-2012.12.01.tar.bz2"
-MD5SUM="50e30dffccea07fc8855112f27eceac4"
+DOWNLOAD="http://6xq.net/static/projects/pianobar/pianobar-2013.09.15.tar.bz2"
+MD5SUM="9b5cb5cc31739cfc4bc1851dcbab78b7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="json-c faad2"
diff --git a/audio/pianobar/pianobarctl b/audio/pianobar/pianobarctl
index ccc99d07a5..619ff0c5a0 100644
--- a/audio/pianobar/pianobarctl
+++ b/audio/pianobar/pianobarctl
@@ -4,7 +4,10 @@
# This script uses a specified named pipe (FIFO) to control pianobar.
# Written by Phillip Warner
-VERSION=0.1
+VERSION=0.2
+# - Updated for new play and "stop" (pause only) controls
+# added to pianobar starting at version 2013.05.19
+# - Added quit option
# This is the FIFO that is used to control pianobar
# It must exist before running pianobar in order for remote control to work
@@ -13,8 +16,11 @@ PIANOBARCTL=~/.config/pianobar/ctl
# Control Functions
NEXT="n"
PLAYPAUSE="p"
+PLAY="P"
+PAUSE="S"
LOVE="+"
BAN="-"
+QUIT="q"
set -e
@@ -26,10 +32,12 @@ usage() {
echo "The script's parameters are:"
echo " -h, --help Help"
echo " -n, --next Play Next"
- echo " -p, --pause Play / Pause"
- echo " -x, --play Play / Pause"
+ echo " -p, --pause Toggle Play / Pause"
+ echo " -x, --play Play"
+ echo " -v, --stop Pause"
echo " -l, --love Love Song"
echo " -b, --ban Ban Song"
+ echo " -q, --quit Quit Program"
echo
echo "Current pianobar PIDs (euid=$(id -u)):"
pgrep -u $(id -u) pianobar$
@@ -55,12 +63,16 @@ then
;;
-p|--pause ) echo -n $PLAYPAUSE > $PIANOBARCTL
;;
- -x|--play ) echo -n $PLAYPAUSE > $PIANOBARCTL
+ -x|--play ) echo -n $PLAY > $PIANOBARCTL
+ ;;
+ -v|--stop ) echo -n $PAUSE > $PIANOBARCTL
;;
-l|--love ) echo -n $LOVE > $PIANOBARCTL
;;
-b|--ban ) echo -n $BAN > $PIANOBARCTL
;;
+ -q|--quit ) echo -n $QUIT > $PIANOBARCTL
+ ;;
* ) usage
;;
esac