mpg321: Always init the main_lock semaphore trunk
authorleot <leot@pkgsrc.org>
Sun, 08 Jul 2018 13:42:13 +0000
branchtrunk
changeset 310237 81dac8852f7d
parent 310236 267e7b2b73a4
child 310238 5b73f4b8216a
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
audio/mpg321/Makefile
audio/mpg321/distinfo
audio/mpg321/patches/patch-mpg321.c
--- a/audio/mpg321/Makefile	Sun Jul 08 12:55:00 2018 +0000
+++ b/audio/mpg321/Makefile	Sun Jul 08 13:42:13 2018 +0000
@@ -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/}
 
--- a/audio/mpg321/distinfo	Sun Jul 08 12:55:00 2018 +0000
+++ b/audio/mpg321/distinfo	Sun Jul 08 13:42:13 2018 +0000
@@ -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
--- a/audio/mpg321/patches/patch-mpg321.c	Sun Jul 08 12:55:00 2018 +0000
+++ b/audio/mpg321/patches/patch-mpg321.c	Sun Jul 08 13:42:13 2018 +0000
@@ -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 @@
      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);
+ 	     }