Re: [AD] 4.0.1 release

["Eric Botcazou" <ebotcazou@xxxxxxxxxx>]

> Is the list complete ? If so, I plan to make a beta3 release on Thursday
> evening (22:00 GMT).

Once again late, but there was a documentary on Linux this evening on the
Franco-German cultural TV channel...

The 4.0.1-beta3 release is available at SourceForge. Hopefully it fixes all
the problems under FreeBSD. It needs to be tested (compilation+installation)
on the three following platforms:
- Linux: ok (Mandrake 8.0)
- FreeBSD
- BeOS


Here are the patches I applied:

--- /home/eric/cvsroot/allegro/src/x/xwin.c Sat Feb  9 13:29:47 2002
+++ allegro/src/x/xwin.c Fri Mar 15 00:32:14 2002
@@ -1103,8 +1103,10 @@
     _xwin.shminfo.readOnly = True;

     /* Attach shared memory to the X-server address space.  */
-    if (XShmAttach(_xwin.display, &_xwin.shminfo))
+    if (XShmAttach(_xwin.display, &_xwin.shminfo)) {
+       XSync(_xwin.display, False);
        break;
+     }

     shmdt(_xwin.shminfo.shmaddr);
         }

--- /home/eric/cvsroot/allegro/configure.in Fri Mar  8 21:09:59 2002
+++ allegro/configure.in Fri Mar 15 00:36:56 2002
@@ -370,6 +370,7 @@
     AC_CHECK_HEADERS(sys/io.h linux/joystick.h)

     if test "$allegro_enable_vga" = yes; then
+      allegro_support_vga=yes
       AC_DEFINE(ALLEGRO_LINUX_VGA)
     fi

@@ -422,7 +423,7 @@
 if test -n "$allegro_support_modules"; then

   dnl VGA/ModeX.
-  if test "X$allegro_enable_vga" = "Xyes"; then
+  if test "X$allegro_support_vga" = "Xyes"; then
     ALLEGRO_MODULE_TARGETS="$ALLEGRO_MODULE_TARGETS lib/unix/alleg-vga.so"
   fi

--- /home/eric/cvsroot/allegro/configure.in Fri Mar  8 21:09:59 2002
+++ allegro/configure.in Fri Mar 15 00:36:56 2002
@@ -396,7 +397,7 @@
    fi
           AC_MSG_CHECKING(for vga_version in vga.h)
           AC_CACHE_VAL(allegro_cv_have_vga_version,
-          [AC_TRY_COMPILE([#include <vga.h>], [int x = vga_version;],
+          [AC_TRY_COMPILE([#include <vga.h>], [int x = vga_version; x++;],
             allegro_cv_have_vga_version=yes,
             allegro_cv_have_vga_version=no)])
           AC_MSG_RESULT($allegro_cv_have_vga_version)

--- /home/eric/cvsroot/allegro/makefile.in Fri Mar  8 21:10:00 2002
+++ allegro/makefile.in Fri Mar 15 00:33:45 2002
@@ -332,9 +332,13 @@
    echo "Warning: shared library destination $(libdir) is not in ldd search
path." ; \
    echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH
to include"; \
    echo "$(libdir) each time you want to run an Allegro program." ; \
-   $(LDCONFIG) -n $(libdir) ; \
   ) ; \
  fi
+ @for l in alleg alld allp; do \
+   if test -f $(libdir)/lib$${l}-$(shared_version).so -a \! -L
$(libdir)/lib$${l}.so.${shared_major_minor}; then \
+     (cd $(libdir); ln -s lib$${l}-$(shared_version).so
lib$${l}.so.${shared_major_minor}); \
+   fi; \
+ done

 install-headers:
  $(mkinstalldirs) $(includedir)/allegro
@@ -423,8 +427,8 @@
  @echo "Uninstalling shared libraries..."
  @for l in alleg alld allp; do \
    rm -f $(libdir)/lib$${l}-${shared_version}.so; \
+   rm -f $(libdir)/lib$${l}.so.${shared_major_minor}; \
  done
- $(LDCONFIG) -n $(libdir)    # remove symlinks
  -$(LDCONFIG) $(libdir)       # update cache (only works if we're root)

 uninstall-modules:


You may note that the third patch is a little different from the initially
planned one; that's the result of a Ping-Pong game between Peter and me...
and he won ;-)

--
Eric Botcazou
ebotcazou@xxxxxxxxxx