Xext/shm.c | 2
Xext/xf86bigfont.c | 2
aclocal.m4 | 14
configure | 218 ++++++++++--
configure.ac | 17
debian/changelog | 10
debian/patches/13_debian_add_xkbpath_env_variable.diff | 14
debian/patches/21_glx_align_fixes.patch | 24 -
debian/patches/46_reduce_wakeups_from_smart_scheduler.patch | 61 +--
debian/patches/51_xkb-and-loathing.diff | 46 --
debian/patches/94_xprint_XSERVER_LIBS | 14
debian/patches/series | 1
dix/getevents.c | 161 ++++++--
hw/xfree86/loader/os.c | 2
hw/xfree86/os-support/bus/Pci.h | 2
hw/xfree86/os-support/bus/freebsdPci.c | 2
ltmain.sh | 2
os/utils.c | 28 +
xkb/ddxLoad.c | 69 +--
19 files changed, 443 insertions(+), 246 deletions(-)
New commits:
commit 47fd38ff513f79771440595fc1f4e782193793d5
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed May 7 22:41:15 2008 +0200
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index 6e7cdfc..c375241 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -6876,7 +6876,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//'
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7025,7 +7025,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7297,14 +7301,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
diff --git a/configure b/configure
index f7aae7a..b6a7a4d 100755
--- a/configure
+++ b/configure
@@ -1274,7 +1274,6 @@ SUN_KBD_MODE_FALSE
BUILD_DATE
BUILD_TIME
DIX_CFLAGS
-libdir exec_prefix prefix
APP_MAN_SUFFIX
LIB_MAN_SUFFIX
FILE_MAN_SUFFIX
@@ -5283,7 +5282,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5286 "configure"' > conftest.$ac_ext
+ echo '#line 5285 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8630,11 +8629,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8633: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8632: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8637: \$? = $ac_status" >&5
+ echo "$as_me:8636: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8920,11 +8919,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8923: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8922: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8927: \$? = $ac_status" >&5
+ echo "$as_me:8926: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9024,11 +9023,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9027: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9026: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9031: \$? = $ac_status" >&5
+ echo "$as_me:9030: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11401,7 +11400,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11404 "configure"
+#line 11403 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11501,7 +11500,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11504 "configure"
+#line 11503 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13902,11 +13901,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13905: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13904: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13909: \$? = $ac_status" >&5
+ echo "$as_me:13908: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14006,11 +14005,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14009: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14008: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14013: \$? = $ac_status" >&5
+ echo "$as_me:14012: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15604,11 +15603,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15607: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15606: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15611: \$? = $ac_status" >&5
+ echo "$as_me:15610: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15708,11 +15707,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15711: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15710: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15715: \$? = $ac_status" >&5
+ echo "$as_me:15714: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17928,11 +17927,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17931: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17930: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17935: \$? = $ac_status" >&5
+ echo "$as_me:17934: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18218,11 +18217,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18221: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18220: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18225: \$? = $ac_status" >&5
+ echo "$as_me:18224: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18322,11 +18321,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18325: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18324: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18329: \$? = $ac_status" >&5
+ echo "$as_me:18328: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21916,6 +21915,147 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
WDTRACE="no"
+ else
+ if test "${ac_cv_header_sys_sdt_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for sys/sdt.h" >&5
+echo $ECHO_N "checking for sys/sdt.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_sdt_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_sdt_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking sys/sdt.h usability" >&5
+echo $ECHO_N "checking sys/sdt.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/sdt.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking sys/sdt.h presence" >&5
+echo $ECHO_N "checking sys/sdt.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/sdt.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: accepted by the compiler,
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sys/sdt.h: accepted by the compiler, rejected by the
preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the compiler's
result" >&5
+echo "$as_me: WARNING: sys/sdt.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: present but cannot be
compiled" >&5
+echo "$as_me: WARNING: sys/sdt.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: check for missing
prerequisite headers?" >&5
+echo "$as_me: WARNING: sys/sdt.h: check for missing prerequisite headers?"
>&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: see the Autoconf
documentation" >&5
+echo "$as_me: WARNING: sys/sdt.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: section \"Present But
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sys/sdt.h: section \"Present But Cannot Be
Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: proceeding with the
preprocessor's result" >&5
+echo "$as_me: WARNING: sys/sdt.h: proceeding with the preprocessor's result"
>&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sdt.h: in the future, the compiler
will take precedence" >&5
+echo "$as_me: WARNING: sys/sdt.h: in the future, the compiler will take
precedence" >&2;}
+ ( cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for sys/sdt.h" >&5
+echo $ECHO_N "checking for sys/sdt.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_sys_sdt_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_sys_sdt_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sdt_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_sdt_h" >&6; }
+
+fi
+if test $ac_cv_header_sys_sdt_h = yes; then
+ HAS_SDT_H="yes"
+else
+ HAS_SDT_H="no"
+fi
+
+
+ if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then
+ WDTRACE="no"
+ fi
fi
fi
if test "x$WDTRACE" != "xno" ; then
@@ -26580,6 +26720,10 @@ _ACEOF
#define USE_DEV_IO 1
_ACEOF
;;
+ *dragonfly*) cat >>confdefs.h <<\_ACEOF
+#define USE_DEV_IO 1
+_ACEOF
+ ;;
*netbsd*) cat >>confdefs.h <<\_ACEOF
#define USE_I386_IOPL 1
_ACEOF
@@ -26616,6 +26760,11 @@ cat >>confdefs.h <<\_ACEOF
#define USE_DEV_IO 1
_ACEOF
;;
+ *dragonfly*)
+cat >>confdefs.h <<\_ACEOF
+#define USE_DEV_IO 1
+_ACEOF
+ ;;
*netbsd*)
cat >>confdefs.h <<\_ACEOF
#define USE_I386_IOPL 1
@@ -26686,7 +26835,7 @@ fi
DRI=no
KDRIVE_HW=no
case $host_os in
- *freebsd*)
+ *freebsd* | *dragonfly*)
case $host_os in
kfreebsd*-gnu) ;;
*)
@@ -26798,7 +26947,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -26807,7 +26956,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -28308,7 +28457,10 @@ fi
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5
echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6; }
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -28331,6 +28483,7 @@ if test `eval echo '${'$as_ac_File'}'` = yes; then
HAVE_DEFS_ENT=yes
fi
+fi
# Extract the first word of "linuxdoc", so it can be a program name with args.
set dummy linuxdoc; ac_word=$2
@@ -33195,7 +33348,7 @@ echo "$as_me: Disabling DGA extension" >&6;}
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
XORG_OS="freebsd"
XORG_OS_SUBDIR="bsd"
case $host_cpu in
@@ -37141,6 +37294,8 @@ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
+
+
# Man page sections - used in config utils & generating man pages
@@ -39572,9 +39727,6 @@ SUN_KBD_MODE_FALSE!$SUN_KBD_MODE_FALSE$ac_delim
BUILD_DATE!$BUILD_DATE$ac_delim
BUILD_TIME!$BUILD_TIME$ac_delim
DIX_CFLAGS!$DIX_CFLAGS$ac_delim
-libdir!$libdir$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
LIB_MAN_SUFFIX!$LIB_MAN_SUFFIX$ac_delim
FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim
@@ -39591,7 +39743,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
commit ef31b82a9f8228af39a97147f009873552928760
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed May 7 22:31:30 2008 +0200
Refresh patches
diff --git a/debian/changelog b/debian/changelog
index 157a769..d1d2fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg-server (2:1.4.1~git20080507-1) UNRELEASED; urgency=low
* Pull from upstream server-1.4-branch
* Drop patch 51_xkb-and-loathing.diff, applied upstream
+ * Refresh patches 13_debian_add_xkbpath_env_variable.diff,
+ 21_glx_align_fixes.patch, 46_reduce_wakeups_from_smart_scheduler.patch and
+ 94_xprint_XSERVER_LIBS.
-- Julien Cristau <[EMAIL PROTECTED]> Wed, 07 May 2008 22:20:17 +0200
diff --git a/debian/patches/13_debian_add_xkbpath_env_variable.diff
b/debian/patches/13_debian_add_xkbpath_env_variable.diff
index 5028e64..0692f46 100644
--- a/debian/patches/13_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/13_debian_add_xkbpath_env_variable.diff
@@ -1,7 +1,5 @@
-Index: xorg-server/xkb/xkbInit.c
-===================================================================
---- xorg-server.orig/xkb/xkbInit.c 2007-08-16 22:37:00.000000000 -0400
-+++ xorg-server/xkb/xkbInit.c 2007-08-16 22:47:28.000000000 -0400
+--- xorg-server.orig/xkb/xkbInit.c
++++ xorg-server/xkb/xkbInit.c
@@ -835,6 +835,14 @@
extern unsigned char XkbDfltAccessXOptions;
@@ -17,11 +15,9 @@ Index: xorg-server/xkb/xkbInit.c
XkbProcessArguments(int argc,char *argv[],int i)
{
if (strcmp(argv[i],"-kb")==0) {
-Index: xorg-server/os/utils.c
-===================================================================
---- xorg-server.orig/os/utils.c 2007-08-16 22:37:00.000000000 -0400
-+++ xorg-server/os/utils.c 2007-08-16 22:47:28.000000000 -0400
-@@ -683,6 +683,7 @@
+--- xorg-server.orig/os/utils.c
++++ xorg-server/os/utils.c
+@@ -684,6 +684,7 @@
*/
void InitGlobals(void)
{
diff --git a/debian/patches/21_glx_align_fixes.patch
b/debian/patches/21_glx_align_fixes.patch
index cf91081..e597094 100644
--- a/debian/patches/21_glx_align_fixes.patch
+++ b/debian/patches/21_glx_align_fixes.patch
@@ -1,7 +1,5 @@
-Index: xorg-server/GL/glx/Makefile.am
-===================================================================
---- xorg-server.orig/GL/glx/Makefile.am 2007-09-06 11:39:53.000000000
+0200
-+++ xorg-server/GL/glx/Makefile.am 2007-09-06 11:42:06.000000000 +0200
+--- xorg-server.orig/GL/glx/Makefile.am
++++ xorg-server/GL/glx/Makefile.am
@@ -14,7 +14,8 @@
[EMAIL PROTECTED]@/src/mesa/glapi \
[EMAIL PROTECTED]@/src/mesa/main \
@@ -12,11 +10,9 @@ Index: xorg-server/GL/glx/Makefile.am
# none yet
#sdk_HEADERS =
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac 2007-09-06 11:39:53.000000000 +0200
-+++ xorg-server/configure.ac 2007-09-06 11:42:06.000000000 +0200
-@@ -280,6 +280,7 @@
+--- xorg-server.orig/configure.ac
++++ xorg-server/configure.ac
+@@ -287,6 +287,7 @@
case $host_os in
*netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha
IO]) ;;
esac
@@ -24,7 +20,7 @@ Index: xorg-server/configure.ac
;;
arm*)
ARM_VIDEO=yes
-@@ -309,6 +310,7 @@
+@@ -317,6 +318,7 @@
xorg_loader_sparcmuldiv="yes"
SPARC64_VIDEO=yes
BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
@@ -32,7 +28,7 @@ Index: xorg-server/configure.ac
;;
x86_64*|amd64*)
use_x86_asm="yes"
-@@ -323,8 +325,16 @@
+@@ -332,8 +334,16 @@
SYS_LIBS=-lamd64
;;
esac
@@ -49,10 +45,8 @@ Index: xorg-server/configure.ac
dnl BSD *_video.c selection
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
-Index: xorg-server/hw/dmx/glxProxy/Makefile.am
-===================================================================
---- xorg-server.orig/hw/dmx/glxProxy/Makefile.am 2007-09-06
11:39:53.000000000 +0200
-+++ xorg-server/hw/dmx/glxProxy/Makefile.am 2007-09-06 11:42:06.000000000
+0200
+--- xorg-server.orig/hw/dmx/glxProxy/Makefile.am
++++ xorg-server/hw/dmx/glxProxy/Makefile.am
@@ -32,6 +32,7 @@
unpack.h
diff --git a/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
b/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
index cd5395d..fa3e4a8 100644
--- a/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
+++ b/debian/patches/46_reduce_wakeups_from_smart_scheduler.patch
@@ -27,11 +27,9 @@ Date: Wed Nov 7 16:33:10 2007 -0800
Don't frob timers unless SmartSchedule is running
-diff --git a/include/dixstruct.h b/include/dixstruct.h
-index dd6347f..bed31dc 100644
---- a/include/dixstruct.h
-+++ b/include/dixstruct.h
-@@ -150,11 +150,9 @@ extern long SmartScheduleTime;
+--- xorg-server.orig/include/dixstruct.h
++++ xorg-server/include/dixstruct.h
+@@ -150,11 +150,9 @@
extern long SmartScheduleInterval;
extern long SmartScheduleSlice;
extern long SmartScheduleMaxSlice;
@@ -45,11 +43,9 @@ index dd6347f..bed31dc 100644
#define SMART_MAX_PRIORITY (20)
#define SMART_MIN_PRIORITY (-20)
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index ec1592c..7683477 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -217,7 +217,8 @@ WaitForSomething(int *pClientsReady)
+--- xorg-server.orig/os/WaitFor.c
++++ xorg-server/os/WaitFor.c
+@@ -217,7 +217,8 @@
XFD_COPYSET(&AllSockets, &LastSelectMask);
#ifdef SMART_SCHEDULE
}
@@ -59,7 +55,7 @@ index ec1592c..7683477 100644
#endif
BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
if (NewOutputPending)
-@@ -237,13 +238,7 @@ WaitForSomething(int *pClientsReady)
+@@ -237,13 +238,7 @@
selecterr = GetErrno();
WakeupHandler(i, (pointer)&LastSelectMask);
#ifdef SMART_SCHEDULE
@@ -74,11 +70,9 @@ index ec1592c..7683477 100644
#endif
if (i <= 0) /* An error or timeout occurred */
{
-diff --git a/os/utils.c b/os/utils.c
-index 31cb0af..6fc1f7d 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1512,10 +1512,6 @@ XNFstrdup(const char *s)
+--- xorg-server.orig/os/utils.c
++++ xorg-server/os/utils.c
+@@ -1513,10 +1513,6 @@
#ifdef SMART_SCHEDULE
@@ -89,7 +83,7 @@ index 31cb0af..6fc1f7d 100644
#ifdef SIGVTALRM
#define SMART_SCHEDULE_POSSIBLE
#endif
-@@ -1525,7 +1521,7 @@ Bool SmartScheduleTimerStopped;
+@@ -1526,49 +1522,43 @@
#define SMART_SCHEDULE_TIMER ITIMER_REAL
#endif
@@ -98,7 +92,12 @@ index 31cb0af..6fc1f7d 100644
SmartScheduleStopTimer (void)
{
#ifdef SMART_SCHEDULE_POSSIBLE
-@@ -1536,38 +1532,28 @@ SmartScheduleStopTimer (void)
+ struct itimerval timer;
+
++ if (SmartScheduleDisable)
++ return;
+ timer.it_interval.tv_sec = 0;
+ timer.it_interval.tv_usec = 0;
timer.it_value.tv_sec = 0;
timer.it_value.tv_usec = 0;
(void) setitimer (ITIMER_REAL, &timer, 0);
@@ -114,6 +113,8 @@ index 31cb0af..6fc1f7d 100644
struct itimerval timer;
- SmartScheduleTimerStopped = FALSE;
++ if (SmartScheduleDisable)
++ return;
timer.it_interval.tv_sec = 0;
timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
timer.it_value.tv_sec = 0;
@@ -139,7 +140,7 @@ index 31cb0af..6fc1f7d 100644
}
#endif
-@@ -1591,14 +1577,6 @@ SmartScheduleInit (void)
+@@ -1592,14 +1582,6 @@
perror ("sigaction for smart scheduler");
return FALSE;
}
@@ -154,25 +155,3 @@ index 31cb0af..6fc1f7d 100644
return TRUE;
#else
return FALSE;
-diff --git a/os/utils.c b/os/utils.c
-index 3228146..ae96a41 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1527,6 +1527,8 @@ SmartScheduleStopTimer (void)
- #ifdef SMART_SCHEDULE_POSSIBLE
- struct itimerval timer;
-
-+ if (SmartScheduleDisable)
-+ return;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = 0;
- timer.it_value.tv_sec = 0;
-@@ -1541,6 +1543,8 @@ SmartScheduleStartTimer (void)
- #ifdef SMART_SCHEDULE_POSSIBLE
- struct itimerval timer;
-
-+ if (SmartScheduleDisable)
-+ return;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
- timer.it_value.tv_sec = 0;
diff --git a/debian/patches/94_xprint_XSERVER_LIBS
b/debian/patches/94_xprint_XSERVER_LIBS
index e20768b..2e74739 100644
--- a/debian/patches/94_xprint_XSERVER_LIBS
+++ b/debian/patches/94_xprint_XSERVER_LIBS
@@ -1,7 +1,5 @@
-Index: xorg-server/hw/xprint/Makefile.am
-===================================================================
---- xorg-server.orig/hw/xprint/Makefile.am 2008-02-25 05:27:19.000000000
+1100
-+++ xorg-server/hw/xprint/Makefile.am 2008-02-25 05:28:41.000000000 +1100
+--- xorg-server.orig/hw/xprint/Makefile.am
++++ xorg-server/hw/xprint/Makefile.am
@@ -18,6 +18,7 @@
$(top_builddir)/fb/libfb.la \
$(top_builddir)/render/librender.la \
@@ -10,11 +8,9 @@ Index: xorg-server/hw/xprint/Makefile.am
$(top_builddir)/Xext/libXext.la \
$(top_builddir)/xkb/libxkb.la \
$(top_builddir)/xkb/libxkbstubs.la \
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac 2008-02-25 05:27:53.000000000 +1100
-+++ xorg-server/configure.ac 2008-02-25 05:27:53.000000000 +1100
-@@ -1626,7 +1626,7 @@
+--- xorg-server.orig/configure.ac
++++ xorg-server/configure.ac
+@@ -1635,7 +1635,7 @@
if test "x$XPRINT" = xyes; then
PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES
xau])
XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS"
commit f30976b2637462cf3d71380adaa60e6e3da382d2
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed May 7 22:27:08 2008 +0200
Update changelog and drop patch included upstream
diff --git a/debian/changelog b/debian/changelog
index eaa245a..157a769 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.1~git20080507-1) UNRELEASED; urgency=low
+
+ * Pull from upstream server-1.4-branch
+ * Drop patch 51_xkb-and-loathing.diff, applied upstream
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 07 May 2008 22:20:17 +0200
+
xorg-server (2:1.4.1~git20080131-4) unstable; urgency=low
* fix AlwaysCore handling: enabling AlwaysCore in xorg.conf 1) is the
diff --git a/debian/patches/51_xkb-and-loathing.diff
b/debian/patches/51_xkb-and-loathing.diff
deleted file mode 100644
index fafbf14..0000000
--- a/debian/patches/51_xkb-and-loathing.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-* Mon Apr 30 2007 Adam Jackson <[EMAIL PROTECTED]> 1.3.0.0-3
-- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
- around calls to Popen()/Pclose(). Fixes a hang in openoffice when
- opening menus.
-
-http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.3.0-xkb-and-loathing.patch?view=markup
-https://bugs.freedesktop.org/show_bug.cgi?id=10525
-
-Fixes #433131
-
---- xorg-server.orig/os/utils.c
-+++ xorg-server/os/utils.c
-@@ -1703,6 +1703,8 @@
- int pid;
- } *pidlist;
-
-+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
-+
- pointer
- Popen(char *command, char *type)
- {
-@@ -1724,11 +1726,15 @@
- return NULL;
- }
-
-+ /* Ignore the smart scheduler while this is going on */
-+ old_alarm = signal(SIGALRM, SIG_IGN);
-+
- switch (pid = fork()) {
- case -1: /* error */
- close(pdes[0]);
- close(pdes[1]);
- xfree(cur);
-+ signal(SIGALRM, old_alarm);
- return NULL;
- case 0: /* child */
- if (setgid(getgid()) == -1)
-@@ -1904,6 +1910,8 @@
- /* allow EINTR again */
- OsReleaseSignals ();
-
-+ signal(SIGALRM, old_alarm);
-+
- return pid == -1 ? -1 : pstat;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 845fa9f..8352e06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,6 @@
45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff
46_reduce_wakeups_from_smart_scheduler.patch
#47_fbdevhw_magic_numbers.diff
-51_xkb-and-loathing.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
commit 104048501f37b139d4113562ef1711978cc76018
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed May 7 23:11:31 2008 +0300
XKB: Actually explain keymap failures
When something went wrong building a keymap, try to explain to the user
what it actually was, instead of the dreaded 'Failed to load XKB keymap'
catch-all.
(cherry picked from commit cf20df39cc78203d17b99223908af388ecbf7d0e)
Conflicts:
xkb/ddxLoad.c
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index d79ae7a..ea9c3ff 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -385,24 +385,20 @@ char tmpname[PATH_MAX];
xfree (buf);
return True;
}
-#ifdef DEBUG
else
- ErrorF("Error compiling keymap (%s)\n",keymap);
-#endif
+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
#ifdef WIN32
/* remove the temporary file */
unlink(tmpname);
#endif
}
-#ifdef DEBUG
else {
#ifndef WIN32
- ErrorF("Could not invoke keymap compiler\n");
+ LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp\n");
#else
- ErrorF("Could not open file %s\n", tmpname);
+ LogMessage(X_ERROR, "Could not open file %s\n", tmpname);
#endif
}
-#endif
if (nameRtrn)
nameRtrn[0]= '\0';
if (buf != NULL)
@@ -477,17 +473,14 @@ unsigned missing;
return 0;
}
else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) {
-#ifdef NOISY
- ErrorF("Couldn't compile keymap file\n");
-#endif
+ LogMessage(X_ERROR, "Couldn't compile keymap file %s\n",
+ names->keymap);
return 0;
}
}
else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
- nameRtrn,nameRtrnLen)){
-#ifdef NOISY
- ErrorF("Couldn't compile keymap file\n");
-#endif
+ nameRtrn,nameRtrnLen)){
+ LogMessage(X_ERROR, "XKB: Couldn't compile keymap\n");
return 0;
}
file= XkbDDXOpenConfigFile(nameRtrn,fileName,PATH_MAX);
@@ -502,11 +495,9 @@ unsigned missing;
(void) unlink (fileName);
return 0;
}
-#ifdef DEBUG
- else if (xkbDebugFlags) {
- ErrorF("Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined);
+ else {
+ DebugF("XKB: Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined);
}
-#endif
fclose(file);
(void) unlink (fileName);
return (need|want)&(~missing);
@@ -525,32 +516,40 @@ XkbRF_RulesPtr rules;
if (!rules_name)
return False;
- if (XkbBaseDirectory==NULL) {
- if (strlen(rules_name)+7 > PATH_MAX)
- return False;
- sprintf(buf,"rules/%s",rules_name);
- }
- else {
- if (strlen(XkbBaseDirectory)+strlen(rules_name)+8 > PATH_MAX)
- return False;
- sprintf(buf,"%s/rules/%s",XkbBaseDirectory,rules_name);
+
+ if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) {
+ LogMessage(X_ERROR, "XKB: Rules name is too long\n");
+ return False;
}
- if ((file= fopen(buf,"r"))==NULL)
+ sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name);
+
+ file = fopen(buf, "r");
+ if (!file) {
+ LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", file);
return False;
- if ((rules= XkbRF_Create(0,0))==NULL) {
+ }
+
+ rules = XkbRF_Create(0, 0);
+ if (!rules) {
+ LogMessage(X_ERROR, "XKB: Couldn't create rules struct\n");
fclose(file);
return False;
}
- if (!XkbRF_LoadRules(file,rules)) {
+
+ if (!XkbRF_LoadRules(file, rules)) {
+ LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
fclose(file);
XkbRF_Free(rules,True);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
