Update to snapshot dated 2012.03.17

This commit is contained in:
dcoppa 2012-03-20 14:27:45 +00:00
parent 8372c80d95
commit 1d4efb175e
4 changed files with 11 additions and 47 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.28 2012/03/02 11:42:56 dcoppa Exp $
# $OpenBSD: Makefile,v 1.29 2012/03/20 14:27:45 dcoppa Exp $
COMMENT = console client for pandora
DISTNAME = pianobar-2012.01.20
REVISION = 0
DISTNAME = pianobar-2012.03.17
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio

View File

@ -1,5 +1,5 @@
MD5 (pianobar-2012.01.20.tar.bz2) = cs35BMqzCCr7ksNHI7eeCg==
RMD160 (pianobar-2012.01.20.tar.bz2) = T6v0rsmNSqvx4vhYcczBQNt2hzM=
SHA1 (pianobar-2012.01.20.tar.bz2) = aFOCvYDRTwX37BA+Qp2CWBijjH8=
SHA256 (pianobar-2012.01.20.tar.bz2) = 5Y/ftljuNsk6Ev6veZVM42I7VoDk7RgQS3ocDdqd9VU=
SIZE (pianobar-2012.01.20.tar.bz2) = 68879
MD5 (pianobar-2012.03.17.tar.bz2) = HjefgJGmlzCygExCfmGCpw==
RMD160 (pianobar-2012.03.17.tar.bz2) = 2NbVE+45T3bJNWa2zUJza+hO1hM=
SHA1 (pianobar-2012.03.17.tar.bz2) = 2WliJwhIoa5swtRXmgAGlNwIdiM=
SHA256 (pianobar-2012.03.17.tar.bz2) = SZNtXyN+SsqNe3fuVVlhc05os2Yz305i2EaLlhdTWRs=
SIZE (pianobar-2012.03.17.tar.bz2) = 69272

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_player_c,v 1.7 2011/07/10 11:01:05 dcoppa Exp $
$OpenBSD: patch-src_player_c,v 1.8 2012/03/20 14:27:45 dcoppa Exp $
Add missing include
Our faad port uses a patched neaacdec.h header
--- src/player.c.orig Sat Jul 9 10:40:54 2011
+++ src/player.c Sun Jul 10 12:40:48 2011
--- src/player.c.orig Tue Mar 20 14:47:07 2012
+++ src/player.c Tue Mar 20 14:54:05 2012
@@ -28,6 +28,7 @@ THE SOFTWARE.
#include <math.h>
#include <stdint.h>
@ -14,7 +14,7 @@ Our faad port uses a patched neaacdec.h header
#include <arpa/inet.h>
#include "player.h"
@@ -186,7 +187,7 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, s
@@ -187,7 +188,7 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, s
/* +1+4 needs to be replaced by <something>! */
player->bufferRead += 1+4;
char err = NeAACDecInit2 (player->aacHandle, player->buffer +

View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_ui_c,v 1.7 2012/03/02 11:42:56 dcoppa Exp $
Don't use custom format output as format string: fixes a segmentation
fault when searching for a station named '%'
(upstream git commit e6a87e15043767c0f1f00a62110e4bbb53de4ece)
--- src/ui.c.orig Fri Mar 2 12:33:15 2012
+++ src/ui.c Fri Mar 2 12:34:56 2012
@@ -709,7 +709,7 @@ inline void BarUiPrintStation (const BarSettings_t *se
BarUiCustomFormat (outstr, sizeof (outstr), settings->npStationFormat,
"ni", vals);
BarUiAppendNewline (outstr, sizeof (outstr));
- BarUiMsg (settings, MSG_PLAYING, outstr);
+ BarUiMsg (settings, MSG_PLAYING, "%s", outstr);
}
/* Print song infos (artist, title, album, loved)
@@ -729,7 +729,7 @@ inline void BarUiPrintSong (const BarSettings_t *setti
BarUiCustomFormat (outstr, sizeof (outstr), settings->npSongFormat,
"talr@su", vals);
BarUiAppendNewline (outstr, sizeof (outstr));
- BarUiMsg (settings, MSG_PLAYING, outstr);
+ BarUiMsg (settings, MSG_PLAYING, "%s", outstr);
}
/* Print list of songs
@@ -756,7 +756,7 @@ size_t BarUiListSongs (const BarSettings_t *settings,
BarUiCustomFormat (outstr, sizeof (outstr), settings->listSongFormat,
"iatr", vals);
BarUiAppendNewline (outstr, sizeof (outstr));
- BarUiMsg (settings, MSG_LIST, outstr);
+ BarUiMsg (settings, MSG_LIST, "%s", outstr);
}
i++;
song = song->next;