rpms/libmikmod/devel libmikmod-info.patch, NONE, 1.1 libmikmod.spec, 1.6, 1.7
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Feb 18 21:53:04 UTC 2008
- Previous message (by thread): rpms/dvdisaster/devel dvdisaster.spec,1.23,1.24
- Next message (by thread): rpms/gdl/F-7 gdl-0.9pre5-ppc64.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gdl.spec, 1.24, 1.25 sources, 1.7, 1.8 gdl-0.9pre3-const.patch, 1.1, NONE gdl-0.9pre3-python25.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/libmikmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv608
Modified Files:
libmikmod.spec
Added Files:
libmikmod-info.patch
Log Message:
* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.0-3.beta2
- Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n
output
libmikmod-info.patch:
--- NEW FILE libmikmod-info.patch ---
diff -up libmikmod-3.2.0-beta2/playercode/mdriver.c~ libmikmod-3.2.0-beta2/playercode/mdriver.c
--- libmikmod-3.2.0-beta2/playercode/mdriver.c~ 2008-02-18 22:34:33.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mdriver.c 2008-02-18 22:34:33.000000000 +0100
@@ -185,11 +185,12 @@ MIKMODAPI CHAR* MikMod_InfoDriver(void)
if(len)
if((list=_mm_malloc(len*sizeof(CHAR)))) {
+ char *_list = list;
list[0]=0;
/* list all registered device drivers : */
for(t=1,l=firstdriver;l;l=l->next,t++)
- sprintf(list,(l->next)?"%s%2d %s\n":"%s%2d %s",
- list,t,l->Version);
+ _list += sprintf(_list,(l->next)?"%2d %s\n":"%2d %s",
+ t,l->Version);
}
MUTEX_UNLOCK(lists);
return list;
diff -up libmikmod-3.2.0-beta2/playercode/mloader.c~ libmikmod-3.2.0-beta2/playercode/mloader.c
--- libmikmod-3.2.0-beta2/playercode/mloader.c~ 2008-02-18 22:36:55.000000000 +0100
+++ libmikmod-3.2.0-beta2/playercode/mloader.c 2008-02-18 22:36:55.000000000 +0100
@@ -67,10 +67,11 @@ MIKMODAPI CHAR* MikMod_InfoLoader(void)
if(len)
if((list=_mm_malloc(len*sizeof(CHAR)))) {
+ char *_list = list;
list[0]=0;
/* list all registered module loders */
for(l=firstloader;l;l=l->next)
- sprintf(list,(l->next)?"%s%s\n":"%s%s",list,l->version);
+ _list += sprintf(_list,(l->next)?"%s\n":"%s",l->version);
}
MUTEX_UNLOCK(lists);
return list;
Index: libmikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/libmikmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmikmod.spec 18 Feb 2008 15:50:41 -0000 1.6
+++ libmikmod.spec 18 Feb 2008 21:52:21 -0000 1.7
@@ -1,7 +1,7 @@
Summary: A MOD music file player library
Name: libmikmod
Version: 3.2.0
-Release: 2.beta2%{?dist}
+Release: 3.beta2%{?dist}
License: GPLv2 and LGPLv2+
Group: Applications/Multimedia
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,7 @@
Patch2: libmikmod-strip-lib.patch
Patch3: libmikmod-multilib.patch
Patch4: libmikmod-autoconf.patch
+Patch5: libmikmod-info.patch
%description
libmikmod is a library used by the mikmod MOD music file player for
@@ -37,6 +38,7 @@
%patch2 -p1 -b .strip-lib
%patch3 -p1 -b .multilib
%patch4 -p1 -b .autoconf
+%patch5 -p1 -b .info
%build
%configure
@@ -78,6 +80,10 @@
%{_mandir}/man1/libmikmod-config*
%changelog
+* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.0-3.beta2
+- Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n
+ output
+
* Mon Feb 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.0-2.beta2
- Replace completely braindead (hint to author, drink coffee first, then code)
esd non blocking patch with one that actually works. This fixes using mikmod
- Previous message (by thread): rpms/dvdisaster/devel dvdisaster.spec,1.23,1.24
- Next message (by thread): rpms/gdl/F-7 gdl-0.9pre5-ppc64.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gdl.spec, 1.24, 1.25 sources, 1.7, 1.8 gdl-0.9pre3-const.patch, 1.1, NONE gdl-0.9pre3-python25.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list