diff --git a/allegro-4.2.0-digmid.patch b/allegro-4.2.0-digmid.patch new file mode 100644 index 0000000..7c0fc66 --- /dev/null +++ b/allegro-4.2.0-digmid.patch @@ -0,0 +1,25 @@ +--- allegro-4.2.0/src/digmid.c.digmid 2004-09-03 11:30:22.000000000 +0200 ++++ allegro-4.2.0/src/digmid.c 2006-02-01 16:35:03.000000000 +0100 +@@ -519,7 +519,7 @@ + { + PACKFILE *f; + char dir[1024], file[1024], buf[1024], filename[1024]; +- char todo[256][32]; ++ char todo[256][1024]; + char *argv[16], *p; + char tmp[128]; + int argc; +@@ -679,8 +679,11 @@ + /* read from regular disk files */ + for (i=0; i<256; i++) { + if (ugetc(todo[i])) { +- ustrzcpy(filename, sizeof(filename), dir); +- ustrzcat(filename, sizeof(filename), todo[i]); ++ if (is_relative_filename(todo[i])) { ++ ustrzcpy(filename, sizeof(filename), dir); ++ ustrzcat(filename, sizeof(filename), todo[i]); ++ } else ++ ustrzcpy(filename, sizeof(filename), todo[i]); + + if (ugetc(get_extension(filename)) == 0) + ustrzcat(filename, sizeof(filename), uconvert_ascii(".pat", tmp)); diff --git a/allegro.spec b/allegro.spec index 74a7c51..45f0288 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 5 +Release: 6 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -15,6 +15,7 @@ Source: http://download.sourceforge.net/alleg/allegro-%{version}.tar.gz Patch1: allegro-4.0.3-libdir.patch Patch2: allegro-4.0.3-cfg.patch Patch3: allegro-4.2.0-nostrip.patch +Patch4: allegro-4.2.0-digmid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel, texinfo, perl, arts-devel BuildRequires: xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel @@ -121,6 +122,7 @@ které jsou užitečné pro vývoj Allegro programů. %patch1 -p0 -b .libdir %patch2 -p1 -b .config %patch3 -p1 -z .nostrip +%patch4 -p1 -z .digmid %build %configure \ @@ -207,6 +209,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 7 2006 Jindrich Novy 4.2.0-6 +- fix digmid loading of timidity midi patches (#180154) + * Wed Jan 25 2006 Jindrich Novy 4.2.0-5 - update default allegro configuration to use sound successfully, thanks to Hans de Goede (#178383)