summaryrefslogtreecommitdiffstats
path: root/extra/source
diff options
context:
space:
mode:
Diffstat (limited to 'extra/source')
-rw-r--r--extra/source/tigervnc/patches/tigervnc-support-xorg120.patch58
-rw-r--r--extra/source/tigervnc/slack-desc2
-rwxr-xr-xextra/source/tigervnc/tigervnc.SlackBuild42
3 files changed, 21 insertions, 81 deletions
diff --git a/extra/source/tigervnc/patches/tigervnc-support-xorg120.patch b/extra/source/tigervnc/patches/tigervnc-support-xorg120.patch
deleted file mode 100644
index dcb50db9a..000000000
--- a/extra/source/tigervnc/patches/tigervnc-support-xorg120.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index 9d1c0eb..79ff79a 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -52,8 +52,10 @@
- #define XORG 118
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
- #define XORG 119
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
-+#define XORG 120
- #else
--#error "X.Org newer than 1.19 is not supported"
-+#error "X.Org newer than 1.20 is not supported"
- #endif
-
- #endif
-diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
-index 93d8af4..1517809 100644
---- a/unix/xserver/hw/vnc/xvnc.c
-+++ b/unix/xserver/hw/vnc/xvnc.c
-@@ -202,6 +202,7 @@ vfbBitsPerPixel(int depth)
-
- static void vfbFreeFramebufferMemory(vfbFramebufferInfoPtr pfb);
-
-+#if XORG < 120
- #ifdef DPMSExtension
- /* Why support DPMS? Because stupid modern desktop environments
- such as Unity 2D on Ubuntu 11.10 crashes if DPMS is not
-@@ -219,6 +220,7 @@ Bool DPMSSupported(void)
- return FALSE;
- }
- #endif
-+#endif
-
- #if XORG < 111
- void ddxGiveUp()
-@@ -1491,6 +1491,12 @@ vfbCloseScreen(ScreenPtr pScreen)
- #endif
- }
-
-+#if XORG >= 120
-+static void vncDPMS(ScreenPtr pScreen, int level)
-+{
-+}
-+#endif
-+
- static Bool
- #if XORG < 113
- vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
-@@ -1661,6 +1667,9 @@ vfbScreenInit(ScreenPtr pScreen, int arg
- if (!ret) return FALSE;
- #endif
-
-+#if XORG >= 120
-+ pScreen->DPMS = vncDPMS;
-+#endif
-
- return TRUE;
diff --git a/extra/source/tigervnc/slack-desc b/extra/source/tigervnc/slack-desc
index 088392abe..fc0692ccf 100644
--- a/extra/source/tigervnc/slack-desc
+++ b/extra/source/tigervnc/slack-desc
@@ -14,6 +14,6 @@ tigervnc: and from a wide variety of machine architectures.
tigervnc: TigerVNC is a suite of VNC servers and clients that have a focus on
tigervnc: performance and remote display functionality.
tigervnc:
+tigervnc: Homepage: http://tigervnc.org
tigervnc:
-tigervnc: tigervnc home: http://tigervnc.org/
tigervnc:
diff --git a/extra/source/tigervnc/tigervnc.SlackBuild b/extra/source/tigervnc/tigervnc.SlackBuild
index ea80ca233..b69490f45 100755
--- a/extra/source/tigervnc/tigervnc.SlackBuild
+++ b/extra/source/tigervnc/tigervnc.SlackBuild
@@ -72,13 +72,14 @@
# * Removed bundled FLTK and libjpeg-turbo builds.
# * Reset build to -1 for inclusion in Slackware's /extra.
# 1.6.0-1: 22/feb/2016 by Patrick Volkerding <volkerdi@slackware.com>
+# 1.9.0-1: 26/jul/2018 by Patrick Volkerding <volkerdi@slackware.com>
#
# -----------------------------------------------------------------------------
PKGNAM=tigervnc
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.9.0}
PVER=$(echo $VERSION | cut -f 1,2 -d . | tr -d .)
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j7 "}
TAG=${TAG:-}
@@ -186,8 +187,8 @@ cd $PKGNAM-$VERSION || exit 1
# HACK! Force protocol 3.3 for UVNCSC
patch -p1 < $CWD/patches/force_protocol_3.3_for_UVNCSC.patch
-# Patch to support x.org 1.20
-cat $CWD/patches/tigervnc-support-xorg120.patch | patch -p1 --verbose || exit 1
+## Patch to support x.org 1.20 (already included in tigervnc-1.9.0):
+#cat $CWD/patches/tigervnc-support-xorg120.patch | patch -p1 --verbose || exit 1
# Explicitly link against libpng to prevent linking errors:
cat $CWD/patches/tigervnc13_link_png.patch | patch -p1 --verbose || exit 1
@@ -205,24 +206,21 @@ sed -e 's,set(MAN_DIR "${DATA_DIR}/man"),set(MAN_DIR "${MAN_INSTALL_DIR}"),' \
-e 's,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/,' \
-i CMakeLists.txt
-mkdir -p build
-cd build
- echo -e "\n*** Building vnc client ***\n"
- cmake \
- -G "Unix Makefiles" \
- -Wno-dev \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DENABLE_PAM:BOOL=OFF \
- -DBUILD_JAVA:BOOL=${CMAKE_JAVA} \
- ..
- make V=1 $NUMJOBS || make || exit 1
- make DESTDIR=$PKG install || exit 1
-cd -
+echo -e "\n*** Building vnc client ***\n"
+cmake \
+ -G "Unix Makefiles" \
+ -Wno-dev \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DENABLE_PAM:BOOL=OFF \
+ -DBUILD_JAVA:BOOL=${CMAKE_JAVA} \
+ .
+make V=1 $NUMJOBS || make || exit 1
+make DESTDIR=$PKG install || exit 1
# Do we have a patch for X.Org which tigervnc does not have?
if [ ! -f unix/xserver${MAXPATCHVER}.patch -a -f $CWD/patches/xserver${MAXPATCHVER}.patch ]