Author: lisu Date: Tue Mar 25 16:16:17 2008 GMT
Module: SOURCES Tag: ALLEGRO_WIP-5_0
---- Log message:
- adapted for 4.9.2 version
---- Files affected:
SOURCES:
allegro-config.patch (1.2 -> 1.2.2.1) , allegro-examples.patch (1.5 ->
1.5.2.1) , allegro-frame-pointer.patch (1.4 -> 1.4.2.1) , allegro-info.patch
(1.6 -> 1.6.2.1) , allegro-ldflags.patch (1.2 -> 1.2.2.1) , allegro-opt.patch
(1.9 -> 1.9.2.1)
---- Diffs:
================================================================
Index: SOURCES/allegro-config.patch
diff -u SOURCES/allegro-config.patch:1.2 SOURCES/allegro-config.patch:1.2.2.1
--- SOURCES/allegro-config.patch:1.2 Sun Jun 17 12:01:03 2007
+++ SOURCES/allegro-config.patch Tue Mar 25 17:16:11 2008
@@ -1,14 +1,14 @@
---- 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
-
+--- allegro-4.9.2/misc/allegro5-config.in~ 2008-03-25 13:59:19.972388263
+0100
++++ allegro-4.9.2/misc/allegro5-config.in 2008-03-25 14:00:44.783109368
+0100
+@@ -185,9 +185,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
++ echo $libdirs$allegro_ldflags -l${lib_type}-${version}
-l${lib_type}_unsharable
+ fi
+ fi
+
================================================================
Index: SOURCES/allegro-examples.patch
diff -u SOURCES/allegro-examples.patch:1.5
SOURCES/allegro-examples.patch:1.5.2.1
--- SOURCES/allegro-examples.patch:1.5 Sun Nov 13 19:48:21 2005
+++ SOURCES/allegro-examples.patch Tue Mar 25 17:16:12 2008
@@ -1,24 +1,24 @@
---- 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; \
+--- allegro-4.9.2/makefile.in~ 2008-03-25 13:37:50.960766155 +0100
++++ allegro-4.9.2/makefile.in 2008-03-25 13:40:51.949418447 +0100
+@@ -536,7 +536,7 @@
+ $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro5/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)
+@@ -624,9 +624,9 @@
+ rm -rf $(includedir)/allegro5
+
+ 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; \
================================================================
Index: SOURCES/allegro-frame-pointer.patch
diff -u SOURCES/allegro-frame-pointer.patch:1.4
SOURCES/allegro-frame-pointer.patch:1.4.2.1
--- SOURCES/allegro-frame-pointer.patch:1.4 Sun Nov 13 19:48:21 2005
+++ SOURCES/allegro-frame-pointer.patch Tue Mar 25 17:16:12 2008
@@ -1,21 +1,20 @@
-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
+--- allegro-4.9.2/configure.in~ 2008-03-25 13:48:59.559395652 +0100
++++ allegro-4.9.2/configure.in 2008-03-25 13:58:36.726987554 +0100
+@@ -275,7 +275,7 @@
+ COMPILE_PROGRAM=COMPILE_DEBUG
+ COMPILE_CXX_PROGRAM=COMPILE_CXX_DEBUG
+ COMPILE_S_PROGRAM=COMPILE_S_DEBUG
+- PROG_LDFLAGS="-g \$(LDFLAGS)"
++ PROG_LDFLAGS="-fno-omit-frame-pointer -pg \$(LDFLAGS)"
+ LIB_TO_LINK=alld
+ PLUGIN_LIB=lib/unix/libaddat.a
+ allegro_build_debugging_library=yes
+@@ -824,7 +824,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
================================================================
Index: SOURCES/allegro-info.patch
diff -u SOURCES/allegro-info.patch:1.6 SOURCES/allegro-info.patch:1.6.2.1
--- SOURCES/allegro-info.patch:1.6 Sun Nov 13 19:48:21 2005
+++ SOURCES/allegro-info.patch Tue Mar 25 17:16:12 2008
@@ -1,15 +1,11 @@
-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) @[EMAIL PROTECTED]
- @$
- @[EMAIL PROTECTED]
[EMAIL PROTECTED]@dircategory Libraries
[EMAIL PROTECTED]@dircategory Libraries:
- @[EMAIL PROTECTED]
[EMAIL PROTECTED] Allegro: (allegro). The Allegro game
programming library.
[EMAIL PROTECTED] Allegro: (allegro). The Allegro game
programming library
- @[EMAIL PROTECTED] direntry
- @$This is the Info version of the Allegro manual
- @$
+--- allegro-4.9.2/docs/src/allegro._tx~ 2008-03-24 20:21:49.962436955
+0100
++++ allegro-4.9.2/docs/src/allegro._tx 2008-03-24 20:22:11.686808839 +0100
+@@ -31,7 +31,7 @@
+ @# This should remain commented at the moment (dvi output) @[EMAIL PROTECTED]
+ @$
+ @[EMAIL PROTECTED]
[EMAIL PROTECTED]@dircategory Libraries
[EMAIL PROTECTED]@dircategory Libraries:
+ @[EMAIL PROTECTED]
+ @$* Allegro: (allegro). The Allegro game programming
library.
+ @[EMAIL PROTECTED] direntry
================================================================
Index: SOURCES/allegro-ldflags.patch
diff -u SOURCES/allegro-ldflags.patch:1.2 SOURCES/allegro-ldflags.patch:1.2.2.1
--- SOURCES/allegro-ldflags.patch:1.2 Sun Nov 13 19:48:21 2005
+++ SOURCES/allegro-ldflags.patch Tue Mar 25 17:16:12 2008
@@ -1,12 +1,11 @@
-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=""
+--- allegro-4.9.2/misc/allegro5-config.in~ 2008-01-18 23:45:23.000000000
+0100
++++ allegro-4.9.2/misc/allegro5-config.in 2008-03-25 13:48:06.266847963
+0100
+@@ -26,7 +26,7 @@
+
+ accepts_frameworks=no
+
+-allegro_ldflags="@LDFLAGS@"
++allegro_ldflags=""
+ allegro_libs="@LIBS@"
+ allegro_frameworks="@FRAMEWORKS@"
+ allegro_cflags=""
================================================================
Index: SOURCES/allegro-opt.patch
diff -u SOURCES/allegro-opt.patch:1.9 SOURCES/allegro-opt.patch:1.9.2.1
--- SOURCES/allegro-opt.patch:1.9 Sun Nov 13 19:48:21 2005
+++ SOURCES/allegro-opt.patch Tue Mar 25 17:16:12 2008
@@ -1,57 +1,57 @@
---- 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
+--- allegro-4.9.2/configure.in~ 2008-03-25 13:41:52.555649102 +0100
++++ allegro-4.9.2/configure.in 2008-03-25 13:45:51.993762276 +0100
+@@ -815,38 +815,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"
+@@ -854,12 +823,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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/allegro-config.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/allegro-examples.patch?r1=1.5&r2=1.5.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/allegro-frame-pointer.patch?r1=1.4&r2=1.4.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/allegro-info.patch?r1=1.6&r2=1.6.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/allegro-ldflags.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/allegro-opt.patch?r1=1.9&r2=1.9.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
