spice-gtk: fixes

1 files changed, 25 insertions, 26 deletions

diff --git a/net-misc/spice-gtk/spice-gtk-scm.ebuild b/net-misc/spice-gtk/spice-gtk-scm.ebuild
index b6a87d4..8ccbd09 100644
--- a/net-misc/spice-gtk/spice-gtk-scm.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-scm.ebuild
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 EGIT_REPO_URI="git://anongit.freedesktop.org/spice/${PN}"
 KEYWORDS=""
-IUSE="doc dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
+IUSE="doc dbus gstreamer +gtk3 introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir +vala webdav"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	?? ( pulseaudio gstreamer )
@@ -78,48 +78,47 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch_user
-	./autogen.sh
+	gtkdocize
+#	git submodule update --init --recursive
+	autoreconf -v --force --install
+	intltoolize -f
 	make distclean
 	use vala && vala_src_prepare
 }
 
 src_configure() {
-	local myconf
-	local audio="no"
+	local myconf=()
+#	local audio="no"
 
-	use gstreamer && audio="gstreamer"
-	use pulseaudio && audio="pulse"
+
+#	if use gstreamer ; then
+#		myconf+=( --enable-gstaudio=yes --enable-gstvideo=yes )
+#	else
+#		myconf+=( --enable-gstaudio=no --enable-gstvideo=no )
+#	fi
+
+#	if use pulseaudio ; then
+#		myconf+=( --enable-pulse=yes )
+#	else
+#		myconf+=( --enable-puse=no )
+#	fi
 
 	if use vala ; then
 		# force vala regen for MinGW, etc
 		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
 	fi
 
-	myconf="
-		--disable-maintainer-mode \
-		$(use_enable static-libs static) \
-		$(use_enable introspection) \
-		--with-audio=${audio} \
-		$(use_with python) \
-		$(use_with sasl) \
-		$(use_enable smartcard) \
-		$(use_enable usbredir) \
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
-		$(use_enable policykit polkit) \
-		$(use_enable vala) \
-		$(use_enable webdav) \
-		$(use_enable dbus) \
-		$(use_enable doc gtk-doc) \
-		--disable-werror \
-		--enable-pie"
-
+	myconf+=( \
+		--disable-maintainer-mode $(use_enable static-libs static) $(use_enable introspection) $(use_with python) $(use_with sasl) $(use_enable smartcard) $(use_enable usbredir) $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) $(use_enable policykit polkit) $(use_enable vala) $(use_enable dbus) $(use_enable doc gtk-doc) --disable-werror --enable-pie $(use_enable webdav) $(use_enable pulseaudio pulse) $(use_enable lz4) \
+		$(use_enable gstreamer gstaudio) $(use_enable gstreamer gstvideo) $(use_enable pulseaudio pulse) \
+		)
 	# Parameter of --with-gtk
 	MULTIBUILD_VARIANTS=( 2.0 )
 	use gtk3 && MULTIBUILD_VARIANTS=( 3.0 )
 
 	configure() {
-		local myconf=()
+#		local myconf=()
 		myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
 
 		if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then