1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
--- misc/gdk-pixbuf-2.23.0/configure 2011-04-08 23:09:51.936125000 +0900
+++ misc/build/gdk-pixbuf-2.23.0/configure 2011-04-08 23:09:30.967375000 +0900
@@ -1417,6 +1417,7 @@
cross_compiling=yes
fi
fi
+cross_compiling=no
ac_tool_prefix=
test -n "$host_alias" && ac_tool_prefix=$host_alias-
@@ -5192,7 +5193,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ if test -n "$ac_tool_prefix"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
@@ -5850,7 +5851,7 @@
# unless we find 'file', for example because we are cross-compiling.
# func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
# Keep this pattern in sync with the one in func_win32_libid.
@@ -16839,7 +16840,7 @@
-
+if test ! 1; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
@@ -17158,14 +17159,20 @@
rm -f conf.glibtest
+else
+ GLIB_MKENUMS=glib-mkenums
+ GLIB_GENMARSHAL=glib-genmarshal
+ GOBJECT_QUERY=gobject-query
+fi
-
+if test ! 1; then
# See if it's safe to turn G_DISABLE_DEPRECATED on.
GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
fi
+fi
CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
@@ -17434,6 +17441,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+if test ! 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dynamic modules work" >&5
$as_echo_n "checking whether dynamic modules work... " >&6; }
## for loop is to strip newline
@@ -17465,6 +17473,7 @@
$as_echo "no" >&6; }
fi
fi
+fi
@@ -18622,8 +18631,8 @@
GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
GDK_PIXBUF_EXTRA_CFLAGS=
-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS"
+GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS"
@@ -18632,6 +18641,9 @@
+USE_X11_TRUE='#'
+USE_X11_FALSE=
+if test ! 1; then
###############
# Check for X11
###############
@@ -18769,6 +18781,7 @@
if test -n "$export_dynamic"; then
GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
fi
+fi
##################################################
# GObject introspection
--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/have_mmx.S 2010-06-26 06:40:10.000000000 +0900
+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/have_mmx.S 2011-04-18 05:35:08.397875000 +0900
@@ -42,7 +42,7 @@
push %ebx
-# Check if bit 21 in flags word is writeable
+/* Check if bit 21 in flags word is writeable */
pushfl
popl %eax
@@ -57,7 +57,7 @@
je .notfound
-# OK, we have CPUID
+/* OK, we have CPUID */
movl $1, %eax
cpuid
--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S 2010-06-26 06:40:10.000000000 +0900
+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S 2011-04-18 20:01:41.207500000 +0900
@@ -189,8 +189,8 @@
shll $2, %edx
-# %mm4 will always be already clear here
-# pxor %mm4, %mm4
+/* %mm4 will always be already clear here
+ * pxor %mm4, %mm4 */
movl 16(%ebp),%edi
movl (%edi, %edx), %eax
|
