|
@@ -5,7 +5,7 @@
|
|
|
Summary: X.Org X11 X server
|
|
|
Summary(ja): X.Org X11 X サーバ
|
|
|
Name: xorg-x11-server
|
|
|
-Version: 1.15.2
|
|
|
+Version: 1.16.2
|
|
|
Release: 1%{?_dist_release}
|
|
|
URL: http://www.x.org
|
|
|
License: MIT/X11
|
|
@@ -36,7 +36,7 @@ Patch6002: xserver-1.12.1-mode-debug.patch
|
|
|
|
|
|
# needs to upstream this
|
|
|
Patch6028: xserver-1.12.1-randr-error-debugging.patch
|
|
|
-Patch6030: xserver-1.12.4-right-of.patch
|
|
|
+Patch6030: xserver-1.16.2-right-of.patch
|
|
|
Patch6033: xserver-1.6.99-default-modes.patch
|
|
|
|
|
|
## Vine Patch
|
|
@@ -111,6 +111,7 @@ BuildRequires: openssl-devel
|
|
|
BuildRequires: freetype2-devel
|
|
|
|
|
|
BuildRequires: eudev-libgudev1-devel
|
|
|
+BuildRequires: dbus-devel
|
|
|
|
|
|
# DMX config utils buildreqs.
|
|
|
BuildRequires: libXt-devel
|
|
@@ -125,6 +126,9 @@ BuildRequires: libXdamage-devel
|
|
|
BuildRequires: libXv-devel
|
|
|
|
|
|
BuildRequires: mesa-libGL-devel >= 7.8
|
|
|
+BuildRequires: mesa-libEGL-devel
|
|
|
+BuildRequires: mesa-libgbm-devel
|
|
|
+BuildRequires: libepoxy-devel
|
|
|
BuildRequires: mesa-source >= 7.8
|
|
|
# XXX silly...
|
|
|
BuildRequires: libdrm-devel >= 2.4.0-3
|
|
@@ -171,6 +175,8 @@ Requires: xorg-x11-server-common >= %{version}-%{release}
|
|
|
Requires: libdrm
|
|
|
Requires: system-setup-keyboard
|
|
|
Obsoletes: XFree86, XOrg
|
|
|
+Obsoletes: xorg-x11-glamor < 0.6.1
|
|
|
+Provides: xorg-x11-glamor = %{version}-%{release}
|
|
|
|
|
|
%description Xorg
|
|
|
X.org X11 is an open source implementation of the X Window System. It
|
|
@@ -261,6 +267,8 @@ Requires: libpciaccess-devel
|
|
|
Requires: pkgconfig
|
|
|
Requires(pre): xorg-x11-filesystem
|
|
|
Provides: libxf86config-devel = %{version}-%{release}
|
|
|
+Obsoletes: xorg-x11-glamor-devel < 0.6.1
|
|
|
+Provides: xorg-x11-glamor-devel = %{version}-%{release}
|
|
|
|
|
|
%description sdk
|
|
|
The SDK package provides the developmental files which are necessary for
|
|
@@ -307,7 +315,7 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
|
%define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
|
|
|
|
|
|
%if %{with_hw_servers}
|
|
|
-%define dri_flags --with-dri-driver-path=%{drimoduledir}
|
|
|
+%define dri_flags --enable-dri2 --enable-dri3 --enable-suid-wrapper --enable-glamor
|
|
|
%else
|
|
|
%define dri_flags --disable-dri
|
|
|
%endif
|
|
@@ -331,6 +339,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
|
|
|
--disable-linux-acpi --disable-linux-apm \
|
|
|
--disable-xselinux --enable-record \
|
|
|
--enable-config-udev \
|
|
|
+ --enable-dmx \
|
|
|
%{dri_flags} \
|
|
|
${CONFIGURE}
|
|
|
|
|
@@ -438,6 +447,8 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
|
|
|
%{_bindir}/X
|
|
|
%attr(4711, root, root) %{_bindir}/Xorg
|
|
|
+%{_libexecdir}/Xorg.bin
|
|
|
+%attr(4755, root, root) %{_libexecdir}/Xorg.wrap
|
|
|
%{_bindir}/gtf
|
|
|
%{_bindir}/cvt
|
|
|
%dir %{_datadir}/xorg
|
|
@@ -460,6 +471,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/xorg/modules/libexa.so
|
|
|
%{_libdir}/xorg/modules/libfb.so
|
|
|
%{_libdir}/xorg/modules/libfbdevhw.so
|
|
|
+%{_libdir}/xorg/modules/libglamoregl.so
|
|
|
%{_libdir}/xorg/modules/libint10.so
|
|
|
%{_libdir}/xorg/modules/libshadow.so
|
|
|
%{_libdir}/xorg/modules/libshadowfb.so
|
|
@@ -468,9 +480,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/xorg/modules/libwfb.so
|
|
|
%{_mandir}/man1/gtf.1*
|
|
|
%{_mandir}/man1/Xorg.1*
|
|
|
+%{_mandir}/man1/Xorg.wrap.1*
|
|
|
%{_mandir}/man1/cvt.1*
|
|
|
%{_mandir}/man4/fbdevhw.4*
|
|
|
%{_mandir}/man4/exa.4*
|
|
|
+%{_mandir}/man5/Xwrapper.config.5*
|
|
|
%{_mandir}/man5/xorg.conf.5*
|
|
|
%{_mandir}/man5/xorg.conf.d.5*
|
|
|
%dir %{_sysconfdir}/X11/xorg.conf.d
|
|
@@ -534,6 +548,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 22 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.16.2-1
|
|
|
+- update to 1.16.2
|
|
|
+- update Patch6030 (xserver-1.16.2-right-of.patch)
|
|
|
+- add BuildRequires: dbus-devel, mesa-libEGL-devel, mesa-libgbm-devel, libepoxy-devel
|
|
|
+
|
|
|
* Wed Jul 09 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.15.2-1
|
|
|
- update to 1.15.2
|
|
|
- remove Patch6011 (xserver-1.12.0-less-acpi-brokenness.patch)
|