From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH 2/2] spice-protocol: Update to 0.14.3 and enable build without python2
Date: Sat, 07 Aug 2021 15:43:37 +0200
Message-ID: <20210807134337.2807376-2-adolf.belka@ipfire.org>
In-Reply-To: <20210807134337.2807376-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4742656946577220057=="
List-Id: <development.lists.ipfire.org>

--===============4742656946577220057==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Update from 0.12.13 to 0.14.3
- Update rootfile
- Remove automake py-compile line from lfs. This only works with python2
   Not clear why this line was put into the lfs. Searched the documentation o=
f spice
   and qemu and could not find any reference to needing any of the python mod=
ules in spice
   to be installed either as modules or compiled in. The only references foun=
d in general
   searches were to modules such as python-virtinst, python-spice-client-gtk =
or
   python-websockify, none of which are in the python modules in spice.
- Removing the automake py-compile line from the lfs enables spice-protocol, =
spice and
   qemu to build without python2 being present.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/common/spice-protocol |  6 +-----
 lfs/spice-protocol                     | 17 ++++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/config/rootfiles/common/spice-protocol b/config/rootfiles/common=
/spice-protocol
index 26cdc2102..d7d6e7470 100644
--- a/config/rootfiles/common/spice-protocol
+++ b/config/rootfiles/common/spice-protocol
@@ -1,11 +1,8 @@
 #usr/include/spice-1
 #usr/include/spice-1/spice
 #usr/include/spice-1/spice/barrier.h
-#usr/include/spice-1/spice/controller_prot.h
 #usr/include/spice-1/spice/end-packed.h
 #usr/include/spice-1/spice/enums.h
-#usr/include/spice-1/spice/error_codes.h
-#usr/include/spice-1/spice/foreign_menu_prot.h
 #usr/include/spice-1/spice/ipc_ring.h
 #usr/include/spice-1/spice/macros.h
 #usr/include/spice-1/spice/protocol.h
@@ -13,8 +10,7 @@
 #usr/include/spice-1/spice/qxl_windows.h
 #usr/include/spice-1/spice/start-packed.h
 #usr/include/spice-1/spice/stats.h
+#usr/include/spice-1/spice/stream-device.h
 #usr/include/spice-1/spice/types.h
 #usr/include/spice-1/spice/vd_agent.h
-#usr/include/spice-1/spice/vdi_dev.h
-#usr/share/pkgconfig
 #usr/share/pkgconfig/spice-protocol.pc
diff --git a/lfs/spice-protocol b/lfs/spice-protocol
index 00f2e57b3..a654d2be4 100644
--- a/lfs/spice-protocol
+++ b/lfs/spice-protocol
@@ -24,15 +24,15 @@
=20
 include Config
=20
-VER        =3D 0.12.13
+VER        =3D 0.14.3
=20
 THISAPP    =3D spice-protocol-$(VER)
-DL_FILE    =3D $(THISAPP).tar.bz2
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D spice-protocol
-PAK_VER    =3D 3
+PAK_VER    =3D 4
=20
 DEPS       =3D
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 50a1d951d1fa96d1478ff0cc7f3b1442
+$(DL_FILE)_MD5 =3D 950e08044497ca9cf64e368cb3ceb395
=20
 install : $(TARGET)
=20
@@ -76,10 +76,9 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=3D/usr
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
-	/usr/share/automake-*/py-compile /usr/lib/spice-protocol/python_modules/*
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && meson --prefix=3D/usr builddir/
+	cd $(DIR_APP) && ninja -C builddir/
+	cd $(DIR_APP) && ninja -C builddir/ install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
2.32.0


--===============4742656946577220057==--