[csw-devel] SF.net SVN: gar:[10804] csw/mgar/pkg/libmikmod/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 10804
          http://gar.svn.sourceforge.net/gar/?rev=10804&view=rev
Author:   jake_goerzen
Date:     2010-08-24 04:41:45 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
downgrade to 3.1.11 for compatibility

Modified Paths:
--------------
    csw/mgar/pkg/libmikmod/trunk/Makefile
    csw/mgar/pkg/libmikmod/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch

Modified: csw/mgar/pkg/libmikmod/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmikmod/trunk/Makefile	2010-08-23 23:56:56 UTC (rev 10803)
+++ csw/mgar/pkg/libmikmod/trunk/Makefile	2010-08-24 04:41:45 UTC (rev 10804)
@@ -1,16 +1,18 @@
 GARNAME = libmikmod
-GARVERSION = 3.2.0
-RELEASE = beta2
-DISTVERSION = $(GARVERSION)-$(RELEASE)
+GARVERSION = 3.1.11
+DISTVERSION = $(GARVERSION)
 DISTNAME = $(GARNAME)-$(DISTVERSION)
 CATEGORIES = lib
-DESCRIPTION = library for MOD audio files and other types
+DESCRIPTION = Library for MOD audio files and other types
 define BLURB
-  library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS,
+  Library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS,
 endef
 
 MASTER_SITES = http://mikmod.raphnet.net/files/
-DISTFILES  = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = libmikmod-3.1.11-a.diff
+PATCHFILES += 0001-fix-compiling-on-Solaris.patch
+LICENSE = COPYING.LIB
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/libmikmod/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmikmod/trunk/checksums	2010-08-23 23:56:56 UTC (rev 10803)
+++ csw/mgar/pkg/libmikmod/trunk/checksums	2010-08-24 04:41:45 UTC (rev 10804)
@@ -1 +1,3 @@
-19fc0879aebd1610813a23bd84726362  libmikmod-3.2.0-beta2.tar.gz
+622ea40e54c8fbd371eb9d8943f17b37  0001-fix-compiling-on-Solaris.patch
+5e56be5a32eecf3cfa195379a5ecb0ef  libmikmod-3.1.11-a.diff
+705106da305e8de191549f1e7393185c  libmikmod-3.1.11.tar.gz

Added: csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch	2010-08-24 04:41:45 UTC (rev 10804)
@@ -0,0 +1,29 @@
+From 3f19c6f14fe8ea820abbc632e547d6301241aba7 Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoerzen at opencsw.org>
+Date: Tue, 24 Aug 2010 05:34:17 +0200
+Subject: [PATCH] fix compiling on Solaris
+
+---
+ drivers/drv_sun.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/drv_sun.c b/drivers/drv_sun.c
+index cc99488..11b824c 100644
+--- a/drivers/drv_sun.c
++++ b/drivers/drv_sun.c
+@@ -85,6 +85,12 @@ extern int fputs(const char *, FILE *);
+ #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.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.