Date: Wed, 15 Oct 2003 19:28:03 +0400 From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports@FreeBSD.org Subject: a little HEADS UP: devel/allegro update Message-ID: <20031015152803.GR39789@freebsd.org.ru>
next in thread | raw e-mail | index | archive | help
--z3Nkz3fRLNVT9Ca+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello allegro users, I have a plan to update our devel/allegro port to 4.1.11. Patch included. Please test it. Thanks. -- Rgdz, /"\ ASCII RIBBON CAMPAIGN Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL http://ozz.pp.ru/ X AND NEWS / \ --z3Nkz3fRLNVT9Ca+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-allegro Index: ports/devel/allegro/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/allegro/Makefile,v retrieving revision 1.16 diff -u -u -r1.16 Makefile --- ports/devel/allegro/Makefile 20 Apr 2003 02:56:20 -0000 1.16 +++ ports/devel/allegro/Makefile 15 Oct 2003 15:23:25 -0000 @@ -6,7 +6,7 @@ # PORTNAME= allegro -PORTVERSION= 4.1.4 +PORTVERSION= 4.1.11 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= alleg @@ -18,11 +18,12 @@ WANT_GNOME= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_AUTOCONF_VER= 213 +USE_AUTOCONF_VER= 253 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \ LDFLAGS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-vga=no MAKEFILE= makefile +ALL_TARGET= full-build INSTALLS_SHLIB= yes SHLIB_VER= 41 Index: ports/devel/allegro/Makefile.man =================================================================== RCS file: /home/pcvs/ports/devel/allegro/Makefile.man,v retrieving revision 1.2 diff -u -u -r1.2 Makefile.man --- ports/devel/allegro/Makefile.man 30 Mar 2003 03:04:33 -0000 1.2 +++ ports/devel/allegro/Makefile.man 15 Oct 2003 15:21:46 -0000 @@ -7,6 +7,8 @@ DATAFILE.3 \ DIALOG.3 \ DIALOG_PLAYER.3 \ + END_OF_MAIN.3 \ + MENU_PLAYER.3 \ FONT.3 \ GFX_MODE.3 \ GFX_MODE_LIST.3 \ @@ -76,18 +78,15 @@ bitmap_mask_color.3 \ black_palette.3 \ blit.3 \ - bmp_read_line.3 \ - bmp_unwrite_line.3 \ - bmp_write_line.3 \ broadcast_dialog_message.3 \ calc_spline.3 \ calibrate_joystick.3 \ calibrate_joystick_name.3 \ + canonicalize_filename.3 \ centre_dialog.3 \ check_cpu.3 \ circle.3 \ circlefill.3 \ - clear.3 \ clear_bitmap.3 \ clear_keybuf.3 \ clear_scene.3 \ @@ -164,7 +163,6 @@ do_uconvert.3 \ dot_product.3 \ dot_product_f.3 \ - draw_character.3 \ draw_character_ex.3 \ draw_compiled_sprite.3 \ draw_gouraud_sprite.3 \ @@ -182,7 +180,54 @@ ellipsefill.3 \ empty_string.3 \ enable_triple_buffer.3 \ + ex12bit.3 \ + ex3buf.3 \ + ex3d.3 \ + exaccel.3 \ + exalpha.3 \ + exbitmap.3 \ + exblend.3 \ + excamera.3 \ + excolmap.3 \ + exconfig.3 \ + excustom.3 \ + exdata.3 \ + exdbuf.3 \ + exdodgy.3 \ + exexedat.3 \ + exfixed.3 \ + exflame.3 \ + exflip.3 \ + exgui.3 \ + exhello.3 \ exists.3 \ + exjoy.3 \ + exkeys.3 \ + exlights.3 \ + exmem.3 \ + exmidi.3 \ + exmouse.3 \ + expal.3 \ + expat.3 \ + exquat.3 \ + exrgbhsv.3 \ + exsample.3 \ + exscale.3 \ + exscn3d.3 \ + exscroll.3 \ + exshade.3 \ + exspline.3 \ + exsprite.3 \ + exstars.3 \ + exstream.3 \ + exswitch.3 \ + extimer.3 \ + extrans.3 \ + extruec.3 \ + exunicod.3 \ + exupdate.3 \ + exxfade.3 \ + exzbuf.3 \ fade_from.3 \ fade_from_range.3 \ fade_in.3 \ @@ -191,7 +236,6 @@ fade_out.3 \ fade_out_range.3 \ file_exists.3 \ - file_select.3 \ file_select_ex.3 \ file_size.3 \ file_time.3 \ @@ -199,7 +243,6 @@ find_datafile_object.3 \ find_dialog_focus.3 \ fix_filename_case.3 \ - fix_filename_path.3 \ fix_filename_slashes.3 \ fixacos.3 \ fixadd.3 \ @@ -232,7 +275,7 @@ floodfill.3 \ flush_config_file.3 \ font.3 \ - for_each_file.3 \ + for_each_file_ex.3 \ free_audio_stream_buffer.3 \ freeze_mouse_flag.3 \ ftofix.3 \ @@ -244,6 +287,8 @@ get_camera_matrix.3 \ get_camera_matrix_f.3 \ get_color.3 \ + get_color_conversion.3 \ + get_color_depth.3 \ get_compiled_sprite.3 \ get_config_argv.3 \ get_config_float.3 \ @@ -336,7 +381,6 @@ gui_shadow_box_proc.3 \ gui_strlen.3 \ gui_text_list_proc.3 \ - gui_textout.3 \ gui_textout_ex.3 \ hline.3 \ hook_config_section.3 \ @@ -345,6 +389,7 @@ identity_matrix_f.3 \ identity_quat.3 \ init_dialog.3 \ + init_menu.3 \ initialise_joystick.3 \ install_allegro.3 \ install_int.3 \ @@ -361,6 +406,7 @@ is_linear_bitmap.3 \ is_memory_bitmap.3 \ is_planar_bitmap.3 \ + is_relative_filename.3 \ is_same_bitmap.3 \ is_screen_bitmap.3 \ is_sub_bitmap.3 \ @@ -395,6 +441,8 @@ lock_bitmap.3 \ lock_midi.3 \ lock_sample.3 \ + make_absolute_filename.3 \ + make_relative_filename.3 \ makeacol.3 \ makeacol32.3 \ makeacol_depth.3 \ @@ -575,6 +623,7 @@ set_blender_mode_ex.3 \ set_burn_blender.3 \ set_clip.3 \ + set_close_button_callback.3 \ set_color.3 \ set_color_blender.3 \ set_color_conversion.3 \ @@ -614,8 +663,6 @@ set_uformat.3 \ set_volume.3 \ set_volume_per_voice.3 \ - set_window_close_button.3 \ - set_window_close_hook.3 \ set_window_title.3 \ set_write_alpha_blender.3 \ set_zbuffer.3 \ @@ -623,6 +670,7 @@ show_video_bitmap.3 \ shutdown_dialog.3 \ simulate_keypress.3 \ + shutdown_menu.3 \ simulate_ukeypress.3 \ solid_mode.3 \ spline.3 \ @@ -635,22 +683,13 @@ stretch_sprite.3 \ text_height.3 \ text_length.3 \ - text_mode.3 \ - textout.3 \ - textout_centre.3 \ textout_centre_ex.3 \ textout_ex.3 \ - textout_justify.3 \ textout_justify_ex.3 \ - textout_right.3 \ textout_right_ex.3 \ - textprintf.3 \ - textprintf_centre.3 \ textprintf_centre_ex.3 \ textprintf_ex.3 \ - textprintf_justify.3 \ textprintf_justify_ex.3 \ - textprintf_right.3 \ textprintf_right_ex.3 \ three_finger_flag.3 \ timer_can_simulate_retrace.3 \ @@ -679,6 +718,7 @@ unselect_palette.3 \ uoffset.3 \ update_dialog.3 \ + update_menu.3 \ ureadkey.3 \ uremove.3 \ usetat.3 \ Index: ports/devel/allegro/distinfo =================================================================== RCS file: /home/pcvs/ports/devel/allegro/distinfo,v retrieving revision 1.4 diff -u -u -r1.4 distinfo --- ports/devel/allegro/distinfo 30 Mar 2003 03:04:33 -0000 1.4 +++ ports/devel/allegro/distinfo 15 Oct 2003 15:21:37 -0000 @@ -1 +1 @@ -MD5 (allegro-4.1.4.tar.gz) = 6be4c094310e98615982bc980e832338 +MD5 (allegro-4.1.11.tar.gz) = 61568ff088fd074eaad8b5cc23ac40ff Index: ports/devel/allegro/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/allegro/pkg-plist,v retrieving revision 1.9 diff -u -u -r1.9 pkg-plist --- ports/devel/allegro/pkg-plist 30 Mar 2003 03:04:33 -0000 1.9 +++ ports/devel/allegro/pkg-plist 15 Oct 2003 15:21:56 -0000 @@ -55,6 +55,7 @@ include/allegro/platform/aintdos.h include/allegro/platform/aintlnx.h include/allegro/platform/aintmac.h +include/allegro/platform/aintosx.h include/allegro/platform/aintqnx.h include/allegro/platform/aintunix.h include/allegro/platform/aintwin.h @@ -70,6 +71,8 @@ include/allegro/platform/almaccfg.h include/allegro/platform/almngw32.h include/allegro/platform/almsvc.h +include/allegro/platform/alosx.h +include/allegro/platform/alosxcfg.h include/allegro/platform/alplatf.h include/allegro/platform/alqnx.h include/allegro/platform/alqnxcfg.h @@ -144,6 +147,8 @@ %%PORTDOCS%%share/doc/allegro/alleg041.html %%PORTDOCS%%share/doc/allegro/alleg042.html %%PORTDOCS%%share/doc/allegro/alleg043.html +%%PORTDOCS%%share/doc/allegro/alleg044.html +%%PORTDOCS%%share/doc/allegro/alleg045.html %%PORTDOCS%%share/doc/allegro/allegro.css %%PORTDOCS%%share/doc/allegro/allegro.html %%PORTDOCS%%share/doc/allegro/api.html Index: ports/devel/allegro/files/patch-configure.in =================================================================== RCS file: /home/pcvs/ports/devel/allegro/files/patch-configure.in,v retrieving revision 1.4 diff -u -u -r1.4 patch-configure.in --- ports/devel/allegro/files/patch-configure.in 30 Mar 2003 03:04:33 -0000 1.4 +++ ports/devel/allegro/files/patch-configure.in 15 Oct 2003 15:22:09 -0000 @@ -1,22 +1,6 @@ ---- configure.in.orig Wed Oct 23 08:08:26 2002 -+++ configure.in Sun Nov 10 00:24:54 2002 -@@ -183,12 +183,12 @@ - TARGET_ARCH= - fi - if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then -- CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" -+ CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" - else -- CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" -+ CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS" - fi - ALLEGRO_DEBUG_CFLAGS="-g $WFLAGS -DDEBUGMODE" -- ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" -+ ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS" - if test "X$allegro_cv_can_use_pipe" = "Xyes"; then - CFLAGS="-pipe $CFLAGS" - ALLEGRO_DEBUG_CFLAGS="-pipe $ALLEGRO_DEBUG_CFLAGS" -@@ -245,8 +245,8 @@ +--- configure.in.orig Wed Oct 15 17:44:15 2003 ++++ configure.in Wed Oct 15 17:49:12 2003 +@@ -235,8 +235,8 @@ LINK_WITH_STATIC_LIBS=yes allegro_static_libraries=yes else @@ -27,7 +11,7 @@ LINK_WITH_STATIC_LIBS=no allegro_shared_libraries=yes fi -@@ -273,13 +273,13 @@ +@@ -264,13 +264,13 @@ fi if test "X$allegro_shared_libraries" = "Xyes"; then if test "X$allegro_build_normal_library" = "Xyes"; then @@ -44,12 +28,24 @@ fi fi AC_SUBST(ALLEGRO_LIB_TARGETS) -@@ -550,7 +550,7 @@ +@@ -647,9 +647,9 @@ + fi + ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" + if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then +- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" ++ CFLAGS="$CFLAGS $TARGET_ARCH -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" + else +- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" ++ CFLAGS="$CFLAGS $TARGET_ARCH -funroll-loops -ffast-math $WFLAGS" + fi + ALLEGRO_SFLAGS="-x assembler-with-cpp" + ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED" +@@ -720,7 +720,7 @@ ${MAKE-make} depend else AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.]) - gmake depend + ${MAKE-make} depend - AC_MSG_WARN([You need to use GNU make to build Allegro.]) - AC_MSG_WARN([This might be called gmake on your system.]) fi + fi + Index: ports/devel/allegro/files/patch-makefile.in =================================================================== RCS file: /home/pcvs/ports/devel/allegro/files/patch-makefile.in,v retrieving revision 1.7 diff -u -u -r1.7 patch-makefile.in --- ports/devel/allegro/files/patch-makefile.in 30 Mar 2003 03:04:33 -0000 1.7 +++ ports/devel/allegro/files/patch-makefile.in 15 Oct 2003 15:22:09 -0000 @@ -1,23 +1,22 @@ ---- makefile.in.orig Wed Oct 23 08:08:26 2002 -+++ makefile.in Sun Nov 10 23:37:39 2002 +--- makefile.in.orig Wed Oct 15 17:50:22 2003 ++++ makefile.in Wed Oct 15 18:01:27 2003 @@ -20,7 +20,7 @@ mandir = @mandir@ libdir = @libdir@ - modulebasedir = @libdir@/allegro + modulebasedir = $(libdir)/allegro -moduledir = $(modulebasedir)/$(shared_major_minor) +moduledir = $(modulebasedir)/$(shared_version) EXE = OBJ = .o -@@ -29,13 +29,14 @@ +@@ -29,12 +29,13 @@ INFO_DIR = $(infodir)/dir DESTDIR = -ACLOCAL = aclocal -+ACLOCAL = true - ACLOCAL_M4 = $(srcdir)/aclocal.m4 -AUTOCONF = autoconf -AUTOHEADER = autoheader ++ACLOCAL = true +AUTOCONF = true +AUTOHEADER = true @@ -27,8 +26,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ -@@ -262,6 +263,11 @@ - all: lib modules programs docs +@@ -293,6 +294,11 @@ + full-build: lib modules programs docs lib: $(ALLEGRO_LIB_TARGETS) + @for l in alleg alld allp; do \ @@ -39,7 +38,7 @@ modules: $(ALLEGRO_MODULE_TARGETS) -@@ -349,35 +355,37 @@ +@@ -402,35 +408,37 @@ fi; \ done @for l in alleg alld allp; do \ @@ -55,7 +54,7 @@ @if test -n "$(ALLEGRO_MODULE_TARGETS)"; then \ $(mkinstalldirs) $(DESTDIR)$(moduledir); \ - for m in $(ALLEGRO_MODULE_TARGETS) modules.lst; do \ -+ for m in $(ALLEGRO_MODULE_TARGETS); do \ ++ for m in $(ALLEGRO_MODULE_TARGETS) ; do \ echo Installing $$m to $(DESTDIR)$(moduledir); \ - $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \ + $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \ Index: ports/devel/allegro/files/patch-misc::deplib.sh =================================================================== RCS file: /home/pcvs/ports/devel/allegro/files/patch-misc::deplib.sh,v retrieving revision 1.2 diff -u -u -r1.2 patch-misc::deplib.sh --- ports/devel/allegro/files/patch-misc::deplib.sh 30 Mar 2003 03:04:33 -0000 1.2 +++ ports/devel/allegro/files/patch-misc::deplib.sh 15 Oct 2003 15:22:09 -0000 @@ -1,5 +1,5 @@ ---- misc/deplib.sh.orig Wed Oct 23 08:08:27 2002 -+++ misc/deplib.sh Sun Nov 10 00:40:21 2002 +--- misc/deplib.sh.orig Wed Oct 15 18:02:29 2003 ++++ misc/deplib.sh Wed Oct 15 18:03:43 2003 @@ -10,7 +10,7 @@ staticlib="lib${1}.a" staticobj="\$(${2}_OBJECTS)" @@ -13,8 +13,8 @@ echo " rm -f \$@" # gf: This bit is obviously gcc-specific # eb: Yes, but the GNU C Compiler doesn't always spell 'gcc' -- echo " \$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)" -+ echo " \$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_version) \$(LIBS)" +- echo " \$(CC) -shared -o \$@ ${shareobj} ${3} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)" ++ echo " \$(CC) -shared -o \$@ ${shareobj} ${3} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_version) \$(LIBS)" echo "" echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}" echo " rm -f \$@" --z3Nkz3fRLNVT9Ca+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031015152803.GR39789>