CVS commit: xsrc/external/mit/freetype/dist/include/freetype/config

2011-08-10 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Wed Aug 10 10:32:19 UTC 2011

Modified Files:
xsrc/external/mit/freetype/dist/include/freetype/config: ftoption.h

Log Message:
Make it possible to disable #define FT_CONFIG_OPTION_USER_BZIP2
setting by -DFT_CONFIG_OPTION_DISABLE_BZIP2 for tools build
on systems which don't have native bzip2 support.
Ok'ed by mrg@ in PR xsrc/45223.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h
diff -u xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h:1.2 xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h:1.3
--- xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h:1.2	Sat Jul 23 23:30:59 2011
+++ xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h	Wed Aug 10 10:32:19 2011
@@ -200,7 +200,9 @@
   /*   */
   /*   Define this macro if you want to enable this `feature'. */
   /*   */
+#ifndef FT_CONFIG_OPTION_DISABLE_BZIP2
 #define FT_CONFIG_OPTION_USE_BZIP2
+#endif
 
 
   /*/

CVS commit: xsrc/external/mit/freetype/dist/include/freetype/config

2011-07-23 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 23:30:59 UTC 2011

Modified Files:
xsrc/external/mit/freetype/dist/include/freetype/config: ftoption.h

Log Message:
enable bzip2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h
diff -u xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h:1.1.1.4 xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h:1.2
--- xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h:1.1.1.4	Sat Jul 23 23:26:36 2011
+++ xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h	Sat Jul 23 23:30:59 2011
@@ -200,7 +200,7 @@
   /*   */
   /*   Define this macro if you want to enable this `feature'. */
   /*   */
-/* #define FT_CONFIG_OPTION_USE_BZIP2 */
+#define FT_CONFIG_OPTION_USE_BZIP2
 
 
   /*/

CVS commit: xsrc/external/mit/freetype/dist/include/freetype/config

2009-05-29 Thread NONAKA Kimihiro 
Module Name:xsrc
Committed By:   nonaka
Date:   Fri May 29 22:25:07 UTC 2009

Modified Files:
xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h

Log Message:
Use correct syntax for orr instruction.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h
diff -u xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.1.1.2 xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.2
--- xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.1.1.2	Mon Apr 13 18:51:14 2009
+++ xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h	Fri May 29 22:25:07 2009
@@ -327,7 +327,7 @@
   adds   %1, %1, %0\n\t   /* %1 += %0 */
   adc%2, %2, #0\n\t   /* %2 += carry */
   mov%0, %1, lsr #16\n\t  /* %0  = %1  16 */
-  orr%0, %2, lsl #16\n\t  /* %0 |= %2  16 */
+  orr%0, %0, %2, lsl #16\n\t  /* %0 |= %2  16 */
   : =r(a), =r(t2), =r(t)
   : r(a), r(b) );
 return a;