commit xorg-x11-server for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2014-04-26 19:35:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2014-04-11 14:40:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2014-04-26 19:35:03.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 25 01:36:46 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Add missing BuildRequires
+
+-------------------------------------------------------------------
Old:
----
xorg-server-1.15.99.902.tar.bz2
New:
----
xorg-server-1.15.99.902.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.S18NVP/_old 2014-04-26 19:35:04.000000000 +0200
+++ /var/tmp/diff_new_pack.S18NVP/_new 2014-04-26 19:35:04.000000000 +0200
@@ -18,7 +18,7 @@
Name: xorg-x11-server
-%define dirsuffix 1.15.99.902
+%define dirsuffix 1.15.99.902.2
Summary: X
License: MIT
@@ -41,8 +41,11 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0
+BuildRequires: pkgconfig(compositeproto)
BuildRequires: pkgconfig(damageproto) >= 1.1
BuildRequires: pkgconfig(dmx) >= 1.0.99.1
+BuildRequires: pkgconfig(dri2proto)
+BuildRequires: pkgconfig(dri3proto)
BuildRequires: pkgconfig(epoxy) >= 1.1
BuildRequires: pkgconfig(fixesproto) >= 4.1
BuildRequires: pkgconfig(fontconfig)
@@ -50,6 +53,7 @@
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(fontutil)
BuildRequires: pkgconfig(freetype2)
+BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(inputproto) >= 1.9.99.902
BuildRequires: pkgconfig(kbproto) >= 1.0.3
@@ -57,8 +61,11 @@
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
BuildRequires: pkgconfig(pixman-1) >= 0.24
+BuildRequires: pkgconfig(presentproto)
BuildRequires: pkgconfig(randrproto) >= 1.2.99.3
BuildRequires: pkgconfig(renderproto) >= 0.11
+BuildRequires: pkgconfig(resourceproto)
+BuildRequires: pkgconfig(scrnsaverproto)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
@@ -71,11 +78,14 @@
BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xext) >= 1.0.99.4
BuildRequires: pkgconfig(xextproto) >= 7.1.99
+BuildRequires: pkgconfig(xf86driproto)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xfont) >= 1.4.2
BuildRequires: pkgconfig(xi) >= 1.2.99.1
+BuildRequires: pkgconfig(xineramaproto)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(xorg-macros)
BuildRequires: pkgconfig(xp)
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xprintutil)
@@ -163,7 +173,6 @@
%package sdk
Summary: X
Group: System/Libraries
-Requires: xorg-x11-proto-devel
Requires: xorg-x11-server
Requires: pkgconfig(fontconfig)
Requires: pkgconfig(fontenc)
++++++ xorg-server-1.15.99.902.tar.bz2 -> xorg-server-1.15.99.902.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/configure.ac new/xorg-server-1.15.99.902.2/configure.ac
--- old/xorg-server-1.15.99.902/configure.ac 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/configure.ac 2014-04-19 01:30:18.000000000 +0200
@@ -629,7 +629,7 @@
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=no])
+AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no])
AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
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])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/glamor/glamor_fbo.c new/xorg-server-1.15.99.902.2/glamor/glamor_fbo.c
--- old/xorg-server-1.15.99.902/glamor/glamor_fbo.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/glamor/glamor_fbo.c 2014-04-19 01:30:18.000000000 +0200
@@ -367,10 +367,11 @@
if (flag == GLAMOR_CREATE_PIXMAP_MAP)
goto no_tex;
- if (flag == GLAMOR_CREATE_PIXMAP_FIXUP)
- cache_flag = GLAMOR_CACHE_EXACT_SIZE;
- else
- cache_flag = 0;
+ /* Tiling from textures requires exact pixmap sizes. As we don't
+ * know which pixmaps will be used as tiles, just allocate
+ * everything at the requested size
+ */
+ cache_flag = GLAMOR_CACHE_EXACT_SIZE;
fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h, format, cache_flag);
if (fbo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/kdrive/linux/linux.c new/xorg-server-1.15.99.902.2/hw/kdrive/linux/linux.c
--- old/xorg-server-1.15.99.902/hw/kdrive/linux/linux.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/kdrive/linux/linux.c 2014-04-19 01:30:18.000000000 +0200
@@ -68,13 +68,16 @@
struct stat st;
__uid_t u;
__gid_t g;
+ int r;
if (stat(file, &st) < 0)
return;
u = getuid();
g = getgid();
- if (st.st_uid != u || st.st_gid != g)
- chown(file, u, g);
+ if (st.st_uid != u || st.st_gid != g) {
+ r = chown(file, u, g);
+ (void) r;
+ }
}
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/kdrive/src/kdrive.c new/xorg-server-1.15.99.902.2/hw/kdrive/src/kdrive.c
--- old/xorg-server-1.15.99.902/hw/kdrive/src/kdrive.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/kdrive/src/kdrive.c 2014-04-19 01:30:18.000000000 +0200
@@ -118,10 +118,17 @@
{
if (kdSwitchCmd) {
char *command;
+ int ret;
if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1)
return;
- system(command);
+
+ /* Ignore the return value from system; I'm not sure
+ * there's anything more useful to be done when
+ * it fails
+ */
+ ret = system(command);
+ (void) ret;
free(command);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/.gitignore new/xorg-server-1.15.99.902.2/hw/xfree86/.gitignore
--- old/xorg-server-1.15.99.902/hw/xfree86/.gitignore 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/.gitignore 2014-04-19 01:30:18.000000000 +0200
@@ -1,4 +1,5 @@
Xorg
+Xorg.wrap
Xorg.sh
xorg.conf.example
sdksyms.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/dri/dri.c new/xorg-server-1.15.99.902.2/hw/xfree86/dri/dri.c
--- old/xorg-server-1.15.99.902/hw/xfree86/dri/dri.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/dri/dri.c 2014-04-19 01:30:18.000000000 +0200
@@ -177,19 +177,15 @@
memset(&tmp, 0, sizeof(tmp));
/* Check the DRM lib version.
- * drmGetLibVersion was not supported in version 1.0, so check for
- * symbol first to avoid possible crash or hang.
*/
drmlibmajor = 1;
drmlibminor = 0;
- if (xf86LoaderCheckSymbol("drmGetLibVersion")) {
- drmlibv = drmGetLibVersion(-1);
- if (drmlibv != NULL) {
- drmlibmajor = drmlibv->version_major;
- drmlibminor = drmlibv->version_minor;
- drmFreeVersion(drmlibv);
- }
+ drmlibv = drmGetLibVersion(-1);
+ if (drmlibv != NULL) {
+ drmlibmajor = drmlibv->version_major;
+ drmlibminor = drmlibv->version_minor;
+ drmFreeVersion(drmlibv);
}
/* Check if the libdrm can handle falling back to loading based on name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Makefile.am new/xorg-server-1.15.99.902.2/hw/xfree86/man/Makefile.am
--- old/xorg-server-1.15.99.902/hw/xfree86/man/Makefile.am 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Makefile.am 2014-04-19 01:30:18.000000000 +0200
@@ -5,4 +5,6 @@
if SUID_WRAPPER
appman_PRE += Xorg.wrap.man
fileman_PRE += Xwrapper.config.man
+else
+EXTRA_DIST += Xorg.wrap.man Xwrapper.config.man
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Xorg.wrap.man new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xorg.wrap.man
--- old/xorg-server-1.15.99.902/hw/xfree86/man/Xorg.wrap.man 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xorg.wrap.man 2014-04-19 01:30:18.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Xwrapper.wrap.1
+.\" Xwrapper.wrap.__appmansuffix__
.\"
.\" Copyright 2014 Red Hat, Inc.
.\"
@@ -26,7 +26,7 @@
.\"
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH Xorg.wrap 1 __xorgversion__
+.TH Xorg.wrap __appmansuffix__ __xorgversion__
.SH NAME
Xorg.wrap \- Xorg X server binary wrapper
.SH DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/man/Xwrapper.config.man new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xwrapper.config.man
--- old/xorg-server-1.15.99.902/hw/xfree86/man/Xwrapper.config.man 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/man/Xwrapper.config.man 2014-04-19 01:30:18.000000000 +0200
@@ -1 +1 @@
-.so man1/Xorg.wrap.1
+.so man__appmansuffix__/Xorg.wrap.__appmansuffix__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.902/hw/xfree86/xorg-wrapper.c new/xorg-server-1.15.99.902.2/hw/xfree86/xorg-wrapper.c
--- old/xorg-server-1.15.99.902/hw/xfree86/xorg-wrapper.c 2014-04-08 23:25:18.000000000 +0200
+++ new/xorg-server-1.15.99.902.2/hw/xfree86/xorg-wrapper.c 2014-04-19 01:30:18.000000000 +0200
@@ -25,6 +25,7 @@
#include "dix-config.h"
+#include
participants (1)
-
root@hilbert.suse.de