update: tcl tinyxml2 vorbis

This commit is contained in:
Mark Brand 2018-11-16 00:37:24 +01:00
parent ce14f7cee4
commit fb338af159
4 changed files with 16 additions and 16 deletions

View File

@ -13,7 +13,7 @@ diff --git a/win/Makefile.in b/win/Makefile.in
index 1111111..2222222 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -139,9 +139,8 @@ REG_DLL_FILE = tclreg$(REGVER)${DLLSUFFIX}
@@ -146,9 +146,8 @@ REG_DLL_FILE = tclreg$(REGVER)${DLLSUFFIX}
REG_LIB_FILE = @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX}
TEST_DLL_FILE = tcltest$(VER)${DLLSUFFIX}
TEST_LIB_FILE = @LIBPREFIX@tcltest$(VER)${LIBSUFFIX}
@ -24,7 +24,7 @@ index 1111111..2222222 100644
STATIC_LIBRARIES = $(TCL_LIB_FILE)
TCLSH = tclsh$(VER)${EXESUFFIX}
@@ -404,7 +403,7 @@ ZLIB_OBJS = \
@@ -411,7 +410,7 @@ ZLIB_OBJS = \
uncompr.$(OBJEXT) \
zutil.$(OBJEXT)
@ -33,7 +33,7 @@ index 1111111..2222222 100644
TCL_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n]
@@ -437,7 +436,7 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS}
@@ -446,7 +445,7 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS}
@MAKE_STUB_LIB@ ${STUB_OBJS}
@POST_MAKE_LIB@
@ -42,13 +42,13 @@ index 1111111..2222222 100644
@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
@VC_MANIFEST_EMBED_DLL@
@@ -457,14 +456,6 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
@@ -466,14 +465,6 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
@$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
-# use pre-built zlib1.dll
-${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
- @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \
- @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \
- $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
- else \
- $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
@ -57,7 +57,7 @@ index 1111111..2222222 100644
# Add the object extension to the implicit rules. By default .obj is not
# automatically added.
@@ -570,7 +561,7 @@ install-binaries: binaries
@@ -579,7 +570,7 @@ install-binaries: binaries
else true; \
fi; \
done;
@ -76,14 +76,14 @@ index 1111111..2222222 100644
])
-AS_IF([test "$tcl_ok" = "yes"], [
- AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
- AS_IF([test "$do64bit" = "yes"], [
- AS_IF([test "$do64bit" != "no"], [
- AS_IF([test "$GCC" == "yes"],[
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a])
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
- ], [
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib])
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
- ])
- ], [
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib])
- ])
-], [
- AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])

View File

@ -4,8 +4,8 @@ PKG := tcl
$(PKG)_WEBSITE := https://tcl.tk/
$(PKG)_OWNER := https://github.com/highperformancecoder
$(PKG)_IGNORE :=
$(PKG)_VERSION := 8.6.4
$(PKG)_CHECKSUM := 9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d
$(PKG)_VERSION := 8.6.9
$(PKG)_CHECKSUM := 04abaa207f4bf4f453bea5bbdbcf6cf4bcdba3ed1c5160bfd732c6b8c70c6269
$(PKG)_SUBDIR := tcl$($(PKG)_VERSION)
$(PKG)_FILE := tcl$($(PKG)_VERSION)-src.tar.gz
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/tcl/Tcl/$($(PKG)_VERSION)/$($(PKG)_FILE)

View File

@ -3,8 +3,8 @@
PKG := tinyxml2
$(PKG)_WEBSITE := http://grinninglizard.com/tinyxml2/
$(PKG)_IGNORE :=
$(PKG)_VERSION := 6.0.0
$(PKG)_CHECKSUM := 9444ba6322267110b4aca61cbe37d5dcab040344b5c97d0b36c119aa61319b0f
$(PKG)_VERSION := 7.0.0
$(PKG)_CHECKSUM := fa0d1c745d65d4d833e62cb183e23c2034dc7a35ec1a4977e808bdebb9b4fe60
$(PKG)_GH_CONF := leethomason/tinyxml2/tags
$(PKG)_DEPS := cc

View File

@ -4,8 +4,8 @@ PKG := vorbis
$(PKG)_WEBSITE := https://xiph.org/vorbis/
$(PKG)_DESCR := Vorbis
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.3.5
$(PKG)_CHECKSUM := 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce
$(PKG)_VERSION := 1.3.6
$(PKG)_CHECKSUM := 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb
$(PKG)_SUBDIR := libvorbis-$($(PKG)_VERSION)
$(PKG)_FILE := libvorbis-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://downloads.xiph.org/releases/vorbis/$($(PKG)_FILE)