rpms/allegro/devel allegro-4.0.3-gcc4.patch, 1.1, 1.2 allegro.spec, 1.13, 1.14
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Wed May 25 14:19:22 UTC 2005
Author: jnovy
Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5247
Modified Files:
allegro-4.0.3-gcc4.patch allegro.spec
Log Message:
fix compilation on x86_64
allegro-4.0.3-gcc4.patch:
Index: allegro-4.0.3-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.0.3-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- allegro-4.0.3-gcc4.patch 2 May 2005 14:12:16 -0000 1.1
+++ allegro-4.0.3-gcc4.patch 25 May 2005 14:19:20 -0000 1.2
@@ -1,16 +1,6 @@
---- 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)
+--- allegro-4.0.3/tools/textconv.c.gcc4 2003-04-19 03:06:49.000000000 -0400
++++ allegro-4.0.3/tools/textconv.c 2005-05-25 09:32:42.000000000 -0400
+@@ -190,7 +190,7 @@
if (out_flip)
c = ((c&0xFF)<<8) | ((c&0xFF00)>>8);
@@ -19,9 +9,63 @@
for (i=0; i<size; i++) {
if (flag_c) {
---- allegro-4.0.3/src/x/xwin.c.gcc4 2003-04-19 09:06:49.000000000 +0200
-+++ allegro-4.0.3/src/x/xwin.c 2005-04-28 15:38:06.559127632 +0200
-@@ -765,7 +765,7 @@ static BITMAP *_xwin_private_create_scre
+--- allegro-4.0.3/src/c/cstretch.c.gcc4 2003-04-19 03:06:47.000000000 -0400
++++ allegro-4.0.3/src/c/cstretch.c 2005-05-25 09:36:17.000000000 -0400
+@@ -34,14 +34,14 @@
+ */
+ #define DECLARE_STRETCHER(type, size, set, get) \
+ int dd = _al_stretch.dd; \
+-type *s = (type*) sptr; \
++unsigned char *s = (unsigned char*) sptr; \
+ unsigned long d = dptr; \
+ unsigned long dend = d + _al_stretch.dw; \
+-for (; d < dend; d += (size), (unsigned char*) s += _al_stretch.sinc) { \
+- set(d, get(s)); \
+- if (dd >= 0) \
+- (unsigned char*) s += (size), dd += _al_stretch.i2; \
+- else \
++for (; d < dend; d += (size), s += _al_stretch.sinc) { \
++ set(d, get((type*) s)); \
++ if (dd >= 0) { \
++ s += (size), dd += _al_stretch.i2; \
++ } else \
+ dd += _al_stretch.i1; \
+ }
+
+@@ -127,15 +127,15 @@
+ */
+ #define DECLARE_MASKED_STRETCHER(type, size, set, get, mask) \
+ int dd = _al_stretch.dd; \
+-type *s = (type*) sptr; \
++unsigned char *s = (unsigned char*) sptr; \
+ unsigned long d = dptr; \
+ unsigned long dend = d + _al_stretch.dw; \
+-for (; d < dend; d += (size), (unsigned char*) s += _al_stretch.sinc) { \
+- unsigned long color = get(s); \
++for (; d < dend; d += (size), s += _al_stretch.sinc) { \
++ unsigned long color = get((type*) s); \
+ if (color != (mask)) \
+ set(d, color); \
+ if (dd >= 0) \
+- (unsigned char*) s += (size), dd += _al_stretch.i2; \
++ s += (size), dd += _al_stretch.i2; \
+ else \
+ dd += _al_stretch.i1; \
+ }
+--- allegro-4.0.3/src/sound.c.gcc4 2003-04-19 03:06:47.000000000 -0400
++++ allegro-4.0.3/src/sound.c 2005-05-25 09:32:42.000000000 -0400
+@@ -25,7 +25,7 @@
+
+
+
+-extern DIGI_DRIVER digi_none;
++static DIGI_DRIVER digi_none;
+
+
+
+--- allegro-4.0.3/src/x/xwin.c.gcc4 2003-04-19 03:06:49.000000000 -0400
++++ allegro-4.0.3/src/x/xwin.c 2005-05-25 09:32:42.000000000 -0400
+@@ -765,7 +765,7 @@
_xwin.fast_visual_depth = _xwin_private_fast_visual_depth();
/* Create screen bitmap from frame buffer. */
@@ -30,7 +74,7 @@
_xwin.ximage->bytes_per_line);
}
-@@ -1400,7 +1400,7 @@ static int _xwin_private_fast_visual_dep
+@@ -1400,7 +1400,7 @@
return 0;
/* Use first line of XImage for test. */
@@ -39,7 +83,7 @@
p16 = (unsigned short*) p8;
p32 = (unsigned long*) p8;
-@@ -2989,7 +2989,7 @@ static BITMAP *_xdga_private_create_scre
+@@ -2989,7 +2989,7 @@
XF86DGASetViewPort(_xwin.display, _xwin.screen, 0, 0);
/* Create screen bitmap from frame buffer. */
@@ -48,20 +92,9 @@
}
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)
+--- allegro-4.0.3/src/fli.c.gcc4 2003-04-19 03:06:47.000000000 -0400
++++ allegro-4.0.3/src/fli.c 2005-05-25 09:32:42.000000000 -0400
+@@ -184,16 +184,16 @@
/* helpers for reading FLI chunk data */
@@ -84,7 +117,7 @@
#else
-@@ -289,16 +289,16 @@ static signed long _fli_read_long_nc(uns
+@@ -289,16 +289,16 @@
* 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 */
@@ -111,3 +144,13 @@
}
+--- allegro-4.0.3/examples/exspline.c.gcc4 2003-04-19 03:06:46.000000000 -0400
++++ allegro-4.0.3/examples/exspline.c 2005-05-25 09:32:42.000000000 -0400
+@@ -84,6 +84,7 @@
+
+ n.x = node.x - (prev.x - node.x) / 8;
+ n.y = node.y - (prev.y - node.y) / 8;
++ n.tangent = 0;
+
+ return n;
+ }
Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- allegro.spec 22 May 2005 22:52:40 -0000 1.13
+++ allegro.spec 25 May 2005 14:19:20 -0000 1.14
@@ -121,9 +121,6 @@
%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
%build
@@ -132,7 +129,11 @@
--enable-vga=no --enable-vbeaf=no \
%endif
--enable-svgalib=no
-make %{?_smp_mflags}
+%ifnarch %{ix86}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
+%else
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
+%endif
MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \
DAT=../../tools/dat sh misc/mkdata.sh
@@ -203,6 +204,9 @@
%changelog
+* Wed May 25 2005 Jindrich Novy <jnovy at redhat.com> 4.0.3-13
+- fix compilation on x86_64 (#158648)
+
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 4.0.3-12
- rebuild on all arches
More information about the fedora-extras-commits
mailing list