From 6c06163730762144e4b9181a4bada491e18279ac Mon Sep 17 00:00:00 2001 From: wolf Date: Sun, 13 Nov 2005 18:48:21 +0000 Subject: [PATCH] - 4.2.0 (kiesyoo at o2 pl) Changed files: allegro-examples.patch -> 1.5 allegro-frame-pointer.patch -> 1.4 allegro-info.patch -> 1.6 allegro-ldflags.patch -> 1.2 allegro-opt.patch -> 1.9 --- allegro-examples.patch | 9 ++++----- allegro-frame-pointer.patch | 8 ++++---- allegro-info.patch | 3 ++- allegro-ldflags.patch | 8 ++++---- allegro-opt.patch | 22 +++++++++++++++++----- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/allegro-examples.patch b/allegro-examples.patch index 3240e7c..aa85db2 100644 --- a/allegro-examples.patch +++ b/allegro-examples.patch @@ -1,23 +1,22 @@ --- 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 -@@ -526,7 +526,7 @@ +@@ -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_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) $(ALLEGRO_EXAMPLE_EXES)) ++INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%, $(ALLEGRO_EXE_TARGETS)) install-programs: $(INSTALL_EXES) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -617,9 +617,10 @@ +@@ -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_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) \ -+ $(ALLEGRO_EXAMPLE_EXES) ; do \ ++ @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; \ diff --git a/allegro-frame-pointer.patch b/allegro-frame-pointer.patch index 45702cf..0290c5f 100644 --- a/allegro-frame-pointer.patch +++ b/allegro-frame-pointer.patch @@ -1,7 +1,7 @@ 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 -@@ -245,7 +245,7 @@ +@@ -271,7 +271,7 @@ COMPILE_PROGRAM=COMPILE_PROFILE COMPILE_CXX_PROGRAM=COMPILE_CXX_PROFILE COMPILE_S_PROGRAM=COMPILE_S_PROFILE @@ -10,12 +10,12 @@ diff -urN aa/allegro-4.1.14/configure.in allegro-4.1.14/configure.in LIB_TO_LINK=allp PLUGIN_LIB=lib/unix/libapdat.a allegro_build_profiling_library=yes -@@ -671,7 +671,7 @@ +@@ -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_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 diff --git a/allegro-info.patch b/allegro-info.patch index f482581..5315ce3 100644 --- a/allegro-info.patch +++ b/allegro-info.patch @@ -1,7 +1,8 @@ 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 -@@ -24,8 +24,8 @@ +@@ -31,9 +31,9 @@ + @# This should remain commented at the moment (dvi output) @$@finalout @$ @$@ifinfo -@$@dircategory Libraries diff --git a/allegro-ldflags.patch b/allegro-ldflags.patch index bf65e4e..f339111 100644 --- a/allegro-ldflags.patch +++ b/allegro-ldflags.patch @@ -1,12 +1,12 @@ 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 -@@ -19,7 +19,7 @@ - static_libs=@LINK_WITH_STATIC_LIBS@ - lib_type=@LIB_TO_LINK@ +@@ -21,7 +21,7 @@ + + accepts_frameworks=no -allegro_ldflags="@LDFLAGS@" +allegro_ldflags="" allegro_libs="@LIBS@" + allegro_frameworks="@FRAMEWORKS@" allegro_cflags="" - allegro_cppflags="" diff --git a/allegro-opt.patch b/allegro-opt.patch index de791f4..cb22311 100644 --- a/allegro-opt.patch +++ b/allegro-opt.patch @@ -1,11 +1,11 @@ --- 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 -@@ -668,26 +662,7 @@ +@@ -720,38 +720,7 @@ dnl How to compile C and asm files. - if test -n "GCC"; then + if test -n "$GCC"; then - if test "X$allegro_strict_warnings" = "Xyes"; then -- WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused -Werror" +- WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused-parameter -Werror" - else - WFLAGS="-Wall -Wno-unused" - fi @@ -17,6 +17,18 @@ - 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 @@ -28,7 +40,7 @@ ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE" if test "X$allegro_debug_with_fortify" = "Xyes"; then ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY" -@@ -692,12 +670,8 @@ +@@ -759,12 +728,8 @@ if test "X$allegro_debug_with_dmalloc" = "Xyes"; then ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC" fi @@ -39,7 +51,7 @@ - CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" - fi + CFLAGS="$CFLAGS $TARGET_ARCH" -+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS" ++ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS" ALLEGRO_SFLAGS="-x assembler-with-cpp" ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED" else -- 2.44.0