-
Notifications
You must be signed in to change notification settings - Fork 515
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #590 from newnon/master
new packages minizip & tinyxml2, OpenAL updated
- Loading branch information
Showing
7 changed files
with
220 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| This file is part of MXE. | ||
| See index.html for further information. | ||
|
|
||
| This patch has been taken from: | ||
| https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-zlib | ||
|
|
||
| From c162a3620a3d0d317f59af8ddc2d1605bf5ee4b3 Mon Sep 17 00:00:00 2001 | ||
| From: martell <martellmalone@gmail.com> | ||
| Date: Sat, 11 Oct 2014 03:32:38 +0100 | ||
| Subject: [PATCH 1/3] unzip: add function unzOpenBuffer | ||
|
|
||
| --- | ||
| Makefile.am | 1 + | ||
| unzip.c | 11 +++++++++++ | ||
| unzip.h | 2 ++ | ||
| 3 files changed, 14 insertions(+) | ||
|
|
||
| diff --git a/Makefile.am b/Makefile.am | ||
| index d83fee7..e2958e6 100644 | ||
| --- a/Makefile.am | ||
| +++ b/Makefile.am | ||
| @@ -19,6 +19,7 @@ libminizip_la_SOURCES = \ | ||
| ioapi.c \ | ||
| unzip.c \ | ||
| zip.c \ | ||
| + ioapi_mem.c \ | ||
| ${iowin32_src} | ||
|
|
||
| libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz | ||
| diff --git a/unzip.c b/unzip.c | ||
| index ce02265..bb72a66 100644 | ||
| --- a/unzip.c | ||
| +++ b/unzip.c | ||
| @@ -26,6 +26,7 @@ | ||
|
|
||
| #include "zlib.h" | ||
| #include "unzip.h" | ||
| +#include "ioapi_mem.h" | ||
|
|
||
| #ifdef STDC | ||
| # include <stddef.h> | ||
| @@ -581,6 +582,16 @@ extern unzFile ZEXPORT unzOpen64(const void *path) | ||
| return unzOpenInternal(path, NULL, 1); | ||
| } | ||
|
|
||
| +extern unzFile ZEXPORT unzOpenBuffer(const void* buffer, uLong size) | ||
| +{ | ||
| + char path[48] = {0}; | ||
| + ourmemory_t FileMemory; | ||
| + zlib_filefunc64_32_def memory_file; | ||
| + sprintf(path, "%llx %lx", (unsigned long long)buffer, (unsigned long)size); | ||
| + fill_memory_filefunc(&memory_file, &FileMemory); | ||
| + return unzOpenInternal(path, &memory_file, 0); | ||
| +} | ||
| + | ||
| extern int ZEXPORT unzClose(unzFile file) | ||
| { | ||
| unz64_s* s; | ||
| diff --git a/unzip.h b/unzip.h | ||
| index 22c830f..28fedb9 100644 | ||
| --- a/unzip.h | ||
| +++ b/unzip.h | ||
| @@ -143,6 +143,8 @@ extern unzFile ZEXPORT unzOpen64 OF((const void *path)); | ||
| open64_file_func callback. Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path | ||
| is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char* does not describe the reality */ | ||
|
|
||
| +extern unzFile ZEXPORT unzOpenBuffer OF((const void* buffer, uLong size)); | ||
| +/* Open a Zip file, like unzOpen, but from a buffer */ | ||
| extern unzFile ZEXPORT unzOpen2 OF((const char *path, zlib_filefunc_def* pzlib_filefunc_def)); | ||
| /* Open a Zip file, like unzOpen, but provide a set of file low level API for read/write operations */ | ||
| extern unzFile ZEXPORT unzOpen2_64 OF((const void *path, zlib_filefunc64_def* pzlib_filefunc_def)); | ||
| -- | ||
| 2.1.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # This file is part of MXE. | ||
| # See index.html for further information. | ||
|
|
||
| PKG := minizip | ||
| $(PKG)_IGNORE := | ||
| $(PKG)_VERSION := 1.1 | ||
| $(PKG)_CHECKSUM := f0a47893d86e48c7336558aa7ec7b6742a1c102f | ||
| $(PKG)_COMMIT := 1f38dffc395c1e847eb26dbd921168e8cc2b6db2 | ||
| $(PKG)_SUBDIR := $(PKG)-$($(PKG)_COMMIT) | ||
| $(PKG)_FILE := $(PKG)-$($(PKG)_COMMIT).zip | ||
| $(PKG)_URL := https://github.com/nmoinvaz/minizip/archive/$($(PKG)_COMMIT).zip | ||
| $(PKG)_DEPS := gcc zlib | ||
|
|
||
| define $(PKG)_UPDATE | ||
| echo 'TODO: write update script for $(PKG).' >&2; | ||
| echo $($(PKG)_VERSION) | ||
| endef | ||
|
|
||
| define $(PKG)_BUILD | ||
| cd '$(1)' && $(TARGET)-gcc -c -O '$(1)'/*.c | ||
| cd '$(1)' && $(TARGET)-ar cr libminizip.a *.o | ||
| $(TARGET)-ranlib '$(1)/libminizip.a' | ||
| $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' | ||
| $(INSTALL) -m644 '$(1)'/*.a '$(PREFIX)/$(TARGET)/lib/' | ||
| $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/minizip' | ||
| $(INSTALL) -m644 '$(1)'/ioapi.h '$(PREFIX)/$(TARGET)/include/minizip/' | ||
| $(INSTALL) -m644 '$(1)'/unzip.h '$(PREFIX)/$(TARGET)/include/minizip/' | ||
| $(INSTALL) -m644 '$(1)'/zip.h '$(PREFIX)/$(TARGET)/include/minizip/' | ||
| endef | ||
|
|
||
| $(PKG)_BUILD_SHARED = |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 91c61a4..1aeba57 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -50,22 +50,22 @@ set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries") | ||
| if(BUILD_STATIC_LIBS) | ||
| add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h) | ||
| set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2) | ||
| -endif(BUILD_STATIC_LIBS) | ||
| +else(BUILD_STATIC_LIBS) | ||
| add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h) | ||
| set_target_properties(tinyxml2 PROPERTIES | ||
| COMPILE_DEFINITIONS "TINYXML2_EXPORT" | ||
| VERSION "${GENERIC_LIB_VERSION}" | ||
| SOVERSION "${GENERIC_LIB_SOVERSION}") | ||
| +endif(BUILD_STATIC_LIBS) | ||
|
|
||
| -add_executable(test xmltest.cpp) | ||
| -add_dependencies(test tinyxml2) | ||
| -add_dependencies(test ${TARGET_DATA_COPY}) | ||
| -target_link_libraries(test tinyxml2) | ||
| +#add_executable(test xmltest.cpp) | ||
| +#add_dependencies(test tinyxml2) | ||
| +#add_dependencies(test ${TARGET_DATA_COPY}) | ||
| +#target_link_libraries(test tinyxml2) | ||
|
|
||
|
|
||
| if(BUILD_STATIC_LIBS) | ||
| - install(TARGETS tinyxml2 tinyxml2static | ||
| - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| + install(TARGETS tinyxml2static | ||
| LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| else(BUILD_STATIC_LIBS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # This file is part of MXE. | ||
| # See index.html for further information. | ||
|
|
||
| PKG := tinyxml2 | ||
| $(PKG)_IGNORE := | ||
| $(PKG)_VERSION := 2.2.0 | ||
| $(PKG)_CHECKSUM := 7869aa08241ce16f93ba3732c1cde155b1f2b6a0 | ||
| $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) | ||
| $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz | ||
| $(PKG)_URL := https://github.com/leethomason/tinyxml2/archive/$($(PKG)_VERSION).tar.gz | ||
| $(PKG)_DEPS := gcc | ||
|
|
||
| define $(PKG)_UPDATE | ||
| $(WGET) -q -O- 'https://github.com/leethomason/tinyxml2/releases' | \ | ||
| $(SED) -n 's,.*/archive/\([0-9][^>]*\)\.tar.*,\1,p' | \ | ||
| head -1 | ||
| endef | ||
|
|
||
| define $(PKG)_BUILD | ||
| mkdir '$(1)/build' | ||
| cd '$(1)/build' && cmake .. \ | ||
| -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ | ||
| $(if $(BUILD_STATIC), \ | ||
| -DBUILD_STATIC_LIBS=ON) | ||
|
|
||
| $(MAKE) -C '$(1)/build' -j '$(JOBS)' install | ||
| endef |