spice-protocol: Update to 0.14.3 and enable build without python2

- v2 version adds $(MAKETUNING) variable to ninja build command
- 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 of spice
   and qemu and could not find any reference to needing any of the python modules in spice
   to be installed either as modules or compiled in. The only references found 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@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/spice-protocol b/config/rootfiles/common/spice-protocol
index 26cdc2102552e43f0c7f45bd02db91f43441ce46..d7d6e74703ef4f318457ad7920eb4ea083ce8f55 100644 (file)
--- 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 00f2e57b3984b5426886623659f09f4160ad6cc9..ead5974385611c319b34fd537fd5ce344ca782cd 100644 (file)
--- a/lfs/spice-protocol
+++ b/lfs/spice-protocol
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.12.13
+VER        = 0.14.3
 
 THISAPP    = spice-protocol-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spice-protocol
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 50a1d951d1fa96d1478ff0cc7f3b1442
+$(DL_FILE)_MD5 = 950e08044497ca9cf64e368cb3ceb395
 
 install : $(TARGET)
 
@@ -76,10 +76,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/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=/usr builddir/
+       cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+       cd $(DIR_APP) && ninja -C builddir/ install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)