diff options
| author | leot <leot@pkgsrc.org> | 2018-07-08 13:42:13 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-07-08 13:42:13 +0000 |
| commit | 720007fff6eb01f4cad200ebcdcc39db5e000ff2 (patch) | |
| tree | 12eaf5bedac614e232c208432487ec1eb0974e98 /audio/mpg321 | |
| parent | 2c9b33d699441f68c1129c456a4e3aeb612171a8 (diff) | |
| download | pkgsrc-720007fff6eb01f4cad200ebcdcc39db5e000ff2.tar.gz | |
mpg321: Always init the main_lock semaphore
The changes in mpg321-0.3.2nb1 actually fixed PR pkg/53369 but accidentally
broke support for `-K' option.
Bump PKGREVISION
Diffstat (limited to 'audio/mpg321')
| -rw-r--r-- | audio/mpg321/Makefile | 4 | ||||
| -rw-r--r-- | audio/mpg321/distinfo | 4 | ||||
| -rw-r--r-- | audio/mpg321/patches/patch-mpg321.c | 24 |
3 files changed, 19 insertions, 13 deletions
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile index 6e4bfdbe0c5..313cb3a82c2 100644 --- a/audio/mpg321/Makefile +++ b/audio/mpg321/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2018/06/16 14:43:21 leot Exp $ +# $NetBSD: Makefile,v 1.21 2018/07/08 13:42:13 leot Exp $ DISTNAME= mpg321_0.3.2.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg321/} diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo index 276a7fae2b7..6b0f6efdc17 100644 --- a/audio/mpg321/distinfo +++ b/audio/mpg321/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2018/06/16 14:43:21 leot Exp $ +$NetBSD: distinfo,v 1.10 2018/07/08 13:42:13 leot Exp $ SHA1 (mpg321_0.3.2.orig.tar.gz) = bf1c22542c86af69267828e45f217fdeb49e5d43 RMD160 (mpg321_0.3.2.orig.tar.gz) = 04ea36c893bbe6fb0054a7fcd71294927cf70ac9 SHA512 (mpg321_0.3.2.orig.tar.gz) = f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234 Size (mpg321_0.3.2.orig.tar.gz) = 151139 bytes SHA1 (patch-ao.c) = cb404acdfb032c5a823c717965d14319db0d4466 -SHA1 (patch-mpg321.c) = c874219aa316899af42d5984ca06860642260d4b +SHA1 (patch-mpg321.c) = 74ee0501db20e2d427c79a4a4f1f418ab05d8fd6 diff --git a/audio/mpg321/patches/patch-mpg321.c b/audio/mpg321/patches/patch-mpg321.c index f76d9f4a51a..bea61cba29a 100644 --- a/audio/mpg321/patches/patch-mpg321.c +++ b/audio/mpg321/patches/patch-mpg321.c @@ -1,4 +1,4 @@ -$NetBSD: patch-mpg321.c,v 1.2 2018/06/16 14:43:21 leot Exp $ +$NetBSD: patch-mpg321.c,v 1.3 2018/07/08 13:42:13 leot Exp $ - Ensure structs are zero'd before use. - Do not unlock uninitialized main_lock @@ -13,12 +13,18 @@ $NetBSD: patch-mpg321.c,v 1.2 2018/06/16 14:43:21 leot Exp $ playbuf.pl = pl = new_playlist(); if (!pl) -@@ -750,8 +751,6 @@ int main(int argc, char *argv[]) - if (tcgetattr(0, &terminal_settings) < 0) - perror("tcgetattr()"); - memcpy(&old_terminal_settings, &terminal_settings, sizeof(struct termios)); -- /* Early thread start */ -- sem_post(&main_lock); - } +@@ -728,12 +729,13 @@ int main(int argc, char *argv[]) + // options.volume = mad_f_tofixed((long)100.0/100.0); } - /* Play the mpeg files or zip it! */ + ++ sem_init(&main_lock,0,0); ++ + if (!(options.opt & MPG321_REMOTE_PLAY)) + { + if(options.opt & MPG321_ENABLE_BASIC) + { + /* Now create and detach the basic controls thread */ +- sem_init(&main_lock,0,0); + pthread_create(&keyb_thread,NULL,read_keyb,NULL); + pthread_detach(keyb_thread); + } |