From 947503f8e0b1b49dd3103414f0283e46e73edc87 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: May 02 2005 14:12:16 +0000 Subject: - fix build failures with gcc4 (#156224) - don't use %%{name} in patch names - add Czech translation to package description/summary --- diff --git a/allegro-4.0.3-gcc4.patch b/allegro-4.0.3-gcc4.patch new file mode 100644 index 0000000..a97e1dc --- /dev/null +++ b/allegro-4.0.3-gcc4.patch @@ -0,0 +1,113 @@ +--- allegro-4.0.3/examples/exspline.c.gcc4 2003-04-19 09:06:46.000000000 +0200 ++++ allegro-4.0.3/examples/exspline.c 2005-04-28 15:38:06.556128088 +0200 +@@ -84,6 +84,7 @@ NODE dummy_node(NODE node, NODE prev) + + n.x = node.x - (prev.x - node.x) / 8; + n.y = node.y - (prev.y - node.y) / 8; ++ n.tangent = 0; + + return n; + } +--- allegro-4.0.3/tools/textconv.c.gcc4 2003-04-19 09:06:49.000000000 +0200 ++++ allegro-4.0.3/tools/textconv.c 2005-04-28 15:45:24.858496000 +0200 +@@ -190,7 +190,7 @@ void write_output(FILE *f, int c) + if (out_flip) + c = ((c&0xFF)<<8) | ((c&0xFF00)>>8); + +- size = out_type->u_setc(buf, c); ++ size = out_type->u_setc((char *)buf, c); + + for (i=0; idata + _xwin.ximage->xoffset, ++ return _xwin_private_create_screen_bitmap(drv, 0, (unsigned char *)(_xwin.ximage->data + _xwin.ximage->xoffset), + _xwin.ximage->bytes_per_line); + } + +@@ -1400,7 +1400,7 @@ static int _xwin_private_fast_visual_dep + return 0; + + /* Use first line of XImage for test. */ +- p8 = _xwin.ximage->data + _xwin.ximage->xoffset; ++ p8 = (unsigned char *)(_xwin.ximage->data + _xwin.ximage->xoffset); + p16 = (unsigned short*) p8; + p32 = (unsigned long*) p8; + +@@ -2989,7 +2989,7 @@ static BITMAP *_xdga_private_create_scre + XF86DGASetViewPort(_xwin.display, _xwin.screen, 0, 0); + + /* Create screen bitmap from frame buffer. */ +- return _xwin_private_create_screen_bitmap(drv, 1, fb_addr + offset_y * fb_width + offset_x * (_xwin.fast_visual_depth / 8), fb_width); ++ return _xwin_private_create_screen_bitmap(drv, 1, (unsigned char *)(fb_addr + offset_y * fb_width + offset_x * (_xwin.fast_visual_depth / 8)), fb_width); + } + + BITMAP *_xdga_create_screen(GFX_DRIVER *drv, int w, int h, int vw, int vh, int depth, int fullscreen) +--- allegro-4.0.3/src/sound.c.gcc4 2003-04-19 09:06:47.000000000 +0200 ++++ allegro-4.0.3/src/sound.c 2005-04-28 15:38:06.560127480 +0200 +@@ -25,7 +25,7 @@ + + + +-extern DIGI_DRIVER digi_none; ++static DIGI_DRIVER digi_none; + + + +--- allegro-4.0.3/src/fli.c.gcc4 2003-04-19 09:06:47.000000000 +0200 ++++ allegro-4.0.3/src/fli.c 2005-04-28 15:38:06.561127328 +0200 +@@ -184,16 +184,16 @@ static void fli_skip(int bytes) + + + /* helpers for reading FLI chunk data */ +-#define READ_BYTE_NC(p) (*((unsigned char *)(p))++) +-#define READ_CHAR_NC(p) (*((signed char *)(p))++) ++#define READ_BYTE_NC(p) (((unsigned char *)(p))[0]++) ++#define READ_CHAR_NC(p) (((signed char *)(p))[0]++) + + #if (defined ALLEGRO_GCC) && (defined ALLEGRO_I386) + + /* for gcc on i386 */ +-#define READ_WORD_NC(p) (*((unsigned short *)(p))++) +-#define READ_SHORT_NC(p) (*((signed short *)(p))++) +-#define READ_ULONG_NC(p) (*((unsigned long *)(p))++) +-#define READ_LONG_NC(p) (*((signed long *)(p))++) ++#define READ_WORD_NC(p) (((unsigned short *)(p))[0]++) ++#define READ_SHORT_NC(p) (((signed short *)(p))[0]++) ++#define READ_ULONG_NC(p) (((unsigned long *)(p))[0]++) ++#define READ_LONG_NC(p) (((signed long *)(p))[0]++) + + #else + +@@ -289,16 +289,16 @@ static signed long _fli_read_long_nc(uns + * sz is a size of chunk after subtructing size bytes (known to be < 0) + * size is how much bytes we need + * (size + sz) is how much bytes is left in chunk */ +-#define FLI_KLUDGE(p,sz,size) \ +-{ \ +- if (((size) + (sz)) <= 0) { \ +- memset(_fli_broken_data, 0, (size)); \ +- } \ +- else { \ +- memcpy(_fli_broken_data, (p), (size) + (sz)); \ +- memset(_fli_broken_data + (size) + (sz), 0, -(sz)); \ +- } \ +- (p) = _fli_broken_data; \ ++inline void FLI_KLUDGE(char *p,int sz, int size) ++{ ++ if (size + sz <= 0) { ++ memset(_fli_broken_data, 0, size); ++ } ++ else { ++ memcpy(_fli_broken_data, p, size + sz); ++ memset(_fli_broken_data + size + sz, 0, -sz); ++ } ++ p = _fli_broken_data; + } + + diff --git a/allegro.spec b/allegro.spec index 2660f65..3bddd06 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,20 +1,22 @@ Name: allegro Version: 4.0.3 -Release: 10 +Release: 11 Summary: A game programming library Summary(es): Una libreria de programacion de juegos Summary(fr): Une librairie de programmation de jeux Summary(it): Una libreria per la programmazione di videogiochi +Summary(cz): Knihovna pro programování her Group: System Environment/Libraries License: Giftware URL: http://alleg.sourceforge.net/ Source: http://download.sourceforge.net/alleg/allegro-4.0.3.tar.gz -Patch0: %{name}-4.0.3-mmaptest.patch -Patch1: %{name}-4.0.3-novga.patch -Patch2: %{name}-4.0.3-libdir.patch -Patch3: %{name}-4.0.3-cfg.patch +Patch0: allegro-4.0.3-mmaptest.patch +Patch1: allegro-4.0.3-novga.patch +Patch2: allegro-4.0.3-libdir.patch +Patch3: allegro-4.0.3-cfg.patch +Patch4: allegro-4.0.3-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, esound-devel, texinfo, perl, arts-devel @@ -34,11 +36,16 @@ dans les jeux vidéo ou d'autres types de programmation multimédia. Allegro è una libreria multipiattaforma dedicata all'uso nei videogiochi ed in altri tipi di programmazione multimediale. +%description -l cs +Allegro je multiplatformní knihovna pro počítačové hry a jiné +typy multimediálního programování. + %package devel Summary: A game programming library Summary(es): Una libreria de programacion de juegos Summary(fr): Une librairie de programmation de jeux Summary(it): Una libreria per la programmazione di videogiochi +Summary(cz): Knihovna pro programování her Group: Development/Libraries Requires: %{name} = %{version}-%{release}, XFree86-devel Requires(post): /sbin/install-info @@ -64,11 +71,17 @@ Allegro è una libreria multipiattaforma dedicata all'uso nei videogiochi ed in altri tipi di programmazione multimediale. Questo pacchetto è necessario per compilare programmi scritti con Allegro. +%description devel -l cs +Allegro je multiplatformní knihovna pro počítačové hry a jiné +typy multimediálního programování. Tento balíček je je potřebný +k sestavení programů napsaných v Allegru. + %package tools Summary: Extra tools for the Allegro programming library -Summary(es): Herramientas adicionales para la librería de programación Allegro -Summary(fr): Outils supplémentaires pour la librairie de programmation Allegro +Summary(es): Herramientas adicionales para la librería de programación Allegro +Summary(fr): Outils supplémentaires pour la librairie de programmation Allegro Summary(it): Programmi di utilità aggiuntivi per la libreria Allegro +Summary(cz): Přídavné nástroje pro programovou knihovnu Allegro Group: Development/Tools Requires: %{name} = %{version}-%{release} @@ -95,6 +108,11 @@ videogiochi ed in altri tipi di programmazione multimediale. Questo pacchetto contiene programmi di utilità aggiuntivi utili allo sviluppo di programmi con Allegro. +%description tools -l cs +Allegro je multiplatformní knihovna pro počítačové hry a jiné +typy multimediálního programování. Tento balíček obsahuje přídavné nástroje, +které jsou užitečné pro vývoj Allegro programů. + %prep %setup -q @@ -102,6 +120,7 @@ di programmi con Allegro. %patch1 -p1 -b .novga %patch2 -p0 -b .libdir %patch3 -p0 -b .cfg +%patch4 -p1 -b .gcc4 %{__perl} -pi -e \ 's|\$TARGET_ARCH\s+-O\S+|\$RPM_OPT_FLAGS| ; s|LDFLAGS="-s |LDFLAGS="|' \ configure @@ -184,6 +203,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 2 2005 Jindrich Novy 0:4.0.3-11 +- fix build failures with gcc4 (#156224) +- don't use %%{name} in patch names +- add Czech translation to package description/summary + * Fri Apr 7 2005 Michael Schwendt - rebuilt