diff options
Diffstat (limited to 'contrib/packages/rpm/el5/SPECS/tigervnc.spec')
| -rw-r--r-- | contrib/packages/rpm/el5/SPECS/tigervnc.spec | 1033 |
1 files changed, 354 insertions, 679 deletions
diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec index 6da5915b..aa0cb67c 100644 --- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec @@ -1,10 +1,9 @@ %define _default_patch_fuzz 2 -%define mesa_version 7.7.1 %{!?_self_signed: %define _self_signed 1} Name: tigervnc Version: @VERSION@ -Release: 18%{?snap:.%{snap}}%{?dist} +Release: 1%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -20,125 +19,89 @@ Source9: FindX11.cmake Source11: http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz Source12: http://downloads.sourceforge.net/project/libjpeg-turbo/1.3.0/libjpeg-turbo-1.3.0.tar.gz -# http://ftp.redhat.com/pub/redhat/linux/enterprise/6Client/en/os/SRPMS/xorg-x11-proto-devel-7.6-13.el6.src.rpm -# http://ftp.redhat.com/pub/redhat/linux/enterprise/6Client/en/os/SRPMS/ -Source98: http://www.x.org/releases/X11R7.5/src/util/makedepend-1.0.2.tar.bz2 -Source99: http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -Source100: http://www.x.org/releases/X11R7.5/src/lib/libICE-1.0.6.tar.bz2 -Source101: http://www.x.org/releases/X11R7.5/src/lib/libSM-1.1.1.tar.bz2 -Source102: http://www.x.org/releases/X11R7.5/src/lib/libX11-1.3.2.tar.bz2 -Source103: http://www.x.org/releases/X11R7.5/src/lib/libXScrnSaver-1.2.0.tar.bz2 -Source104: http://www.x.org/releases/X11R7.5/src/lib/libXau-1.0.5.tar.bz2 -Source105: http://www.x.org/releases/X11R7.5/src/lib/libXaw-1.0.7.tar.bz2 -Source106: http://www.x.org/releases/X11R7.5/src/lib/libXcomposite-0.4.1.tar.bz2 -Source107: http://www.x.org/releases/X11R7.5/src/lib/libXcursor-1.1.10.tar.bz2 -Source108: http://www.x.org/releases/X11R7.5/src/lib/libXdamage-1.1.2.tar.bz2 -Source109: http://www.x.org/releases/X11R7.5/src/lib/libXdmcp-1.0.3.tar.bz2 -Source110: http://www.x.org/releases/individual/lib/libXext-1.1.tar.bz2 -Source111: http://www.x.org/releases/X11R7.5/src/lib/libXfixes-4.0.4.tar.bz2 -Source112: http://www.x.org/releases/X11R7.5/src/lib/libXfont-1.4.1.tar.bz2 -Source113: http://www.x.org/releases/X11R7.5/src/lib/libXft-2.1.14.tar.bz2 -Source114: http://www.x.org/releases/X11R7.5/src/lib/libXi-1.3.tar.bz2 -Source115: http://www.x.org/releases/X11R7.5/src/lib/libXinerama-1.1.tar.bz2 -Source116: http://www.x.org/releases/X11R7.5/src/lib/libXmu-1.0.5.tar.bz2 -Source117: http://www.x.org/releases/X11R7.5/src/lib/libXpm-3.5.8.tar.bz2 -Source118: http://www.x.org/releases/X11R7.5/src/lib/libXrandr-1.3.0.tar.bz2 -Source119: http://www.x.org/releases/X11R7.5/src/lib/libXrender-0.9.5.tar.bz2 -Source120: http://www.x.org/releases/X11R7.5/src/lib/libXt-1.0.7.tar.bz2 -Source121: http://www.x.org/releases/X11R7.5/src/lib/libXtst-1.1.0.tar.bz2 -Source122: http://www.x.org/releases/X11R7.5/src/lib/libXv-1.0.5.tar.bz2 -Source123: http://www.x.org/releases/X11R7.5/src/lib/libXvMC-1.0.5.tar.bz2 -Source124: http://www.x.org/releases/X11R7.5/src/lib/libXxf86dga-1.1.1.tar.bz2 -Source125: http://www.x.org/releases/X11R7.5/src/lib/libXxf86vm-1.1.0.tar.bz2 -Source126: http://www.x.org/releases/X11R7.5/src/lib/libfontenc-1.0.5.tar.bz2 -Source127: http://www.x.org/releases/X11R7.5/src/lib/libpciaccess-0.10.9.tar.bz2 -Source128: http://www.x.org/releases/X11R7.5/src/lib/libxkbfile-1.0.6.tar.bz2 -Source129: http://www.x.org/releases/X11R7.5/src/lib/xtrans-1.2.5.tar.bz2 -Source130: http://xorg.freedesktop.org/archive/individual/proto/bigreqsproto-1.1.0.tar.bz2 -Source131: http://xorg.freedesktop.org/archive/individual/proto/compositeproto-0.4.1.tar.bz2 -Source132: http://xorg.freedesktop.org/archive/individual/proto/damageproto-1.2.0.tar.bz2 -Source133: http://xorg.freedesktop.org/archive/individual/proto/evieext-1.1.1.tar.bz2 -Source134: http://xorg.freedesktop.org/archive/individual/proto/fixesproto-5.0.tar.bz2 -Source135: http://xorg.freedesktop.org/archive/individual/proto/fontsproto-2.1.0.tar.bz2 -Source136: http://xorg.freedesktop.org/archive/individual/proto/glproto-1.4.12.tar.bz2 -Source137: http://xorg.freedesktop.org/archive/individual/proto/inputproto-2.0.2.tar.bz2 -Source138: http://xorg.freedesktop.org/archive/individual/proto/kbproto-1.0.5.tar.bz2 -Source139: http://xorg.freedesktop.org/archive/individual/proto/randrproto-1.3.1.tar.bz2 -#Source139: http://xorg.freedesktop.org/archive/individual/proto/randrproto-20110224-git105a161.tar.bz2 -Source140: http://xorg.freedesktop.org/archive/individual/proto/recordproto-1.14.1.tar.bz2 -Source141: http://xorg.freedesktop.org/archive/individual/proto/renderproto-0.11.1.tar.bz2 -Source142: http://xorg.freedesktop.org/archive/individual/proto/resourceproto-1.2.0.tar.bz2 -Source143: http://xorg.freedesktop.org/archive/individual/proto/scrnsaverproto-1.2.1.tar.bz2 -Source144: http://xorg.freedesktop.org/archive/individual/proto/videoproto-2.3.1.tar.bz2 -Source145: http://xorg.freedesktop.org/archive/individual/proto/xcmiscproto-1.2.1.tar.bz2 -Source146: http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.2.0.tar.bz2 -Source147: http://xorg.freedesktop.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.bz2 -Source148: http://xorg.freedesktop.org/archive/individual/proto/xf86dgaproto-2.1.tar.bz2 -Source149: http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1.1.tar.bz2 -Source150: http://xorg.freedesktop.org/archive/individual/proto/xf86miscproto-0.9.3.tar.bz2 -Source151: http://xorg.freedesktop.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 -Source152: http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.1.tar.bz2 -Source153: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.22.tar.bz2 -Source154: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-2.3.tar.bz2 - -#Source130: http://www.x.org/releases/X11R7.5/src/proto/bigreqsproto-1.1.0.tar.bz2 -#Source131: http://www.x.org/releases/X11R7.5/src/proto/compositeproto-0.4.1.tar.bz2 -#Source132: http://www.x.org/releases/X11R7.5/src/proto/damageproto-1.2.0.tar.bz2 -#Source133: http://www.x.org/releases/X11R7.5/src/proto/dri2proto-2.3.tar.bz2 -#Source134: http://www.x.org/releases/X11R7.5/src/proto/fixesproto-5.0.tar.bz2 -#Source135: http://www.x.org/releases/X11R7.5/src/proto/fontsproto-2.1.0.tar.bz2 -#Source136: http://www.x.org/releases/X11R7.5/src/proto/glproto-1.4.12.tar.bz2 -#Source137: http://www.x.org/releases/X11R7.5/src/proto/inputproto-2.0.2.tar.bz2 -#Source138: http://www.x.org/releases/X11R7.5/src/proto/kbproto-1.0.5.tar.bz2 -#Source139: http://www.x.org/releases/X11R7.5/src/proto/randrproto-20110224-git105a161.tar.bz2 -#Source140: http://www.x.org/releases/X11R7.5/src/proto/recordproto-1.14.1.tar.bz2 -#Source141: http://www.x.org/releases/X11R7.5/src/proto/renderproto-0.11.1.tar.bz2 -#Source142: http://www.x.org/releases/X11R7.5/src/proto/resourceproto-1.2.0.tar.bz2 -#Source143: http://www.x.org/releases/X11R7.5/src/proto/scrnsaverproto-1.2.1.tar.bz2 -#Source144: http://www.x.org/releases/X11R7.5/src/proto/videoproto-2.3.1.tar.bz2 -#Source145: http://www.x.org/releases/X11R7.5/src/proto/xcmiscproto-1.2.1.tar.bz2 -#Source146: http://www.x.org/releases/X11R7.5/src/proto/xextproto-7.2.0.tar.bz2 -#Source147: http://www.x.org/releases/X11R7.5/src/proto/xf86bigfontproto-1.2.0.tar.bz2 -#Source148: http://www.x.org/releases/X11R7.5/src/proto/xf86dgaproto-2.1.tar.bz2 -#Source149: http://www.x.org/releases/X11R7.5/src/proto/xf86driproto-2.1.1.tar.bz2 -#Source150: http://www.x.org/releases/X11R7.5/src/proto/xf86vidmodeproto-2.3.1.tar.bz2 -#Source151: http://www.x.org/releases/X11R7.5/src/proto/xproto-7.0.22.tar.bz2 - -Source155: http://www.x.org/releases/individual/util/util-macros-1.4.1.tar.bz2 -Source156: http://www.x.org/pub/individual/xserver/xorg-server-1.7.7.tar.bz2 -#Source157: ftp://ftp.x.org/pub/individual/app/xauth-1.0.2.tar.bz2 -#Source158: http://www.x.org/releases/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2 -Source159: http://dri.freedesktop.org/libdrm/libdrm-2.4.15.tar.bz2 -Source160: http://downloads.sourceforge.net/project/freetype/freetype2/2.3.11/freetype-2.3.11.tar.bz2 -Source161: ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/%{mesa_version}/MesaLib-%{mesa_version}.tar.bz2 -Source162: http://cgit.freedesktop.org/pixman/snapshot/pixman-0.26.0.tar.gz -Source163: http://www.x.org/releases/X11R7.5/src/lib/libXres-1.0.4.tar.bz2 -Source164: http://www.x.org/releases/individual/lib/libXxf86misc-1.0.2.tar.bz2 - -Source200: http://fontconfig.org/release/fontconfig-2.4.1.tar.gz -Source201: 25-no-hint-fedora.conf -Source202: 30-aliases-fedora.conf -Source203: 40-generic-fedora.conf -Source204: 64-nonlatin-fedora.conf -Source205: 75-blacklist-fedora.conf - -Source210: fc-cache.1 -Source211: fc-cat.1 -Source212: fc-list.1 -Source213: fc-match.1 - -# FIXME: -# need to apply any patches in from the F12 srpms -# http://dl.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/source/SRPMS/mesa-7.6-0.13.fc12.src.rpm -# http://dl.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/source/SRPMS/pixman-0.16.2-1.fc12.src.rpm -# http://vault.centos.org/6.3/os/Source/SPackages/pixman-0.18.4-1.el6_0.1.src.rpm -# http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Everything/source/SRPMS/libdrm-2.4.15-4.fc12.src.rpm -# http://dl.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/source/SRPMS/freetype-2.3.9-6.fc12.src.rpm +Source100: http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 +Source101: http://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 +Source102: http://www.x.org/releases/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 +Source103: http://www.x.org/releases/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 +Source104: http://www.x.org/releases/X11R7.7/src/everything/dri2proto-2.6.tar.bz2 +Source105: http://www.x.org/releases/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 +Source106: http://www.x.org/releases/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 +Source107: http://www.x.org/releases/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2 +Source108: http://www.x.org/releases/X11R7.7/src/everything/glproto-1.4.15.tar.bz2 +Source109: http://www.x.org/releases/X11R7.7/src/everything/inputproto-2.2.tar.bz2 +Source110: http://www.x.org/releases/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 +Source111: http://www.x.org/releases/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 +Source112: http://www.x.org/releases/X11R7.7/src/everything/libSM-1.2.1.tar.bz2 +Source113: http://www.x.org/releases/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 +Source114: http://www.x.org/releases/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 +Source115: http://www.x.org/releases/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 +Source116: http://www.x.org/releases/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 +Source117: http://www.x.org/releases/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 +Source118: http://www.x.org/releases/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2 +Source119: http://www.x.org/releases/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 +Source120: http://www.x.org/releases/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 +Source121: http://www.x.org/releases/X11R7.7/src/everything/libXext-1.3.1.tar.bz2 +Source122: http://www.x.org/releases/X11R7.7/src/everything/libXfixes-5.0.tar.bz2 +Source123: http://www.x.org/releases/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2 +Source124: http://www.x.org/releases/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 +Source125: http://www.x.org/releases/X11R7.7/src/everything/libXi-1.6.1.tar.bz2 +Source126: http://www.x.org/releases/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2 +Source127: http://www.x.org/releases/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2 +Source128: http://www.x.org/releases/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2 +Source129: http://www.x.org/releases/X11R7.7/src/everything/libXrandr-1.3.2.tar.bz2 +Source130: http://www.x.org/releases/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2 +Source131: http://www.x.org/releases/X11R7.7/src/everything/libXres-1.0.6.tar.bz2 +Source132: http://www.x.org/releases/X11R7.7/src/everything/libXt-1.1.3.tar.bz2 +Source133: http://www.x.org/releases/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2 +Source134: http://www.x.org/releases/X11R7.7/src/everything/libXv-1.0.7.tar.bz2 +Source135: http://www.x.org/releases/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2 +Source136: http://www.x.org/releases/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2 +Source137: http://www.x.org/releases/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2 +Source138: http://www.x.org/releases/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 +Source139: http://www.x.org/releases/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2 +#Source140: http://www.x.org/releases/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2 +# libpthread-stubs fails to compile, so we use the same method +# as the el6 libxcb rpm. pthread-stubs.pc.in taken from el6 libxcb rpm +Source140: pthread-stubs.pc.in +Source141: http://www.x.org/releases/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2 +Source142: http://www.x.org/releases/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 +Source143: http://www.x.org/releases/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2 +Source144: http://www.x.org/releases/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2 +Source145: http://www.x.org/releases/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 +Source146: http://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 +Source147: http://www.x.org/releases/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 +Source148: http://www.x.org/releases/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 +Source149: http://www.x.org/releases/X11R7.7/src/everything/util-macros-1.17.tar.bz2 +Source150: http://www.x.org/releases/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2 +Source151: http://www.x.org/releases/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2 +Source152: http://www.x.org/releases/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 +Source153: http://www.x.org/releases/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2 +Source154: http://www.x.org/releases/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 +Source155: http://www.x.org/releases/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 +Source156: http://www.x.org/releases/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 +Source157: http://www.x.org/releases/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 +Source158: http://www.x.org/releases/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 +Source159: http://www.x.org/releases/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2 +Source160: http://www.x.org/releases/X11R7.7/src/everything/xproto-7.0.23.tar.bz2 +Source161: http://www.x.org/releases/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2 +Source162: http://www.x.org/releases/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2 + +Source200: http://fontconfig.org/release/fontconfig-2.8.0.tar.gz +Source201: http://download.savannah.gnu.org/releases/freetype/freetype-old/freetype-2.3.11.tar.bz2 +Source202: http://xorg.freedesktop.org/archive/individual/lib/pixman-0.32.4.tar.bz2 +Source203: http://dri.freedesktop.org/libdrm/libdrm-2.4.52.tar.bz2 +Source204: ftp://ftp.freedesktop.org/pub/mesa/older-versions/9.x/9.2.5/MesaLib-9.2.5.tar.bz2 +# NOTE: +# libgcrypt from el5 is not new enough to satisfy newer Xorg requirements for --with-sha1, +# which causes Xorg to link against libssl.so and introduce about 10 dynamic dependencies. +# to prevent this, build a static libsha1 and link against that. +# NOTE: +Source205: https://github.com/dottedmag/libsha1/archive/0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}%{?snap:-%{snap}}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake >= 1.7, autoconf >= 2.57, libtool >= 1.4, gettext >= 0.14.4, gettext-devel >= 0.14.4, bison-devel -BuildRequires: openssl-devel +# xorg requires newer versions of automake, & autoconf than are available with el5. Use el6 versions. +BuildRequires: automake >= 1.11, autoconf >= 2.60, libtool >= 1.4, gettext >= 0.14.4, gettext-devel >= 0.14.4, bison-devel, python26 BuildRequires: desktop-file-utils, java-devel, jpackage-utils BuildRequires: gnutls-devel, pam-devel BuildRequires: cmake28 @@ -146,7 +109,8 @@ BuildRequires: pkgconfig >= 0.20 BuildRequires: gcc44, gcc44-c++ BuildRequires: glibc-devel, libstdc++-devel, libpng-devel BuildRequires: expat-devel -BuildRequires: gperf, intltool, libtalloc-devel +BuildRequires: git, gperf, intltool, libtalloc-devel +BuildRequires: kernel-headers, libatomic_ops-devel BuildRequires: openmotif-devel Requires: openmotif, openmotif22 @@ -160,230 +124,63 @@ Obsoletes: vnc < 4.1.3-2, vnc-libs < 4.1.3-2 Provides: tightvnc = 1.5.0-0.15.20090204svn3586 Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 +# tigervnc patches Patch4: tigervnc-cookie.patch Patch10: tigervnc11-ldnow.patch Patch11: tigervnc11-gethomedir.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=692048 Patch14: tigervnc-x0vncserver-static-libs-fix.patch Patch15: tigervnc-static-fltk.patch -Patch101: tigervnc-ac-compatibility.patch -Patch102: tigervnc-xorg-1.7.5-remove-copyisolatin1lowered.patch +# fltk patches Patch124: fltk-1.3.2-libdl.patch Patch125: fltk-1.3.2-static-libs.patch -# Patches from libdrm-2.4.15-4.fc12.src.rpm -# hardcode the 666 instead of 660 for device nodes -Patch133: libdrm-make-dri-perms-okay.patch -# remove backwards compat not needed on Fedora -Patch134: libdrm-2.4.0-no-bc.patch - -Patch135: libdrm-page-flip.patch - -# nouveau: retry pushbuf ioctl if interrupted by signal -Patch136: libdrm-nouveau-restart-pushbuf.patch -# nouveau: drop rendering on floor rather than asserting if flush fails -Patch137: libdrm-nouveau-drop-rendering.patch -# nouveau: improve reloc API to allow better error handling -Patch138: libdrm-nouveau-better-relocs.patch - -# patches from mesa-7.11-5.el6.src.rpm -# ftp://ftp.redhat.com/pub/redhat/linux/enterprise/6Client/en/os/SRPMS/mesa-7.11-5.el6.src.rpm -Patch141: mesa-7.1-osmesa-version.patch -Patch142: mesa-7.1-nukeglthread-debug.patch -Patch143: mesa-no-mach64.patch - -#Patch147: mesa-7.1-link-shared.patch -Patch149: intel-revert-vbl.patch -#Patch1410: r600-fix-tfp.patch - -#Patch1413: mesa-7.5-sparc64.patch - -Patch1430: mesa-7.6-hush-vblank-warning.patch -Patch1431: mesa-7.6-glx13-app-warning.patch - -#Patch1440: r300g-no-llvm.patch - -# 7.11 branch backport -#Patch1460: mesa-7.11-b9c7773e.patch - -# not on 7.11 branch yet -#Patch1470: mesa-7.11-gen6-depth-stalls.patch - -#Patch1480: mesa-r600g-new-pciids.patch -#Patch1481: mesa-7.11-ivybridge-server-pci-ids.patch - -# Patches from EL6 xorg-x11-server-1.7.7 source RPM -# ftp://ftp.redhat.com/pub/redhat/linux/enterprise/6Client/en/os/SRPMS/xorg-x11-server-1.7.7-29.el6_1.2.src.rpm -Patch5: xserver-1.4.99-pic-libxf86config.patch -Patch6: xserver-1.7.4-z-now.patch - -# OpenGL compositing manager feature/optimization patches. -Patch103: xserver-1.5.0-bg-none-root.patch - -Patch2014: xserver-1.5.0-projector-fb-size.patch - -# Trivial things to never merge upstream ever: -# This really could be done prettier. -Patch5002: xserver-1.4.99-ssh-isnt-local.patch - -# force mode debugging on for randr 1.2 drivers -Patch6002: xserver-1.5.1-mode-debug.patch - -# don't build the (broken) acpi code -Patch6011: xserver-1.6.0-less-acpi-brokenness.patch - -# Make autoconfiguration chose nouveau driver for NVIDIA GPUs -Patch6016: xserver-1.6.1-nouveau.patch - -# ajax needs to upstream this -Patch6027: xserver-1.6.0-displayfd.patch -Patch6028: xserver-1.6.99-randr-error-debugging.patch -Patch6030: xserver-1.6.99-right-of.patch -Patch6033: xserver-1.6.99-default-modes.patch -Patch6044: xserver-1.6.99-hush-prerelease-warning.patch -Patch6045: xserver-1.7.0-randr-gamma-restore.patch - -Patch6047: xserver-1.7.0-glx-versioning.patch -#Patch6048: xserver-1.7.0-exa-fix-mixed.patch -Patch6049: xserver-1.7.1-multilib.patch -Patch6051: xserver-1.7.1-gamma-kdm-fix.patch -Patch6052: xserver-1.7.1-libcrypto.patch -Patch6066: xserver-1.7.1-glx14-swrast.patch - -Patch6067: xserver-1.7.7-exa-master.patch - -Patch6070: xserver-1.7.3-no-free-on-abort.patch -# 558613 -Patch6075: xserver-1.7.4-qxl-autoconfig.patch -# 516918 -Patch6076: xserver-1.7.4-dpms-timeouts.patch -Patch6077: xserver-1.7.6-export-dix-functions.patch -Patch6078: xserver-1.7.6-export-more-dix-functions.patch - -# 583544 - Pointer jumps to lower-right corner when clicking mousekeys -Patch6087: xserver-1.7.6-pointerkeys.patch - -Patch7002: xserver-1.7.6-no-connected-outputs.patch -# 586926 - randr change while off vt -Patch7003: xserver-1.7.6-randr-vt-switch.patch -# 582710 - pam support -Patch7004: xserver-1.1.1-pam.patch -# 584927 - xinerama coordinate sign fix -Patch7005: xserver-1.7.6-deviceevent-coordinates-xinerama.patch -# 585371 - default mode list unification -Patch7006: xserver-1.7.6-default-modes.patch -# 586567 - big window crash when try to resize -Patch7007: xserver-1.7.7-compresize-fix.patch -# 602080 - fix unnecessary fb resize in multi-head configurations -Patch7008: xserver-1.7.7-randr-initial.patch -# 600180 - Buffer overflow in XKB geometry copying code. -Patch7009: xserver-1.7.7-xkb-invalid-writes.patch -# 600116 - Properties are not reset in the second server generation -Patch7010: xserver-1.7.7-property-generation-reset.patch -# 594523 - Wrong axis mode for absolute axes -Patch7011: xserver-1.7.7-device-mode-list.patch -# 602511 - Stuck modifiers when using multiple keyboards or XTEST -Patch7012: xserver-1.7.7-modifier-keycount.patch -# 588640 - XKEYBOARD Warning: Duplicate shape name "" -Patch7013: xserver-1.7.7-xkb-geom-copy.patch -# 574486 - Dual head setup overlaps one pixel -Patch7014: xserver-1.7.7-fix-randr-rotation.patch -# 600505 - Xephyr utility should be resizeable -Patch7015: xserver-1.7.7-make-ephyr-resize.patch -# 604057 - fix aspect match for classic drivers -Patch7016: xserver-1.7.7-improve-mode-selection.patch -# 607045 - DGA client can crash the server -Patch7017: xserver-1.7.7-dga-master-keyboard.patch -# 607410 - Reproducible stuck grab on server -Patch7018: xserver-1.7.7-event-mask-revert.patch -# 607051 - Keyboard bell settings don't apply to keyboards. -Patch7019: xserver-1.7.7-sd-keyboard-controls.patch -# 607022 - segfault during Xorg -showopts -Patch7020: xserver-1.7.7-showopts-segv.patch -# Related 607150 -Patch7021: xserver-1.7.7-xkb-purge-includes.patch -# Related 607150 -Patch7022: xserver-1.7.7-xkb-rename-fakebutton.patch -# Related 607150 -Patch7023: xserver-1.7.7-xkb-pointerkeys-on-master.patch -# 607150 - Mouse button never releases when xkb PointerKeys are used -Patch7024: xserver-1.7.7-xkb-lockedPtrBtns-state-merge.patch -# 607150 - Mouse button never releases when xkb PointerKeys are used, part2 -Patch7025: xserver-1.7.7-release-xtest-on-phys-buttons.patch -# 581505 - Xephyr crashes inside kvm-qemu virtual host -Patch7026: xserver-1.7.7-xephyr-24bpp.patch -# 605302 - vesa doesn't work on intel gen6 -Patch7027: xserver-1.7.7-int10-reserved-areas.patch -# 618422 - Wrong handling of devices with more than 2 valuators -Patch7028: xserver-1.7.7-postfix-DCE-PointerKeys.patch -# related 618422, Patch7028 -Patch7029: xserver-1.7.7-reset-unused-classes.patch -# 601319 - LVDS activated when notebook lid is closed -Patch7030: xserver-1.7.7-lid-hack.patch -# 585283 - xrandr allows mouse to move into non-existant screen locations -Patch7031: xserver-1.7.7-randr-cursor-dead-zones.patch -# 620333 - mga shows blank screen when X server starts -Patch7032: xserver-1.7.7-ddc-probe-less.patch -# 638234 - Bump classic driver default resolution to 1024x768 -Patch7033: xserver-1.7.7-classic-default-mode.patch - -Patch8000: cve-2011-4818.patch -Patch8001: cve-2011-4818-extra.patch - -# Add -lm when linking X demos -Patch9020: freetype-2.1.10-enable-ft2-bci.patch -Patch9021: freetype-2.3.0-enable-spr.patch +# freetype patches +Patch20: freetype-2.1.10-enable-ft2-bci.patch +Patch21: freetype-2.3.0-enable-spr.patch # Enable otvalid and gxvalid modules -Patch9046: freetype-2.2.1-enable-valid.patch +Patch46: freetype-2.2.1-enable-valid.patch # Fix multilib conflicts -Patch9088: freetype-multilib.patch - -Patch9089: freetype-2.3.11-CVE-2010-2498.patch -Patch9090: freetype-2.3.11-CVE-2010-2499.patch -Patch9091: freetype-2.3.11-CVE-2010-2500.patch -Patch9092: freetype-2.3.11-CVE-2010-2519.patch -Patch9093: freetype-2.3.11-CVE-2010-2520.patch -#Patch9094: freetype-2.3.11-CVE-2010-2527.patch -#Patch9095: freetype-2.3.11-axis-name-overflow.patch -Patch9096: freetype-2.3.11-CVE-2010-1797.patch -Patch9097: freetype-2.3.11-CVE-2010-2805.patch -Patch9098: freetype-2.3.11-CVE-2010-2806.patch -Patch9099: freetype-2.3.11-CVE-2010-2808.patch -Patch9100: freetype-2.3.11-CVE-2010-3311.patch -Patch9101: freetype-2.3.11-CVE-2010-3855.patch -Patch9102: freetype-2.3.11-CVE-2011-0226.patch -Patch9103: freetype-2.3.11-CVE-2011-3256.patch -Patch9104: freetype-2.3.11-CVE-2011-3439.patch -Patch9105: freetype-2.3.11-CVE-2012-1126.patch -Patch9106: freetype-2.3.11-CVE-2012-1127.patch -Patch9107: freetype-2.3.11-CVE-2012-1130.patch -Patch9108: freetype-2.3.11-CVE-2012-1131.patch -Patch9109: freetype-2.3.11-CVE-2012-1132.patch -Patch9110: freetype-2.3.11-CVE-2012-1134.patch -Patch9111: freetype-2.3.11-CVE-2012-1136.patch -Patch9112: freetype-2.3.11-CVE-2012-1137.patch -Patch9113: freetype-2.3.11-CVE-2012-1139.patch -Patch9114: freetype-2.3.11-CVE-2012-1140.patch -Patch9115: freetype-2.3.11-CVE-2012-1141.patch -Patch9116: freetype-2.3.11-CVE-2012-1142.patch -Patch9117: freetype-2.3.11-CVE-2012-1143.patch -Patch9118: freetype-2.3.11-CVE-2012-1144.patch -Patch9119: freetype-2.3.11-bdf-overflow.patch -Patch9120: freetype-2.3.11-array-initialization.patch - -Patch10001: xtrans-1.0.3-avoid-gethostname.patch - -Patch10102: dont-forward-keycode-0.patch -Patch10103: libX11-1.3.1-creategc-man-page.patch - -Patch10201: libXext-1.1-XAllocID.patch - -Patch10301: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch - -Patch10400: libXt-1.0.2-libsm-fix.patch +Patch88: freetype-multilib.patch + +Patch89: freetype-2.3.11-CVE-2010-2498.patch +Patch90: freetype-2.3.11-CVE-2010-2499.patch +Patch91: freetype-2.3.11-CVE-2010-2500.patch +Patch92: freetype-2.3.11-CVE-2010-2519.patch +Patch93: freetype-2.3.11-CVE-2010-2520.patch +Patch96: freetype-2.3.11-CVE-2010-1797.patch +Patch97: freetype-2.3.11-CVE-2010-2805.patch +Patch98: freetype-2.3.11-CVE-2010-2806.patch +Patch99: freetype-2.3.11-CVE-2010-2808.patch +Patch100: freetype-2.3.11-CVE-2010-3311.patch +Patch101: freetype-2.3.11-CVE-2010-3855.patch +Patch102: freetype-2.3.11-CVE-2011-0226.patch +Patch103: freetype-2.3.11-CVE-2011-3256.patch +Patch104: freetype-2.3.11-CVE-2011-3439.patch +Patch105: freetype-2.3.11-CVE-2012-1126.patch +Patch106: freetype-2.3.11-CVE-2012-1127.patch +Patch107: freetype-2.3.11-CVE-2012-1130.patch +Patch108: freetype-2.3.11-CVE-2012-1131.patch +Patch109: freetype-2.3.11-CVE-2012-1132.patch +Patch110: freetype-2.3.11-CVE-2012-1134.patch +Patch111: freetype-2.3.11-CVE-2012-1136.patch +Patch112: freetype-2.3.11-CVE-2012-1137.patch +Patch113: freetype-2.3.11-CVE-2012-1139.patch +Patch114: freetype-2.3.11-CVE-2012-1140.patch +Patch115: freetype-2.3.11-CVE-2012-1141.patch +Patch116: freetype-2.3.11-CVE-2012-1142.patch +Patch117: freetype-2.3.11-CVE-2012-1143.patch +Patch118: freetype-2.3.11-CVE-2012-1144.patch +Patch119: freetype-2.3.11-bdf-overflow.patch +Patch120: freetype-2.3.11-array-initialization.patch +Patch121: freetype-2.3.11-CVE-2012-5669.patch + +# Patches for Xorg CVE-2014-12-09 taken from Debian: +# https://release.debian.org/proposed-updates/stable_diffs/xorg-server_1.12.4-6+deb7u5.debdiff +Patch10000: 16_CVE-2014-mult.diff +Patch10001: 17_CVE-regressions.diff %description Virtual Network Computing (VNC) is a remote display system which @@ -420,6 +217,7 @@ Requires(preun):initscripts Requires(postun):initscripts Requires: xkeyboard-config, xorg-x11-xkb-utils +Requires: keyutils-libs-devel Requires: tigervnc-license %description server-minimal @@ -464,7 +262,6 @@ This package contains icons for TigerVNC viewer rm -rf %{_builddir}/%{name}-%{version}%{?snap:-%{snap}} %setup -q -n %{name}-%{version}%{?snap:-%{snap}} -# sed -i -e 's/80/0/g' CMakeLists.txt cp %SOURCE9 cmake/Modules/ %patch4 -p1 -b .cookie %patch10 -p1 -b .ldnow @@ -487,8 +284,6 @@ tar xzf %SOURCE12 mkdir xorg pushd xorg -tar xjf %SOURCE98 -tar xjf %SOURCE99 tar xjf %SOURCE100 tar xjf %SOURCE101 tar xjf %SOURCE102 @@ -529,7 +324,7 @@ tar xjf %SOURCE136 tar xjf %SOURCE137 tar xjf %SOURCE138 tar xjf %SOURCE139 -tar xjf %SOURCE140 + tar xjf %SOURCE141 tar xjf %SOURCE142 tar xjf %SOURCE143 @@ -546,263 +341,105 @@ tar xjf %SOURCE153 tar xjf %SOURCE154 tar xjf %SOURCE155 tar xjf %SOURCE156 -# tar xjf %SOURCE157 -# tar xjf %SOURCE158 +tar xjf %SOURCE157 +tar xjf %SOURCE158 tar xjf %SOURCE159 tar xjf %SOURCE160 tar xjf %SOURCE161 -tar xzf %SOURCE162 -tar xjf %SOURCE163 -tar xjf %SOURCE164 -popd +tar xjf %SOURCE162 tar xzf %SOURCE200 -cp -a xorg/xorg-server-1.*/* unix/xserver -pushd xorg -pushd libdrm-* -%patch133 -p1 -b .forceperms -%patch134 -p1 -b .no-bc -%patch135 -p1 -b .page-flip -%patch136 -p1 -b .nouveau-pbrestart -%patch137 -p1 -b .nouveau-drop -%patch138 -p1 -b .nouveau-relocs -popd -pushd Mesa-* -%patch141 -p1 -b .osmesa -%patch142 -p1 -b .intel-glthread -%patch143 -p1 -b .no-mach64 -#%patch147 -p1 -b .dricore -%patch149 -p1 -b .intel-vbl -#%patch1410 -p1 -b .r600_tfp -#%patch1413 -p1 -b .sparc64 -%patch1430 -p1 -b .vblank-warning -%patch1431 -p1 -b .glx13-warning -#%patch1440 -p1 -b .r300g -#%patch1460 -p1 - -#%patch1470 -p1 -b .depth-stall - -#%patch1480 -p1 -b .r600gpciids -#%patch1481 -p1 -b .ivbpciid -popd - +tar xjf %SOURCE201 pushd freetype-* -%patch9020 -p1 -b .enable-ft2-bci -%patch9021 -p1 -b .enable-spr - -# Enable otvalid and gxvalid modules -%patch9046 -p1 -b .enable-valid - -# Fix multilib conflicts -%patch9088 -p1 -b .multilib - -%patch9089 -p1 -b .CVE-2010-2498 -%patch9090 -p1 -b .CVE-2010-2499 -%patch9091 -p1 -b .CVE-2010-2500 -%patch9092 -p1 -b .CVE-2010-2519 -%patch9093 -p1 -b .CVE-2010-2520 -%patch9096 -p1 -b .CVE-2010-1797 -%patch9097 -p1 -b .CVE-2010-2805 -%patch9098 -p1 -b .CVE-2010-2806 -%patch9099 -p1 -b .CVE-2010-2808 -%patch9100 -p1 -b .CVE-2010-3311 -%patch9101 -p1 -b .CVE-2010-3855 -%patch9102 -p1 -b .CVE-2011-0226 -%patch9103 -p1 -b .CVE-2011-3256 -%patch9104 -p1 -b .CVE-2011-3439 -%patch9105 -p1 -b .CVE-2012-1126 -%patch9106 -p1 -b .CVE-2012-1127 -%patch9107 -p1 -b .CVE-2012-1130 -%patch9108 -p1 -b .CVE-2012-1131 -%patch9109 -p1 -b .CVE-2012-1132 -%patch9110 -p1 -b .CVE-2012-1134 -%patch9111 -p1 -b .CVE-2012-1136 -%patch9112 -p1 -b .CVE-2012-1137 -%patch9113 -p1 -b .CVE-2012-1139 -%patch9114 -p1 -b .CVE-2012-1140 -%patch9115 -p1 -b .CVE-2012-1141 -%patch9116 -p1 -b .CVE-2012-1142 -%patch9117 -p1 -b .CVE-2012-1143 -%patch9118 -p1 -b .CVE-2012-1144 -%patch9119 -p1 -b .bdf-overflow -%patch9120 -p1 -b .array-initialization -popd - -pushd xtrans-* -%patch10001 -p1 -b .my-name-is-unix -popd - -pushd libX11-* -%patch10102 -p1 -b .dont-forward-keycode-0 -%patch10103 -p1 -b .manual +%patch46 -p1 -b .enable-valid +%patch88 -p1 -b .multilib +%patch89 -p1 -b .CVE-2010-2498 +%patch90 -p1 -b .CVE-2010-2499 +%patch91 -p1 -b .CVE-2010-2500 +%patch92 -p1 -b .CVE-2010-2519 +%patch93 -p1 -b .CVE-2010-2520 +%patch96 -p1 -b .CVE-2010-1797 +%patch97 -p1 -b .CVE-2010-2805 +%patch98 -p1 -b .CVE-2010-2806 +%patch99 -p1 -b .CVE-2010-2808 +%patch100 -p1 -b .CVE-2010-3311 +%patch101 -p1 -b .CVE-2010-3855 +%patch102 -p1 -b .CVE-2011-0226 +%patch103 -p1 -b .CVE-2011-3256 +%patch104 -p1 -b .CVE-2011-3439 +%patch105 -p1 -b .CVE-2012-1126 +%patch106 -p1 -b .CVE-2012-1127 +%patch107 -p1 -b .CVE-2012-1130 +%patch108 -p1 -b .CVE-2012-1131 +%patch109 -p1 -b .CVE-2012-1132 +%patch110 -p1 -b .CVE-2012-1134 +%patch111 -p1 -b .CVE-2012-1136 +%patch112 -p1 -b .CVE-2012-1137 +%patch113 -p1 -b .CVE-2012-1139 +%patch114 -p1 -b .CVE-2012-1140 +%patch115 -p1 -b .CVE-2012-1141 +%patch116 -p1 -b .CVE-2012-1142 +%patch117 -p1 -b .CVE-2012-1143 +%patch118 -p1 -b .CVE-2012-1144 +%patch119 -p1 -b .bdf-overflow +%patch120 -p1 -b .array-initialization +%patch121 -p1 -b .CVE-2012-5669 popd - -pushd libXext-* -%patch10201 -p1 -popd - -pushd libfontenc-* -%patch10301 -p0 -b .get-fontdir-from-pkgconfig +tar xjf %SOURCE202 +tar xjf %SOURCE203 +tar xjf %SOURCE204 +pushd xorg-server-1* +%patch10000 -p1 -b .CVE-2014-mult +%patch10001 -p1 -b .CVE-regressions +for f in `find . -type f -perm -000`; do + chmod +r "$f" +done popd - -pushd libXt-* -%patch10400 -p1 -b .libsm-fix +tar xzf %SOURCE205 popd -popd +cp -a xorg/xorg-server-1*/* unix/xserver pushd unix/xserver -patch -p1 < %{_builddir}/%{name}-%{version}%{?snap:-%{snap}}/unix/xserver17.patch -for all in `find %{_builddir}/%{name}-%{version}%{?snap:-%{snap}}/unix/xorg-7.5-patches/ -type f |grep '.*\.patch$'`; do - echo Applying $all - patch -p1 < $all +for all in `find . -type f -perm -001`; do + chmod -x "$all" done -%patch101 -p1 -b .ac-compatibility -%patch102 -p1 -b .CopyISOLatin1Lowered - -%patch5 -p1 -b .xserver-1.4.99-pic-libxf86config -%patch6 -p1 -b .xserver-1.7.4-z-now - -# OpenGL compositing manager feature/optimization patches. -%patch103 -p1 -b .xserver-1.5.0-bg-none-root - -%patch2014 -p1 -b .xserver-1.5.0-projector-fb-size - -# Trivial things to never merge upstream ever: -# This really could be done prettier. -%patch5002 -p1 -b .xserver-1.4.99-ssh-isnt-local - -# force mode debugging on for randr 1.2 drivers -%patch6002 -p1 -b .xserver-1.5.1-mode-debug - -# don't build the (broken) acpi code -%patch6011 -p1 -b .xserver-1.6.0-less-acpi-brokenness - -# Make autoconfiguration chose nouveau driver for NVIDIA GPUs -%patch6016 -p1 -b .xserver-1.6.1-nouveau - -# ajax needs to upstream this -%patch6027 -p1 -b .xserver-1.6.0-displayfd -%patch6028 -p1 -b .xserver-1.6.99-randr-error-debugging -%patch6030 -p1 -b .xserver-1.6.99-right-of -%patch6033 -p1 -b .xserver-1.6.99-default-modes -%patch6044 -p1 -b .xserver-1.6.99-hush-prerelease-warning -%patch6045 -p1 -b .xserver-1.7.0-randr-gamma-restore - -%patch6047 -p1 -b .xserver-1.7.0-glx-versioning -#%patch6048 -p1 -b .xserver-1.7.0-exa-fix-mixed -%patch6049 -p1 -b .xserver-1.7.1-multilib -%patch6051 -p1 -b .xserver-1.7.1-gamma-kdm-fix -%patch6052 -p1 -b .xserver-1.7.1-libcrypto -%patch6066 -p1 -b .xserver-1.7.1-glx14-swrast - -%patch6067 -p1 -b .xserver-1.7.7-exa-master - -%patch6070 -p1 -b .xserver-1.7.3-no-free-on-abort -# 558613 -%patch6075 -p1 -b .xserver-1.7.4-qxl-autoconfig -# 516918 -%patch6076 -p1 -b .xserver-1.7.4-dpms-timeouts -%patch6077 -p1 -b .xserver-1.7.6-export-dix-functions -%patch6078 -p1 -b .xserver-1.7.6-export-more-dix-functions - -# 583544 - Pointer jumps to lower-right corner when clicking mousekeys -%patch6087 -p1 -b .xserver-1.7.6-pointerkeys - -%patch7002 -p1 -b .xserver-1.7.6-no-connected-outputs -# 586926 - randr change while off vt -%patch7003 -p1 -b .xserver-1.7.6-randr-vt-switch -# 582710 - pam support -%patch7004 -p1 -b .xserver-1.1.1-pam -# 584927 - xinerama coordinate sign fix -%patch7005 -p1 -b .xserver-1.7.6-deviceevent-coordinates-xinerama -# 585371 - default mode list unification -%patch7006 -p1 -b .xserver-1.7.6-default-modes -# 586567 - big window crash when try to resize -%patch7007 -p1 -b .xserver-1.7.7-compresize-fix -# 602080 - fix unnecessary fb resize in multi-head configurations -%patch7008 -p1 -b .xserver-1.7.7-randr-initial -# 600180 - Buffer overflow in XKB geometry copying code. -%patch7009 -p1 -b .xserver-1.7.7-xkb-invalid-writes -# 600116 - Properties are not reset in the second server generation -%patch7010 -p1 -b .xserver-1.7.7-property-generation-reset -# 594523 - Wrong axis mode for absolute axes -%patch7011 -p1 -b .xserver-1.7.7-device-mode-list -# 602511 - Stuck modifiers when using multiple keyboards or XTEST -%patch7012 -p1 -b .xserver-1.7.7-modifier-keycount -# 588640 - XKEYBOARD Warning: Duplicate shape name "" -%patch7013 -p1 -b .xserver-1.7.7-xkb-geom-copy -# 574486 - Dual head setup overlaps one pixel -%patch7014 -p1 -b .xserver-1.7.7-fix-randr-rotation -# 600505 - Xephyr utility should be resizeable -%patch7015 -p1 -b .xserver-1.7.7-make-ephyr-resize -# 604057 - fix aspect match for classic drivers -%patch7016 -p1 -b .xserver-1.7.7-improve-mode-selection -# 607045 - DGA client can crash the server -%patch7017 -p1 -b .xserver-1.7.7-dga-master-keyboard -# 607410 - Reproducible stuck grab on server -%patch7018 -p1 -b .xserver-1.7.7-event-mask-revert -# 607051 - Keyboard bell settings don't apply to keyboards. -%patch7019 -p1 -b .xserver-1.7.7-sd-keyboard-controls -# 607022 - segfault during Xorg -showopts -%patch7020 -p1 -b .xserver-1.7.7-showopts-segv -# Related 607150 -%patch7021 -p1 -b .xserver-1.7.7-xkb-purge-includes -# Related 607150 -%patch7022 -p1 -b .xserver-1.7.7-xkb-rename-fakebutton -# Related 607150 -%patch7023 -p1 -b .xserver-1.7.7-xkb-pointerkeys-on-master -# 607150 - Mouse button never releases when xkb PointerKeys are used -%patch7024 -p1 -b .xserver-1.7.7-xkb-lockedPtrBtns-state-merge -# 607150 - Mouse button never releases when xkb PointerKeys are used, part2 -%patch7025 -p1 -b .xserver-1.7.7-release-xtest-on-phys-buttons -# 581505 - Xephyr crashes inside kvm-qemu virtual host -%patch7026 -p1 -b .xserver-1.7.7-xephyr-24bpp -# 605302 - vesa doesn't work on intel gen6 -%patch7027 -p1 -b .xserver-1.7.7-int10-reserved-areas -# 618422 - Wrong handling of devices with more than 2 valuators -%patch7028 -p1 -b .xserver-1.7.7-postfix-DCE-PointerKeys -# related 618422, Patch7028 -%patch7029 -p1 -b .xserver-1.7.7-reset-unused-classes -# 601319 - LVDS activated when notebook lid is closed -%patch7030 -p1 -b .xserver-1.7.7-lid-hack -# 585283 - xrandr allows mouse to move into non-existant screen locations -%patch7031 -p1 -b .xserver-1.7.7-randr-cursor-dead-zones -# 620333 - mga shows blank screen when X server starts -%patch7032 -p1 -b .xserver-1.7.7-ddc-probe-less -# 638234 - Bump classic driver default resolution to 1024x768 -%patch7033 -p1 -b .xserver-1.7.7-classic-default-mode - -%patch8000 -p1 -b .cve-2011-4818 -%patch8001 -p1 -b .cve-2011-4818-extra +patch -p1 < %{_builddir}/%{name}-%{version}%{?snap:-%{snap}}/unix/xserver112.patch popd %build %define tigervnc_src_dir %{_builddir}/%{name}-%{version}%{?snap:-%{snap}} -%define static_lib_buildroot %{tigervnc_src_dir}/build export CC=gcc44 export CXX=g++44 export CFLAGS="$RPM_OPT_FLAGS -fPIC" export CXXFLAGS="$CFLAGS -static-libgcc" +export PYTHON=python26 %define xorg_buildroot %{tigervnc_src_dir}/xorg.build mkdir -p %{xorg_buildroot}%{_libdir} pushd %{xorg_buildroot}%{_libdir} -ln -s `g++44 -print-file-name=libexpat.a` -ln -s `g++44 -print-file-name=libgcrypt.a` -ln -s `g++44 -print-file-name=libgpg-error.a` -ln -s `g++44 -print-file-name=libgnutls.a` ln -s `g++44 -print-file-name=libstdc++.a` -ln -s `g++44 -print-file-name=libcrypto.a` ln -s `g++44 -print-file-name=libz.a` ln -s `g++44 -print-file-name=libgcc.a` -ln -s `g++44 -print-file-name=libpng.a` popd echo "*** Building libjpeg-turbo ***" pushd libjpeg-turbo-* -./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-nls --enable-static --disable-shared +LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-nls --enable-static --disable-shared +make %{?_smp_mflags} DESTDIR=%{xorg_buildroot} install +popd + +echo "*** Building Xorg ***" +pushd xorg + +echo "*** Building libsha1 ***" +pushd libsha1-* +autoreconf -fiv +LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-nls --enable-static --disable-shared make %{?_smp_mflags} DESTDIR=%{xorg_buildroot} install +find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -delete +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{xorg_buildroot}%{_prefix}|" {} \; popd export CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{xorg_buildroot}%{_includedir}" @@ -810,20 +447,18 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I%{xorg_buildroot}%{_includedir} -static- export CPPFLAGS=$CXXFLAGS export LDFLAGS="$LDFLAGS -L%{xorg_buildroot}%{_libdir}" export ACLOCAL="aclocal -I %{xorg_buildroot}%{_datadir}/aclocal" -export PKG_CONFIG_PATH="%{xorg_buildroot}%{_libdir}/pkgconfig:%{xorg_buildroot}%{_datadir}/pkgconfig" - -echo "*** Building Xorg ***" -pushd xorg +export PKG_CONFIG_PATH="%{xorg_buildroot}%{_libdir}/pkgconfig:%{xorg_buildroot}%{_libdir}/tigervnc/pkgconfig:%{xorg_buildroot}%{_datadir}/pkgconfig" echo "*** Building freetype ***" pushd freetype-* -CFLAGS="$CFLAGS -fno-strict-aliasing" LDFLAGS="$LDFLAGS -static" ./configure --prefix=/usr --libdir=%{_libdir} --enable-static --disable-shared +LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-static --disable-shared sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool make DESTDIR=%{xorg_buildroot} install +# FIXME: fontconfig bails out if we delete the libtool archives find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -exec sed -i -e "s|libdir='%{_libdir}'|libdir='%{xorg_buildroot}%{_libdir}'|" {} \; find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; -find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=/usr|prefix=%{xorg_buildroot}%{_prefix}|" {} \; +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{xorg_buildroot}%{_prefix}|" {} \; # fix multilib issues %ifarch x86_64 s390x ia64 ppc64 alpha sparc64 %define wordsize 64 @@ -851,13 +486,24 @@ cat >%{xorg_buildroot}%{_includedir}/freetype2/freetype/config/ftconfig.h <<EOF EOF popd +echo "*** Building fontconfig ***" +pushd fontconfig-* +autoreconf -fiv +LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" HASDOCBOOK=no ./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF --enable-static --disable-shared +make %{?_smp_mflags} +make DESTDIR=%{xorg_buildroot} install +find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -delete +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{xorg_buildroot}%{_prefix}|" {} \; +popd + pushd util-macros-* echo "Building macros" -./configure --prefix=/usr --libdir=%{_libdir} --disable-nls --enable-static --disable-shared +LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-static --disable-shared make DESTDIR=%{xorg_buildroot} install -find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -exec sed -i -e "s|libdir='%{_libdir}'|libdir='%{xorg_buildroot}%{_libdir}'|" {} \; +find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -delete find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; -find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=/usr|prefix=%{xorg_buildroot}%{_prefix}|" {} \; +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{xorg_buildroot}%{_prefix}|" {} \; popd modules="\ @@ -876,6 +522,7 @@ modules="\ resourceproto \ scrnsaverproto \ videoproto \ + xcb-proto \ xproto \ xcmiscproto \ xextproto \ @@ -883,13 +530,12 @@ modules="\ xf86dgaproto \ xf86driproto \ xf86vidmodeproto \ - xf86miscproto \ xineramaproto \ makedepend \ xtrans \ libXau \ libXdmcp \ - libpthread-stubs \ + libxcb \ libX11 \ libXext \ libfontenc \ @@ -916,10 +562,10 @@ modules="\ libXv \ libXxf86dga \ libXxf86vm \ - libXxf86misc \ libpciaccess \ pixman \ - libdrm" + libdrm \ + font-util" for module in ${modules}; do extraoptions="" @@ -927,22 +573,41 @@ for module in ${modules}; do echo ====================== echo configuring ${module} echo ====================== -%ifarch i386 i686 +%ifarch i386 i686 x86_64 if [ "${module}" = "libdrm" ]; then - extraoptions="${extraoptions} --disable-intel" + autoreconf -fiv + extraoptions="${extraoptions} --enable-udev --disable-libkms --disable-manpages --disable-intel --disable-radeon --disable-nouveau --disable-vmwgfx" fi %endif + if [ "${module}" = "libXdmcp" ]; then + autoreconf -fiv + fi + if [ "${module}" = "libXcursor" ]; then + autoreconf -fiv + fi + if [ "${module}" = "libfontenc" ]; then + autoconf + fi + if [ "${module}" = "libXi" ]; then + autoreconf -fiv + fi if [ "${module}" = "libXaw" ]; then extraoptions="${extraoptions} --disable-xaw8 --disable-xaw6" fi + if [ "${module}" = "libxcb" ]; then + sed -i 's/pthread-stubs //' configure.ac + autoreconf -fiv + fi if [ "${module}" = "libX11" ]; then - extraoptions="${extraoptions} --without-xcb --disable-specs" + autoreconf -fiv + sed -i -e 's|^\(#pragma weak pthread_equal.*\)$||' src/UIThrStubs.c + extraoptions="${extraoptions} --disable-specs" fi if [ "${module}" = "libSM" ]; then extraoptions="${extraoptions} --without-libuuid" fi if [ "${module}" = "pixman" ]; then - extraoptions="${extraoptions} --disable-gtk" + extraoptions="${extraoptions} --disable-gtk --disable-openmp" aclocal -I %{xorg_buildroot}%{_datadir}/aclocal autoconf autoreconf -fiv @@ -950,79 +615,97 @@ for module in ${modules}; do if [ "${module}" = "libXfont" ]; then extraoptions="${extraoptions} --with-freetype-config=%{xorg_buildroot}%{_bindir}/freetype-config" fi - if [ "${module}" = "libpthread-stubs" ]; then - LDFLAGS="" ./configure --prefix=/usr --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + if [ "${module}" = "libXScrnSaver" ]; then + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + elif [ "${module}" = "libxkbfile" ]; then + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + elif [ "${module}" = "pixman" ]; then + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + elif [ "${module}" = "libXt" ]; then + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic elif [ "${module}" = "libX11" ]; then - XDMCP_FLAGS="-L%{xorg_buildroot}%{_libdir} -Wl,-B,static -lXdmcp -lXau" ./configure --prefix=/usr --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic elif [ "${module}" = "libXtst" ]; then - XTST_FLAGS="-L%{xorg_buildroot}%{_libdir} -Wl,-B,static -lXext" ./configure --prefix=/usr --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + elif [ "${module}" = "libXpm" ]; then + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic else - ./configure --prefix=/usr --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic + LDFLAGS="$LDFLAGS -static" PKG_CONFIG="pkg-config --static" ./configure --prefix=%{_prefix} --libdir=%{_libdir} ${extraoptions} --enable-static --disable-shared --with-pic fi echo ====================== echo building ${module} echo ====================== - make DESTDIR=%{xorg_buildroot} install - find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -exec sed -i -e "s|libdir='%{_libdir}'|libdir='%{xorg_buildroot}%{_libdir}'|" {} \; + make DESTDIR=%{xorg_buildroot} + if [ "${module}" = "libX11" ]; then + make DESTDIR=%{xorg_buildroot} INSTALL="install -p" install + else + make DESTDIR=%{xorg_buildroot} install + fi + find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -delete find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; - find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=/usr|prefix=%{xorg_buildroot}%{_prefix}|" {} \; + find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{xorg_buildroot}%{_prefix}|" {} \; + if [ "${module}" = "libxcb" ]; then + sed 's,@libdir@,%{xorg_buildroot}%{_libdir},;s,@prefix@,%{xorg_buildroot}%{_prefix},;s,@exec_prefix@,%{xorg_buildroot}%{_exec_prefix},' %{SOURCE140} > %{xorg_buildroot}%{_libdir}/pkgconfig/pthread-stubs.pc + sed -i -e 's/^\(Libs.private:.*\)$/\1 -L${libdir} -lXdmcp -lXau/' %{xorg_buildroot}%{_libdir}/pkgconfig/xcb.pc + elif [ "${module}" = "libX11" ]; then + sed -i -e 's/^\(Libs:.*\)$/\1 -ldl/' %{xorg_buildroot}%{_libdir}/pkgconfig/x11.pc + sed -i -e 's/^\(Libs.private:.*\)$/\1 -L${libdir} -lxcb/' %{xorg_buildroot}%{_libdir}/pkgconfig/x11.pc + elif [ "${module}" = "libSM" ]; then + echo 'Libs.private: -L${libdir} -lICE' >> %{xorg_buildroot}%{_libdir}/pkgconfig/sm.pc + fi + popd done # build mesa echo "*** Building Mesa ***" pushd Mesa-* +export PYTHON2=python26 +%ifarch %{ix86} +sed -i -e 's/-std=c99/-std=gnu99/g' configure.ac +%endif +sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac +autoreconf -fiv %ifarch %{ix86} # i do not have words for how much the assembly dispatch code infuriates me -%define _mesa_flags --enable-pic --disable-asm +%define common_flags --disable-selinux --enable-pic --disable-asm %else -%define _mesa_flags --enable-pic +%define common_flags --disable-selinux --enable-pic %endif -# Need to set cfghost? -./configure \ - --prefix=/usr \ - --libdir=%{_libdir} \ - --enable-motif \ - --with-driver=dri \ - --with-dri-drivers=swrast \ - --with-dri-driverdir=%{_libdir}/dri \ - --with-gallium-drivers="" \ - --without-demos \ - --disable-driglx-direct \ - --disable-egl \ - --disable-glut \ - --disable-gallium \ - --disable-gl-osmesa \ - --disable-gallium-intel \ - --disable-gallium-radeon \ - --disable-gallium-nouveau \ - %{_mesa_flags} - -# Mesa build fails to install libGLU* if 'make install' is run before 'make' +# link libGL statically against any xorg libraries built above +LDFLAGS="$LDFLAGS -Wl,-Bstatic -lxcb -lX11 -lXdmcp -lXau -lXext -lXxf86vm -ldrm -Wl,-Bdynamic -Wl,-rpath,%{_libdir}/tigervnc:%{_libdir}" \ +PKG_CONFIG="pkg-config --static" ./configure %{common_flags} \ + --prefix=%{_prefix} \ + --libdir=%{_libdir}/tigervnc \ + --disable-osmesa \ + --disable-shared-glapi \ + --disable-egl \ + --disable-gbm \ + --enable-glx \ + --disable-glx-tls \ + --disable-opencl \ + --disable-xvmc \ + --with-dri-driverdir=%{_libdir}/tigervnc/dri \ + --disable-gallium-egl \ + --with-gallium-drivers="" \ + --with-dri-drivers=swrast + make DESTDIR=%{xorg_buildroot} -make DESTDIR=%{xorg_buildroot} install -find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -exec sed -i -e "s|libdir='%{_libdir}'|libdir='%{xorg_buildroot}%{_libdir}'|" {} \; +make install DESTDIR=%{xorg_buildroot} +find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -delete find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; -find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=/usr|prefix=%{xorg_buildroot}%{_prefix}|" {} \; +find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=%{_prefix}|prefix=%{xorg_buildroot}%{_prefix}|" {} \; popd popd -echo "*** Building fontconfig ***" -pushd fontconfig-* -HASDOCBOOK=no ./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF --enable-static --disable-shared -make %{?_smp_mflags} -make DESTDIR=%{xorg_buildroot} install -find %{xorg_buildroot}%{_prefix} -type f -name "*.la" -exec sed -i -e "s|libdir='%{_libdir}'|libdir='%{xorg_buildroot}%{_libdir}'|" {} \; -find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|libdir=%{_libdir}|libdir=%{xorg_buildroot}%{_libdir}|" {} \; -find %{xorg_buildroot}%{_prefix} -type f -name "*.pc" -exec sed -i -e "s|prefix=/usr|prefix=%{xorg_buildroot}%{_prefix}|" {} \; -popd - echo "*** Building fltk ***" pushd fltk-* export CMAKE_PREFIX_PATH="%{xorg_buildroot}%{_prefix}:%{_prefix}" export CMAKE_EXE_LINKER_FLAGS="-static-libgcc -L%{xorg_buildroot}%{_libdir}" +export LDFLAGS="$LDFLAGS -static" +export PKG_CONFIG="pkg-config --static" %{cmake28} -G"Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX=%{xorg_buildroot}%{_prefix} \ -DX11_INC_SEARCH_PATH=%{xorg_buildroot}%{_includedir} \ @@ -1041,64 +724,47 @@ export CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -c //g'` -DX11_INC_SEARCH_PATH=%{xorg_buildroot}%{_includedir} \ -DX11_LIB_SEARCH_PATH=%{xorg_buildroot}%{_libdir} \ -DFLTK_LIBRARY_DIR=%{tigervnc_src_dir}/fltk-1.3.2/lib \ - -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ + -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng;" \ -DFLTK_FLUID_EXECUTABLE=%{tigervnc_src_dir}/fltk-1.3.2/bin/fluid \ -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.2 \ -DBUILD_STATIC=1 \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_INCLUDED_ZLIB=0 \ + -DZLIB_INCLUDE_DIR=%{_includedir} \ + -DZLIB_LIBRARY=%{_libdir}/libz.a \ -DCMAKE_INSTALL_PREFIX=%{_prefix} make %{?_smp_mflags} pushd unix/xserver -export LD=$CXX export PIXMANINCDIR=%{xorg_buildroot}%{_includedir}/pixman-1 +sed -i -e 's/^\(\s*WAYLAND_SCANNER_RULES.*\)/dnl\1/' configure.ac autoreconf -fiv -./configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_datadir}/man \ - --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ - --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ - --disable-xinerama \ - --with-int10=x86emu \ - --enable-xdmcp \ - --enable-composite \ - --disable-xgl \ - --disable-xglx \ - --enable-freetype \ - --with-fontdir=%{_datadir}/X11/fonts \ - --with-xkb-output=%{_localstatedir}/lib/xkb \ - --enable-install-libxf86config \ - --enable-glx --disable-dri --enable-dri2 \ - --disable-config-dbus \ - --disable-config-hal \ - --disable-config-udev \ - --with-dri-driver-path=%{_libdir}/dri \ - --without-dtrace \ - --disable-unit-tests \ - --disable-devel-docs \ - --with-sha1=libgcrypt SHA1_LIB=-lcrypto \ - --disable-shared \ - --enable-static \ - --disable-record \ - --enable-aiglx \ - --disable-xvmc \ - --enable-dga \ - --disable-screensaver \ - --enable-xdm-auth-1 \ - --enable-xf86vidmode \ - --enable-xcsecurity \ - --enable-appgroup \ - --enable-xevie \ - --enable-evi \ - --enable-multibuffer \ - --enable-xf86bigfont \ - --disable-dpms \ - --disable-ipv6 \ - --with-mesa-source=%{tigervnc_src_dir}/xorg/Mesa-%{mesa_version} \ - --with-freetype-config=%{xorg_buildroot}%{_bindir}/freetype-config \ - --disable-maintainer-mode - -sed -i -e 's/^ECHO/echo/' ./libtool +chmod +x ./configure +# create a relocatable Xvnc so that we can bundle the custom libGL & swrast w/o overwriting existing libs +GL_LIBS='-Wl,-Bdynamic -lGL' LDFLAGS="$LDFLAGS -L%{xorg_buildroot}%{_libdir}/tigervnc -Wl,-rpath,%{_libdir}/tigervnc:%{_libdir}" \ +%configure \ + --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_datadir}/man \ + --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ + --disable-xwin --disable-xephyr --disable-kdrive --disable-wayland \ + --with-pic --enable-static --disable-shared --disable-xinerama \ + --with-default-xkb-rules=base \ + --with-default-font-path="built-ins" \ + --with-serverconfig-path=%{_libdir}/xorg \ + --with-fontrootdir=%{_datadir}/X11/fonts \ + --with-xkb-output=%{_localstatedir}/lib/xkb \ + --enable-install-libxf86config \ + --enable-glx --disable-glx-tls --disable-dri --enable-dri2 --disable-dri3 \ + --disable-present \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-config-udev \ + --without-dtrace \ + --disable-unit-tests \ + --disable-docs \ + --disable-devel-docs \ + --disable-selective-werror \ + --with-sha1=libsha1 make TIGERVNC_SRCDIR=%{tigervnc_src_dir} %{?_smp_mflags} popd @@ -1112,12 +778,12 @@ popd pushd java %{cmake28} \ %if !%{_self_signed} - -DJAVA_KEYSTORE=%{_keystore} \ - -DJAVA_KEYSTORE_TYPE=%{_keystore_type} \ - -DJAVA_KEY_ALIAS=%{_key_alias} \ - -DJAVA_STOREPASS=":env STOREPASS" \ - -DJAVA_KEYPASS=":env KEYPASS" \ - -DJAVA_TSA_URL=https://timestamp.geotrust.com/tsa . + -DJAVA_KEYSTORE=%{_keystore} \ + -DJAVA_KEYSTORE_TYPE=%{_keystore_type} \ + -DJAVA_KEY_ALIAS=%{_key_alias} \ + -DJAVA_STOREPASS=":env STOREPASS" \ + -DJAVA_KEYPASS=":env KEYPASS" \ + -DJAVA_TSA_URL=https://timestamp.geotrust.com/tsa . %endif JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make @@ -1131,6 +797,10 @@ pushd unix/xserver/hw/vnc make install DESTDIR=$RPM_BUILD_ROOT popd +pushd xorg/Mesa-* +make install DESTDIR=$RPM_BUILD_ROOT +popd + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vncserver @@ -1161,13 +831,12 @@ popd %find_lang %{name} %{name}.lang # remove unwanted files -rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la -rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.a -rm -f $RPM_BUILD_ROOT%{_libdir}/dri/libdricore.so - -# move files to correct location -mkdir -p $RPM_BUILD_ROOT%{_libdir}/dri -cp %{xorg_buildroot}%{_libdir}/dri/* $RPM_BUILD_ROOT%{_libdir}/dri/ +rm -rf $RPM_BUILD_ROOT%{_libdir}/tigervnc/pkgconfig +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig +rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg +rm -rf $RPM_BUILD_ROOT%{_includedir} +rm -f $RPM_BUILD_ROOT%{_libdir}/tigervnc/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/tigervnc/dri/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -1220,7 +889,7 @@ fi %{_mandir}/man1/Xvnc.1* %{_mandir}/man1/vncpasswd.1* %{_mandir}/man1/vncconfig.1* -%{_libdir}/dri/swrast_dri.so +%{_libdir}/* %files server-applet %defattr(-,root,root,-) @@ -1236,6 +905,12 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Dec 24 2014 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.80-1.20141119git59c5a55c +- Rebuilt against Xorg 7.7 with CVE-2104-12-09 patches from debian. +- Bumped versions of Mesa, Freetype, fontconfig, etc. +- Link against our own version of libGL to improve portability. +- Added static libsha1 to avoid linking against libssl.so. + * Wed Nov 19 2014 Brian P. Hinz <bphinz@users.sourceforge.net> 1.3.80-18.20141119git59c5a55c - Removed server module sub-package |