mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
zxtune: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -1,6 +1,6 @@
|
||||
From 950fa944540ba2462028dc58271ffd131d921936 Mon Sep 17 00:00:00 2001
|
||||
From 95ad550d41fdaa174da0d595b22cab2ff6e4c8ee Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 16 Nov 2021 15:46:57 +1000
|
||||
Date: Thu, 13 Jul 2023 21:10:12 +1000
|
||||
Subject: Fix build for haiku
|
||||
|
||||
|
||||
@@ -39,6 +39,23 @@ 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
|
||||
@@ -53,7 +70,7 @@ index 0deee8b..cd7cff0 100644
|
||||
ts_files := ui_preferences
|
||||
|
||||
diff --git a/apps/zxtune-qt/ui/preferences/sound.cpp b/apps/zxtune-qt/ui/preferences/sound.cpp
|
||||
index bb78c89..19fb369 100644
|
||||
index bccfb94..9875cc3 100644
|
||||
--- a/apps/zxtune-qt/ui/preferences/sound.cpp
|
||||
+++ b/apps/zxtune-qt/ui/preferences/sound.cpp
|
||||
@@ -11,11 +11,13 @@
|
||||
@@ -70,7 +87,7 @@ index bb78c89..19fb369 100644
|
||||
#include "supp/options.h"
|
||||
#include "ui/tools/parameters_helpers.h"
|
||||
#include "ui/utils.h"
|
||||
@@ -135,13 +137,15 @@ namespace
|
||||
@@ -99,13 +101,15 @@ namespace
|
||||
{
|
||||
backendsList->addItem(ToQString(id));
|
||||
}
|
||||
@@ -87,7 +104,7 @@ index bb78c89..19fb369 100644
|
||||
void AddPage(UI::BackendSettingsWidget* (*factory)(QWidget&))
|
||||
{
|
||||
std::unique_ptr<UI::BackendSettingsWidget> wid(factory(*backendGroupBox));
|
||||
@@ -153,7 +157,7 @@ namespace
|
||||
@@ -117,7 +121,7 @@ namespace
|
||||
SetupPages[id] = wid.release();
|
||||
}
|
||||
}
|
||||
@@ -97,16 +114,16 @@ 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 8e8c1dc..2635102 100644
|
||||
index 171a1e5..fc987aa 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
|
||||
|
||||
#specify endpoint commands
|
||||
build_obj_cmd_nodeps = $(tools.cxx) $(CXXFLAGS) -c $1 -o $2
|
||||
build_obj_cmd_nodeps = $(tools.cxx) $(CXXFLAGS) -c $$(realpath $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) -c $1 -o $2 -MMD
|
||||
build_obj_cmd_cc = $(tools.cc) $(CCFLAGS) -c $$(realpath $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
|
||||
@@ -117,7 +134,7 @@ index 8e8c1dc..2635102 100644
|
||||
\ No newline at end of file
|
||||
+endif
|
||||
diff --git a/make/features.mak b/make/features.mak
|
||||
index 7b7c7ee..73f5e2d 100644
|
||||
index bd54710..440f91c 100644
|
||||
--- a/make/features.mak
|
||||
+++ b/make/features.mak
|
||||
@@ -8,10 +8,11 @@ support_ogg = 1
|
||||
@@ -135,19 +152,6 @@ index 7b7c7ee..73f5e2d 100644
|
||||
support_mp3 = 1
|
||||
support_ogg = 1
|
||||
support_flac = 1
|
||||
diff --git a/make/platforms/linux.mak b/make/platforms/linux.mak
|
||||
index fb21959..13dca1b 100644
|
||||
--- a/make/platforms/linux.mak
|
||||
+++ b/make/platforms/linux.mak
|
||||
@@ -6,7 +6,7 @@ makeobj_name = $(1).o
|
||||
host=linux
|
||||
compiler?=gcc
|
||||
|
||||
-libraries.linux += dl rt pthread stdc++
|
||||
+libraries.linux += stdc++
|
||||
|
||||
ifneq ($($(platform).$(arch).crossroot),)
|
||||
libraries.dirs.linux += $($(platform).$(arch).crossroot)/usr/lib
|
||||
diff --git a/src/sound/backends/Makefile b/src/sound/backends/Makefile
|
||||
index f11401d..f9b4b85 100644
|
||||
--- a/src/sound/backends/Makefile
|
||||
@@ -205,13 +209,13 @@ index 867e91d..84a19cc 100644
|
||||
RegisterAyLptBackend(storage);
|
||||
}
|
||||
diff --git a/src/sound/backends/gates/openal_api.h b/src/sound/backends/gates/openal_api.h
|
||||
index 03d9fe3..03b7639 100644
|
||||
index f49eadc..a5dab63 100644
|
||||
--- a/src/sound/backends/gates/openal_api.h
|
||||
+++ b/src/sound/backends/gates/openal_api.h
|
||||
@@ -13,8 +13,13 @@
|
||||
//std includes
|
||||
// std includes
|
||||
#include <memory>
|
||||
//platform-dependent includes
|
||||
// platform-dependent includes
|
||||
+#ifdef __HAIKU__
|
||||
+#include <AL/al.h>
|
||||
+#include <AL/alc.h>
|
||||
@@ -220,48 +224,8 @@ index 03d9fe3..03b7639 100644
|
||||
#include <OpenAL/alc.h>
|
||||
+#endif
|
||||
|
||||
namespace Sound
|
||||
namespace Sound::OpenAl
|
||||
{
|
||||
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.37.3
|
||||
|
||||
|
||||
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 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
|
||||
|
||||
private:
|
||||
Log::ProgressCallback* const Delegate;
|
||||
- const Math::ScaleFunctor<std::size_t> ToPercent;
|
||||
+ const Math::ScaleFunctor<uint64_t> ToPercent;
|
||||
const String Text;
|
||||
};
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
SUMMARY="Crossplatform chiptunes player"
|
||||
DESCRIPTION="Player of computer music from ZX Spectrum, Amiga, Atari, Commodore and more."
|
||||
HOMEPAGE="https://zxtune.bitbucket.io/"
|
||||
COPYRIGHT="2008–2022 Vitamin, CAIG"
|
||||
COPYRIGHT="2008–2023 Vitamin, CAIG"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/vitamin-caig/zxtune/archive/refs/tags/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="0e5a9f1b60b78b638a98a46cd3759438fc2deea25648f5c22a36f9903ebc6974"
|
||||
CHECKSUM_SHA256="bf58d100b20c24a639dd66db1bf06e3e082a03b79085b9d8f766443c91df9765"
|
||||
SOURCE_DIR="zxtune-$portVersion"
|
||||
PATCHES="zxtune-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
Reference in New Issue
Block a user