mac32 third-party using specs

build.macos32x86/third-party/cairo/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: cairo)
+include ../../third-party/cairo.spec
 
 # plugin definitions
-CAIROURL:=http://www.cairographics.org/releases/cairo-1.14.6.tar.xz
-CAIROLIBNAME:=libcairo.2.dylib
-CAIRODIR:=$(THIRDPARTYDIR)/cairo-1.14.6
+CAIROURL:=$(cairo_spec_download_url)
+CAIROLIBNAME:=$(cairo_spec_product_name_macOS)
+CAIRODIR:=$(THIRDPARTYDIR)/$(cairo_spec_unpack_dir_name)
+CAIROARCHIVE:=$(THIRDPARTYCACHEDIR)/$(cairo_spec_archive_name)
 CAIROLIB:=$(THIRDPARTYINSTALLDIR)/$(CAIROLIBNAME)
-CAIROARCHIVE:=$(THIRDPARTYCACHEDIR)/cairo-1.14.6.tar.xz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)

build.macos32x86/third-party/freetype2/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: freetype2)
+include ../../third-party/freetype2.spec
 
 # plugin definitions
-FREETYPE2URL:=http://ftp.igh.cnrs.fr/pub/nongnu/freetype/freetype-2.6.5.tar.gz
-FREETYPE2DIR:=$(THIRDPARTYDIR)/freetype-2.6.5
-FREETYPE2LIBNAME:=libfreetype.6.dylib
+FREETYPE2URL:=$(freetype2_spec_download_url)
+FREETYPE2LIBNAME:=$(freetype2_spec_product_name_macOS)
+FREETYPE2DIR:=$(THIRDPARTYDIR)/$(freetype2_spec_unpack_dir_name)
+FREETYPE2ARCHIVE:=$(THIRDPARTYCACHEDIR)/$(freetype2_spec_archive_name)
 FREETYPE2LIB:=$(THIRDPARTYINSTALLDIR)/$(FREETYPE2LIBNAME)
-FREETYPE2ARCHIVE:=$(THIRDPARTYCACHEDIR)/freetype-2.6.5.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR) $(THIRDPARTYINCLUDEDIR)/freetype2

build.macos32x86/third-party/libgit2/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: libgit2)
+include ../../third-party/libgit2.spec
 
 # plugin definitions
-LIBGIT2URL:=https://github.com/libgit2/libgit2/archive/v0.23.0.tar.gz
-LIBGIT2DIR:=$(THIRDPARTYDIR)/libgit2-0.23.0
-LIBGIT2LIBNAME:=libgit2.0.23.0.dylib
+LIBGIT2URL:=$(libgit2_spec_download_url)
+LIBGIT2LIBNAME:=$(libgit2_spec_product_name_macOS)
+LIBGIT2DIR:=$(THIRDPARTYDIR)/$(libgit2_spec_unpack_dir_name)
+LIBGIT2ARCHIVE:=$(THIRDPARTYCACHEDIR)/$(libgit2_spec_archive_name)
 LIBGIT2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBGIT2LIBNAME)
-LIBGIT2ARCHIVE:=$(THIRDPARTYCACHEDIR)/libgit2-v0.23.0.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)

build.macos32x86/third-party/libpng/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: pixman)
+include ../../third-party/libpng.spec
 
 # plugin definitions
-LIBPNGURL:=ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng12/libpng-1.2.49.tar.gz
-LIBPNGDIR:=$(THIRDPARTYDIR)/libpng-1.2.49
-LIBPNGLIBNAME:=libpng12.0.dylib
+LIBPNGURL:=$(libpng_spec_download_url)
+LIBPNGLIBNAME:=$(libpng_spec_product_name_macOS)
+LIBPNGDIR:=$(THIRDPARTYDIR)/$(libpng_spec_unpack_dir_name)
+LIBPNGARCHIVE:=$(THIRDPARTYCACHEDIR)/$(libpng_spec_archive_name)
 LIBPNGLIB:=$(THIRDPARTYINSTALLDIR)/$(LIBPNGLIBNAME)
-LIBPNGARCHIVE:=$(THIRDPARTYCACHEDIR)/libpng-1.2.49.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)

build.macos32x86/third-party/libsdl2/Makefile.lib

@@ -1,14 +1,13 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: libsdl2)
+include ../../third-party/libsdl2.spec
 
 # plugin definitions
-LIBSDL2URL:=http://www.libsdl.org/release/SDL2-2.0.4.tar.gz
-LIBSDL2DIR:=$(THIRDPARTYDIR)/SDL2-2.0.4
-LIBSDL2LIBNAME:=libSDL2-2.0.0.dylib
+LIBSDL2URL:=$(libsdl2_spec_download_url)
+LIBSDL2LIBNAME:=$(libsdl2_spec_product_name_macOS)
+LIBSDL2DIR:=$(THIRDPARTYDIR)/$(libsdl2_spec_unpack_dir_name)
+LIBSDL2ARCHIVE:=$(THIRDPARTYCACHEDIR)/$(libsdl2_spec_archive_name)
 LIBSDL2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBSDL2LIBNAME)
-LIBSDL2ARCHIVE:=$(THIRDPARTYCACHEDIR)/SDL2-2.0.4.tar.gz
-
+
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
 EXTRALIBS:=$(EXTRALIBS) -undefined dynamic_lookup $(LIBSDL2LIB)

build.macos32x86/third-party/libssh2/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: libssh2)
+include ../../third-party/libssh2.spec
 
 # plugin definitions
-LIBSSH2URL:=https://www.libssh2.org/download/libssh2-1.7.0.tar.gz
-LIBSSH2DIR:=$(THIRDPARTYDIR)/libssh2-1.7.0
-LIBSSH2LIBNAME:=libssh2.1.dylib
+LIBSSH2URL:=$(libssh2_spec_download_url)
+LIBSSH2LIBNAME:=$(libssh2_spec_product_name_macOS)
+LIBSSH2DIR:=$(THIRDPARTYDIR)/$(libssh2_spec_unpack_dir_name)
+LIBSSH2ARCHIVE:=$(THIRDPARTYCACHEDIR)/$(libssh2_spec_archive_name)
 LIBSSH2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBSSH2LIBNAME)
-LIBSSH2ARCHIVE:=$(THIRDPARTYCACHEDIR)/libssh2-1.7.0.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)

build.macos32x86/third-party/openssl/Makefile.lib

@@ -1,14 +1,13 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: openssl)
+include ../../third-party/openssl.spec
 
 # plugin definitions
-OPENSSLURL:=https://www.openssl.org/source/openssl-1.0.2j.tar.gz
-OPENSSLDIR:=$(THIRDPARTYDIR)/openssl-1.0.2j
-OPENSSLLIBNAME:=libssl.1.0.0.dylib
-OPENSSLALLLIBNAMES:=libcrypto.1.0.0.dylib $(OPENSSLLIBNAME)
+OPENSSLURL:=$(openssl_spec_download_url)
+OPENSSLLIBNAME:=$(openssl_spec_product1_name_macOS)
+OPENSSLALLLIBNAMES:=$(openssl_spec_product2_name_macOS) $(OPENSSLLIBNAME)
+OPENSSLDIR:=$(THIRDPARTYDIR)/$(openssl_spec_unpack_dir_name)
+OPENSSLARCHIVE:=$(THIRDPARTYCACHEDIR)/$(openssl_spec_archive_name)
 OPENSSLLIB:=$(THIRDPARTYINSTALLDIR)/$(OPENSSLLIBNAME)
-OPENSSLARCHIVE:=$(THIRDPARTYCACHEDIR)/openssl-1.0.2j.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)

build.macos32x86/third-party/pixman/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: pixman)
+include ../../third-party/pixman.spec
 
 # plugin definitions
-PIXMANURL:=http://www.cairographics.org/releases/pixman-0.34.0.tar.gz
-PIXMANLIBNAME:=libpixman-1.0.dylib
-PIXMANDIR:=$(THIRDPARTYDIR)/pixman-0.34.0
+PIXMANURL:=$(pixman_spec_download_url)
+PIXMANLIBNAME:=$(pixman_spec_product_name_macOS)
+PIXMANDIR:=$(THIRDPARTYDIR)/$(pixman_spec_unpack_dir_name)
+PIXMANARCHIVE:=$(THIRDPARTYCACHEDIR)/$(pixman_spec_archive_name)
 PIXMANLIB:=$(THIRDPARTYINSTALLDIR)/$(PIXMANLIBNAME)
-PIXMANARCHIVE:=$(THIRDPARTYCACHEDIR)/pixman-0.34.0.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)

build.macos32x86/third-party/pkgconfig/Makefile.lib

@@ -1,13 +1,12 @@
 include ../common/Makefile.lib.extra
-
-$(info LIBRARY: pkgconfig)
+include ../../third-party/pkgconfig.spec
 
 # plugin definitions
-PKGCONFIGURL:=http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz
-PKGCONFIGDIR:=$(THIRDPARTYDIR)/pkg-config-0.23
+PKGCONFIGURL:=$(pkgconfig_spec_download_url)
+PKGCONFIGDIR:=$(THIRDPARTYDIR)/$(pkgconfig_spec_unpack_dir_name)
+PKGCONFIGARCHIVE:=$(THIRDPARTYCACHEDIR)/$(pkgconfig_spec_archive_name)
 PKGCONFIGBIN:=$(THIRDPARTYOUTDIR)/bin/pkg-config
 PKGCONFIGLIB:=$(THIRDPARTYOUTDIR)/lib/pkgconfig
-PKGCONFIGARCHIVE:=$(THIRDPARTYCACHEDIR)/pkg-config-0.23.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)