head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.1
date	2003.08.01.09.21.21;	author ms;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2003.08.01.09.21.21;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.51.58;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@Correct build configuration and patch code for Solaris
@
text
@diff -Naur libmikmod-3.1.10.orig/drivers/drv_sun.c libmikmod-3.1.10/drivers/drv_sun.c
--- libmikmod-3.1.10.orig/drivers/drv_sun.c	2002-01-13 01:58:57.000000000 +0100
+++ libmikmod-3.1.10/drivers/drv_sun.c	2003-08-01 06:27:46.084049000 +0200
@@@@ -85,6 +85,12 @@@@
 #define SOUNDDEVICE "/dev/audio"
 #endif
 
+/* Solaris doesn't have these */
+#ifdef SOLARIS
+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR
+#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_LINEAR8
+#endif
+
 /* Compatibility defines, for old *BSD or SunOS systems */
 #ifndef AUDIO_ENCODING_PCM16
 #define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR
@


1.1.2.1
log
@file libmikmod.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:58 +0000
@
text
@d1 16
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 16
diff -Naur libmikmod-3.1.10.orig/drivers/drv_sun.c libmikmod-3.1.10/drivers/drv_sun.c
--- libmikmod-3.1.10.orig/drivers/drv_sun.c	2002-01-13 01:58:57.000000000 +0100
+++ libmikmod-3.1.10/drivers/drv_sun.c	2003-08-01 06:27:46.084049000 +0200
@@@@ -85,6 +85,12 @@@@
 #define SOUNDDEVICE "/dev/audio"
 #endif
 
+/* Solaris doesn't have these */
+#ifdef SOLARIS
+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR
+#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_LINEAR8
+#endif
+
 /* Compatibility defines, for old *BSD or SunOS systems */
 #ifndef AUDIO_ENCODING_PCM16
 #define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR
@