cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- C++ fix for compiling with gcc3.

Browse Source 
- Use CXX for linking rather than CC.
This commit is contained in:
naddy 2002-09-27 22:51:58 +00:00
parent 7ea4345d52
commit ff0c13ae86
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/wmmixer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2002/09/17 14:35:03 wilfried Exp $
# $OpenBSD: Makefile,v 1.11 2002/09/27 22:51:58 naddy Exp $
COMMENT= 'wm-dockapp; audio mixer'
@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz
USE_X11= Yes
NO_REGRESS= Yes
CONFIGURE_STYLE= imake
CONFIGURE_STYLE= imake noman
WRKDIST= ${WRKDIR}/wmmixer

10
audio/wmmixer/patches/patch-Imakefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $
$OpenBSD: patch-Imakefile,v 1.2 2002/09/27 22:51:58 naddy Exp $
--- Imakefile.orig Sat Sep 5 17:11:33 1998
+++ Imakefile Mon Feb 5 19:08:41 2001
+++ Imakefile Sat Sep 28 00:52:35 2002
@@ -1,5 +1,7 @@
#ifdef NetBSDArchitecture
OSSAUDIO = -lossaudio
@ -9,9 +9,11 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $
#else
OSSAUDIO =
#endif
@@ -10,4 +12,4 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OS
@@ -10,4 +12,6 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OS
SRCS = wmmixer.cc
OBJS = wmmixer.o
-ComplexProgramTarget(wmmixer)
+ComplexProgramTargetNoMan(wmmixer)
+wmmixer.man:
+
+ComplexCplusplusProgramTarget(wmmixer)

6
audio/wmmixer/patches/patch-mixctl_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mixctl_h,v 1.2 2002/04/11 19:12:58 tdeval Exp $
$OpenBSD: patch-mixctl_h,v 1.3 2002/09/27 22:51:58 naddy Exp $
--- mixctl.h.orig Sat Sep 5 17:11:33 1998
+++ mixctl.h Mon Feb 5 19:08:10 2001
+++ mixctl.h Sat Sep 28 00:52:09 2002
@@ -21,6 +21,9 @@
#ifdef __FreeBSD__
#include <machine/soundcard.h>
@ -11,7 +11,7 @@ $OpenBSD: patch-mixctl_h,v 1.2 2002/04/11 19:12:58 tdeval Exp $
#ifdef __linux__
#include <linux/soundcard.h>
#endif
@@ -31,7 +34,7 @@
@@ -31,7 +34,7 @@ public:
MixCtl(char *dname){
device=(char *)malloc(sizeof(char)*(strlen(dname)+1));
strcpy(device,dname);

13
audio/wmmixer/patches/patch-wmmixer_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-wmmixer_cc,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $
$OpenBSD: patch-wmmixer_cc,v 1.2 2002/09/27 22:51:58 naddy Exp $
--- wmmixer.cc.orig Sat Sep 5 17:11:33 1998
+++ wmmixer.cc Mon Feb 5 19:29:21 2001
+++ wmmixer.cc Sat Sep 28 00:53:31 2002
@@ -110,8 +110,8 @@ int rpttimer=0;
bool dragging=false;
@ -23,3 +23,12 @@ $OpenBSD: patch-wmmixer_cc,v 1.1.1.1 2001/02/06 11:54:55 wilfried Exp $
break;
}
if(mixctl->getSupport(i)){
@@ -503,7 +503,7 @@ void readFile(){
}
}
-void checkVol(bool forced=true){
+void checkVol(bool forced){
mixctl->readVol(channel[curchannel], true);
int nl=mixctl->readLeft(channel[curchannel]);
int nr=mixctl->readRight(channel[curchannel]);