merge libXrandr 1.2.2

2 files changed, 26 insertions, 13 deletions

diff --git a/lib/libXrandr/configure b/lib/libXrandr/configure
index 08b111532..63b1e82a1 100644
--- a/lib/libXrandr/configure
+++ b/lib/libXrandr/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXrandr 1.1.2.
+# Generated by GNU Autoconf 2.59 for libXrandr 1.2.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libXrandr'
 PACKAGE_TARNAME='libXrandr'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='libXrandr 1.1.2'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='libXrandr 1.2.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -973,7 +973,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXrandr 1.1.2 to adapt to many kinds of systems.
+\`configure' configures libXrandr 1.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1039,7 +1039,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXrandr 1.1.2:";;
+     short | recursive ) echo "Configuration of libXrandr 1.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1190,7 +1190,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-libXrandr configure 1.1.2
+libXrandr configure 1.2.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1204,7 +1204,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXrandr $as_me 1.1.2, which was
+It was created by libXrandr $as_me 1.2.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1847,7 +1847,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXrandr'
- VERSION='1.1.2'
+ VERSION='1.2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19500,7 +19500,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXrandr $as_me 1.1.2, which was
+This file was extended by libXrandr $as_me 1.2.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19563,7 +19563,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXrandr config.status 1.1.2
+libXrandr config.status 1.2.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libXrandr/src/Makefile.in b/lib/libXrandr/src/Makefile.in
index 919305d71..f5fdb9977 100644
--- a/lib/libXrandr/src/Makefile.in
+++ b/lib/libXrandr/src/Makefile.in
@@ -58,7 +58,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libXrandr_la_DEPENDENCIES =
-am_libXrandr_la_OBJECTS = Xrandr.lo
+am_libXrandr_la_OBJECTS = Xrandr.lo XrrConfig.lo XrrCrtc.lo XrrMode.lo \
+	XrrOutput.lo XrrProperty.lo XrrScreen.lo
 libXrandr_la_OBJECTS = $(am_libXrandr_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -202,12 +203,18 @@ target_alias = @target_alias@
 lib_LTLIBRARIES = libXrandr.la
 libXrandr_la_SOURCES = \
 	Xrandr.c 	\
-	Xrandrint.h
+	Xrandrint.h	\
+	XrrConfig.c	\
+	XrrCrtc.c	\
+	XrrMode.c	\
+	XrrOutput.c	\
+	XrrProperty.c	\
+	XrrScreen.c
 
 libXrandr_la_LIBADD = @X_LIBS@ @RANDR_LIBS@
 AM_CFLAGS = @X_CFLAGS@ @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
 INCLUDES = -I$(top_srcdir)/include/X11/extensions
-libXrandr_la_LDFLAGS = -version-number 2:0:0 -no-undefined
+libXrandr_la_LDFLAGS = -version-number 2:1:0 -no-undefined
 libXrandrincludedir = $(includedir)/X11/extensions
 libXrandrinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrandr.h 
 all: all-am
@@ -280,6 +287,12 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xrandr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XrrConfig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XrrCrtc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XrrMode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XrrOutput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XrrProperty.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XrrScreen.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \