CVS commit: pkgsrc/audio/xmix

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Tue Jul 16 10:46:45 UTC 2019

Modified Files:
        pkgsrc/audio/xmix: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/xmix/patches: patch-Imakefile patch-xmix.c
Removed Files:
        pkgsrc/audio/xmix/patches: patch-aa patch-ab

Log Message:
xmix: Failed to build with RELRO option

- Honor LDFLAGS
- Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/xmix/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/xmix/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/xmix/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/xmix/patches/patch-Imakefile \
    pkgsrc/audio/xmix/patches/patch-xmix.c
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/xmix/patches/patch-aa
cvs rdiff -u -r1.7 -r0 pkgsrc/audio/xmix/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/xmix/Makefile
diff -u pkgsrc/audio/xmix/Makefile:1.28 pkgsrc/audio/xmix/Makefile:1.29
--- pkgsrc/audio/xmix/Makefile:1.28     Wed Apr 20 12:10:34 2016
+++ pkgsrc/audio/xmix/Makefile  Tue Jul 16 10:46:45 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2016/04/20 12:10:34 nros Exp $
+# $NetBSD: Makefile,v 1.29 2019/07/16 10:46:45 micha Exp $
 
 DISTNAME=              xmix-2.1
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 

Index: pkgsrc/audio/xmix/PLIST
diff -u pkgsrc/audio/xmix/PLIST:1.2 pkgsrc/audio/xmix/PLIST:1.3
--- pkgsrc/audio/xmix/PLIST:1.2 Sun Nov  6 23:58:05 2005
+++ pkgsrc/audio/xmix/PLIST     Tue Jul 16 10:46:45 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/11/06 23:58:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/07/16 10:46:45 micha Exp $
 bin/xmix
 lib/X11/app-defaults/XMix
-${IMAKE_MAN_DIR}/xmix.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xmix.1

Index: pkgsrc/audio/xmix/distinfo
diff -u pkgsrc/audio/xmix/distinfo:1.9 pkgsrc/audio/xmix/distinfo:1.10
--- pkgsrc/audio/xmix/distinfo:1.9      Tue Nov  3 01:12:55 2015
+++ pkgsrc/audio/xmix/distinfo  Tue Jul 16 10:46:45 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:12:55 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/07/16 10:46:45 micha Exp $
 
-SHA1 (xmix-2.1.tar.gz) = 390096a541a41ffb47c9b57ee6029211d31393d3
-RMD160 (xmix-2.1.tar.gz) = 0f1bc15b89bfc657ade9b12cb9decb248d780925
-SHA512 (xmix-2.1.tar.gz) = 1acdb835ed5791b7642910909ea932c9750935d795e14dcc88da011ece8e303e20610945f8f7382b4e141311de42c16df2626d8b313bf187ee08f7bfcfa1b988
-Size (xmix-2.1.tar.gz) = 34835 bytes
 SHA1 (xmix-2.1.mixers.patch) = 86b423774a6afcd56a8f8931108823d702db1ea5
 RMD160 (xmix-2.1.mixers.patch) = bbbc4b44ed603e54044fc1c71fa20f4373cae81a
 SHA512 (xmix-2.1.mixers.patch) = c5f72de9d0f28208269fcf6a2e2db6ed6b5c40c94c82effeef1b9c2d5ffc086c92c0a55f28d674ae9be9d592f7969046701f664325338d9f45506326d0aa9a7a
 Size (xmix-2.1.mixers.patch) = 1684 bytes
-SHA1 (patch-aa) = a60baf409d6f9182f185fbd41676d85c31971363
-SHA1 (patch-ab) = ad1c8f86668fc0a56e1df875f42896097718e7c9
+SHA1 (xmix-2.1.tar.gz) = 390096a541a41ffb47c9b57ee6029211d31393d3
+RMD160 (xmix-2.1.tar.gz) = 0f1bc15b89bfc657ade9b12cb9decb248d780925
+SHA512 (xmix-2.1.tar.gz) = 1acdb835ed5791b7642910909ea932c9750935d795e14dcc88da011ece8e303e20610945f8f7382b4e141311de42c16df2626d8b313bf187ee08f7bfcfa1b988
+Size (xmix-2.1.tar.gz) = 34835 bytes
+SHA1 (patch-Imakefile) = ddaa95bd48632bff826d1da484d0360a6b3e720e
+SHA1 (patch-xmix.c) = 449734b8de82dda37c61d8703ecafcf1d8921607

Added files:

Index: pkgsrc/audio/xmix/patches/patch-Imakefile
diff -u /dev/null pkgsrc/audio/xmix/patches/patch-Imakefile:1.1
--- /dev/null   Tue Jul 16 10:46:45 2019
+++ pkgsrc/audio/xmix/patches/patch-Imakefile   Tue Jul 16 10:46:45 2019
@@ -0,0 +1,31 @@
+$NetBSD: patch-Imakefile,v 1.1 2019/07/16 10:46:45 micha Exp $
+
+Remove CDEBUGFLAGS.
+Honor LDFLAGS from environment.
+Add local libraries.
+
+--- Imakefile.orig     1994-02-02 04:54:35.000000000 +0000
++++ Imakefile
+@@ -2,7 +2,7 @@
+ # xmix Imakefile.
+ #
+ #CDEBUGFLAGS=-gstabs
+-CDEBUGFLAGS=-O
++#CDEBUGFLAGS=-O
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+ 
+ SRCS1=        xmix.c
+@@ -12,6 +12,11 @@ PROGRAMS = xmix
+ 
+ all::  $(PROGRAMS)
+ 
+-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++# Honor LDFLAGS from environment
++LOCAL_LDFLAGS = $(LDFLAGS)
+ 
+-NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
++LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(LIBOSSAUDIO)
++
++PROGRAM = $(PROGRAMS)
++
++ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
Index: pkgsrc/audio/xmix/patches/patch-xmix.c
diff -u /dev/null pkgsrc/audio/xmix/patches/patch-xmix.c:1.1
--- /dev/null   Tue Jul 16 10:46:45 2019
+++ pkgsrc/audio/xmix/patches/patch-xmix.c      Tue Jul 16 10:46:45 2019
@@ -0,0 +1,43 @@
+$NetBSD: patch-xmix.c,v 1.1 2019/07/16 10:46:45 micha Exp $
+
+- support more OSes (is the first hunk actually correct?)
+- fix void main
+- remove debug printout
+
+--- xmix.c.orig        2019-07-03 12:47:36.000000000 +0000
++++ xmix.c
+@@ -77,7 +77,16 @@ to Rick! I'll call this version V2.1
+ #include "square_empty.bit"
+ #include "square_with_x.bit"
+ 
++#if defined(__linux__)
+ #include <linux/soundcard.h>
++#elif defined(__NetBSD__)
++#include <sys/ioctl.h>
++#include <soundcard.h>
++#elif defined(__sun)
++#include <sys/soundcard.h>
++#else
++#include <machine/soundcard.h>
++#endif
+ 
+ #define SOUND_FULL_SCALE 100.0
+ #define MAX_SOUND_VOL 95
+@@ -450,7 +459,7 @@ static void set_supported(VolumeControl 
+ }
+ 
+ 
+-void main (int argc, char **argv)
++int main (int argc, char **argv)
+ {
+   XtAppContext app_context;
+   int scroll_sep, longway;
+@@ -742,7 +751,7 @@ void main (int argc, char **argv)
+   mic.locked = 0;
+   reclvl.locked = 0;
+ 
+-  printf("supported = 0x%x\n",supported);
++  /*printf("supported = 0x%x\n",supported);*/
+   set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0);
+   set_supported(&bass,(supported & SOUND_MASK_BASS) != 0);
+   set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0);