From 59b4bc5638ced3cb5f043ccd9ed207fe76148d1a Mon Sep 17 00:00:00 2001 From: "Brian P. Hinz" Date: Sat, 7 Mar 2015 22:05:04 -0500 Subject: [PATCH] Don't disable xinerama (#147) Xinerama was disabled in the redhat spec file that ours was adapted from. Unsure why it was disabled in the first place. --- contrib/packages/deb/ubuntu-precise/debian/rules | 2 +- contrib/packages/deb/ubuntu-trusty/debian/rules | 2 +- contrib/packages/rpm/el5/SPECS/tigervnc.spec | 7 +++++-- contrib/packages/rpm/el6/SPECS/tigervnc.spec | 7 +++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules index 17686cef..286c1ad5 100755 --- a/contrib/packages/deb/ubuntu-precise/debian/rules +++ b/contrib/packages/deb/ubuntu-precise/debian/rules @@ -105,7 +105,7 @@ config-stamp: --enable-xdm-auth-1 \ --enable-glx \ --disable-dri --enable-dri2 \ - --disable-xinerama \ + --enable-xinerama \ --enable-xf86vidmode \ --enable-xace \ --disable-selinux \ diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules index 4ad2c137..09d28966 100755 --- a/contrib/packages/deb/ubuntu-trusty/debian/rules +++ b/contrib/packages/deb/ubuntu-trusty/debian/rules @@ -112,7 +112,7 @@ config-stamp: --enable-xdm-auth-1 \ --enable-glx \ --disable-dri --enable-dri2 --enable-dri3 \ - --disable-xinerama \ + --enable-xinerama \ --enable-xf86vidmode \ --enable-xace \ --disable-selinux \ diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec index 6ab92c33..4bf12620 100644 --- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec @@ -5,7 +5,7 @@ Name: tigervnc Version: @VERSION@ -Release: 4%{?snap:.%{snap}}%{?dist} +Release: 5%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -762,7 +762,7 @@ GL_LIBS='-Wl,-Bdynamic -lGL' LDFLAGS="$LDFLAGS -L%{xorg_buildroot}%{_libdir}/tig --with-vendor-web="http://www.tigervnc.org" \ --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-pic --enable-static --disable-shared --enable-xinerama \ --with-default-xkb-rules=base \ --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,%{_datadir}/X11/fonts/misc,%{_datadir}/X11/fonts/OTF,%{_datadir}/X11/fonts/TTF,%{_datadir}/X11/fonts/Type1,%{_datadir}/X11/fonts/100dpi,%{_datadir}/X11/fonts/75dpi,built-ins" \ --with-serverconfig-path=%{_libdir}/xorg \ @@ -920,6 +920,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Mar 07 2015 Brian P. Hinz 1.4.80-5 +- Don't disable xinerama extension + * Thu Feb 19 2015 Brian P. Hinz 1.4.80-4 - Bumped fltk to 1.3.3, no longer requires patching diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec index f1fef8d4..dd0fb09e 100644 --- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec @@ -2,7 +2,7 @@ Name: tigervnc Version: @VERSION@ -Release: 19%{?snap:.%{snap}}%{?dist} +Release: 20%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -187,7 +187,7 @@ autoreconf -fiv %configure \ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --disable-wayland \ - --with-pic --disable-static --disable-xinerama \ + --with-pic --disable-static --enable-xinerama \ --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ --with-serverconfig-path=%{_libdir}/xorg \ --with-fontrootdir=%{_datadir}/X11/fonts \ @@ -336,6 +336,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Mar 07 2015 Brian P. Hinz 1.4.80-20 +- Don't disable xinerama extension + * Thu Feb 19 2015 Brian P. Hinz 1.4.80-19 - Bumped fltk version to 1.3.3, no longer requires any patching -- 2.39.5