Changes - SailfishOS Open Build Service

Difference Between Revision 5 and home:cxl000:n7x / xorg-x11-server-Xwayland

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Deleted	xorg-x11-server-Xwayland.spec
@@ -1,170 +0,0 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.27 -# - -Name: xorg-x11-server-Xwayland - -# >> macros -# << macros - -Summary: X.Org X11 Xwayland server -Version: 1.16.4 -Release: 1 -Group: System/X11 -License: MIT -URL: http://cgit.freedesktop.org/xorg/xserver -Source0: http://xorg.freedesktop.org/archive/individual/xserver/xorg-x11-server-%{version}.tar.xz -Requires: libdrm >= 2.4.0 -BuildRequires: pkgconfig(xorg-macros) >= 1.17 -BuildRequires: pkgconfig(fontutil) >= 1.1 -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(pixman-1) >= 0.27.2 -BuildRequires: pkgconfig(dri2proto) >= 2.8 -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(fixesproto) >= 5.0 -BuildRequires: pkgconfig(damageproto) >= 1.1 -BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0 -BuildRequires: pkgconfig(xtrans) >= 1.3.3 -BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0 -BuildRequires: pkgconfig(xproto) >= 7.0.26 -BuildRequires: pkgconfig(randrproto) >= 1.4.0 -BuildRequires: pkgconfig(renderproto) >= 0.11 -BuildRequires: pkgconfig(xextproto) >= 7.2.99.901 -BuildRequires: pkgconfig(inputproto) >= 2.3 -BuildRequires: pkgconfig(kbproto) >= 1.0.3 -BuildRequires: pkgconfig(fontsproto) >= 2.1.3 -BuildRequires: pkgconfig(videoproto) -BuildRequires: pkgconfig(compositeproto) >= 0.4 -BuildRequires: pkgconfig(recordproto) >= 1.13.99.1 -BuildRequires: pkgconfig(scrnsaverproto) >= 1.1 -BuildRequires: pkgconfig(resourceproto) >= 1.2.0 -BuildRequires: pkgconfig(xf86driproto) >= 2.1.0 -BuildRequires: pkgconfig(glproto) >= 1.4.17 -#BuildRequires: pkgconfig(dri) >= 7.8.0 -BuildRequires: pkgconfig(presentproto) >= 1.0 -BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(xfont) >= 1.4.2 -BuildRequires: pkgconfig(xau) -BuildRequires: systemd-devel -BuildRequires: pkgconfig(epoxy) - -#CXL#BuildRequires: pkgconfig(dri3proto) >= 1.0 -#CXL#BuildRequires: pkgconfig(xineramaproto) -#CXL#BuildRequires: pkgconfig(xf86bigfontproto) >= 1.2.0 -#CXL#BuildRequires: pkgconfig(xf86dgaproto) >= 2.0.99.1 -#CXL#BuildRequires: pkgconfig(dmxproto) >= 2.2.99.1 -#CXL#BuildRequires: pkgconfig(xf86vidmodeproto) >= 2.2.99.1 -#CXL#BuildRequires: pkgconfig(xshmfence) >= 1.1 -#CXL#BuildRequires: pkgconfig(dmx) >= 1.0.99.1 -BuildRequires: pkgconfig(libdrm) >= 2.3.0 -#BuildRequires: pkgconfig(gl) >= 7.1.0 -#CXL#BuildRequires: pkgconfig(xext) >= 1.0.99.4 -#CXL#BuildRequires: pkgconfig(xi) >= 1.2.99.1 -#CXL#BuildRequires: pkgconfig(xtst) >= 1.0.99.2 -#CXL#BuildRequires: pkgconfig(pciaccess) >= 0.12.901 -#CXL#BuildRequires: pkgconfig(libudev) >= 143 -#CXL#BuildRequires: pkgconfig(dbus-1) >= 1.0 -#CXL#BuildRequires: pkgconfig(xdmcp) -#CXL#BuildRequires: pkgconfig(xv) -#BuildRequires: pkgconfig(glamor) - - -Requires: xorg-x11-server = %{version}-%{release} -Requires: xkbdata -Requires: xkbcomp -Requires: xorg-x11-server-common >= %{version}-%{release} -Provides: xorg-x11-server-Xorg = %{version} - -%description -Description: %{summary} - - -%package common -Summary: Xorg server common files -Group: System/X11 -Requires: %{name} = %{version}-%{release} - -%description common -Common files shared among all X servers. - - - -%prep -%setup -q -n xorg-x11-server-%{version} - -# >> setup -# << setup - -%build -# >> build pre -# << build pre - -#cd xorg-x11-server-%{version} -%reconfigure --disable-static \ - --enable-xwayland \ - --with-pic \ - --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ - --with-module-dir=%{_libdir}/xorg/modules \ - --with-builderstring="Build ID: %{name} %{version}-%{release}" \ - --with-xkb-output=%{_localstatedir}/cache/xkb \ - --enable-config-udev \ - --disable-config-hal \ - --disable-xvfb \ - --disable-xnest \ - --disable-dmx \ - --enable-kdrive \ - --disable-xephyr \ - --disable-xfake \ - --disable-xfbdev \ - --disable-xselinux \ - --disable-xinerama \ - --enable-dri2 \ - --disable-xorg \ - --disable-dri \ - --disable-glx \ - --disable-glamor - -# --enable-xorg \ -# --enable-glx \ -# --enable-dri \ -#./configure --help - -make %{?_smp_mflags} - -# >> build post -# << build post - -%install -rm -rf %{buildroot} -# >> install pre -# << install pre -#cd xorg-x11-server-%{version} -%make_install - -# >> install post -if [ -f %{buildroot}/usr/lib/xorg/protocol.txt ] -then - rm %{buildroot}/usr/lib/xorg/protocol.txt -fi - -if [ -f %{buildroot}/usr/share/man/man1/Xserver.1 ] -then - rm %{buildroot}/usr/share/man/man1/Xserver.1 -fi - -if [ -f %{buildroot}/var/cache/xkb/README.compiled ] -then - rm %{buildroot}/var/cache/xkb/README.compiled -fi -#mkdir -p %{_sysconfdir}/X11/xorg.conf.d/ -# << install post - -%files -%defattr(-,root,root,-) -# >> files Xwayland -%{_bindir}/Xwayland -# << files Xwayland - - -
[-] [+]	Added	xorg-x11-server.spec ^
@@ -0,0 +1,295 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.27 +# + +Name: xorg-x11-server + +# >> macros +# << macros + +Summary: X.Org X11 X server +Version: 1.16.4 +Release: 1 +Group: System/X11 +License: MIT +URL: http://cgit.freedesktop.org/xorg/xserver +Source0: http://xorg.freedesktop.org/archive/individual/xserver/%{name}-%{version}.tar.xz +Source100: xorg-x11-server.yaml +Requires: libdrm >= 2.4.0 +BuildRequires: pkgconfig(xorg-macros) >= 1.14 +BuildRequires: pkgconfig(fontutil) >= 1.1 +BuildRequires: pkgconfig(videoproto) +BuildRequires: pkgconfig(compositeproto) >= 0.4 +BuildRequires: pkgconfig(recordproto) >= 1.13.99.1 +BuildRequires: pkgconfig(scrnsaverproto) >= 1.1 +BuildRequires: pkgconfig(resourceproto) >= 1.2.0 +BuildRequires: pkgconfig(xf86driproto) >= 2.1.0 +BuildRequires: pkgconfig(dri2proto) >= 2.8 +BuildRequires: pkgconfig(dri3proto) >= 1.0 +BuildRequires: pkgconfig(xineramaproto) +BuildRequires: pkgconfig(xf86bigfontproto) >= 1.2.0 +BuildRequires: pkgconfig(xf86dgaproto) >= 2.0.99.1 +BuildRequires: pkgconfig(dmxproto) >= 2.2.99.1 +BuildRequires: pkgconfig(xf86vidmodeproto) >= 2.2.99.1 +BuildRequires: pkgconfig(xproto) >= 7.0.22 +BuildRequires: pkgconfig(randrproto) >= 1.4.0 +BuildRequires: pkgconfig(renderproto) >= 0.11 +BuildRequires: pkgconfig(xextproto) >= 7.2.99.901 +BuildRequires: pkgconfig(inputproto) >= 2.3 +BuildRequires: pkgconfig(kbproto) >= 1.0.3 +BuildRequires: pkgconfig(fontsproto) +BuildRequires: pkgconfig(fixesproto) >= 5.0 +BuildRequires: pkgconfig(damageproto) >= 1.1 +BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0 +BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0 +BuildRequires: pkgconfig(presentproto) >= 1.0 +BuildRequires: pkgconfig(xshmfence) >= 1.1 +BuildRequires: pkgconfig(xtrans) >= 1.3.2 +BuildRequires: pkgconfig(dmx) >= 1.0.99.1 +BuildRequires: pkgconfig(dri) >= 7.8.0 +BuildRequires: pkgconfig(libdrm) >= 2.3.0 +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(gl) >= 7.1.0 +BuildRequires: pkgconfig(xext) >= 1.0.99.4 +BuildRequires: pkgconfig(xfont) >= 1.4.2 +BuildRequires: pkgconfig(xi) >= 1.2.99.1 +BuildRequires: pkgconfig(xtst) >= 1.0.99.2 +BuildRequires: pkgconfig(pciaccess) >= 0.12.901 +BuildRequires: pkgconfig(libudev) >= 143 +BuildRequires: pkgconfig(dbus-1) >= 1.0 +BuildRequires: pkgconfig(pixman-1) >= 0.27.2 +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(glproto) >= 1.4.17 +BuildRequires: pkgconfig(xdmcp) +BuildRequires: pkgconfig(xv) + +%description +Description: %{summary} + + +%package devel +Summary: SDK for X server driver module development +Group: System/X11 +Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-util-macros +Requires: pixman-devel +Requires: libpciaccess-devel +Requires: xorg-x11-proto-resourceproto +Requires: xorg-x11-proto-scrnsaverproto +Requires: xorg-x11-proto-xextproto +Requires: xorg-x11-proto-xf86bigfontproto +Requires: xorg-x11-proto-kbproto +Requires: xorg-x11-proto-videoproto + +%description devel +The SDK package provides the developmental files which are necessary for +developing X server driver modules, and for compiling driver modules +outside of the standard X11 source code tree. Developers writing video +drivers, input drivers, or other X modules should install this package. + + +%package common +Summary: Xorg server common files +Group: System/X11 +Requires: %{name} = %{version}-%{release} + +%description common +Common files shared among all X servers. + +%package Xorg +Summary: Xorg X server +Group: System/X11 +Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-drv-mouse +Requires: xorg-x11-drv-keyboard +Requires: xorg-x11-drv-evdev +Requires: xkbdata +Requires: xkbcomp +Requires: xorg-x11-server-common >= %{version}-%{release} +Conflicts: %{name}-Xorg-setuid + +%description Xorg +X.org X11 is an open source implementation of the X Window System. It +provides the basic low level functionality which full fledged +graphical user interfaces (GUIs) such as GNOME and KDE are designed +upon. + + +%package Xorg-setuid +Summary: Xorg X server with setuid +Group: System/X11 +Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-drv-mouse +Requires: xorg-x11-drv-keyboard +Requires: xorg-x11-drv-evdev +Requires: xkbdata +Requires: xkbcomp +Requires: xorg-x11-server-common >= %{version}-%{release} +Provides: xorg-x11-server-Xorg = %{version} + +%description Xorg-setuid +X.org X11 is an open source implementation of the X Window System. It +provides the basic low level functionality which full fledged +graphical user interfaces (GUIs) such as GNOME and KDE are designed +upon. + + +%prep +%setup -q -n %{name}-%{version} + +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%reconfigure --disable-static \ + --enable-config-udev \ + --disable-config-hal \ + --disable-xvfb \ + --disable-xnest \ + --disable-dmx \ + --enable-glx \ + --enable-kdrive \ + --disable-xephyr \ + --disable-xfake \ + --disable-xfbdev \ + --enable-xorg \ + --with-pic \ + --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ + --with-module-dir=%{_libdir}/xorg/modules \ + --with-builderstring="Build ID: %{name} %{version}-%{release}" \ + --with-xkb-output=%{_localstatedir}/cache/xkb \ + --disable-xselinux \ + --disable-xinerama \ + --enable-dri2 \ + --enable-dri + +make %{?_smp_mflags} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +mkdir -p %{buildroot}/%{_sysconfdir}/X11/xorg.conf.d/ +# << install post + +%files +%defattr(-,root,root,-) +# >> files +# this section/file is intentionally left blank +# << files + +%files devel +%defattr(-,root,root,-) +# >> files devel +%{_libdir}/pkgconfig/xorg-server.pc +%dir %{_includedir}/xorg +%{_includedir}/xorg/*.h +%{_datadir}/aclocal/xorg-server.m4