Hello community,
here is the log from the commit of package libmikmod for openSUSE:Factory
checked in at 2013-03-28 13:19:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmikmod (Old)
and /work/SRC/openSUSE:Factory/.libmikmod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmikmod", Maintainer is "orpha...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmikmod/libmikmod.changes 2012-09-11
09:09:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libmikmod.new/libmikmod.changes 2013-03-28
13:19:55.000000000 +0100
@@ -1,0 +2,61 @@
+Tue Mar 26 16:49:21 UTC 2013 - meiss...@suse.com
+
+- merged / ported missing patches:
+ - libmikmod-lp64.patch: generic 64bit patch for 64LP architectures
+ - CVE-2007-6720.diff: perhaps missing upstream boundary checks (?)
+ - libmikmod-3.2.0-loopingvolume-fix.diff: seems missing upstream still
+
+-------------------------------------------------------------------
+Tue Nov 20 16:26:37 UTC 2012 - zai...@opensuse.org
+
+- Update to version 3.2.0:
+ + MacOS X CoreAudio driver
+ + Carbon support
+ + Loader for ASYLUM Music Format v1.0 (.amf) modules, as used in
+ crusader games.
+ + New function 'Player_QueryVoices' added, which is used to
+ return dynamic channel information about the module player.
+ + Mixing with floating point output.
+ + AIFF disk writer driver.
+ + RPM support. To build a rpm, download the tar.gz, and run this:
+ % rpmbuild -tb libmikmod-3.2.0-beta2.tar.gz
+ + New NAS driver (Network Audio System). Tested with nasd and
+ NCD X terminals.
+ + MREADERs now have an iobase member (previously was a static
+ variable in mmio.c).
+ + Created an example/ subdirectory, to hold programming examples.
+ + Added functions to read from memory.
+ + Renamed internal _mm_malloc function to MikMod_malloc, which
+ is now part of the API.
+ + Raw samples can now be loaded using the new Sample_LoadRaw*
+ family of functions for sound effects.
+ + PowerPC 64 support
+ + ALSA driver is now working with "recent" ALSAs.
+ + Change MDRIVER "char *" fields to "const char *".
+ + Implement a fix to the ALSA driver in MIKMOD_DYNAMIC mode so
+ it will allow linking against libmikmod when "-Wl,--no-undefined"
+ is passed.
+- Bugfixes:
+ + The sun driver now compiles on solaris.
+ + The wav output driver had problems on big endian systems.
+ + A warning in libmikmod.m4 with autoconf 1.8 was fixed.
+ + The 'card' argument, supported by the OSS driver was not
+ documented via the MDRIVER->CmdLineHelp string.
+ + libmikmod-3.1.11-CVE-2010-2546,2971.diff
+ + libmikmod-3.1.11-CVE-2009-3995,3996.diff
+ + Now checking for linking against -lm.
+ + Modified patch of libmikmod-CVE-2009-0179.patch.
+ + Apply the libmikmod-CVE-2007-6720.patch.
+ + Implement a fix for sprintf-of-list
+ + Apply a patch for non-blocking opening of the OSS driver.
+ + Fixed the prototypes of vc_callback.
+ + Cast a vc_callback parameter to "unsigned char *" instead of "char *",
+ becuase the former is what it accepts.
+ + Check for Samples' validatity in virtch_common.c.
+ + Fix compilation on MSVC.
+- Drop all patches, fixed upstream.
+- Stop passing autoreconf, not needed anymore since we do not carry
+ any patches.
+- Bump so name, following upstream changes.
+
+-------------------------------------------------------------------
Old:
----
libmikmod-3.1.12-64bit-fix.diff
libmikmod-3.1.12-CVE-2007-6720.diff
libmikmod-3.1.12-CVE-2009-0179.diff
libmikmod-3.1.12-CVE-2009-3995,3996.diff
libmikmod-3.1.12-autotools.diff
libmikmod-3.1.12-config-fix.diff
libmikmod-3.1.12-conftest_fix.diff
libmikmod-3.1.12-exitcrash-fix.diff
libmikmod-3.1.12-loopingvolume-fix.diff
libmikmod-3.1.12.tar.bz2
New:
----
CVE-2007-6720.diff
libmikmod-3.2.0-loopingvolume-fix.diff
libmikmod-3.2.0.tar.gz
libmikmod-lp64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmikmod.spec ++++++
--- /var/tmp/diff_new_pack.touFC2/_old 2013-03-28 13:19:57.000000000 +0100
+++ /var/tmp/diff_new_pack.touFC2/_new 2013-03-28 13:19:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libmikmod
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,7 +17,7 @@
Name: libmikmod
-%define lname libmikmod2
+%define lname libmikmod3
BuildRequires: esound-devel
BuildRequires: libtool
%if 0%{suse_version} > 1220
@@ -27,20 +27,14 @@
Summary: MikMod Sound Library
License: LGPL-2.1+
Group: Development/Libraries/C and C++
-Version: 3.1.12
+Version: 3.2.0
Release: 0
-Source: %{name}-%{version}.tar.bz2
+Source: http://mikmod.shlomifish.org/files/%{name}-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Source2: baselibs.conf
-Patch0: %{name}-3.1.12-CVE-2007-6720.diff
-Patch1: %{name}-3.1.12-CVE-2009-0179.diff
-Patch2: %{name}-3.1.12-64bit-fix.diff
-Patch3: %{name}-3.1.12-autotools.diff
-Patch4: %{name}-3.1.12-config-fix.diff
-Patch5: %{name}-3.1.12-conftest_fix.diff
-Patch6: %{name}-3.1.12-exitcrash-fix.diff
-Patch7: %{name}-3.1.12-loopingvolume-fix.diff
-Patch8: %{name}-3.1.12-CVE-2009-3995,3996.diff
+Patch0: libmikmod-lp64.patch
+Patch1: CVE-2007-6720.diff
+Patch2: libmikmod-3.2.0-loopingvolume-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -97,17 +91,10 @@
%prep
%setup -q
%patch0 -p1
-%patch1
+%patch1 -p1
%patch2 -p1
-%patch3
-%patch4
-%patch5
-%patch6 -p1
-%patch7 -p1
-%patch8
%build
-autoreconf -f -i
%configure --disable-static --with-pic
make %{?_smp_mflags}
@@ -130,7 +117,7 @@
%files -n %lname
%defattr(-,root,root)
%doc COPYING.LIB COPYING.LESSER
-%{_libdir}/libmikmod.so.2*
+%{_libdir}/libmikmod.so.3*
%files devel
%defattr(-,root,root)
++++++ CVE-2007-6720.diff ++++++
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;
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.touFC2/_old 2013-03-28 13:19:57.000000000 +0100
+++ /var/tmp/diff_new_pack.touFC2/_new 2013-03-28 13:19:57.000000000 +0100
@@ -1 +1 @@
-libmikmod2
+libmikmod3
++++++ libmikmod-3.1.12-loopingvolume-fix.diff ->
libmikmod-3.2.0-loopingvolume-fix.diff ++++++
++++++ libmikmod-lp64.patch ++++++
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 */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
