Date: Sun, 14 Aug 2005 15:16:32 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/84918: [UPDATE] devel/allegro: update to version 4.2.0 beta 4 and ports that depend on it Message-ID: <1124043392.0@phobos.mars.bsd> Resent-Message-ID: <200508141820.j7EIKFUq080522@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84918
>Category: ports
>Synopsis: [UPDATE] devel/allegro: update to version 4.2.0 beta 4 and ports that depend on it
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 14 18:20:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
>Description:
* Update to 4.2.0 beta 4.
* Change library version from 41 to 42.
* Take maintainership.
* Use autoconf 2.59 instead of 2.53.
* Add OPTIONS.
* Remove automatic target optimizations (-mcpu).
* Update the ports that depend on allegro:
devel/dumb
emulators/o2em
emulators/raine
games/pinball
graphics/allegrogl
math/chryzodus
(games/fargoal will be upgraded separately, because the port will be upgraded too)
>How-To-Repeat:
>Fix:
--- allegro.diff begins here ---
diff -urN /usr/ports/devel/allegro/Makefile allegro/Makefile
--- /usr/ports/devel/allegro/Makefile Wed Jul 27 18:10:14 2005
+++ allegro/Makefile Sun Aug 14 15:12:33 2005
@@ -6,90 +6,124 @@
#
PORTNAME= allegro
-PORTVERSION= 4.1.12
-PORTREVISION= 1
+PORTVERSION= 4.2.0${BSFX}
+BETA= 4
+BSFX= .b${BETA}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= alleg
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/${BSFX}//}-beta${BETA}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= alejandro@varnet.biz
COMMENT= A cross-platform library for games and multimedia programming
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/${BSFX}//}
+
+USE_GMAKE= yes
+USE_REINPLACE= yes
USE_XLIB= yes
WANT_GNOME= yes
-USE_REINPLACE= yes
-USE_GMAKE= yes
-USE_AUTOCONF_VER= 253
-.if !defined(WITHOUT_THREADS)
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
- LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --enable-vga=no
-.else
-CONFIGURE_ARGS= --enable-vga=no --enable-pthreads=no
-.endif
+USE_AUTOCONF_VER= 259
+
+.include "Makefile.man"
+
+INFO= allegro
+
+OPTIONS= ARTS "Enable Arts support" off \
+ DEV_UTILS "Build development utilities" on \
+ ESOUND "Enable Esound support" off \
+ OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
+ THREADS "Enable threads" on
MAKEFILE= makefile
ALL_TARGET= full-build
+
INSTALLS_SHLIB= yes
-SHLIB_VER= 41
PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
-DEMO= demo.c demo.dat demo.h music.txt ../readme.txt
-INFO= allegro
+DEMO= demo.c demo.dat demo.h music.txt ../readme.txt
+SHLIB_VER= 42
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+= esound
-PKGNAMESUFFIX= -esound
-PLIST_SUB+= ESOUND=""
-.else
-CONFIGURE_ARGS+= --enable-esddigi=no
-PLIST_SUB+= ESOUND="@comment "
+.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in
.endif
-.if exists(${LOCALBASE}/lib/libartsc.so.0)
-WITH_ARTS= yes
-.endif
-.if defined(WITH_ARTS)
+.if defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so.0)
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
+CONFIGURE_ARGS+= --enable-artsdigi
PLIST_SUB+= ARTS=""
.else
CONFIGURE_ARGS+= --disable-artsdigi
PLIST_SUB+= ARTS="@comment "
.endif
-.if defined(WITHOUT_DEVEL)
+.if defined(WITH_DEV_UTILS)
+INSTALL_TARGET= full-install install-man install-info
+PLIST_SUB+= DEV_UTILS=""
+.else
INSTALL_TARGET= mini-install install-man install-info
-PLIST_SUB+= FULL="@comment "
+PLIST_SUB+= DEV_UTILS="@comment "
+.endif
+
+.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+= esound
+PKGNAMESUFFIX= -esound
+CONFIGURE_ARGS+= --enable-esddigi
+PLIST_SUB+= ESOUND=""
.else
-INSTALL_TARGET= full-install install-man install-info
-PLIST_SUB+= FULL=""
+CONFIGURE_ARGS+= --disable-esddigi
+PLIST_SUB+= ESOUND="@comment "
.endif
-.if !defined(NOPORTDOCS)
-PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}"
+.if defined(WITH_THREADS)
+CONFIGURE_ARGS+= --enable-pthreads
+CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
+ LDFLAGS="${PTHREAD_LIBS}"
+.else
+CONFIGURE_ARGS+= --disable-pthreads
.endif
post-patch:
- @${REINPLACE_CMD} -e \
- 's|${PORTVERSION}|${SHLIB_VER}|g' ${WRKSRC}/makefile.ver
- @${REINPLACE_CMD} -e 's|-l[$$]{lib_type}-[$$]{version}|-l\$${lib_type}|' \
- ${WRKSRC}/misc/allegro-config.in
+# Change "x.y.z" into "xy" in the shared library version
+ @${REINPLACE_CMD} -e 's|${PORTVERSION:S/${BSFX}//}|${SHLIB_VER}|g' \
+ ${WRKSRC}/makefile.ver
+
+# Remove architecture specific optimizations
+ @${REINPLACE_CMD} -e 's|$$TARGET_ARCH||g' \
+ ${CONFIGURE_WRKSRC}/configure.in
+
+# Remove "-ffast-math" flag on alpha, because it breaks
+.if ${ARCH} == "alpha"
+ @${REINPLACE_CMD} -e 's|-ffast-math||g' \
+ ${CONFIGURE_WRKSRC}/configure.in
+.endif
+
+# Enable/disable compilation optimizations
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+ @${REINPLACE_CMD} -e 's|-O2||g ; \
+ s|-ffast-math||g ; \
+ s|-fomit-frame-pointer||g ; \
+ s|-funroll-loops||g' \
+ ${CONFIGURE_WRKSRC}/configure.in
+.endif
post-install:
+# Documentation
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/html/*.css ${DOCSDIR}
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
+
+# Examples
.for FILE in ${DEMO}
${INSTALL_DATA} ${WRKSRC}/demo/${FILE} ${EXAMPLESDIR}
.endfor
.endif
-.include "Makefile.man"
.include <bsd.port.post.mk>
diff -urN /usr/ports/devel/allegro/Makefile.man allegro/Makefile.man
--- /usr/ports/devel/allegro/Makefile.man Fri Dec 12 22:41:30 2003
+++ allegro/Makefile.man Wed Aug 3 18:57:41 2005
@@ -1,12 +1,21 @@
MAN3= \
+ ALLEGRO_DATE.3 \
+ ALLEGRO_DATE_STR.3 \
+ ALLEGRO_SUB_VERSION.3 \
+ ALLEGRO_VERSION.3 \
+ ALLEGRO_VERSION_STR.3 \
+ ALLEGRO_WIP_VERSION.3 \
+ AL_ID.3 \
ASSERT.3 \
AUDIOSTREAM.3 \
BITMAP.3 \
COLOR_MAP.3 \
COMPILED_SPRITE.3 \
DATAFILE.3 \
+ DAT_ID.3 \
DIALOG.3 \
DIALOG_PLAYER.3 \
+ END_OF_FUNCTION.3 \
END_OF_MAIN.3 \
FONT.3 \
GFX_MODE.3 \
@@ -15,6 +24,11 @@
JOYSTICK_INFO.3 \
JOYSTICK_STICK_INFO.3 \
JOYSTIC_AXIS_INFO.3 \
+ LOCK_FUNCTION.3 \
+ LOCK_VARIABLE.3 \
+ LZSS_PACK_DATA.3 \
+ LZSS_UNPACK_DATA.3 \
+ MAKE_VERSION.3 \
MASK_COLOR_15.3 \
MASK_COLOR_16.3 \
MASK_COLOR_24.3 \
@@ -26,15 +40,36 @@
MENU_PLAYER.3 \
MIDI.3 \
PACKFILE.3 \
+ PACKFILE_VTABLE.3 \
PALETTE.3 \
+ PAL_SIZE.3 \
+ POLYTYPE_ATEX.3 \
+ POLYTYPE_ATEX_LIT.3 \
+ POLYTYPE_ATEX_MASK.3 \
+ POLYTYPE_ATEX_MASK_LIT.3 \
+ POLYTYPE_ATEX_MASK_TRANS.3 \
+ POLYTYPE_ATEX_TRANS.3 \
+ POLYTYPE_FLAT.3 \
+ POLYTYPE_GCOL.3 \
+ POLYTYPE_GRGB.3 \
+ POLYTYPE_PTEX.3 \
+ POLYTYPE_PTEX_LIT.3 \
+ POLYTYPE_PTEX_MASK.3 \
+ POLYTYPE_PTEX_MASK_LIT.3 \
+ POLYTYPE_PTEX_MASK_TRANS.3 \
+ POLYTYPE_PTEX_TRANS.3 \
QUAT.3 \
RGB.3 \
RGB_MAP.3 \
RLE_SPRITE.3 \
SAMPLE.3 \
+ SCREEN_H.3 \
+ SCREEN_W.3 \
TRACE.3 \
V3D.3 \
V3D_f.3 \
+ VIRTUAL_H.3 \
+ VIRTUAL_W.3 \
ZBUFFER.3 \
_getpixel.3 \
_getpixel15.3 \
@@ -52,6 +87,7 @@
acquire_screen.3 \
active_dialog.3 \
active_menu.3 \
+ add_clip_rect.3 \
adjust_sample.3 \
al_assert.3 \
al_ffblk.3 \
@@ -64,6 +100,7 @@
allegro_404_char.3 \
allegro_error.3 \
allegro_exit.3 \
+ allegro_icon.3 \
allegro_id.3 \
allegro_init.3 \
allegro_message.3 \
@@ -78,6 +115,9 @@
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 \
@@ -106,6 +146,8 @@
create_blender_table.3 \
create_color_table.3 \
create_light_table.3 \
+ create_lzss_pack_data.3 \
+ create_lzss_unpack_data.3 \
create_rgb_table.3 \
create_sample.3 \
create_scene.3 \
@@ -154,6 +196,7 @@
detect_midi_driver.3 \
dialog_message.3 \
digi_recorder.3 \
+ disable_hardware_cursor.3 \
do_arc.3 \
do_circle.3 \
do_dialog.3 \
@@ -179,6 +222,7 @@
ellipse.3 \
ellipsefill.3 \
empty_string.3 \
+ enable_hardware_cursor.3 \
enable_triple_buffer.3 \
ex12bit.3 \
ex3buf.3 \
@@ -193,11 +237,11 @@
excustom.3 \
exdata.3 \
exdbuf.3 \
- exdodgy.3 \
exexedat.3 \
exfixed.3 \
exflame.3 \
exflip.3 \
+ exfont.3 \
exgui.3 \
exhello.3 \
exists.3 \
@@ -207,6 +251,7 @@
exmem.3 \
exmidi.3 \
exmouse.3 \
+ expackf.3 \
expal.3 \
expat.3 \
exquat.3 \
@@ -221,7 +266,9 @@
exstars.3 \
exstream.3 \
exswitch.3 \
+ exsyscur.3 \
extimer.3 \
+ extract_font_range.3 \
extrans.3 \
extruec.3 \
exunicod.3 \
@@ -235,6 +282,7 @@
fade_interpolate.3 \
fade_out.3 \
fade_out_range.3 \
+ fastline.3 \
file_exists.3 \
file_select_ex.3 \
file_size.3 \
@@ -277,6 +325,8 @@
font.3 \
for_each_file_ex.3 \
free_audio_stream_buffer.3 \
+ free_lzss_pack_data.3 \
+ free_lzss_unpack_data.3 \
freeze_mouse_flag.3 \
ftofix.3 \
generate_332_palette.3 \
@@ -286,6 +336,8 @@
get_audio_stream_buffer.3 \
get_camera_matrix.3 \
get_camera_matrix_f.3 \
+ get_clip_rect.3 \
+ get_clip_state.3 \
get_color.3 \
get_color_conversion.3 \
get_color_depth.3 \
@@ -303,7 +355,17 @@
get_executable_name.3 \
get_extension.3 \
get_filename.3 \
+ get_font_range_begin.3 \
+ get_font_range_end.3 \
+ get_font_ranges.3 \
get_gfx_mode_list.3 \
+ get_midi_length.3 \
+ get_mixer_bits.3 \
+ get_mixer_buffer_length.3 \
+ get_mixer_channels.3 \
+ get_mixer_frequency.3 \
+ get_mixer_quality.3 \
+ get_mixer_voices.3 \
get_mouse_mickeys.3 \
get_palette.3 \
get_palette_range.3 \
@@ -364,12 +426,14 @@
gfx_mode_select.3 \
gfx_mode_select_ex.3 \
gfx_mode_select_filter.3 \
+ grab_font_from_bitmap.3 \
gui_bg_color.3 \
gui_button_proc.3 \
gui_ctext_proc.3 \
gui_edit_proc.3 \
gui_fg_color.3 \
gui_font_baseline.3 \
+ gui_get_screen.3 \
gui_list_proc.3 \
gui_menu_draw_menu.3 \
gui_menu_draw_menu_item.3 \
@@ -379,6 +443,7 @@
gui_mouse_x.3 \
gui_mouse_y.3 \
gui_mouse_z.3 \
+ gui_set_screen.3 \
gui_shadow_box_proc.3 \
gui_strlen.3 \
gui_text_list_proc.3 \
@@ -404,8 +469,12 @@
install_sound.3 \
install_sound_input.3 \
install_timer.3 \
+ is_color_font.3 \
+ is_compatible_font.3 \
+ is_inside_bitmap.3 \
is_linear_bitmap.3 \
is_memory_bitmap.3 \
+ is_mono_font.3 \
is_planar_bitmap.3 \
is_relative_filename.3 \
is_same_bitmap.3 \
@@ -413,6 +482,7 @@
is_sub_bitmap.3 \
is_system_bitmap.3 \
is_video_bitmap.3 \
+ is_windowed_mode.3 \
itofix.3 \
joy.3 \
key.3 \
@@ -424,24 +494,38 @@
keyboard_ucallback.3 \
keypressed.3 \
line.3 \
+ load_bios_font.3 \
load_bitmap.3 \
+ load_bitmap_font.3 \
load_bmp.3 \
+ load_bmp_pf.3 \
+ load_dat_font.3 \
load_datafile.3 \
load_datafile_callback.3 \
load_datafile_object.3 \
+ load_font.3 \
+ load_grx_font.3 \
+ load_grx_or_bios_font.3 \
load_ibk.3 \
load_joystick_data.3 \
load_lbm.3 \
load_midi.3 \
load_midi_patches.3 \
load_pcx.3 \
+ load_pcx_pf.3 \
load_sample.3 \
load_tga.3 \
+ load_tga_pf.3 \
+ load_txt_font.3 \
load_voc.3 \
+ load_voc_pf.3 \
load_wav.3 \
+ load_wav_pf.3 \
lock_bitmap.3 \
lock_midi.3 \
lock_sample.3 \
+ lzss_read.3 \
+ lzss_write.3 \
make_absolute_filename.3 \
make_relative_filename.3 \
makeacol.3 \
@@ -461,6 +545,7 @@
matrix_mul.3 \
matrix_mul_f.3 \
matrix_to_quat.3 \
+ merge_fonts.3 \
midi_loop_end.3 \
midi_loop_start.3 \
midi_meta_callback.3 \
@@ -472,6 +557,7 @@
midi_resume.3 \
midi_seek.3 \
midi_sysex_callback.3 \
+ midi_time.3 \
mouse_b.3 \
mouse_callback.3 \
mouse_needs_poll.3 \
@@ -504,6 +590,7 @@
pack_fgets.3 \
pack_fopen.3 \
pack_fopen_chunk.3 \
+ pack_fopen_vtable.3 \
pack_fputs.3 \
pack_fread.3 \
pack_fseek.3 \
@@ -569,6 +656,7 @@
register_assert_handler.3 \
register_bitmap_file_type.3 \
register_datafile_object.3 \
+ register_font_file_type.3 \
register_sample_file_type.3 \
register_trace_handler.3 \
register_uformat.3 \
@@ -596,7 +684,6 @@
rest.3 \
rest_callback.3 \
retrace_count.3 \
- retrace_proc.3 \
rgb_map.3 \
rgb_to_hsv.3 \
rotate_scaled_sprite.3 \
@@ -605,11 +692,15 @@
rotate_sprite_v_flip.3 \
save_bitmap.3 \
save_bmp.3 \
+ save_bmp_pf.3 \
save_joystick_data.3 \
save_pcx.3 \
+ save_pcx_pf.3 \
save_sample.3 \
save_tga.3 \
+ save_tga_pf.3 \
scancode_to_ascii.3 \
+ scancode_to_name.3 \
scare_mouse.3 \
scare_mouse_area.3 \
scene_gap.3 \
@@ -617,13 +708,16 @@
scene_polygon3d_f.3 \
screen.3 \
scroll_screen.3 \
+ select_mouse_cursor.3 \
select_palette.3 \
set_add_blender.3 \
+ set_allegro_resource_path.3 \
set_alpha_blender.3 \
set_blender_mode.3 \
set_blender_mode_ex.3 \
set_burn_blender.3 \
- set_clip.3 \
+ set_clip_rect.3 \
+ set_clip_state.3 \
set_close_button_callback.3 \
set_color.3 \
set_color_blender.3 \
@@ -643,11 +737,14 @@
set_dissolve_blender.3 \
set_dodge_blender.3 \
set_gfx_mode.3 \
+ set_hardware_volume.3 \
set_hue_blender.3 \
set_invert_blender.3 \
set_keyboard_rate.3 \
set_leds.3 \
set_luminance_blender.3 \
+ set_mixer_quality.3 \
+ set_mouse_cursor_bitmap.3 \
set_mouse_range.3 \
set_mouse_speed.3 \
set_mouse_sprite.3 \
@@ -668,6 +765,7 @@
set_write_alpha_blender.3 \
set_zbuffer.3 \
show_mouse.3 \
+ show_os_cursor.3 \
show_video_bitmap.3 \
shutdown_dialog.3 \
shutdown_menu.3 \
@@ -693,9 +791,7 @@
textprintf_justify_ex.3 \
textprintf_right_ex.3 \
three_finger_flag.3 \
- timer_can_simulate_retrace.3 \
- timer_is_using_retrace.3 \
- timer_simulate_retrace.3 \
+ transpose_font.3 \
triangle.3 \
triangle3d.3 \
triangle3d_f.3 \
@@ -786,5 +882,4 @@
voice_sweep_pan.3 \
vsync.3 \
xor_mode.3 \
- xwin_set_window_name.3 \
- yield_timeslice.3
+ xwin_set_window_name.3
diff -urN /usr/ports/devel/allegro/distinfo allegro/distinfo
--- /usr/ports/devel/allegro/distinfo Thu Jan 29 04:22:54 2004
+++ allegro/distinfo Wed Aug 3 18:01:21 2005
@@ -1,2 +1,2 @@
-MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
-SIZE (allegro-4.1.12.tar.gz) = 2760323
+MD5 (allegro-4.2.0-beta4.tar.gz) = 65c2ee9caab79ea3616458a911a1b855
+SIZE (allegro-4.2.0-beta4.tar.gz) = 3016035
diff -urN /usr/ports/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in allegro/files/extra-patch-include-allegro-inline-fmaths.in
--- /usr/ports/devel/allegro/files/extra-patch-include-allegro-inline-fmaths.in Wed Dec 31 21:00:00 1969
+++ allegro/files/extra-patch-include-allegro-inline-fmaths.in Thu Aug 11 18:54:55 2005
@@ -0,0 +1,43 @@
+--- include/allegro/inline/fmaths.inl.orig Sun Jun 5 18:23:46 2005
++++ include/allegro/inline/fmaths.inl Thu Aug 11 18:53:53 2005
+@@ -103,40 +103,11 @@
+
+ AL_INLINE(fixed, fixmul, (fixed x, fixed y),
+ {
+- /* In benchmarks conducted circa May 2005 we found that, in the main:
+- * - IA32 machines performed faster with one implementation;
+- * - AMD64 and G4 machines performed faster with another implementation.
+- *
+- * Benchmarks were mainly done with differing versions of gcc.
+- * Results varied with other compilers, optimisation levels, etc.
+- * so this is not optimal, though a tenable compromise.
+- */
+- #if (defined ALLEGRO_I386) || (!defined LONG_LONG)
+-
+- fixed sign = (x^y) & 0x80000000;
+- int mask_x = x >> 31;
+- int mask_y = y >> 31;
+- int mask_result = sign >> 31;
+- fixed result;
+-
+- x = (x^mask_x) - mask_x;
+- y = (y^mask_y) - mask_y;
+-
+- result = ((y >> 8)*(x >> 8) +
+- (((y >> 8)*(x&0xff)) >> 8) +
+- (((x >> 8)*(y&0xff)) >> 8));
+-
+- return (result^mask_result) - mask_result;
+-
+- #else
+-
+ LONG_LONG lx = x;
+ LONG_LONG ly = y;
+ LONG_LONG lres = (lx*ly)>>16;
+ int res = lres;
+ return res;
+-
+- #endif
+ })
+
+
diff -urN /usr/ports/devel/allegro/files/patch-configure.in allegro/files/patch-configure.in
--- /usr/ports/devel/allegro/files/patch-configure.in Fri Dec 12 22:41:30 2003
+++ allegro/files/patch-configure.in Fri Aug 5 15:09:22 2005
@@ -1,8 +1,8 @@
---- configure.in.orig Sun Nov 9 19:43:06 2003
-+++ configure.in Thu Dec 11 22:22:35 2003
-@@ -256,8 +256,8 @@
- LINK_WITH_STATIC_LIBS=yes
+--- configure.in.orig Sun Jun 12 04:53:19 2005
++++ configure.in Fri Aug 5 15:09:10 2005
+@@ -297,8 +297,8 @@
allegro_static_libraries=yes
+ _programs="statically linked $_programs"
else
- LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
@@ -10,45 +10,23 @@
+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK} -l${LIB_TO_LINK}_unsharable -lm"
LINK_WITH_STATIC_LIBS=no
allegro_shared_libraries=yes
- fi
-@@ -286,13 +286,13 @@
- fi
- if test "X$allegro_shared_libraries" = "Xyes"; then
+ _programs="dynamically linked $_programs"
+@@ -337,15 +337,15 @@
+
+ _libraries="$_libraries shared"
if test "X$allegro_build_normal_library" = "Xyes"; then
- ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg-\$(shared_version).so lib/unix/liballeg_unsharable.a"
+ ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg.so.\$(shared_version) lib/unix/liballeg_unsharable.a"
+ _libraries="$_libraries release"
fi
if test "X$allegro_build_debugging_library" = "Xyes"; then
- ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd-\$(shared_version).so lib/unix/liballd_unsharable.a"
+ ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd.so.\$(shared_version) lib/unix/liballd_unsharable.a"
+ _libraries="$_libraries debug"
fi
if test "X$allegro_build_profiling_library" = "Xyes"; then
- ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp-\$(shared_version).so lib/unix/liballp_unsharable.a"
+ ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp.so.\$(shared_version) lib/unix/liballp_unsharable.a"
+ _libraries="$_libraries profile"
fi
fi
- AC_SUBST(ALLEGRO_LIB_TARGETS)
-@@ -647,11 +647,11 @@
- if test "X$allegro_debug_with_fortify" = "Xyes"; then
- ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
- fi
-- ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -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 $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS"
- else
-- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-+ CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS"
- fi
- ALLEGRO_SFLAGS="-x assembler-with-cpp"
- ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
-@@ -740,7 +740,7 @@
- ${MAKE-make} depend
- else
- AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.])
-- gmake depend
-+ ${MAKE-make} depend
- fi
- fi
-
diff -urN /usr/ports/devel/allegro/files/patch-makefile.in allegro/files/patch-makefile.in
--- /usr/ports/devel/allegro/files/patch-makefile.in Fri Dec 12 22:41:30 2003
+++ allegro/files/patch-makefile.in Fri Aug 5 15:23:18 2005
@@ -1,5 +1,5 @@
---- makefile.in.orig Sun Nov 9 19:43:06 2003
-+++ makefile.in Thu Dec 11 22:25:58 2003
+--- makefile.in.orig Fri Jun 10 07:24:04 2005
++++ makefile.in Fri Aug 5 15:17:56 2005
@@ -20,7 +20,7 @@
mandir = @mandir@
libdir = @libdir@
@@ -26,8 +26,8 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_INFO = @INSTALL_INFO@
-@@ -325,6 +326,11 @@
- full-build: lib modules programs docs
+@@ -355,6 +356,11 @@
+ endif
lib: $(ALLEGRO_LIB_TARGETS)
+ @for l in alleg alld allp; do \
@@ -38,7 +38,7 @@
modules: $(ALLEGRO_MODULE_TARGETS)
-@@ -436,35 +442,37 @@
+@@ -466,35 +472,27 @@
fi; \
done
@for l in alleg alld allp; do \
@@ -46,8 +46,8 @@
- echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
- $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
-+ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \
-+ $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \
++ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(DESTDIR)$(libdir); \
++ $(INSTALL_DATA) $(LIBDIR)/lib$${l}.so.$(shared_version) $(DESTDIR)$(libdir)/; \
$(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
fi; \
done
@@ -76,21 +76,20 @@
- ) ; \
- fi
+ @$(INSTALL_SCRIPT) allegro-config $(DESTDIR)$(bindir)
-+# @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
-+# (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
-+# test $(libdir) = /lib || test $(libdir) = /usr/lib) \
-+# && ($(LDCONFIG) $(libdir) || true) || (\
-+# echo "" ; \
-+# 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." ; \
-+# ) ; \
-+# fi
@for l in alleg alld allp; do \
- if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
- (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
-+ if test -f $(libdir)/lib$${l}.so.$(shared_version) -a \! -L $(libdir)/lib$${l}.so; then \
-+ (cd $(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
++ if test -f $(DESTDIR)$(libdir)/lib$${l}.so.$(shared_version) -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so; then \
++ (cd $(DESTDIR)$(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
fi; \
done
-
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/aclocal
+@@ -603,7 +601,7 @@
+ uninstall-shared:
+ @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_version}; \
+ rm -f $(libdir)/lib$${l}.so.${shared_major_minor}; \
+ done
+ -$(LDCONFIG) $(libdir) # update cache (only works if we're root)
diff -urN /usr/ports/devel/allegro/files/patch-misc-allegro-config.in allegro/files/patch-misc-allegro-config.in
--- /usr/ports/devel/allegro/files/patch-misc-allegro-config.in Wed Dec 31 21:00:00 1969
+++ allegro/files/patch-misc-allegro-config.in Fri Aug 5 14:14:22 2005
@@ -0,0 +1,11 @@
+--- misc/allegro-config.in.orig Wed Oct 23 08:10:01 2002
++++ misc/allegro-config.in Mon Nov 11 18:41:09 2002
+@@ -167,7 +167,7 @@
+ if test "$static_libs" = "yes"; then
+ echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
+ else
+- echo $libdirs $allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable
++ echo $libdirs $allegro_ldflags -l${lib_type} -l${lib_type}_unsharable
+ fi
+ fi
+
diff -urN /usr/ports/devel/allegro/files/patch-misc-deplib.sh allegro/files/patch-misc-deplib.sh
--- /usr/ports/devel/allegro/files/patch-misc-deplib.sh Wed Dec 31 21:00:00 1969
+++ allegro/files/patch-misc-deplib.sh Fri Aug 5 14:14:33 2005
@@ -0,0 +1,20 @@
+--- misc/deplib.sh.orig Sun Nov 9 19:43:07 2003
++++ misc/deplib.sh Thu Dec 11 22:32:16 2003
+@@ -10,7 +10,7 @@
+ staticlib="lib${1}.a"
+ staticobj="\$(${2}_OBJECTS)"
+
+- sharelib="lib${1}-\$(shared_version).so"
++ sharelib="lib${1}.so.\$(shared_version)"
+ shareobj="\$(${2}_SHARED_OBJECTS)"
+
+ unsharelib="lib${1}_unsharable.a"
+@@ -24,7 +24,7 @@
+ 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} ${3} \$(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 ""
+ echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}"
+ echo " rm -f \$@"
diff -urN /usr/ports/devel/allegro/files/patch-misc::allegro-config.in allegro/files/patch-misc::allegro-config.in
--- /usr/ports/devel/allegro/files/patch-misc::allegro-config.in Sun Mar 30 00:04:33 2003
+++ allegro/files/patch-misc::allegro-config.in Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- misc/allegro-config.in.orig Wed Oct 23 08:10:01 2002
-+++ misc/allegro-config.in Mon Nov 11 18:41:09 2002
-@@ -167,7 +167,7 @@
- if test "$static_libs" = "yes"; then
- echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
- else
-- echo $libdirs $allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable
-+ echo $libdirs $allegro_ldflags -l${lib_type} -l${lib_type}_unsharable
- fi
- fi
-
diff -urN /usr/ports/devel/allegro/files/patch-misc::deplib.sh allegro/files/patch-misc::deplib.sh
--- /usr/ports/devel/allegro/files/patch-misc::deplib.sh Fri Dec 12 22:41:30 2003
+++ allegro/files/patch-misc::deplib.sh Wed Dec 31 21:00:00 1969
@@ -1,20 +0,0 @@
---- misc/deplib.sh.orig Sun Nov 9 19:43:07 2003
-+++ misc/deplib.sh Thu Dec 11 22:32:16 2003
-@@ -10,7 +10,7 @@
- staticlib="lib${1}.a"
- staticobj="\$(${2}_OBJECTS)"
-
-- sharelib="lib${1}-\$(shared_version).so"
-+ sharelib="lib${1}.so.\$(shared_version)"
- shareobj="\$(${2}_SHARED_OBJECTS)"
-
- unsharelib="lib${1}_unsharable.a"
-@@ -24,7 +24,7 @@
- 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} ${3} \$(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 ""
- echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}"
- echo " rm -f \$@"
diff -urN /usr/ports/devel/allegro/pkg-plist allegro/pkg-plist
--- /usr/ports/devel/allegro/pkg-plist Fri Dec 12 22:41:30 2003
+++ allegro/pkg-plist Fri Aug 5 15:44:54 2005
@@ -1,14 +1,14 @@
bin/allegro-config
-%%FULL%%bin/colormap
-%%FULL%%bin/dat
-%%FULL%%bin/dat2c
-%%FULL%%bin/dat2s
-%%FULL%%bin/exedat
-%%FULL%%bin/grabber
-%%FULL%%bin/pack
-%%FULL%%bin/pat2dat
-%%FULL%%bin/rgbmap
-%%FULL%%bin/textconv
+%%DEV_UTILS%%bin/colormap
+%%DEV_UTILS%%bin/dat
+%%DEV_UTILS%%bin/dat2c
+%%DEV_UTILS%%bin/dat2s
+%%DEV_UTILS%%bin/exedat
+%%DEV_UTILS%%bin/grabber
+%%DEV_UTILS%%bin/pack
+%%DEV_UTILS%%bin/pat2dat
+%%DEV_UTILS%%bin/rgbmap
+%%DEV_UTILS%%bin/textconv
include/allegro.h
include/allegro/3d.h
include/allegro/3dmaths.h
@@ -28,6 +28,7 @@
include/allegro/fixed.h
include/allegro/fli.h
include/allegro/fmaths.h
+include/allegro/font.h
include/allegro/gfx.h
include/allegro/graphics.h
include/allegro/gui.h
@@ -47,6 +48,7 @@
include/allegro/internal/alconfig.h
include/allegro/joystick.h
include/allegro/keyboard.h
+include/allegro/lzss.h
include/allegro/matrix.h
include/allegro/midi.h
include/allegro/mouse.h
@@ -81,6 +83,7 @@
include/allegro/platform/alunixac.h
include/allegro/platform/alwatcom.h
include/allegro/platform/alwin.h
+include/allegro/platform/astdint.h
include/allegro/platform/macdef.h
include/allegro/quat.h
include/allegro/rle.h
@@ -96,9 +99,10 @@
lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
%%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
lib/allegro/%%SHLIB_VER%%/modules.lst
-lib/liballeg_unsharable.a
lib/liballeg.so
lib/liballeg.so.%%SHLIB_VER%%
+lib/liballeg_unsharable.a
+share/aclocal/allegro.m4
%%PORTDOCS%%%%DOCSDIR%%/abi.html
%%PORTDOCS%%%%DOCSDIR%%/ahack.html
%%PORTDOCS%%%%DOCSDIR%%/alleg000.html
@@ -147,13 +151,25 @@
%%PORTDOCS%%%%DOCSDIR%%/alleg043.html
%%PORTDOCS%%%%DOCSDIR%%/alleg044.html
%%PORTDOCS%%%%DOCSDIR%%/alleg045.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg046.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg047.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg048.html
+%%PORTDOCS%%%%DOCSDIR%%/alleg049.html
%%PORTDOCS%%%%DOCSDIR%%/allegro.css
%%PORTDOCS%%%%DOCSDIR%%/allegro.html
%%PORTDOCS%%%%DOCSDIR%%/api.html
%%PORTDOCS%%%%DOCSDIR%%/changes.html
%%PORTDOCS%%%%DOCSDIR%%/const.html
+%%PORTDOCS%%%%DOCSDIR%%/dat.html
+%%PORTDOCS%%%%DOCSDIR%%/dat2c.html
+%%PORTDOCS%%%%DOCSDIR%%/dat2s.html
+%%PORTDOCS%%%%DOCSDIR%%/datafile.html
%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/grabber.html
%%PORTDOCS%%%%DOCSDIR%%/help.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/makedoc.html
%%PORTDOCS%%%%DOCSDIR%%/packfile.html
%%PORTDOCS%%%%DOCSDIR%%/readme.html
%%PORTDOCS%%%%DOCSDIR%%/thanks.html
@@ -163,8 +179,8 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
%%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/allegro/%%SHLIB_VER%%
@dirrm lib/allegro
@dirrm include/allegro/platform
diff -urN /usr/ports/graphics/allegrogl/Makefile allegrogl/Makefile
--- /usr/ports/graphics/allegrogl/Makefile Wed Aug 11 18:21:12 2004
+++ allegrogl/Makefile Sun Aug 14 14:44:03 2005
@@ -15,7 +15,7 @@
MAINTAINER= ip@doom.homeunix.org
COMMENT= OpenGL inteface for Allegro library
-LIB_DEPENDS= alleg.41:${PORTSDIR}/devel/allegro
+LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
USE_BZIP2= yes
USE_GMAKE= yes
diff -urN /usr/ports/math/chryzodus/Makefile chryzodus/Makefile
--- /usr/ports/math/chryzodus/Makefile Mon Jul 11 16:25:17 2005
+++ chryzodus/Makefile Sun Aug 14 14:44:32 2005
@@ -15,7 +15,7 @@
MAINTAINER= nivit@email.it
COMMENT= A chryzode (http//www.chryzode.org) explorer
-LIB_DEPENDS= alleg.41:${PORTSDIR}/devel/allegro
+LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKEFILE= makefile.unx
diff -urN /usr/ports/devel/dumb/Makefile dumb/Makefile
--- /usr/ports/devel/dumb/Makefile Sun Mar 13 19:42:38 2005
+++ dumb/Makefile Sun Aug 14 14:45:42 2005
@@ -22,7 +22,7 @@
.include <bsd.port.pre.mk>
.if defined(WITH_ALLEGRO)
-LIB_DEPENDS+= alleg.41:${PORTSDIR}/devel/allegro
+LIB_DEPENDS+= alleg.42:${PORTSDIR}/devel/allegro
PLIST_SUB+= ALLEGRO=""
.else
PLIST_SUB+= ALLEGRO="@comment "
diff -urN /usr/ports/emulators/o2em/Makefile o2em/Makefile
--- /usr/ports/emulators/o2em/Makefile Mon Jul 25 16:13:14 2005
+++ o2em/Makefile Sun Aug 14 14:46:20 2005
@@ -16,7 +16,7 @@
MAINTAINER= techgunter@yahoo.com
COMMENT= An Odyssey2 / Videopac console emulator
-LIB_DEPENDS= alleg.41:${PORTSDIR}/devel/allegro
+LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
WRKSRC= ${WRKDIR}/o2em117src
MAKEFILE= Makefile.freebsd
diff -urN /usr/ports/games/pinball/Makefile pinball/Makefile
--- /usr/ports/games/pinball/Makefile Wed Jul 27 18:15:46 2005
+++ pinball/Makefile Sun Aug 14 14:47:55 2005
@@ -20,7 +20,7 @@
.else
BROKEN= "support with Allegro is (temporarily) broken as of version 0.3.1"
BUILD_DEPENDS= ${ALLEGRO_CONFIG}:${PORTSDIR}/devel/allegro
-LIB_DEPENDS= alleg.41:${PORTSDIR}/devel/allegro
+LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
.endif
USE_SDL= image mixer sdl
diff -urN /usr/ports/emulators/raine/Makefile raine/Makefile
--- /usr/ports/emulators/raine/Makefile Tue Mar 1 09:27:57 2005
+++ raine/Makefile Sun Aug 14 14:48:46 2005
@@ -15,7 +15,7 @@
COMMENT= Arcade Emulator for M68000, M68020 and Z80 based hardware
BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS= alleg.41:${PORTSDIR}/devel/allegro
+LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
--- allegro.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1124043392.0>