Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (33e2c346b01ce6d24c92cade499f5964fca791f1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (33e2c346b01ce6d24c92cade499f5964fca791f1)
  • Date: Wed, 4 Sep 2013 22:51:15 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/qemu/DEPENDS | 5 +
utils/qemu/HISTORY | 4 +
utils/qemu/PRE_SUB_DEPENDS | 6 +
utils/qemu/REPAIR^none^PRE_SUB_DEPENDS | 6 +
utils/qemu/SUB_DEPENDS | 6 +
utils/spice-gtk/DEPENDS | 17
+++++
utils/spice-gtk/HISTORY | 6 +
utils/spice/DEPENDS | 32
++++++++--
utils/spice/HISTORY | 6 +
x11/gtk-vnc/CONFIGURE | 5 +
x11/gtk-vnc/DEPENDS | 9 ++
x11/gtk-vnc/HISTORY | 4 +
x11/gtk-vnc/PRE_SUB_DEPENDS | 8 +-
x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS | 8 ++
x11/gtk-vnc/SUB_DEPENDS | 2
x11/virt-viewer/CONFIGURE | 2
x11/virt-viewer/DEPENDS | 13
++--
x11/virt-viewer/HISTORY | 3
x11/virt-viewer/PRE_SUB_DEPENDS | 8 ++
x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS | 8 ++
x11/virt-viewer/SUB_DEPENDS | 21
++++++
21 files changed, 164 insertions(+), 15 deletions(-)

New commits:
commit 33e2c346b01ce6d24c92cade499f5964fca791f1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

virt-viewer: Allow for selecting spice-gtk or gtk-vnc, these are
exclusive options

Without this selection, ./configure fails and specifies that one must
be disabled for the other to live (compile).

commit 91df55e0509fe4a8ca59c0de50fba5e7fa928662
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk-vnc: Allow for building gtk-vnc without an external entity enforcing
gtk+2|3

commit cd54bf6af9bd8cc2640c162acd7cc3ced01151f3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk-vnc: Suggest virt-viewer with appropriate gtk

commit 7b1bfd9437873fde406c6a409a32eeef231380b1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice-gtk: Optionally depend on qemu with nss for smart cards

commit 7e190d09b1f465bc57bb8b7788cf83bc0ffb02a6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice-gtk: Suggest virt-viewer for a better spice client
See http://spice-space.org/download.html
Make sure virt-viewer uses spice and the same GTK as spice-gtk

commit 0c769ec9d22a8905208c6581256c595f18e7145c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice: Optionally depends on qemu with nss

commit 935ebfede1cb2c3dbe297a15100d1c0ab2b99dc9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice: Optionally depends on libxinerama

commit 93e3e34b82fb3ade6ba1dc2caa8b88b309b7de2d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice: OPENGL optional dependency is for the spice client

commit c0725ff661f53afe91dfb26bf7eecdcf26980b34
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice: Optionally depends on LIBSASL

commit c02952af4e68246bf7dd51d400faf125f8ca8fdb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

spice: Depends on qemu built with nss support

commit 3c2d75d5633b2966e595560834994c1b294f1429
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: Optionally depends on nss
*SUB_DEPENDS: Allow forcing dependency on nss

diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 529a9a9..13283cb 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -69,6 +69,11 @@ optional_depends libusbx \
'--disable-libusb' \
'for USB pass-through support' &&

+optional_depends nss \
+ '--enable-smartcard-nss' \
+ '--disable-smartcard-nss' \
+ 'for SmartCard NSS support' &&
+
if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
suggest_depends gnutls \
"--enable-vnc-tls" \
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index b4341e4..cfd6f3d 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,7 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on nss
+ * *SUB_DEPENDS: Allow forcing dependency on nss
+
2013-08-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.5.2
* CONFIGURE: sb16, cs4231a, adlib, and gus sound cards removed
diff --git a/utils/qemu/PRE_SUB_DEPENDS b/utils/qemu/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c19df56
--- /dev/null
+++ b/utils/qemu/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL nss && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c19df56
--- /dev/null
+++ b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL nss && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/utils/qemu/SUB_DEPENDS b/utils/qemu/SUB_DEPENDS
new file mode 100755
index 0000000..75b63ab
--- /dev/null
+++ b/utils/qemu/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) echo "nss support requested, forcing nss dependency." &&
+ depends nss '--enable-smartcard-nss'
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac
diff --git a/utils/spice-gtk/DEPENDS b/utils/spice-gtk/DEPENDS
index 97fc9a1..479d315 100755
--- a/utils/spice-gtk/DEPENDS
+++ b/utils/spice-gtk/DEPENDS
@@ -50,4 +50,19 @@ optional_depends PYTHON \
optional_depends 'vala' \
'--enable-vala' \
'--disable-vala' \
- 'for Vala language support'
+ 'for Vala language support' &&
+
+message "${MESSAGE_COLOR}It is recommended to NOT enable the" \
+ "smartcard support via qemu or there will be a circular" \
+ "dependency between qemu and spice${DEFAULT_COLOR}" &&
+
+optional_depends qemu \
+ '--enable-smartcard' \
+ '--disable-smartcard' \
+ 'for smartcard support' &&
+
+if is_depends_enabled $SPELL qemu; then
+ depends -sub 'NSS' qemu
+fi &&
+
+suggest_depends -sub "GTK${SPICE_GTK_VER} SPICE" 'virt-viewer' '' '' 'for
a better spice client'
diff --git a/utils/spice-gtk/HISTORY b/utils/spice-gtk/HISTORY
index f781dcf..d24b7f3 100644
--- a/utils/spice-gtk/HISTORY
+++ b/utils/spice-gtk/HISTORY
@@ -1,3 +1,9 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest virt-viewer for a better spice client
+ See http://spice-space.org/download.html
+ Make sure virt-viewer uses spice and the same GTK as spice-gtk
+ Optionally depend on qemu with nss for smart cards
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* Created

diff --git a/utils/spice/DEPENDS b/utils/spice/DEPENDS
index 994f9f6..7e7f82c 100755
--- a/utils/spice/DEPENDS
+++ b/utils/spice/DEPENDS
@@ -1,6 +1,5 @@
depends alsa-lib &&
depends celt051 &&
-depends qemu &&
depends cairo &&
depends pixman &&
depends spice-protocol &&
@@ -12,7 +11,30 @@ depends libxext &&
depends libxrender &&
depends pyparsing &&

-optional_depends OPENGL \
- "--enable-opengl" \
- "--disable-opengl" \
- "for OpenGL video output"
+optional_depends LIBSASL \
+ '--with-sasl' \
+ '--without-sasl' \
+ 'for Cyrus SASL authentication' &&
+
+optional_depends libxinerama \
+ '--enable-xinerama' \
+ '--disable-xinerama' \
+ 'for multi-monitor support via Xinerama' &&
+
+optional_depends OPENGL \
+ "--enable-client --enable-opengl" \
+ "--disable-client --disable-opengl" \
+ "for OpenGL video output" &&
+
+message "${MESSAGE_COLOR}It is recommended to NOT enable the" \
+ "smartcard support via qemu or there will be a circular" \
+ "dependency between qemu and spice${DEFAULT_COLOR}" &&
+
+optional_depends qemu \
+ '--enable-smartcard' \
+ '--disable-smartcard' \
+ 'for smartcard support' &&
+
+if is_depends_enabled $SPELL qemu; then
+ depends -sub 'NSS' qemu
+fi
diff --git a/utils/spice/HISTORY b/utils/spice/HISTORY
index ee7b049..5a17d19 100644
--- a/utils/spice/HISTORY
+++ b/utils/spice/HISTORY
@@ -1,3 +1,9 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on qemu built with nss support
+ Optionally depends on LIBSASL
+ OPENGL optional dependency is for the spice client
+ Optionally depends on libxinerama
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.12.4
* DEPENDS: Depends on pyparsing
diff --git a/x11/gtk-vnc/CONFIGURE b/x11/gtk-vnc/CONFIGURE
index 1e44014..40b4012 100755
--- a/x11/gtk-vnc/CONFIGURE
+++ b/x11/gtk-vnc/CONFIGURE
@@ -1,2 +1,5 @@
config_query_option GTK_VNC_EXAMPLES 'Install example programs?' n \
- '--with-examples' '--without-examples'
+ '--with-examples' '--without-examples' &&
+
+config_query_list GTK_VNC_VER 'Which GTK version (RECOMMEND 3)' \
+ 3 2
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 0a05090..a73685c 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,4 +1,5 @@
depends gnutls &&
+depends gtk+${GTK_VNC_VER} "--with-gtk=${GTK_VNC_VER}.0" &&
depends -sub VAPIGEN vala &&

optional_depends gettext \
@@ -30,4 +31,10 @@ optional_depends gobject-introspection \
optional_depends pulseaudio \
'--with-pulseaudio' \
'--without-pulseaudio' \
- 'for PulseAudio audio playback'
+ 'for PulseAudio audio playback' &&
+
+if is_depends_enabled $SPELL gtk+2; then
+ suggest_depends -sub "GTK2 VNC" 'virt-viewer' '' '' 'for a better spice
client'
+else
+ suggest_depends -sub "GTK3 VNC" 'virt-viewer' '' '' 'for a better spice
client'
+fi
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index a57c554..77275d2 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,3 +1,7 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest virt-viewer with appropriate gtk
+ * Allow for building gtk-vnc without an external entity enforcing
gtk+2|3
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.1
SOURCE matches upstream SHA256
diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS
index 241941f..0f2f0ba 100755
--- a/x11/gtk-vnc/PRE_SUB_DEPENDS
+++ b/x11/gtk-vnc/PRE_SUB_DEPENDS
@@ -1,8 +1,12 @@
case $THIS_SUB_DEPENDS in
PYTHON) is_depends_enabled $SPELL python &&
is_depends_enabled $SPELL gtk+2 && return 0 ;;
- GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
- GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 &&
+ [[ "x${GTK_VNC_VER}" == "x2" ]] &&
+ return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 &&
+ [[ "x${GTK_VNC_VER}" == "x3" ]] &&
+ return 0 ;;
esac

return 1
diff --git
a/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS
b/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..241941f
--- /dev/null
+++ b/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+esac
+
+return 1
diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS
index e9d41db..fd0d96b 100755
--- a/x11/gtk-vnc/SUB_DEPENDS
+++ b/x11/gtk-vnc/SUB_DEPENDS
@@ -4,9 +4,11 @@ case $THIS_SUB_DEPENDS in
depends gtk+2 '--with-gtk=2.0'
;;
GTK2) echo "gtk+2 bindings requested, forcing them." &&
+ GTK_VNC_VER=2
depends gtk+2 '--with-gtk=2.0'
;;
GTK3) echo "gtk+3 bindings requested, forcing them." &&
+ GTK_VNC_VER=3
depends gtk+3 '--with-gtk=3.0'
;;
*) echo "unknown sub-depends!"
diff --git a/x11/virt-viewer/CONFIGURE b/x11/virt-viewer/CONFIGURE
new file mode 100755
index 0000000..0c7d84d
--- /dev/null
+++ b/x11/virt-viewer/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_list VIRT_VIEWER_GUI 'Use which GTK viewer (recommend
spice-gtk)?' \
+ spice-gtk gtk-vnc
diff --git a/x11/virt-viewer/DEPENDS b/x11/virt-viewer/DEPENDS
index 7ca551f..f212e86 100755
--- a/x11/virt-viewer/DEPENDS
+++ b/x11/virt-viewer/DEPENDS
@@ -1,5 +1,8 @@
-depends gtk+2 &&
-depends libxml2 &&
-depends gtk-vnc &&
-depends libglade2 &&
-depends libvirt
+depends libxml2 &&
+depends libvirt &&
+
+if [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]]; then
+ depends ${VIRT_VIEWER_GUI} '--without-spice-vnc'
+else
+ depends ${VIRT_VIEWER_GUI} '--without-gtk-vnc'
+fi
diff --git a/x11/virt-viewer/HISTORY b/x11/virt-viewer/HISTORY
index 1b98ef5..9ad7a23 100644
--- a/x11/virt-viewer/HISTORY
+++ b/x11/virt-viewer/HISTORY
@@ -1,3 +1,6 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Allow for selecting spice-gtk or gtk-vnc, these are exclusive
options
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.7

diff --git a/x11/virt-viewer/PRE_SUB_DEPENDS b/x11/virt-viewer/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6900451
--- /dev/null
+++ b/x11/virt-viewer/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ SPICE) [[ "x${VIRT_VIEWER_GUI}" == "xspice-gtk" ]] && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 ;;
+ VNC) [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS
b/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6900451
--- /dev/null
+++ b/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ SPICE) [[ "x${VIRT_VIEWER_GUI}" == "xspice-gtk" ]] && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 ;;
+ VNC) [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/x11/virt-viewer/SUB_DEPENDS b/x11/virt-viewer/SUB_DEPENDS
new file mode 100755
index 0000000..16a12fb
--- /dev/null
+++ b/x11/virt-viewer/SUB_DEPENDS
@@ -0,0 +1,21 @@
+case $THIS_SUB_DEPENDS in
+ SPICE) message "spice-gtk requested, forcing enabled spice-gtk
dependency" &&
+ persistent_add VIRT_VIEWER_GUI &&
+ VIRT_VIEWER_GUI=spice-gtk
+ ;;
+ GTK3) message "gtk+3 requested, forcing enabled gtk+3 dependency" &&
+ VIRT_VIEWER_GTK_VER=3 &&
+ depends gtk+3 '--with-gtk=3.0'
+ ;;
+ GTK2) message "gtk+2 requested, forcing enabled gtk+2 dependency" &&
+ VIRT_VIEWER_GTK_VER=2 &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ VNC) message "gtk-vnc requested, forcing enabled gtk-vnc dependency" &&
+ persistent_add VIRT_VIEWER_GUI &&
+ VIRT_VIEWER_GUI=gtk-vnc
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1
+ ;;
+esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (33e2c346b01ce6d24c92cade499f5964fca791f1), Eric Sandall, 09/04/2013

Archive powered by MHonArc 2.6.24.

Top of Page