[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'ubuntu'

 debian/changelog                                         |   21 ++
 debian/control                                           |    1 
 debian/patches/glamor-make-current-in-prepare-paths.diff |   32 +++
 debian/patches/series                                    |    1 
 debian/patches/xmir.patch                                |  141 ++++++---------
 5 files changed, 116 insertions(+), 80 deletions(-)

New commits:
commit 20ab8d0971b20d8b79da97cffbb41c99e851e899
Author: Robert Ancell <robert.ancell@canonical.com>
Date:   Tue Oct 27 11:23:29 2015 +1300

    * debian/patches/xmir.patch:
      - Fix FTBFS due to change in Mir headers

diff --git a/debian/changelog b/debian/changelog
index 0074e9a..9f04da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu9) wily; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix FTBFS due to change in Mir headers
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 30 Sep 2015 16:15:39 +1300
+
 xorg-server (2:1.17.2-1ubuntu8) wily; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index f0c8bef..fd421ae 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -45,11 +45,11 @@ Contributions from:
  create mode 100644 hw/xmir/xmir.c
  create mode 100644 hw/xmir/xmir.h
 
-diff --git a/configure.ac b/configure.ac
-index d8f0e74..75d74ae 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -624,6 +624,7 @@ AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server
+Index: xorg-server-1.17.2/configure.ac
+===================================================================
+--- xorg-server-1.17.2.orig/configure.ac
++++ xorg-server-1.17.2/configure.ac
+@@ -629,6 +629,7 @@ AC_ARG_ENABLE(xvfb,    	      AS_HELP_ST
  AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
  AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
  AC_ARG_ENABLE(xwayland,       AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
@@ -57,7 +57,7 @@ index d8f0e74..75d74ae 100644
  AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
  AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
  AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no])
-@@ -745,6 +746,7 @@ case $host_os in
+@@ -750,6 +751,7 @@ case $host_os in
  			XVFB=no
  			XNEST=no
  			XWAYLAND=no
@@ -65,13 +65,13 @@ index d8f0e74..75d74ae 100644
  
  			COMPOSITE=no
  			DGA=no
-@@ -2474,6 +2476,27 @@ if test "x$XWAYLAND" = xyes; then
+@@ -2495,6 +2497,27 @@ if test "x$XWAYLAND" = xyes; then
  		     [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
  fi
  
 +dnl Xmir DDX
 +
-+PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1 libdrm epoxy], [have_xmir=yes], [have_xmir=no])
++PKG_CHECK_MODULES(XMIRMODULES, [mirclient >= 0.13.1 mir-client-platform-mesa-dev libdrm epoxy], [have_xmir=yes], [have_xmir=no])
 +AC_MSG_CHECKING([whether to build Xmir DDX])
 +if test "x$XMIR" = xauto; then
 +   XMIR="$have_xmir"
@@ -93,7 +93,7 @@ index d8f0e74..75d74ae 100644
  
  dnl and the rest of these are generic, so they're in config.h
  dnl 
-@@ -2622,6 +2645,8 @@ hw/kdrive/fbdev/Makefile
+@@ -2643,6 +2666,8 @@ hw/kdrive/fbdev/Makefile
  hw/kdrive/linux/Makefile
  hw/kdrive/src/Makefile
  hw/xwayland/Makefile
@@ -102,10 +102,10 @@ index d8f0e74..75d74ae 100644
  test/Makefile
  test/xi1/Makefile
  test/xi2/Makefile
-diff --git a/hw/Makefile.am b/hw/Makefile.am
-index 19895dc..b7b958c 100644
---- a/hw/Makefile.am
-+++ b/hw/Makefile.am
+Index: xorg-server-1.17.2/hw/Makefile.am
+===================================================================
+--- xorg-server-1.17.2.orig/hw/Makefile.am
++++ xorg-server-1.17.2/hw/Makefile.am
 @@ -30,6 +30,10 @@ if XWAYLAND
  XWAYLAND_SUBDIRS = xwayland
  endif
@@ -130,18 +130,16 @@ index 19895dc..b7b958c 100644
  
  relink:
  	$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
-diff --git a/hw/xmir/.gitignore b/hw/xmir/.gitignore
-new file mode 100644
-index 0000000..b6a16d4
+Index: xorg-server-1.17.2/hw/xmir/.gitignore
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/.gitignore
++++ xorg-server-1.17.2/hw/xmir/.gitignore
 @@ -0,0 +1 @@
 +Xmir
-diff --git a/hw/xmir/Makefile.am b/hw/xmir/Makefile.am
-new file mode 100644
-index 0000000..be5225e
+Index: xorg-server-1.17.2/hw/xmir/Makefile.am
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/Makefile.am
++++ xorg-server-1.17.2/hw/xmir/Makefile.am
 @@ -0,0 +1,61 @@
 +bin_PROGRAMS = Xmir
 +
@@ -204,11 +202,10 @@ index 0000000..be5225e
 +
 +relink:
 +	$(AM_V_at)rm -f Xmir$(EXEEXT) && $(MAKE) Xmir$(EXEEXT)
-diff --git a/hw/xmir/dri2/Makefile.am b/hw/xmir/dri2/Makefile.am
-new file mode 100644
-index 0000000..696240c
+Index: xorg-server-1.17.2/hw/xmir/dri2/Makefile.am
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/dri2/Makefile.am
++++ xorg-server-1.17.2/hw/xmir/dri2/Makefile.am
 @@ -0,0 +1,14 @@
 +noinst_LTLIBRARIES = libdri2.la
 +
@@ -224,11 +221,10 @@ index 0000000..696240c
 +	dri2ext.c \
 +	dri2int.h
 +
-diff --git a/hw/xmir/dri2/dri2.c b/hw/xmir/dri2/dri2.c
-new file mode 100644
-index 0000000..6aa19ba
+Index: xorg-server-1.17.2/hw/xmir/dri2/dri2.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/dri2/dri2.c
++++ xorg-server-1.17.2/hw/xmir/dri2/dri2.c
 @@ -0,0 +1,1398 @@
 +/*
 + * Copyright © 2007, 2008 Red Hat, Inc.
@@ -1628,11 +1624,10 @@ index 0000000..6aa19ba
 +    *is_param_recognized = FALSE;
 +    return Success;
 +}
-diff --git a/hw/xmir/dri2/dri2.h b/hw/xmir/dri2/dri2.h
-new file mode 100644
-index 0000000..318898b
+Index: xorg-server-1.17.2/hw/xmir/dri2/dri2.h
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/dri2/dri2.h
++++ xorg-server-1.17.2/hw/xmir/dri2/dri2.h
 @@ -0,0 +1,364 @@
 +/*
 + * Copyright © 2007 Red Hat, Inc.
@@ -1998,11 +1993,10 @@ index 0000000..318898b
 +extern Bool noDRI2Extension;
 +
 +#endif
-diff --git a/hw/xmir/dri2/dri2ext.c b/hw/xmir/dri2/dri2ext.c
-new file mode 100644
-index 0000000..befbb82
+Index: xorg-server-1.17.2/hw/xmir/dri2/dri2ext.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/dri2/dri2ext.c
++++ xorg-server-1.17.2/hw/xmir/dri2/dri2ext.c
 @@ -0,0 +1,683 @@
 +/*
 + * Copyright © 2008 Red Hat, Inc.
@@ -2687,11 +2681,10 @@ index 0000000..befbb82
 +
 +    DRI2ModuleSetup();
 +}
-diff --git a/hw/xmir/dri2/dri2int.h b/hw/xmir/dri2/dri2int.h
-new file mode 100644
-index 0000000..7f53eba
+Index: xorg-server-1.17.2/hw/xmir/dri2/dri2int.h
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/dri2/dri2int.h
++++ xorg-server-1.17.2/hw/xmir/dri2/dri2int.h
 @@ -0,0 +1,26 @@
 +/*
 + * Copyright © 2011 Daniel Stone
@@ -2719,11 +2712,10 @@ index 0000000..7f53eba
 + */
 +
 +extern Bool DRI2ModuleSetup(void);
-diff --git a/hw/xmir/xmir-cursor.c b/hw/xmir/xmir-cursor.c
-new file mode 100644
-index 0000000..459f9ac
+Index: xorg-server-1.17.2/hw/xmir/xmir-cursor.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-cursor.c
++++ xorg-server-1.17.2/hw/xmir/xmir-cursor.c
 @@ -0,0 +1,214 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -2939,11 +2931,10 @@ index 0000000..459f9ac
 +                               &xmir_pointer_sprite_funcs,
 +                               &xmir_pointer_screen_funcs, TRUE);
 +}
-diff --git a/hw/xmir/xmir-cvt.c b/hw/xmir/xmir-cvt.c
-new file mode 100644
-index 0000000..6070d77
+Index: xorg-server-1.17.2/hw/xmir/xmir-cvt.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-cvt.c
++++ xorg-server-1.17.2/hw/xmir/xmir-cvt.c
 @@ -0,0 +1,304 @@
 +/* Copied from hw/xfree86/modes/xf86cvt.c into xmir DDX and
 + * changed to generate an RRMode */
@@ -3249,11 +3240,10 @@ index 0000000..6070d77
 +
 +    return RRModeGet(&modeinfo, name);
 +}
-diff --git a/hw/xmir/xmir-dri2.c b/hw/xmir/xmir-dri2.c
-new file mode 100644
-index 0000000..1f7c1b0
+Index: xorg-server-1.17.2/hw/xmir/xmir-dri2.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-dri2.c
++++ xorg-server-1.17.2/hw/xmir/xmir-dri2.c
 @@ -0,0 +1,529 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -3784,11 +3774,10 @@ index 0000000..1f7c1b0
 +    ret = DRI2ScreenInit(xmir_screen->screen, &xmir_screen->dri2);
 +    return ret;
 +}
-diff --git a/hw/xmir/xmir-glamor.c b/hw/xmir/xmir-glamor.c
-new file mode 100644
-index 0000000..83bd5cc
+Index: xorg-server-1.17.2/hw/xmir/xmir-glamor.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-glamor.c
++++ xorg-server-1.17.2/hw/xmir/xmir-glamor.c
 @@ -0,0 +1,1184 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -4974,11 +4963,10 @@ index 0000000..83bd5cc
 +
 +    return TRUE;
 +}
-diff --git a/hw/xmir/xmir-input.c b/hw/xmir/xmir-input.c
-new file mode 100644
-index 0000000..855b6d3
+Index: xorg-server-1.17.2/hw/xmir/xmir-input.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-input.c
++++ xorg-server-1.17.2/hw/xmir/xmir-input.c
 @@ -0,0 +1,505 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -5485,11 +5473,10 @@ index 0000000..855b6d3
 +
 +    mieqFini();
 +}
-diff --git a/hw/xmir/xmir-output.c b/hw/xmir/xmir-output.c
-new file mode 100644
-index 0000000..f958e87
+Index: xorg-server-1.17.2/hw/xmir/xmir-output.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-output.c
++++ xorg-server-1.17.2/hw/xmir/xmir-output.c
 @@ -0,0 +1,444 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -5935,11 +5922,10 @@ index 0000000..f958e87
 +
 +    return TRUE;
 +}
-diff --git a/hw/xmir/xmir-thread-proxy.c b/hw/xmir/xmir-thread-proxy.c
-new file mode 100644
-index 0000000..6b16871
+Index: xorg-server-1.17.2/hw/xmir/xmir-thread-proxy.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir-thread-proxy.c
++++ xorg-server-1.17.2/hw/xmir/xmir-thread-proxy.c
 @@ -0,0 +1,132 @@
 +/*
 + * Copyright © 2012-2015 Canonical Ltd
@@ -6073,11 +6059,10 @@ index 0000000..6b16871
 +		free(msg);
 +	}
 +}
-diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-new file mode 100644
-index 0000000..4afd66e
+Index: xorg-server-1.17.2/hw/xmir/xmir.c
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir.c
++++ xorg-server-1.17.2/hw/xmir/xmir.c
 @@ -0,0 +1,999 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -7078,11 +7063,10 @@ index 0000000..4afd66e
 +        FatalError("Couldn't add screen\n");
 +    }
 +}
-diff --git a/hw/xmir/xmir.h b/hw/xmir/xmir.h
-new file mode 100644
-index 0000000..e43fa40
+Index: xorg-server-1.17.2/hw/xmir/xmir.h
+===================================================================
 --- /dev/null
-+++ b/hw/xmir/xmir.h
++++ xorg-server-1.17.2/hw/xmir/xmir.h
 @@ -0,0 +1,211 @@
 +/*
 + * Copyright © 2015 Canonical Ltd
@@ -7295,6 +7279,3 @@ index 0000000..e43fa40
 +	(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
 +
 +#endif
--- 
-2.4.6
-

commit e37256228494d651488af75a53d8bd96fd433b7b
Author: Robert Ancell <robert.ancell@canonical.com>
Date:   Tue Oct 27 11:23:17 2015 +1300

    * debian/control:
      - xmir depends on xserver-common (LP: #1500848)

diff --git a/debian/changelog b/debian/changelog
index 9f42a13..0074e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu8) wily; urgency=medium
+
+  * debian/control:
+    - xmir depends on xserver-common (LP: #1500848)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 30 Sep 2015 14:56:38 +1300
+
 xorg-server (2:1.17.2-1ubuntu7) wily; urgency=medium
 
   * glamor-make-current-in-prepare-paths.diff: Fix LO crashing the
diff --git a/debian/control b/debian/control
index ca853b3..82d76e5 100644
--- a/debian/control
+++ b/debian/control
@@ -371,6 +371,7 @@ Description: common files used by various X servers
 Package: xmir
 Architecture: amd64 armhf i386
 Depends:
+ xserver-common (>= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
 Description: Xmir X server

commit cbdf27a6dad9533e9811c17cd8722591d4bdb4a6
Author: Robert Ancell <robert.ancell@canonical.com>
Date:   Tue Oct 27 11:22:34 2015 +1300

    glamor-make-current-in-prepare-paths.diff: Fix LO crashing the server. (LP: #1443456)

diff --git a/debian/changelog b/debian/changelog
index 2448815..9f42a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu7) wily; urgency=medium
+
+  * glamor-make-current-in-prepare-paths.diff: Fix LO crashing the
+    server. (LP: #1443456)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 17 Sep 2015 12:04:08 +0300
+
 xorg-server (2:1.17.2-1ubuntu6) wily; urgency=medium
 
   * os-make-sure-the-clientswritable-fd-set-is-initialized.diff: Fix
diff --git a/debian/patches/glamor-make-current-in-prepare-paths.diff b/debian/patches/glamor-make-current-in-prepare-paths.diff
new file mode 100644
index 0000000..78594cb
--- /dev/null
+++ b/debian/patches/glamor-make-current-in-prepare-paths.diff
@@ -0,0 +1,32 @@
+commit db5337afb248edf81087cf8d74006fc496d70589
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed Jul 15 17:56:11 2015 +1000
+
+    glamor: make current in prepare paths
+    
+    Lots of the accel paths only make current once they start
+    doing someting, so a lot of them call the bail paths without
+    make current, which means on PRIME systems for example
+    we end up in the wrong context.
+    
+    Add a prepare pixmap in the prepare fallback path.
+    
+    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+    Signed-off-by: Eric Anholt <eric@anholt.net>
+    Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+    Reviewed-by: Eric Anholt <eric@anholt.net>
+
+diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
+index 833291c..5a73e6c 100644
+--- a/glamor/glamor_prepare.c
++++ b/glamor/glamor_prepare.c
+@@ -45,6 +45,8 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
+     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
+         return TRUE;
+ 
++    glamor_make_current(glamor_priv);
++
+     RegionInit(&region, box, 1);
+ 
+     /* See if it's already mapped */
diff --git a/debian/patches/series b/debian/patches/series
index e1f102b..9327629 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@ xmir-desktop-file-hint-flag.patch
 drm_device_keep_trying.patch
 xi2-resize-touch.patch
 os-make-sure-the-clientswritable-fd-set-is-initialized.diff
+glamor-make-current-in-prepare-paths.diff
Reply to: