diff options
| -rw-r--r-- | package/spice/spice.hash | 2 | ||||
| -rw-r--r-- | package/spice/spice.mk | 24 |
2 files changed, 2 insertions, 24 deletions
diff --git a/package/spice/spice.hash b/package/spice/spice.hash index 04bd516689..c9b591f41d 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c098b6298a020b378ace8569b6 spice-0.12.6.tar.bz2 +sha256 f901a5c5873d61acac84642f9eea5c4d6386fc3e525c2b68792322794e1c407d spice-0.12.8.tar.bz2 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index f1fb46d29c..7b09f39fe7 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_VERSION = 0.12.6 +SPICE_VERSION = 0.12.8 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases SPICE_LICENSE = LGPL-2.1+ @@ -47,28 +47,6 @@ ifeq ($(BR2_PACKAGE_OPUS),y) SPICE_DEPENDENCIES += opus endif -# build system uses pkg-config --variable=codegendir spice-protocol which -# returns the runtime path rather than build time, so it needs some help -SPICE_MAKE_OPTS = CODE_GENERATOR_BASEDIR=$(STAGING_DIR)/usr/lib/spice-protocol -SPICE_INSTALL_STAGING_OPTS = $(SPICE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -SPICE_INSTALL_TARGET_OPTS = $(SPICE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - -# spice uses a number of source files that are generated with python / pyparsing. -# The generated files are part of the tarball, so python / pyparsing isn't needed -# when building from the tarball, but the configure script gets confused and looks -# for the wrong file name to know if it needs to check for python / pyparsing, -# so convince it they aren't needed. -# It will also regenerate these files if the spice-protocol protocol definition -# is newer than the generated files (which it will be when spice-protocol -# installs it to staging), so ensure their timestamp is updated to skip this. -define SPICE_NO_PYTHON_PYPARSING - mkdir -p $(@D)/client - touch $(@D)/client/generated_marshallers.cpp - touch $(@D)/spice-common/common/generated_* -endef - -SPICE_PRE_CONFIGURE_HOOKS += SPICE_NO_PYTHON_PYPARSING - # We need to tweak spice.pc because it /forgets/ (for static linking) that # it should link against libz and libjpeg. libz is pkg-config-aware, while # libjpeg isn't, hence the two-line tweak |
