16858543 Upgrade synergy app to 1.7.6 (pkg errors) s12_105
authorStuart Kreitman <stuart.kreitman@oracle.com>
Thu, 28 Jul 2016 13:41:00 -0700
changeset 1649 50bc46483f90
parent 1648 1389442ad431
child 1650 2340183272de
16858543 Upgrade synergy app to 1.7.6 (pkg errors)
open-src/app/synergy/Makefile
pkg/exceptions-validate_pkg.p5m
pkg/manifests/developer-opensolaris-X.p5m
--- a/open-src/app/synergy/Makefile	Wed Jul 27 15:05:13 2016 -0700
+++ b/open-src/app/synergy/Makefile	Thu Jul 28 13:41:00 2016 -0700
@@ -119,7 +119,7 @@
 	$(INSTALL_SCRIPT) -m 0755 $(BUILD_DIR)/bin/synergyc \
 		$(BUILD_DIR)/bin/synergys \
 		$(PROTODIR)/usr/bin
-	$(INSTALL_SCRIPT) -m 0444 \
+	$(INSTALL_SCRIPT) -m 0555 \
 		$(BUILD_DIR)/bin/plugins/libns.so  \
 		$(PROTODIR)/usr/lib/synergy/plugins
 	$(INSTALL_SCRIPT) -m 0444 \
--- a/pkg/exceptions-validate_pkg.p5m	Wed Jul 27 15:05:13 2016 -0700
+++ b/pkg/exceptions-validate_pkg.p5m	Thu Jul 28 13:41:00 2016 -0700
@@ -63,6 +63,7 @@
 dir  path=usr/bin/$(ARCH64)
 dir  path=usr/demo
 dir  path=usr/include
+dir  path=usr/include/vdpau
 dir  path=usr/lib
 dir  path=usr/lib/$(ARCH64)
 dir  path=usr/lib/$(ARCH64)/pkgconfig
@@ -75,6 +76,10 @@
 dir  path=usr/lib/pkgconfig
 dir  path=usr/lib/python$(PYTHON_PATH_VERSION)
 dir  path=usr/lib/python$(PYTHON_PATH_VERSION)/vendor-packages
+dir  path=usr/lib/synergy
+dir  path=usr/lib/synergy/plugins
+dir  path=usr/lib/vdpau
+dir  path=usr/lib/$(ARCH64)/vdpau
 dir  path=usr/sbin
 dir  path=usr/share
 dir  path=usr/share/aclocal
@@ -84,6 +89,8 @@
 dir  path=usr/share/doc/X11/graphics
 dir  path=usr/share/doc/X11/xext
 dir  path=usr/share/doc/release-notes
+dir  path=usr/share/doc/libvdpau
+dir  path=usr/share/doc/libvdpau/html
 dir  path=usr/share/locale
 dir  path=usr/share/locale/C
 dir  path=usr/share/locale/C/LC_MESSAGES
--- a/pkg/manifests/developer-opensolaris-X.p5m	Wed Jul 27 15:05:13 2016 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Thu Jul 28 13:41:00 2016 -0700
@@ -120,6 +120,10 @@
 depend type=require fmri=pkg:/file/gnu-coreutils \
     org.opensolaris.pkgdepend.resolve=true
 
+# libvdpau depends on graphviz commands
+depend type=require fmri=pkg:/image/graphviz \
+    org.opensolaris.pkgdepend.resolve=true
+
 # tigervnc links with libjpg
 depend type=require fmri=pkg:/image/library/libjpeg \
     org.opensolaris.pkgdepend.resolve=true
@@ -163,6 +167,10 @@
 # Mesa 7.10.2 requires libxml2 python module
 depend type=require fmri=pkg:/library/python/libxml2-$(PYTHON_PKG_VERSION)
 
+# Synergy links against OpenSSL libraries
+depend type=require fmri=pkg:/library/security/openssl \
+    org.opensolaris.pkgdepend.resolve=true
+
 # freetype, libXfont & libfontenc link with libz
 depend type=require fmri=pkg:/library/zlib \
     org.opensolaris.pkgdepend.resolve=true