Sprout from master 2008-01-24 01:36:30 UTC Elan Ruusamäe <glen@pld-linux.org> '- invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep'
Delete:
allegro-config.patch
allegro-examples.patch
allegro-frame-pointer.patch
allegro-info.patch
allegro-ldflags.patch
allegro-opt.patch
+++ /dev/null
---- allegro-4.3.1/misc/allegro-config.in~ 2007-06-17 02:44:32.000000000 +0200
-+++ allegro-4.3.1/misc/allegro-config.in 2007-06-17 02:45:48.000000000 +0200
-@@ -183,9 +183,9 @@
- if test "$echo_libs" = "yes"; then
- libdirs=-L${lib_path}
- if test "$static_libs" = "yes"; then
-- echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
-+ 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}-${version} -l${lib_type}_unsharable
- fi
- fi
-
+++ /dev/null
---- allegro-4.1.17/makefile.in.orig 2004-12-02 02:02:14.000000000 +0100
-+++ allegro-4.1.17/makefile.in 2005-01-16 22:24:04.277495544 +0100
-@@ -527,7 +527,7 @@
- $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/platform/; \
- done
-
--INSTALL_EXES = $(filter tools/%, $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES))
-+INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%, $(ALLEGRO_EXE_TARGETS))
-
- install-programs: $(INSTALL_EXES)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -618,9 +618,9 @@
- rm -rf $(includedir)/allegro
-
- uninstall-programs:
-- @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
-- if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \
-- p=`echo $$prog | sed -e s,tools/,,`; \
-+ @for prog in $(ALLEGRO_EXE_TARGETS); do \
-+ if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \
-+ p=`echo $$prog | sed -e s,,,`; \
- echo rm -f $(bindir)/$$p; \
- rm -f $(bindir)/$$p; \
- fi; \
+++ /dev/null
-diff -urN aa/allegro-4.1.14/configure.in allegro-4.1.14/configure.in
---- aa/allegro-4.1.14/configure.in 2004-05-23 21:23:07.930046696 +0200
-+++ allegro-4.1.14/configure.in 2004-05-23 21:21:51.225707528 +0200
-@@ -271,7 +271,7 @@
- COMPILE_PROGRAM=COMPILE_PROFILE
- COMPILE_CXX_PROGRAM=COMPILE_CXX_PROFILE
- COMPILE_S_PROGRAM=COMPILE_S_PROFILE
-- PROG_LDFLAGS="-pg \$(LDFLAGS)"
-+ PROG_LDFLAGS="-fno-omit-frame-pointer -pg \$(LDFLAGS)"
- LIB_TO_LINK=allp
- PLUGIN_LIB=lib/unix/libapdat.a
- allegro_build_profiling_library=yes
-@@ -730,7 +730,7 @@
- ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC"
- fi
- CFLAGS="$CFLAGS $TARGET_ARCH"
-- ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
-+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -fno-omit-frame-pointer -pg $WFLAGS"
- ALLEGRO_SFLAGS="-x assembler-with-cpp"
- ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
- else
+++ /dev/null
-Don't use tabs, they are expanded at wrong moment
---- allegro-4.1.12/docs/src/allegro._tx~ Fri Nov 23 07:03:08 2001
-+++ allegro-4.1.12/docs/src/allegro._tx Fri Nov 23 07:03:08 2001
-@@ -31,9 +31,9 @@
- @# This should remain commented at the moment (dvi output) @$@finalout
- @$
- @$@ifinfo
--@$@dircategory Libraries
-+@$@dircategory Libraries:
- @$@direntry
--@$* Allegro: (allegro). The Allegro game programming library.
-+@$* Allegro: (allegro). The Allegro game programming library
- @$@end direntry
- @$This is the Info version of the Allegro manual
- @$
+++ /dev/null
-diff -ruN allegro-4.1.11./misc/allegro-config.in allegro-4.1.11/misc/allegro-config.in
---- allegro-4.1.11./misc/allegro-config.in 2003-06-30 01:27:31.000000000 +0200
-+++ allegro-4.1.11/misc/allegro-config.in 2003-08-25 00:50:30.000000000 +0200
-@@ -21,7 +21,7 @@
-
- accepts_frameworks=no
-
--allegro_ldflags="@LDFLAGS@"
-+allegro_ldflags=""
- allegro_libs="@LIBS@"
- allegro_frameworks="@FRAMEWORKS@"
- allegro_cflags=""
+++ /dev/null
---- aa/allegro-4.1.15/configure.in 2004-04-27 13:53:02.000000000 +0200
-+++ allegro-4.1.15/configure.in 2004-05-23 21:18:36.478313632 +0200
-@@ -720,38 +720,7 @@
-
- dnl How to compile C and asm files.
- if test -n "$GCC"; then
-- if test "X$allegro_strict_warnings" = "Xyes"; then
-- WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused-parameter -Werror"
-- else
-- WFLAGS="-Wall -Wno-unused"
-- fi
-- if test "X$allegro_cv_processor_type" = "Xi386"; then
-- if test "$allegro_exclusive_optimizations" != none; then
-- TARGET_ARCH="-march=$allegro_exclusive_optimizations"
-- elif test "X$allegro_cv_support_i386_mtune" = "Xyes"; then
-- TARGET_ARCH="-mtune=$allegro_optimizations"
-- else
-- TARGET_ARCH="-mcpu=$allegro_optimizations"
-- fi
-- elif test "X$allegro_cv_processor_type" = "Xamd64"; then
-- dnl Change default pentium->athlon64
-- if test "X$allegro_optimizations" = "Xpentium"; then
-- allegro_optimizations="k8"
-- fi
-- if test "$allegro_exclusive_optimizations" != none; then
-- TARGET_ARCH="-march=$allegro_exclusive_optimizations"
-- elif test "X$allegro_cv_support_amd64_mtune" = "Xyes"; then
-- TARGET_ARCH="-mtune=$allegro_optimizations"
-- else
-- TARGET_ARCH="-mcpu=$allegro_optimizations"
-- fi
-- else
-- TARGET_ARCH=
-- fi
-- dnl Allow to specify additional flags.
-- CFLAGS="$CFLAGS $XCFLAGS"
-- WFLAGS="$WFLAGS $WCFLAGS"
-- dnl In this order...
-+ WFLAGS="-Wall -Wno-unused"
- ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE"
- if test "X$allegro_debug_with_fortify" = "Xyes"; then
- ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
-@@ -759,12 +728,8 @@
- if test "X$allegro_debug_with_dmalloc" = "Xyes"; then
- ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC"
- 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"
-- else
-- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
-- fi
-+ CFLAGS="$CFLAGS $TARGET_ARCH"
-+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
- ALLEGRO_SFLAGS="-x assembler-with-cpp"
- ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
- else