diff --git a/N_default-module-path.diff b/N_default-module-path.diff index 0d49b82..9f6cbb2 100644 --- a/N_default-module-path.diff +++ b/N_default-module-path.diff @@ -14,5 +14,5 @@ Index: hw/xfree86/common/xf86Globals.c -const char *xf86ModulePath = DEFAULT_MODULE_PATH; +const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH; MessageType xf86ModPathFrom = X_DEFAULT; - const char *xf86LogFile = DEFAULT_LOGPREFIX; + const char *xf86LogFile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX; MessageType xf86LogFileFrom = X_DEFAULT; diff --git a/xorg-server-1.15.99.901.7.tar.bz2 b/xorg-server-1.15.99.901.7.tar.bz2 deleted file mode 100644 index 966f2f5..0000000 --- a/xorg-server-1.15.99.901.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:011bc1cbda0d6968d0cd987434582e22282466f3a129738a547666640e508b8d -size 3779951 diff --git a/xorg-server-1.15.99.902.tar.bz2 b/xorg-server-1.15.99.902.tar.bz2 new file mode 100644 index 0000000..03d09c1 --- /dev/null +++ b/xorg-server-1.15.99.902.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71de6ec0758c8223eb4e21c5a573d649318320adffcd3a648efd2e515ded17ba +size 3804821 diff --git a/xorg-server-provides b/xorg-server-provides index 343157b..75b001e 100644 --- a/xorg-server-provides +++ b/xorg-server-provides @@ -1,4 +1,4 @@ Provides: X11_ABI_XINPUT = 21.0 -Provides: X11_ABI_VIDEODRV = 16.0 +Provides: X11_ABI_VIDEODRV = 17.0 Provides: X11_ABI_ANSIC = 0.4 Provides: X11_ABI_EXTENSION = 8.0 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 732abeb..dd38804 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 8 22:04:19 UTC 2014 - tobias.johannes.klausmann@mni.thm.de + +- Update to 1.16RC2 +- Build and pack XWayland DDX + ------------------------------------------------------------------- Sat Mar 22 07:02:56 UTC 2014 - coolo@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 51bd40c..a334986 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,11 +18,12 @@ Name: xorg-x11-server -%define dirsuffix 1.15.99.901.7 +%define dirsuffix 1.15.99.902 Summary: X License: MIT Group: System/X11/Servers/XF86_4 +# Source URL: http://xorg.freedesktop.org/archive/individual/xserver/ Source0: xorg-server-%{dirsuffix}.tar.bz2 Source1: sysconfig.displaymanager.template Source2: README.updates @@ -243,6 +244,7 @@ autoreconf -fi --with-sha1=libcrypto \ --disable-linux-acpi \ --disable-linux-apm \ + --enable-xwayland \ %ifarch s390 s390x --disable-xorg \ --disable-aiglx \ @@ -361,6 +363,7 @@ exit 0 %ifnarch s390 s390x %{_bindir}/Xorg %{_bindir}/X +%{_bindir}/Xwayland %{_bindir}/cvt %{_bindir}/gtf %{_libdir}/xorg/modules/