pool/libmikmod
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 229268 from multimedia:libs

Browse Source 
- Fix Source URL

- update to version 3.3.6 from 3.3.5
  Changes description from upstream:
  This release adds updates to the umx loader, a fix for a dynamic loading
  issue for ALSA and ESD drivers, a small update to the OSS driver to cover
  less common setups, a minor fix to PulseAudio driver, and build system
  updates (configure and cmake).

- Update to version 3.3.5
  + Lots of changes. See NEWS file or http://mikmod.sourceforge.net/#news
- Remove CVE-2007-6720.diff, libmikmod-3.2.0-loopingvolume-fix.diff,
  libmikmod-altivec.patch and libmikmod-lp64.patch. Applied upstream.
- Remove libmikmod-rpmlintrc. Doesn't apply anymore.
- Remove esound-devel BuildRequires
- Add pkg-config, pkgconfig(alsa) and pkgconfig(libpulse-simple) BuildRequires
- Disable OSS sound output

OBS-URL: https://build.opensuse.org/request/show/229268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmikmod?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2014-04-09 11:14:19 +00:00 committed by Git OBS Bridge
commit fa51bd3233
9 changed files with 39 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
CVE-2007-6720.diff
View File

@ -1,84 +0,0 @@
Index: libmikmod-3.2.0/playercode/mplayer.c
===================================================================
--- libmikmod-3.2.0.orig/playercode/mplayer.c
+++ libmikmod-3.2.0/playercode/mplayer.c
@@ -50,6 +50,8 @@ extern long int random(void);
/* The currently playing module */
MODULE *pf = NULL;
+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
+
#define HIGH_OCTAVE 2 /* number of above-range octaves */
static UWORD oldperiods[OCTAVE*2]={
@@ -246,14 +248,14 @@ static int MP_FindEmptyChannel(MODULE *m
MP_VOICE *a;
ULONG t,k,tvol,pp;
- for (t=0;t<md_sngchn;t++)
+ for (t=0;t<NUMVOICES(mod);t++)
if (((mod->voice[t].main.kick==KICK_ABSENT)||
(mod->voice[t].main.kick==KICK_ENV))&&
Voice_Stopped_internal(t))
return t;
tvol=0xffffffUL;t=-1;a=mod->voice;
- for (k=0;k<md_sngchn;k++,a++) {
+ for (k=0;k<NUMVOICES(mod);k++,a++) {
/* allow us to take over a nonexisting sample */
if (!a->main.s)
return k;
@@ -2247,12 +2249,12 @@ static void DoNNAEffects(MODULE *mod, MP
switch (dat) {
case 0x0: /* past note cut */
- for (t=0;t<md_sngchn;t++)
+ for (t=0;t<NUMVOICES(mod);t++)
if (mod->voice[t].master==a)
mod->voice[t].main.fadevol=0;
break;
case 0x1: /* past note off */
- for (t=0;t<md_sngchn;t++)
+ for (t=0;t<NUMVOICES(mod);t++)
if (mod->voice[t].master==a) {
mod->voice[t].main.keyoff|=KEY_OFF;
if ((!(mod->voice[t].venv.flg & EF_ON))||
@@ -2261,7 +2263,7 @@ static void DoNNAEffects(MODULE *mod, MP
}
break;
case 0x2: /* past note fade */
- for (t=0;t<md_sngchn;t++)
+ for (t=0;t<NUMVOICES(mod);t++)
if (mod->voice[t].master==a)
mod->voice[t].main.keyoff|=KEY_FADE;
break;
@@ -2737,7 +2739,7 @@ void pt_NNA(MODULE *mod)
if (a->dct!=DCT_OFF) {
int t;
- for (t=0;t<md_sngchn;t++)
+ for (t=0;t<NUMVOICES(mod);t++)
if ((!Voice_Stopped_internal(t))&&
(mod->voice[t].masterchn==channel)&&
(a->main.sample==mod->voice[t].main.sample)) {
@@ -2979,6 +2981,11 @@ BOOL Player_Init(MODULE* mod)
if (!(mod->voice=(MP_VOICE*)MikMod_calloc(md_sngchn,sizeof(MP_VOICE))))
return 1;
+ /* mod->numvoices was used during loading to clamp md_sngchn.
+ After loading it's used to remember how big mod->voice is.
+ */
+ mod->numvoices = md_sngchn;
+
Player_Init_internal(mod);
return 0;
}
@@ -3370,7 +3377,7 @@ MIKMODAPI int Player_QueryVoices(UWORD n
MUTEX_LOCK(vars);
if (pf)
- for (i = 0; i < md_sngchn; i++) {
+ for (i = 0; i < numvoices; i++) {
vinfo [i].i = pf->voice[i].main.i;
vinfo [i].s = pf->voice[i].main.s;
vinfo [i].panning = pf->voice [i].main.panning;

16
libmikmod-3.2.0-loopingvolume-fix.diff
View File

@ -1,16 +0,0 @@
Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001
* Fixed MOD music volume when looping
Index: libmikmod-3.1.12/playercode/mplayer.c
===================================================================
--- libmikmod-3.1.12.orig/playercode/mplayer.c
+++ libmikmod-3.1.12/playercode/mplayer.c
@@ -3019,7 +3019,7 @@ MIKMODAPI void Player_SetVolume(SWORD vo
{
MUTEX_LOCK(vars);
if (pf)
- pf->volume=(volume<0)?0:(volume>128)?128:volume;
+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
MUTEX_UNLOCK(vars);
}

3
libmikmod-3.2.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e
size 873258

3
libmikmod-3.3.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330
size 1288510

35
libmikmod-altivec.patch
View File

@ -1,35 +0,0 @@
Index: libmikmod-3.2.0/configure
===================================================================
--- libmikmod-3.2.0.orig/configure
+++ libmikmod-3.2.0/configure
@@ -13701,10 +13701,10 @@ $as_echo_n "checking whether to use alti
then
case `uname` in
Darwin)
- CFLAGS="$CFLAGS -faltivec -force_cpusubtype_ALL"
+ CFLAGS="$CFLAGS -maltivec -force_cpusubtype_ALL"
;;
Linux)
- CFLAGS="$CFLAGS -faltivec"
+ CFLAGS="$CFLAGS -maltivec"
;;
esac
fi
Index: libmikmod-3.2.0/configure.in
===================================================================
--- libmikmod-3.2.0.orig/configure.in
+++ libmikmod-3.2.0/configure.in
@@ -720,11 +720,11 @@ ppc|ppc64|powerpc|powerpc64)
case `uname` in
Darwin)
dnl compile all Altivec functions, check at run-time
- CFLAGS="$CFLAGS -faltivec -force_cpusubtype_ALL"
+ CFLAGS="$CFLAGS -maltivec -force_cpusubtype_ALL"
;;
Linux)
dnl force_cpusubtype_ALL not allowed for Linux as
- CFLAGS="$CFLAGS -faltivec"
+ CFLAGS="$CFLAGS -maltivec"
;;
esac
fi

13
libmikmod-lp64.patch
View File

@ -1,13 +0,0 @@
Index: libmikmod-3.2.0/include/mikmod.h.in
===================================================================
--- libmikmod-3.2.0.orig/include/mikmod.h.in
+++ libmikmod-3.2.0/include/mikmod.h.in
@@ -85,7 +85,7 @@ typedef char CHAR;
@DOES_NOT_HAVE_SIGNED@
-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(_LP64)
/* 64 bit architectures */
typedef signed char SBYTE; /* 1 byte, signed */

16
libmikmod-rpmlintrc
View File

@ -1,16 +0,0 @@
# This line is mandatory to access the configuration functions
from Config import *
# The development of libmikmod has stopped in mid-2004, it is highly unlikely
# that there will ever be a newer version, installing this version in parallel
# an even older version sounds something which only experts would do while
# debugging, and an application build must be very old to need libmikmod < 2.0,
# so there is little priority in a rename in libmikmod due to these:
#
# W: libmikmod shlib-policy-nonversioned-dir /usr/share/doc/packages/libmikmod
# Your shared library package contains non-versioned directories. Those will not
# allow to install multiple versions of the package in parallel.
# W: libmikmod shlib-legacy-policy-name-error libmikmod2
addFilter("libmikmod shlib-policy-nonversioned-dir")
addFilter("libmikmod shlib-legacy-policy-name-error libmikmod2")

27
libmikmod.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Apr 7 10:39:46 UTC 2014 - idonmez@suse.com
- Fix Source URL
-------------------------------------------------------------------
Sun Apr 6 11:55:15 UTC 2014 - stephan.barth@suse.com
- update to version 3.3.6 from 3.3.5
Changes description from upstream:
This release adds updates to the umx loader, a fix for a dynamic loading
issue for ALSA and ESD drivers, a small update to the OSS driver to cover
less common setups, a minor fix to PulseAudio driver, and build system
updates (configure and cmake).
-------------------------------------------------------------------
Fri Mar 7 14:01:25 UTC 2014 - reddwarf@opensuse.org
- Update to version 3.3.5
+ Lots of changes. See NEWS file or http://mikmod.sourceforge.net/#news
- Remove CVE-2007-6720.diff, libmikmod-3.2.0-loopingvolume-fix.diff,
libmikmod-altivec.patch and libmikmod-lp64.patch. Applied upstream.
- Remove libmikmod-rpmlintrc. Doesn't apply anymore.
- Remove esound-devel BuildRequires
- Add pkg-config, pkgconfig(alsa) and pkgconfig(libpulse-simple) BuildRequires
- Disable OSS sound output
-------------------------------------------------------------------
Thu Apr 4 21:56:30 UTC 2013 - dvaleev@suse.com

28
libmikmod.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libmikmod
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,24 +18,18 @@
Name: libmikmod
%define lname libmikmod3
BuildRequires: esound-devel
BuildRequires: libtool
%if 0%{suse_version} > 1220
BuildRequires: makeinfo
%endif
BuildRequires: pkg-config
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(libpulse-simple)
Url: http://mikmod.raphnet.net/
Summary: MikMod Sound Library
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Version: 3.2.0
Version: 3.3.6
Release: 0
Source: http://mikmod.shlomifish.org/files/%{name}-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Source2: baselibs.conf
Patch0: libmikmod-lp64.patch
Patch1: CVE-2007-6720.diff
Patch2: libmikmod-3.2.0-loopingvolume-fix.diff
Patch3: libmikmod-altivec.patch
Source: http://sourceforge.net/projects/mikmod/files/%{name}/%{version}/%{name}-%{version}.tar.gz
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -68,7 +62,6 @@ mtm, xm, and it.
Summary: Development files for MikMod Sound Library
Group: Development/Libraries/C and C++
Requires: %lname = %version
Requires: audiofile-devel
Requires: glibc-devel
PreReq: %install_info_prereq
# bug437293
@ -91,13 +84,9 @@ mtm, xm, and it.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure --disable-static --with-pic
%configure --disable-static --disable-oss
make %{?_smp_mflags}
%install
@ -127,6 +116,7 @@ ln -f $RPM_BUILD_ROOT%{_includedir}/mikmod{,_build}.h
%{_bindir}/*-config
%{_datadir}/aclocal/libmikmod.m4
%{_includedir}/*
%{_libdir}/pkgconfig/libmikmod.pc
%doc %{_infodir}/mikmod*
%{_libdir}/libmikmod.so
%doc %{_mandir}/man1/*-config.*