- Update to 4.2.0

- Use OPTIONS
- Take maintainership

PR:		ports/88907
Submitted by:	Alejandro Pulver <alejandro@varnet.biz>
This commit is contained in:
Pav Lucistnik 2005-11-13 15:16:30 +00:00
parent 474945f33a
commit ceac2c1f1c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=148108
14 changed files with 898 additions and 1838 deletions

View file

@ -6,90 +6,134 @@
#
PORTNAME= allegro
PORTVERSION= 4.1.12
PORTREVISION= 1
DISTVERSION= 4.2.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= alleg
MAINTAINER= ports@FreeBSD.org
MAINTAINER= alejandro@varnet.biz
COMMENT= A cross-platform library for games and multimedia programming
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
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
.include "Makefile.man"
INFO= allegro
OPTIONS= ARTS "Enable Arts support" off \
DEBUG_LIB "Build debugging library" off \
DEV_UTILS "Build development utilities" on \
ESOUND "Enable Esound support" off \
OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
PROFILE_LIB "Build profiling library" off \
THREADS "Enable threads" on
MAKEFILE= makefile
ALL_TARGET= full-build
INSTALLS_SHLIB= yes
SHLIB_VER= 42
PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
DEMO= demo.c demo.dat demo.h music.txt ../readme.txt
.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)
INSTALL_TARGET= mini-install install-man install-info
PLIST_SUB+= FULL="@comment "
.if defined(WITH_DEBUG_LIB)
CONFIGURE_ARGS+= --enable-dbglib
PLIST_SUB+= DEBUG_LIB=""
.else
INSTALL_TARGET= full-install install-man install-info
PLIST_SUB+= FULL=""
CONFIGURE_ARGS+= --disable-dbglib
PLIST_SUB+= DEBUG_LIB="@comment "
.endif
.if !defined(NOPORTDOCS)
PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}"
.if !defined(WITHOUT_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+= DEV_UTILS="@comment "
.endif
.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
USE_GNOME+= esound
CONFIGURE_ARGS+= --enable-esddigi
PLIST_SUB+= ESOUND=""
.else
CONFIGURE_ARGS+= --disable-esddigi
PLIST_SUB+= ESOUND="@comment "
.endif
.if defined(WITH_PROFILE_LIB)
CONFIGURE_ARGS+= --enable-proflib
PLIST_SUB+= PROFILE_LIB=""
.else
CONFIGURE_ARGS+= --disable-proflib
PLIST_SUB+= PROFILE_LIB="@comment "
.endif
.if !defined(WITHOUT_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}|${SHLIB_VER}|g' \
${WRKSRC}/makefile.ver
post-install:
.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}
.for FILE in ${DEMO}
${INSTALL_DATA} ${WRKSRC}/demo/${FILE} ${EXAMPLESDIR}
.endfor
# 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(WITHOUT_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}
# Examples.
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
. for f in ${DEMO}
${INSTALL_DATA} ${WRKSRC}/demo/${f} ${EXAMPLESDIR}
. endfor
.endif
.include "Makefile.man"
.include <bsd.port.post.mk>

File diff suppressed because it is too large Load diff

View file

@ -1,2 +1,3 @@
MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
SIZE (allegro-4.1.12.tar.gz) = 2760323
MD5 (allegro-4.2.0.tar.gz) = a8b2c85c58b16345fe735f72763f3a6e
SHA256 (allegro-4.2.0.tar.gz) = d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c
SIZE (allegro-4.2.0.tar.gz) = 3056173

View file

@ -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
})

View file

@ -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

View file

@ -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 Sat Sep 10 17:17:51 2005
+++ makefile.in Sat Nov 12 19:41:57 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
@@ -354,6 +355,11 @@
endif
lib: $(ALLEGRO_LIB_TARGETS)
+ @for l in alleg alld allp; do \
@ -38,29 +38,20 @@
modules: $(ALLEGRO_MODULE_TARGETS)
@@ -436,35 +442,37 @@
@@ -465,9 +471,9 @@
fi; \
done
@for l in alleg alld allp; do \
- if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
- echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
- $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
- $(INSTALL_PROGRAM) $(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)/; \
$(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
fi; \
done
@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 \
echo Installing $$m to $(DESTDIR)$(moduledir); \
- $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \
+ $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \
done; \
+ echo Installing modules.lst to $(DESTDIR)$(moduledir); \
+ $(INSTALL_DATA) modules.lst $(DESTDIR)$(moduledir)/; \
@@ -481,20 +487,10 @@
fi
$(mkinstalldirs) $(DESTDIR)$(bindir)
@echo Installing allegro-config to $(DESTDIR)$(bindir)
@ -76,21 +67,11 @@
- ) ; \
- 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

View file

@ -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/fix.h
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/aintvga.h
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/alunix.h
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,16 @@ include/xalleg.h
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
%%DEBUG_LIB%%lib/liballd.so
%%DEBUG_LIB%%lib/liballd.so.%%SHLIB_VER%%
%%DEBUG_LIB%%lib/liballd_unsharable.a
lib/liballeg.so
lib/liballeg.so.%%SHLIB_VER%%
lib/liballeg_unsharable.a
%%PROFILE_LIB%%lib/liballp.so
%%PROFILE_LIB%%lib/liballp.so.%%SHLIB_VER%%
%%PROFILE_LIB%%lib/liballp_unsharable.a
share/aclocal/allegro.m4
%%PORTDOCS%%%%DOCSDIR%%/abi.html
%%PORTDOCS%%%%DOCSDIR%%/ahack.html
%%PORTDOCS%%%%DOCSDIR%%/alleg000.html
@ -147,13 +157,26 @@ lib/liballeg.so.%%SHLIB_VER%%
%%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%%/mistakes.html
%%PORTDOCS%%%%DOCSDIR%%/packfile.html
%%PORTDOCS%%%%DOCSDIR%%/readme.html
%%PORTDOCS%%%%DOCSDIR%%/thanks.html
@ -163,8 +186,8 @@ lib/liballeg.so.%%SHLIB_VER%%
%%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

View file

@ -6,90 +6,134 @@
#
PORTNAME= allegro
PORTVERSION= 4.1.12
PORTREVISION= 1
DISTVERSION= 4.2.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= alleg
MAINTAINER= ports@FreeBSD.org
MAINTAINER= alejandro@varnet.biz
COMMENT= A cross-platform library for games and multimedia programming
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
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
.include "Makefile.man"
INFO= allegro
OPTIONS= ARTS "Enable Arts support" off \
DEBUG_LIB "Build debugging library" off \
DEV_UTILS "Build development utilities" on \
ESOUND "Enable Esound support" off \
OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
PROFILE_LIB "Build profiling library" off \
THREADS "Enable threads" on
MAKEFILE= makefile
ALL_TARGET= full-build
INSTALLS_SHLIB= yes
SHLIB_VER= 42
PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
DEMO= demo.c demo.dat demo.h music.txt ../readme.txt
.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)
INSTALL_TARGET= mini-install install-man install-info
PLIST_SUB+= FULL="@comment "
.if defined(WITH_DEBUG_LIB)
CONFIGURE_ARGS+= --enable-dbglib
PLIST_SUB+= DEBUG_LIB=""
.else
INSTALL_TARGET= full-install install-man install-info
PLIST_SUB+= FULL=""
CONFIGURE_ARGS+= --disable-dbglib
PLIST_SUB+= DEBUG_LIB="@comment "
.endif
.if !defined(NOPORTDOCS)
PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}"
.if !defined(WITHOUT_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+= DEV_UTILS="@comment "
.endif
.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
USE_GNOME+= esound
CONFIGURE_ARGS+= --enable-esddigi
PLIST_SUB+= ESOUND=""
.else
CONFIGURE_ARGS+= --disable-esddigi
PLIST_SUB+= ESOUND="@comment "
.endif
.if defined(WITH_PROFILE_LIB)
CONFIGURE_ARGS+= --enable-proflib
PLIST_SUB+= PROFILE_LIB=""
.else
CONFIGURE_ARGS+= --disable-proflib
PLIST_SUB+= PROFILE_LIB="@comment "
.endif
.if !defined(WITHOUT_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}|${SHLIB_VER}|g' \
${WRKSRC}/makefile.ver
post-install:
.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}
.for FILE in ${DEMO}
${INSTALL_DATA} ${WRKSRC}/demo/${FILE} ${EXAMPLESDIR}
.endfor
# 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(WITHOUT_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}
# Examples.
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
. for f in ${DEMO}
${INSTALL_DATA} ${WRKSRC}/demo/${f} ${EXAMPLESDIR}
. endfor
.endif
.include "Makefile.man"
.include <bsd.port.post.mk>

File diff suppressed because it is too large Load diff

View file

@ -1,2 +1,3 @@
MD5 (allegro-4.1.12.tar.gz) = 93c215aab32b086dcfd8a74c1d383abc
SIZE (allegro-4.1.12.tar.gz) = 2760323
MD5 (allegro-4.2.0.tar.gz) = a8b2c85c58b16345fe735f72763f3a6e
SHA256 (allegro-4.2.0.tar.gz) = d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c
SIZE (allegro-4.2.0.tar.gz) = 3056173

View file

@ -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
})

View file

@ -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

View file

@ -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 Sat Sep 10 17:17:51 2005
+++ makefile.in Sat Nov 12 19:41:57 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
@@ -354,6 +355,11 @@
endif
lib: $(ALLEGRO_LIB_TARGETS)
+ @for l in alleg alld allp; do \
@ -38,29 +38,20 @@
modules: $(ALLEGRO_MODULE_TARGETS)
@@ -436,35 +442,37 @@
@@ -465,9 +471,9 @@
fi; \
done
@for l in alleg alld allp; do \
- if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
- echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
- $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
- $(INSTALL_PROGRAM) $(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)/; \
$(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
fi; \
done
@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 \
echo Installing $$m to $(DESTDIR)$(moduledir); \
- $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \
+ $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \
done; \
+ echo Installing modules.lst to $(DESTDIR)$(moduledir); \
+ $(INSTALL_DATA) modules.lst $(DESTDIR)$(moduledir)/; \
@@ -481,20 +487,10 @@
fi
$(mkinstalldirs) $(DESTDIR)$(bindir)
@echo Installing allegro-config to $(DESTDIR)$(bindir)
@ -76,21 +67,11 @@
- ) ; \
- 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

View file

@ -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/fix.h
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/aintvga.h
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/alunix.h
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,16 @@ include/xalleg.h
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
%%DEBUG_LIB%%lib/liballd.so
%%DEBUG_LIB%%lib/liballd.so.%%SHLIB_VER%%
%%DEBUG_LIB%%lib/liballd_unsharable.a
lib/liballeg.so
lib/liballeg.so.%%SHLIB_VER%%
lib/liballeg_unsharable.a
%%PROFILE_LIB%%lib/liballp.so
%%PROFILE_LIB%%lib/liballp.so.%%SHLIB_VER%%
%%PROFILE_LIB%%lib/liballp_unsharable.a
share/aclocal/allegro.m4
%%PORTDOCS%%%%DOCSDIR%%/abi.html
%%PORTDOCS%%%%DOCSDIR%%/ahack.html
%%PORTDOCS%%%%DOCSDIR%%/alleg000.html
@ -147,13 +157,26 @@ lib/liballeg.so.%%SHLIB_VER%%
%%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%%/mistakes.html
%%PORTDOCS%%%%DOCSDIR%%/packfile.html
%%PORTDOCS%%%%DOCSDIR%%/readme.html
%%PORTDOCS%%%%DOCSDIR%%/thanks.html
@ -163,8 +186,8 @@ lib/liballeg.so.%%SHLIB_VER%%
%%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