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.

diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules
index 17686cefc0bfd0679093c84b5be4cdeb694b4254..286c1ad5cff1067d3f1c51a6a33346d9d20114e7 100755 (executable)
--- 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 4ad2c13773a1cd85a40ada208e03165c75fab0cb..09d289662991eafa23dd6ef93d44ff5699169a9e 100755 (executable)
--- 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 6ab92c33bec8df7de01fec52c66e0b136960377c..4bf12620714270b4e30d0a13dad91a77ada22528 100644 (file)
--- 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 <bphinz@users.sourceforge.net> 1.4.80-5
+- Don't disable xinerama extension
+
 * Thu Feb 19 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 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 f1fef8d481b345e32225469276e7b43cc66e7ef4..dd0fb09ecf87adcc65a1df3675e7e952f6e7f0fd 100644 (file)
--- 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 <bphinz@users.sourceforge.net> 1.4.80-20
+- Don't disable xinerama extension
+
 * Thu Feb 19 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.80-19
 - Bumped fltk version to 1.3.3, no longer requires any patching