rpm/libmikmod
SHA256
1
0
Fork 0
forked from pool/libmikmod
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmikmod?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-03-23 20:22:07 +00:00 committed by Git OBS Bridge
parent 080da40ae7
commit 75653d91ab
3 changed files with 82 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmikmod.changes
View File

@ -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 Thu Jan 26 15:51:26 CET 2006 - sbrabec@suse.cz

15
libmikmod.spec
View File

@ -1,11 +1,11 @@
# #
# spec file for package libmikmod (Version 3.1.11) # 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 # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # 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 # norootforbuild
@ -13,16 +13,17 @@
Name: libmikmod Name: libmikmod
BuildRequires: esound-devel BuildRequires: esound-devel
URL: http://mikmod.raphnet.net/ URL: http://mikmod.raphnet.net/
License: LGPL License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Libraries Group: System/Libraries
Obsoletes: libmikmo Obsoletes: libmikmo
Provides: libmikmo Provides: libmikmo
PreReq: %install_info_prereq PreReq: %install_info_prereq
Autoreqprov: on Autoreqprov: on
Requires: audiofile-devel
Summary: MikMod Sound Library Summary: MikMod Sound Library
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.1.11 Version: 3.1.11
Release: 2 Release: 41
Source0: libmikmod-%{version}.tar.bz2 Source0: libmikmod-%{version}.tar.bz2
Patch0: libmikmod.diff Patch0: libmikmod.diff
Patch1: mikmod-64bit-fix.diff Patch1: mikmod-64bit-fix.diff
@ -48,7 +49,6 @@ mtm, xm, and it.
%patch4 %patch4
%build %build
libtoolize -f
autoreconf -f -i autoreconf -f -i
export CFLAGS="%optflags" export CFLAGS="%optflags"
%configure %configure
@ -78,7 +78,10 @@ rm -rf %buildroot
/%{_libdir}/libmikmod.* /%{_libdir}/libmikmod.*
%{_datadir}/aclocal/libmikmod.m4 %{_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 * Thu Jan 26 2006 - sbrabec@suse.cz
- Added %%install_info_prereq. - Added %%install_info_prereq.
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 - mls@suse.de

62
mikmod-64bit-fix.diff
View File

@ -1,24 +1,62 @@
--- include/mikmod.h.in-dist 2002-08-20 16:40:45.000000000 +0200 --- include/mikmod.h.in
+++ include/mikmod.h.in 2002-08-20 16:50:34.000000000 +0200 +++ include/mikmod.h.in
@@ -85,7 +85,8 @@ @@ -85,30 +85,16 @@
@DOES_NOT_HAVE_SIGNED@ @DOES_NOT_HAVE_SIGNED@
-#if defined(__arch64__) || defined(__alpha) -#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 <stdint.h> +#include <stdint.h>
+#if __WORDSIZE == 64 +typedef int8_t SBYTE; /* 1 byte, signed */
/* 64 bit architectures */ +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 * ========== Error codes
+++ include/mikmod_internals.h 2002-08-20 16:50:59.000000000 +0200 --- include/mikmod_internals.h
@@ -50,7 +50,8 @@ +++ include/mikmod_internals.h
@@ -50,15 +50,11 @@
/*========== More type definitions */ /*========== More type definitions */
/* SLONGLONG: 64bit, signed */ /* SLONGLONG: 64bit, signed */
-#if defined (__arch64__) || defined(__alpha) -#if defined (__arch64__) || defined(__alpha)
-typedef long SLONGLONG;
+#include <stdint.h> +#include <stdint.h>
+#if __WORDSIZE == 64 +typedef int64_t SLONGLONG;
typedef long SLONGLONG; +#include <limits.h>
+#if ULONG_MAX > 0xffffffff
#define NATIVE_64BIT_INT #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 */