1.5.76 release

* Update bundletool to 1.15.6 * Update bundled libc++ to 17.0.6
Rakashazi · Dec 14, 2023 · 7408dae · 7408dae
1 parent f8a5e36
commit 7408dae
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/EmuFramework/metadata/conf.mk b/EmuFramework/metadata/conf.mk
@@ -1,4 +1,4 @@
-metadata_version = 1.5.75
+metadata_version = 1.5.76
 metadata_supportedMIMETypes = application/zip
 metadata_supportedFileExtensions = rar 7z
 android_metadata_versionCodeExtra = 16

diff --git a/imagine/build.mk b/imagine/build.mk
@@ -47,7 +47,7 @@ prefix ?= $(IMAGINE_SDK_PLATFORM_PATH)
 imaginePkgconfigTemplate := $(IMAGINE_PATH)/pkgconfig/imagine.pc
 pkgName := $(libName)
 pkgDescription := Game/Multimedia Engine
-pkgVersion := 1.5.75
+pkgVersion := 1.5.76
 LDLIBS := -l$(libName) $(LDLIBS)
 ifdef libNameExt
  pkgCFlags := -DIMAGINE_CONFIG_H=$(configFilename)

diff --git a/imagine/bundle/all/src/libcxx/common.mk b/imagine/bundle/all/src/libcxx/common.mk
@@ -1,4 +1,4 @@
-libcxxVersion := 17.0.0-rc1
+libcxxVersion := 17.0.6
 libcxxSrcDir := $(tempDir)/llvm-project-$(libcxxVersion).src/libcxx
 libcxxabiSrcDir := $(tempDir)/llvm-project-$(libcxxVersion).src/libcxxabi
 # Archive containing the libcxx & libcxxabi directories along with a minimal set of cmake support files

diff --git a/imagine/bundle/all/src/libcxx/llvm-project-libcxx-17.0.0-rc1.src.tar.xz b/imagine/bundle/all/src/libcxx/llvm-project-libcxx-17.0.0-rc1.src.tar.xz
diff --git a/imagine/bundle/all/src/libcxx/llvm-project-libcxx-17.0.6.src.tar.xz b/imagine/bundle/all/src/libcxx/llvm-project-libcxx-17.0.6.src.tar.xz
diff --git a/imagine/include/imagine/config/version.h b/imagine/include/imagine/config/version.h
@@ -15,7 +15,7 @@
 	You should have received a copy of the GNU General Public License
 	along with Imagine.  If not, see <http://www.gnu.org/licenses/> */
 
-#define IMAGINE_VERSION_BASE "1.5.75"
+#define IMAGINE_VERSION_BASE "1.5.76"
 
 #ifdef NDEBUG
 #define IMAGINE_VERSION IMAGINE_VERSION_BASE

diff --git a/imagine/make/shortcut/meta-builds/android.mk b/imagine/make/shortcut/meta-builds/android.mk
@@ -6,7 +6,7 @@ include $(buildSysPath)/setAndroidNDKPath.mk
 .PHONY: all
 all : android-bundle
 
-BUNDLETOOL_PATH ?= $(IMAGINE_PATH)/tools/bundletool-all-1.15.2.jar
+BUNDLETOOL_PATH ?= $(IMAGINE_PATH)/tools/bundletool-all-1.15.6.jar
 BUNDLETOOL := java -jar $(BUNDLETOOL_PATH)
 
 # Code signing parameters used when generating APKs from the app bundle

diff --git a/imagine/tools/bundletool-all-1.15.2.jar → imagine/tools/bundletool-all-1.15.6.jar b/imagine/tools/bundletool-all-1.15.2.jar → imagine/tools/bundletool-all-1.15.6.jar