From 75653d91ab9dc186b24febf316584461a7625754c4a6f25616ced02404c5febd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 23 Mar 2007 20:22:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmikmod?expand=0&rev=2 --- libmikmod.changes | 6 +++++ libmikmod.spec | 49 ++++++++++++++++++---------------- mikmod-64bit-fix.diff | 62 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 82 insertions(+), 35 deletions(-) diff --git a/libmikmod.changes b/libmikmod.changes index a5a7352..75c2bdb 100644 --- a/libmikmod.changes +++ b/libmikmod.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 23 11:31:56 CET 2007 - schwab@suse.de + +- Require audiofile-devel. +- Fix 64bit patch. + ------------------------------------------------------------------- Thu Jan 26 15:51:26 CET 2006 - sbrabec@suse.cz diff --git a/libmikmod.spec b/libmikmod.spec index bf458fc..4a99720 100644 --- a/libmikmod.spec +++ b/libmikmod.spec @@ -1,34 +1,35 @@ # # spec file for package libmikmod (Version 3.1.11) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -Name: libmikmod -BuildRequires: esound-devel -URL: http://mikmod.raphnet.net/ -License: LGPL -Group: System/Libraries -Obsoletes: libmikmo -Provides: libmikmo -PreReq: %install_info_prereq -Autoreqprov: on -Summary: MikMod Sound Library -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 3.1.11 -Release: 2 -Source0: libmikmod-%{version}.tar.bz2 -Patch0: libmikmod.diff -Patch1: mikmod-64bit-fix.diff -Patch2: libmikmod-m4-fix.dif -Patch3: libmikmod-config-fix.dif -Patch4: libmikmod-conftest_fix.diff +Name: libmikmod +BuildRequires: esound-devel +URL: http://mikmod.raphnet.net/ +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Group: System/Libraries +Obsoletes: libmikmo +Provides: libmikmo +PreReq: %install_info_prereq +Autoreqprov: on +Requires: audiofile-devel +Summary: MikMod Sound Library +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Version: 3.1.11 +Release: 41 +Source0: libmikmod-%{version}.tar.bz2 +Patch0: libmikmod.diff +Patch1: mikmod-64bit-fix.diff +Patch2: libmikmod-m4-fix.dif +Patch3: libmikmod-config-fix.dif +Patch4: libmikmod-conftest_fix.diff %description Libmikmod is a portable sound library, capable of playing samples as @@ -48,7 +49,6 @@ mtm, xm, and it. %patch4 %build -libtoolize -f autoreconf -f -i export CFLAGS="%optflags" %configure @@ -78,7 +78,10 @@ rm -rf %buildroot /%{_libdir}/libmikmod.* %{_datadir}/aclocal/libmikmod.m4 -%changelog -n libmikmod +%changelog +* Fri Mar 23 2007 - schwab@suse.de +- Require audiofile-devel. +- Fix 64bit patch. * Thu Jan 26 2006 - sbrabec@suse.cz - Added %%install_info_prereq. * Wed Jan 25 2006 - mls@suse.de diff --git a/mikmod-64bit-fix.diff b/mikmod-64bit-fix.diff index 7664b6f..eaa8074 100644 --- a/mikmod-64bit-fix.diff +++ b/mikmod-64bit-fix.diff @@ -1,24 +1,62 @@ ---- include/mikmod.h.in-dist 2002-08-20 16:40:45.000000000 +0200 -+++ include/mikmod.h.in 2002-08-20 16:50:34.000000000 +0200 -@@ -85,7 +85,8 @@ +--- include/mikmod.h.in ++++ include/mikmod.h.in +@@ -85,30 +85,16 @@ @DOES_NOT_HAVE_SIGNED@ -#if defined(__arch64__) || defined(__alpha) +-/* 64 bit architectures */ +- +-typedef signed char SBYTE; /* 1 byte, signed */ +-typedef unsigned char UBYTE; /* 1 byte, unsigned */ +-typedef signed short SWORD; /* 2 bytes, signed */ +-typedef unsigned short UWORD; /* 2 bytes, unsigned */ +-typedef signed int SLONG; /* 4 bytes, signed */ +-typedef unsigned int ULONG; /* 4 bytes, unsigned */ +-typedef int BOOL; /* 0=false, <>0 true */ +- +-#else +-/* 32 bit architectures */ +- +-typedef signed char SBYTE; /* 1 byte, signed */ +-typedef unsigned char UBYTE; /* 1 byte, unsigned */ +-typedef signed short SWORD; /* 2 bytes, signed */ +-typedef unsigned short UWORD; /* 2 bytes, unsigned */ +-typedef signed long SLONG; /* 4 bytes, signed */ +#include -+#if __WORDSIZE == 64 - /* 64 bit architectures */ ++typedef int8_t SBYTE; /* 1 byte, signed */ ++typedef uint8_t UBYTE; /* 1 byte, unsigned */ ++typedef int16_t SWORD; /* 2 bytes, signed */ ++typedef uint16_t UWORD; /* 2 bytes, unsigned */ ++typedef int32_t SLONG; /* 4 bytes, signed */ + #if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32) +-typedef unsigned long ULONG; /* 4 bytes, unsigned */ ++typedef uint32_t ULONG; /* 4 bytes, unsigned */ + typedef int BOOL; /* 0=false, <>0 true */ + #endif +-#endif - typedef signed char SBYTE; /* 1 byte, signed */ ---- include/mikmod_internals.h-dist 2002-08-20 16:41:51.000000000 +0200 -+++ include/mikmod_internals.h 2002-08-20 16:50:59.000000000 +0200 -@@ -50,7 +50,8 @@ + /* + * ========== Error codes +--- include/mikmod_internals.h ++++ include/mikmod_internals.h +@@ -50,15 +50,11 @@ /*========== More type definitions */ /* SLONGLONG: 64bit, signed */ -#if defined (__arch64__) || defined(__alpha) +-typedef long SLONGLONG; +#include -+#if __WORDSIZE == 64 - typedef long SLONGLONG; ++typedef int64_t SLONGLONG; ++#include ++#if ULONG_MAX > 0xffffffff #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) +-#elif defined(__WATCOMC__) +-typedef __int64 SLONGLONG; +-#elif defined(WIN32) && !defined(__MWERKS__) +-typedef LONGLONG SLONGLONG; +-#else +-typedef long long SLONGLONG; + #endif + + /*========== Error handling */