zxtune: bump version

This commit is contained in:
Gerasim Troeglazov
2023-03-03 20:51:18 +10:00
parent ba52d90d25
commit 0b7f2ec4ac
2 changed files with 25 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
From 0c5c580e530c763ec4b67ee94a33272cc6913ec0 Mon Sep 17 00:00:00 2001
From 950fa944540ba2462028dc58271ffd131d921936 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 16 Nov 2021 15:46:57 +1000
Subject: Fix build for haiku
@@ -39,23 +39,6 @@ index 1ee29ba..f4450f5 100644
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
diff --git a/3rdparty/unrar/os.hpp b/3rdparty/unrar/os.hpp
index 21488a8..f3455e5 100644
--- a/3rdparty/unrar/os.hpp
+++ b/3rdparty/unrar/os.hpp
@@ -212,6 +212,12 @@
#endif
#endif
+#if defined(__HAIKU__)
+ #ifndef BIG_ENDIAN
+ #define BIG_ENDIAN
+ #endif
+#endif
+
#endif
typedef const char* MSGID;
diff --git a/apps/zxtune-qt/ui/preferences/Makefile b/apps/zxtune-qt/ui/preferences/Makefile
index 0deee8b..cd7cff0 100644
--- a/apps/zxtune-qt/ui/preferences/Makefile
@@ -114,7 +97,7 @@ index bb78c89..19fb369 100644
{
const uint_t* const frq = std::find(FREQUENCES, std::end(FREQUENCES), val);
diff --git a/make/compilers/gcc.mak b/make/compilers/gcc.mak
index 484b894..64ff77f 100644
index 8e8c1dc..2635102 100644
--- a/make/compilers/gcc.mak
+++ b/make/compilers/gcc.mak
@@ -62,7 +62,7 @@ LDFLAGS = $(LD_MODE_FLAGS) $($(platform).ld.flags) $($(platform).$(arch).ld.flag
@@ -123,7 +106,7 @@ index 484b894..64ff77f 100644
build_obj_cmd_nodeps = $(tools.cxx) $(CXXFLAGS) -c $1 -o $2
-build_obj_cmd = $(build_obj_cmd_nodeps) -MMD
+build_obj_cmd = $(build_obj_cmd_nodeps) -MMD -std=c++17
build_obj_cmd_cc = $(tools.cc) $(CCFLAGS) -std=c99 -c $1 -o $2 -MMD
build_obj_cmd_cc = $(tools.cc) $(CCFLAGS) -c $1 -o $2 -MMD
build_lib_cmd = $(tools.ar) $(ARFLAGS) $2 $1
link_cmd = $(tools.ld) $(LDFLAGS) -o $@ $(OBJECTS) $(RESOURCES) \
@@ -118,4 +118,4 @@ symbolstree: $(target).syms.json
@@ -239,18 +222,35 @@ index 03d9fe3..03b7639 100644
namespace Sound
{
diff --git a/3rdparty/unrar/os.hpp b/3rdparty/unrar/os.hpp
index 21488a8..f3455e5 100644
--- a/3rdparty/unrar/os.hpp
+++ b/3rdparty/unrar/os.hpp
@@ -212,6 +212,12 @@
#endif
#endif
+#if defined(__HAIKU__)
+ #ifndef BIG_ENDIAN
+ #define BIG_ENDIAN
+ #endif
+#endif
+
#endif
typedef const char* MSGID;
--
2.30.2
2.37.3
From 41035027e8e2e8ff17e0c9b5cb68faf901d88f11 Mon Sep 17 00:00:00 2001
From 0303851e504a73e71624acb7dd3922b757a62c01 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 16 Nov 2021 18:48:15 +1000
Subject: Fix build for 32 bit
diff --git a/src/core/plugins/archives/raw_supp.cpp b/src/core/plugins/archives/raw_supp.cpp
index 2cd9696..14692d9 100644
index 588b2a6..cabcad3 100644
--- a/src/core/plugins/archives/raw_supp.cpp
+++ b/src/core/plugins/archives/raw_supp.cpp
@@ -338,7 +338,7 @@ namespace ZXTune::Raw
@@ -263,5 +263,5 @@ index 2cd9696..14692d9 100644
};
--
2.30.2
2.37.3

View File

@@ -5,7 +5,7 @@ COPYRIGHT="20082022 Vitamin, CAIG"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/vitamin-caig/zxtune/archive/refs/tags/$portVersion.tar.gz"
CHECKSUM_SHA256="97aa87c6481671b0920431c06bb57444566d5b9c58c0180262eafc296a11e1cc"
CHECKSUM_SHA256="0e5a9f1b60b78b638a98a46cd3759438fc2deea25648f5c22a36f9903ebc6974"
SOURCE_DIR="zxtune-$portVersion"
PATCHES="zxtune-$portVersion.patchset"
ADDITIONAL_FILES="