Release 1.0.6

* Updated build scripts.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.6 ===
+* Updated build scripts.
+
 === 1.0.5 ===
 * Added memswap() function for vertical flipping support of the image.
 * Updated build scripts.

include/lsp-plug.in/r3d/base/version.h

@@ -24,7 +24,7 @@
 
 #define LSP_R3D_BASE_LIB_MAJOR          1
 #define LSP_R3D_BASE_LIB_MINOR          0
-#define LSP_R3D_BASE_LIB_MICRO          5
+#define LSP_R3D_BASE_LIB_MICRO          6
 
 #if defined(LSP_R3D_BASE_LIB_PUBLISHER)
     #define LSP_R3D_BASE_LIB_PUBLIC         LSP_EXPORT_MODIFIER

make/configure.mk

@@ -154,12 +154,8 @@ endef
 
 define binconfig =
   $(eval name=$(1))
-<<<<<<< Updated upstream
-  $(eval $(call _modconfig,$(1),$(1)))
-=======
   $(eval publisher=1)
-  $(eval $(call _modconfig,$(1),))
->>>>>>> Stashed changes
+  $(eval $(call _modconfig,$(name),$(publisher)))
 endef
 
 define hdrconfig =

make/modules.mk

@@ -78,8 +78,8 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
 	test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
 	mkdir -p $(dir $($(@)_PATH))
 	$(GIT) -C "$($(@)_PATH)" reset --hard
-	$(GIT) -C "$($(@)_PATH)" fetch origin --force
-	$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
+	$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
+	$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \

modules.mk

@@ -20,19 +20,19 @@
 
 #------------------------------------------------------------------------------
 # Variables that describe source code dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.21
+LSP_COMMON_LIB_VERSION     := 1.0.22
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL_RO      := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_URL_RW      := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.15
+LSP_TEST_FW_VERSION        := 1.0.16
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL_RO         := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
 LSP_TEST_FW_URL_RW         := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
 
-LSP_R3D_IFACE_VERSION      := 1.0.5
+LSP_R3D_IFACE_VERSION      := 1.0.6
 LSP_R3D_IFACE_NAME         := lsp-r3d-iface
 LSP_R3D_IFACE_TYPE         := src
 LSP_R3D_IFACE_URL_RO       := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git

project.mk

@@ -23,5 +23,5 @@ ARTIFACT_ID                 = LSP_R3D_BASE_LIB
 ARTIFACT_NAME               = lsp-r3d-base-lib
 ARTIFACT_DESC               = Base library for implementing and loading 3D rendering backend
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.5
+ARTIFACT_VERSION            = 1.0.6
 ARTIFACT_EXPORT_SYMBOLS     = 0