[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e - IPFire-SCM

29 Mar 2016

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e (commit)
       via  ad77dfeac119582a53a97f9e30a8d634fdd6594a (commit)
       via  02fa48b12c16753c6622d8ab904c40d0db776a3a (commit)
       via  8d90174af53cb4631bf98e0f056be84b925d6228 (commit)
       via  dc2f6cac63c3f336ab82235ec69e83fe32c14796 (commit)
       via  7657c08d587d6053d9d6318fe55be6e6232686fe (commit)
       via  e54c37bba11859ad7707e7b3eab9dc99e06afe60 (commit)
       via  ef1798872ba81be24df331b8646a900d01a3ce09 (commit)
       via  a9d0172bac3a6765ca282ecec0548491ed9dbb6f (commit)
       via  a7775d4dc4b7da68d292c64d3b65b740f731b674 (commit)
      from  f56d44e5f20ea7093acb4f6e2280a9d52586c535 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 29 21:56:05 2016 +0100
opus: Build in parallel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ad77dfeac119582a53a97f9e30a8d634fdd6594a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 29 21:54:31 2016 +0100
opus: Don't ship development files
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 02fa48b12c16753c6622d8ab904c40d0db776a3a
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:41 2016 +0200
Enable spice support in qemu, add spice as a dependency for qemu and bump qemu version number.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8d90174af53cb4631bf98e0f056be84b925d6228
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:40 2016 +0200
Add all new packages (opus, python-pyparsing, python-six, spice-protocol, spice) to make.sh
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dc2f6cac63c3f336ab82235ec69e83fe32c14796
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:39 2016 +0200
New package spice
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7657c08d587d6053d9d6318fe55be6e6232686fe
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:38 2016 +0200
New package spice-protocol (required by spice (only for build))
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e54c37bba11859ad7707e7b3eab9dc99e06afe60
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:37 2016 +0200
New package python-pyparsing (required by spice (only for build))
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ef1798872ba81be24df331b8646a900d01a3ce09
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:36 2016 +0200
New package python-six (required by spice (only for build))
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a9d0172bac3a6765ca282ecec0548491ed9dbb6f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 29 21:48:23 2016 +0100
opus: Remove whitespace errors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a7775d4dc4b7da68d292c64d3b65b740f731b674
Author: Jonatan Schlag jonatan.schlag@ipfire.org
Date:   Tue Mar 29 20:57:35 2016 +0200
New package opus (required by spice)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/python-pyparsing |  9 +++++++
 config/rootfiles/common/python-six       |  9 +++++++
 config/rootfiles/common/spice-protocol   | 42 ++++++++++++++++++++++++++++++++
 config/rootfiles/packages/opus           | 12 +++++++++
 config/rootfiles/packages/spice          | 17 +++++++++++++
 lfs/{htop => opus}                       | 19 +++++++--------
 lfs/{python-xattr => python-pyparsing}   | 10 ++++----
 lfs/{python-xattr => python-six}         | 10 ++++----
 lfs/qemu                                 |  6 ++---
 lfs/{cifs-utils => spice}                | 18 +++++++-------
 lfs/{intltool => spice-protocol}         | 16 ++++++------
 make.sh                                  |  5 ++++
 12 files changed, 133 insertions(+), 40 deletions(-)
 create mode 100644 config/rootfiles/common/python-pyparsing
 create mode 100644 config/rootfiles/common/python-six
 create mode 100644 config/rootfiles/common/spice-protocol
 create mode 100644 config/rootfiles/packages/opus
 create mode 100644 config/rootfiles/packages/spice
 copy lfs/{htop => opus} (93%)
 copy lfs/{python-xattr => python-pyparsing} (93%)
 copy lfs/{python-xattr => python-six} (94%)
 copy lfs/{cifs-utils => spice} (90%)
 copy lfs/{intltool => spice-protocol} (91%)
Difference in files:

diff --git a/config/rootfiles/common/python-pyparsing b/config/rootfiles/common/python-pyparsing
new file mode 100644
index 0000000..f75b88e
--- /dev/null
+++ b/config/rootfiles/common/python-pyparsing
@@ -0,0 +1,9 @@
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/PKG-INFO
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/not-zip-safe
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/top_level.txt
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.py
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.pyc
diff --git a/config/rootfiles/common/python-six b/config/rootfiles/common/python-six
new file mode 100644
index 0000000..9520c38a
--- /dev/null
+++ b/config/rootfiles/common/python-six
@@ -0,0 +1,9 @@
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/PKG-INFO
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/not-zip-safe
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/top_level.txt
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.py
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.pyc
diff --git a/config/rootfiles/common/spice-protocol b/config/rootfiles/common/spice-protocol
new file mode 100644
index 0000000..0db86e0
--- /dev/null
+++ b/config/rootfiles/common/spice-protocol
@@ -0,0 +1,42 @@
+#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
+#usr/include/spice-1/spice/qxl_dev.h
+#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/types.h
+#usr/include/spice-1/spice/vd_agent.h
+#usr/include/spice-1/spice/vdi_dev.h
+#usr/lib/spice-protocol
+#usr/lib/spice-protocol/python_modules
+#usr/lib/spice-protocol/python_modules/__init__.py
+#usr/lib/spice-protocol/python_modules/__init__.pyc
+#usr/lib/spice-protocol/python_modules/__init__.pyo
+#usr/lib/spice-protocol/python_modules/codegen.py
+#usr/lib/spice-protocol/python_modules/codegen.pyc
+#usr/lib/spice-protocol/python_modules/codegen.pyo
+#usr/lib/spice-protocol/python_modules/demarshal.py
+#usr/lib/spice-protocol/python_modules/demarshal.pyc
+#usr/lib/spice-protocol/python_modules/demarshal.pyo
+#usr/lib/spice-protocol/python_modules/marshal.py
+#usr/lib/spice-protocol/python_modules/marshal.pyc
+#usr/lib/spice-protocol/python_modules/marshal.pyo
+#usr/lib/spice-protocol/python_modules/ptypes.py
+#usr/lib/spice-protocol/python_modules/ptypes.pyc
+#usr/lib/spice-protocol/python_modules/ptypes.pyo
+#usr/lib/spice-protocol/python_modules/spice_parser.py
+#usr/lib/spice-protocol/python_modules/spice_parser.pyc
+#usr/lib/spice-protocol/python_modules/spice_parser.pyo
+#usr/lib/spice-protocol/spice.proto
+#usr/lib/spice-protocol/spice1.proto
+#usr/lib/spice-protocol/spice_codegen.py
+#usr/share/pkgconfig/spice-protocol.pc
diff --git a/config/rootfiles/packages/opus b/config/rootfiles/packages/opus
new file mode 100644
index 0000000..db98a1d
--- /dev/null
+++ b/config/rootfiles/packages/opus
@@ -0,0 +1,12 @@
+#usr/include/opus
+#usr/include/opus/opus.h
+#usr/include/opus/opus_defines.h
+#usr/include/opus/opus_multistream.h
+#usr/include/opus/opus_types.h
+#usr/lib/libopus.a
+#usr/lib/libopus.la
+#usr/lib/libopus.so
+usr/lib/libopus.so.0
+usr/lib/libopus.so.0.5.2
+#usr/lib/pkgconfig/opus.pc
+#usr/share/aclocal/opus.m4
diff --git a/config/rootfiles/packages/spice b/config/rootfiles/packages/spice
new file mode 100644
index 0000000..93d2e9e
--- /dev/null
+++ b/config/rootfiles/packages/spice
@@ -0,0 +1,17 @@
+#usr/include/spice-server
+#usr/include/spice-server/spice-audio.h
+#usr/include/spice-server/spice-char.h
+#usr/include/spice-server/spice-core.h
+#usr/include/spice-server/spice-experimental.h
+#usr/include/spice-server/spice-input.h
+#usr/include/spice-server/spice-migration.h
+#usr/include/spice-server/spice-qxl.h
+#usr/include/spice-server/spice-server.h
+#usr/include/spice-server/spice-version.h
+#usr/include/spice-server/spice.h
+#usr/lib/libspice-server.a
+#usr/lib/libspice-server.la
+#usr/lib/libspice-server.so
+usr/lib/libspice-server.so.1
+usr/lib/libspice-server.so.1.10.0
+#usr/lib/pkgconfig/spice-server.pc
diff --git a/lfs/opus b/lfs/opus
new file mode 100644
index 0000000..2446edb
--- /dev/null
+++ b/lfs/opus
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.1.2
+
+THISAPP    = opus-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = opus
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1f08a661bc72930187893a07f3741a91
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+ 
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure  --prefix=/usr --libdir=/usr/lib
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/python-pyparsing b/lfs/python-pyparsing
new file mode 100644
index 0000000..f84253b
--- /dev/null
+++ b/lfs/python-pyparsing
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.0.7
+
+THISAPP    = pyparsing-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-pyparsing
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1c8bed7530642ca19197f3caa05fd28b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && python setup.py install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/python-six b/lfs/python-six
new file mode 100644
index 0000000..d210e4c
--- /dev/null
+++ b/lfs/python-six
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.10.0
+
+THISAPP    = six-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-six
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 34eed507548117b2ab523ab14b2f8b55
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && python setup.py install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/qemu b/lfs/qemu
index a15dccd..804ec26 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 17
+PAK_VER    = 18
-DEPS       = "sdl"
+DEPS       = "sdl spice"
###############################################################################
 # Top-level Rules
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
    	--enable-kvm --disable-attr \
    	--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
-		--extra-cflags="$(CFLAGS)"
+		--extra-cflags="$(CFLAGS)" --enable-spice
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/spice b/lfs/spice
new file mode 100644
index 0000000..415d5aa
--- /dev/null
+++ b/lfs/spice
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.12.6
+
+THISAPP    = spice-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = spice
+PAK_VER    = 1
+
+DEPS       = "opus"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 605a8c8ea80bc95076c4b3539c6dd026
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-celt051
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/spice-protocol b/lfs/spice-protocol
new file mode 100644
index 0000000..c399fac
--- /dev/null
+++ b/lfs/spice-protocol
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.12.10
+
+THISAPP    = spice-protocol-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = spice-protocol
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1fb9d0dcdd42dce1b476ae8aa7569bcc
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index da4bf16..8784dff 100755
--- a/make.sh
+++ b/make.sh
@@ -696,6 +696,11 @@ buildipfire() {
   ipfiremake elinks
   ipfiremake igmpproxy
   ipfiremake fbset
+  ipfiremake opus
+  ipfiremake python-six
+  ipfiremake python-pyparsing
+  ipfiremake spice-protocol
+  ipfiremake spice
   ipfiremake sdl
   ipfiremake qemu
   ipfiremake sane
hooks/post-receive
--
IPFire 2.x development tree

    