OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Aug-2003 11:21:22
Branch: HEAD Handle: 2003080110212001
Added files:
openpkg-src/libmikmod libmikmod.patch
Modified files:
openpkg-src/libmikmod libmikmod.spec
openpkg-web news.txt
Log:
Correct build configuration and patch code for Solaris
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/libmikmod/libmikmod.patch
1.6 +11 -1 openpkg-src/libmikmod/libmikmod.spec
1.5992 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libmikmod/libmikmod.patch
============================================================================
$ cvs diff -u -r0 -r1.1 libmikmod.patch
--- /dev/null 2003-08-01 11:21:22.000000000 +0200
+++ libmikmod.patch 2003-08-01 11:21:22.000000000 +0200
@@ -0,0 +1,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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libmikmod/libmikmod.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 libmikmod.spec
--- openpkg-src/libmikmod/libmikmod.spec 8 Jul 2003 14:40:32 -0000 1.5
+++ openpkg-src/libmikmod/libmikmod.spec 1 Aug 2003 09:21:21 -0000 1.6
@@ -33,10 +33,11 @@
Group: Audio
License: LGPL
Version: 3.1.10
-Release: 20030702
+Release: 20030801
# list of sources
Source0: http://www.mikmod.org/files/libmikmod/libmikmod-%{version}.tar.gz
+Patch0: libmikmod.patch
# build information
Prefix: %{l_prefix}
@@ -53,6 +54,15 @@
%prep
%setup -q
+ %patch -p1
+ case "%{l_target}" in
+ *-solaris* )
+ %{l_shtool} subst \
+ -e 's;-pthread;-pthreads;g' \
+ configure \
+ configure.in \
+ ;;
+ esac
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5991 -r1.5992 news.txt
--- openpkg-web/news.txt 1 Aug 2003 09:17:43 -0000 1.5991
+++ openpkg-web/news.txt 1 Aug 2003 09:21:20 -0000 1.5992
@@ -1,3 +1,4 @@
+01-Aug-2003: Upgraded package: P<libmikmod-3.1.10-20030801>
01-Aug-2003: Upgraded package: P<skey-1.1.5-20030801>
01-Aug-2003: Upgraded package: P<pgadmin-0.8.0.20030801-20030801>
01-Aug-2003: Upgraded package: P<patchutils-0.2.24-20030801>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
