svn commit: r380117 - in branches/2015Q1/audio/gkrellmvolume2: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Feb 27 19:18:56 2015
New Revision: 380117
URL: https://svnweb.freebsd.org/changeset/ports/380117
QAT: https://qat.redports.org/buildarchive/r380117/

Log:
  MFH: r378362
  
  - Fix volume reading
  - Remove author from pkg-descr
  - Fix WWW:
  
  PR:		197247
  Submitted by:	amdmi3
  Approved by:	ports-secteam (zi), portmgr (mat)

Modified:
  branches/2015Q1/audio/gkrellmvolume2/Makefile
  branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c
  branches/2015Q1/audio/gkrellmvolume2/pkg-descr
Directory Properties:
  branches/2015Q1/   (props changed)

Modified: branches/2015Q1/audio/gkrellmvolume2/Makefile
==============================================================================
--- branches/2015Q1/audio/gkrellmvolume2/Makefile	Fri Feb 27 19:03:07 2015	(r380116)
+++ branches/2015Q1/audio/gkrellmvolume2/Makefile	Fri Feb 27 19:18:56 2015	(r380117)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gkrellmvolume
 PORTVERSION=	2.1.13
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 PKGNAMESUFFIX=	2

Modified: branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c
==============================================================================
--- branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c	Fri Feb 27 19:03:07 2015	(r380116)
+++ branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c	Fri Feb 27 19:18:56 2015	(r380117)
@@ -1,7 +1,5 @@
-Index: oss_mixer.c
-diff -u -p oss_mixer.c.orig oss_mixer.c
---- oss_mixer.c.orig	Wed May 19 04:39:27 2004
-+++ oss_mixer.c	Wed May 19 04:39:43 2004
+--- oss_mixer.c.orig	2004-08-20 00:07:27.000000000 +0400
++++ oss_mixer.c	2015-02-01 20:21:32.000000000 +0300
 @@ -32,6 +32,9 @@
  #else
    #include <sys/soundcard.h>
@@ -12,3 +10,12 @@ diff -u -p oss_mixer.c.orig oss_mixer.c
  
  #include "mixer.h"
  #include "oss_mixer.h"
+@@ -126,7 +129,7 @@
+   long amount;
+   ioctl(OSSMIXER(mixer)->fd,MIXER_READ(OSSMIXER(mixer)->table[devid]),&amount);
+   *left = amount & 0xff;
+-  *right = amount >> 8;
++  *right = (amount >> 8) & 0xff;
+ }
+ 
+ static void  

Modified: branches/2015Q1/audio/gkrellmvolume2/pkg-descr
==============================================================================
--- branches/2015Q1/audio/gkrellmvolume2/pkg-descr	Fri Feb 27 19:03:07 2015	(r380116)
+++ branches/2015Q1/audio/gkrellmvolume2/pkg-descr	Fri Feb 27 19:18:56 2015	(r380117)
@@ -2,5 +2,4 @@ GKrellM volume plugin
 
 A plugin for gkrellm 2.0, that lets you control your mixer..
 
-Author:  Sjoerd Simons <Sjoerd at donald-duck.ele.tue.nl>
-WWW: http://gkrellm.luon.net/volume.phtml
+WWW: http://gkrellm.luon.net/volume.php