From 94264fba54893bd377da53430fd77c694f2a939a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Jul 2020 15:48:46 -0700 Subject: [PATCH] spice: small cleanups for consistency between packages Signed-off-by: Rosen Penev --- libs/spice/Makefile | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/spice/Makefile b/libs/spice/Makefile index 1c239b6a0..ae8ebcef8 100644 --- a/libs/spice/Makefile +++ b/libs/spice/Makefile @@ -10,15 +10,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spice PKG_VERSION:=0.14.3 PKG_RELEASE:=3 + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.spice-space.org/download/releases/spice-server PKG_HASH:=551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114 + +PKG_MAINTAINER:=Yousong Zhou PKG_LICENSE:=LGPL-2.1-only PKG_LICENSE_FILES:=COPYING -PKG_INSTALL:=1 -PKG_MAINTAINER:=Yousong Zhou -PKG_BUILD_DEPENDS+=spice-protocol +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=spice-protocol include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -32,18 +34,6 @@ define Package/libspice-server DEPENDS:=+glib2 +libjpeg +libopenssl +pixman +zlib endef -define Package/libspice-server/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspice-server.so* $(1)/usr/lib -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib -endef - # audio codec MESON_ARGS += \ -Dcelt051=disabled \ @@ -72,4 +62,16 @@ MESON_ARGS += \ -Dspice-common:generate-code=none \ -Dspice-common:tests=false \ +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib +endef + +define Package/libspice-server/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspice-server.so* $(1)/usr/lib +endef + $(eval $(call BuildPackage,libspice-server))