2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2012-12-16 07:56:15 +01:00
|
|
|
#
|
2013-06-06 01:53:28 +02:00
|
|
|
# spice
|
2012-12-16 07:56:15 +01:00
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2012-12-16 07:56:15 +01:00
|
|
|
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
SPICE_VERSION = 0.12.4
|
|
|
|
|
SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
|
|
|
|
|
SPICE_SITE = http://www.spice-space.org/download/releases
|
|
|
|
|
SPICE_LICENSE = LGPLv2.1+
|
|
|
|
|
SPICE_LICENSE_FILES = COPYING
|
2012-12-16 07:56:15 +01:00
|
|
|
SPICE_INSTALL_STAGING = YES
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
SPICE_DEPENDENCIES = \
|
2012-12-16 07:56:15 +01:00
|
|
|
alsa-lib \
|
|
|
|
|
celt051 \
|
|
|
|
|
jpeg \
|
|
|
|
|
openssl \
|
|
|
|
|
pixman \
|
|
|
|
|
python-pyparsing \
|
|
|
|
|
spice-protocol \
|
|
|
|
|
|
|
|
|
|
# We disable everything for now, because the dependency tree can become
|
|
|
|
|
# quite deep if we try to enable some features, and I have not tested that.
|
2014-10-24 07:57:37 +02:00
|
|
|
SPICE_CONF_OPTS = \
|
|
|
|
|
--disable-opengl \
|
|
|
|
|
--disable-smartcard \
|
|
|
|
|
--disable-automated-tests \
|
|
|
|
|
--without-sasl \
|
2012-12-16 07:56:15 +01:00
|
|
|
|
|
|
|
|
SPICE_DEPENDENCIES += host-pkgconf
|
|
|
|
|
|
2012-12-16 07:56:16 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y)
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += --enable-client
|
2012-12-16 07:56:16 +01:00
|
|
|
SPICE_DEPENDENCIES += xlib_libXfixes xlib_libXrandr
|
|
|
|
|
else
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += --disable-client
|
2012-12-16 07:56:16 +01:00
|
|
|
endif
|
|
|
|
|
|
2012-12-16 07:56:17 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_SPICE_GUI),y)
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += --enable-gui
|
2012-12-16 07:56:17 +01:00
|
|
|
SPICE_DEPENDENCIES += cegui06
|
|
|
|
|
else
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += --disable-gui
|
2012-12-16 07:56:17 +01:00
|
|
|
endif
|
|
|
|
|
|
2012-12-16 07:56:18 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_SPICE_TUNNEL),y)
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += --enable-tunnel
|
2012-12-16 07:56:18 +01:00
|
|
|
SPICE_DEPENDENCIES += slirp
|
|
|
|
|
else
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += --disable-tunnel
|
2012-12-16 07:56:18 +01:00
|
|
|
endif
|
|
|
|
|
|
2012-12-16 07:56:15 +01:00
|
|
|
SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
|
|
|
|
|
SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
define SPICE_POST_INSTALL_STAGING_FIX_PC
|
|
|
|
|
$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
|
|
|
|
|
"$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
|
|
|
|
|
endef
|
|
|
|
|
SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
|
|
|
|
|
|
|
|
|
|
# It is currently not possible to detect if stack-protection is available
|
|
|
|
|
# or not, because it requires support from both the compiler *and* the
|
|
|
|
|
# C library, but the C library (eg. uClibc) can be compiled without that
|
|
|
|
|
# support, even if gcc accepts the -fstack-protector-all option.
|
|
|
|
|
# spice's ./configure only checks for gcc's -fstack-protector-all option,
|
|
|
|
|
# so it misses the case where the C library doe not provide the requires
|
|
|
|
|
# support.
|
|
|
|
|
# A correct fix would be to fix spice's ./configure to also check the C
|
|
|
|
|
# library, but it might be much more involved.
|
|
|
|
|
# So, we simply disable it for now. After all, as uClibc's help puts it:
|
|
|
|
|
# Note that NOEXECSTACK on a kernel with address space randomization
|
|
|
|
|
# is generally sufficient to prevent most buffer overflow exploits
|
|
|
|
|
# without increasing code size.
|
2014-09-27 21:32:44 +02:00
|
|
|
SPICE_CONF_OPTS += gl_cv_warn__fstack_protector_all=no
|
2012-12-16 07:56:15 +01:00
|
|
|
|
|
|
|
|
$(eval $(autotools-package))
|
