mirror of
https://github.com/SerenityOS/serenity.git
synced 2026-11-07 04:29:30 -10:00
Ports: Update milkytracker to 1.06
This commit is contained in:
Linus Groh authored and Nico Weber committed
1 parent
b3dcd97f01
commit
a80c583ea1
8 files changed
+57
-23
No files matched your search
@@ -222,7 +222,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
||||
| [`md4c`](md4c/) | Markdown for C | 0.6.0 | https://github.com/mity/md4c |
|
||||
| [`mednafen`](mednafen/) | Mednafen (My Emulator Doesn't Need A Frickin' Excellent Name) | 1.32.1 | https://mednafen.github.io/ |
|
||||
| [`mgba`](mgba/) | Game Boy, Game Boy Color and Game Boy Advance emulator | 0.10.5 | https://mgba.io/ |
|
||||
| [`milkytracker`](milkytracker/) | milkytracker | 1.03.00 | https://github.com/milkytracker/MilkyTracker |
|
||||
| [`milkytracker`](milkytracker/) | milkytracker | 1.06 | https://github.com/milkytracker/MilkyTracker |
|
||||
| [`mold`](mold/) | A Modern Linker | 2.34.1 | https://github.com/rui314/mold |
|
||||
| [`mpc`](mpc/) | GNU Multiple Precision Complex Library (MPC) | 1.4.1 | http://www.multiprecision.org/mpc/ |
|
||||
| [`mpfr`](mpfr/) | GNU Multiple Precision Floating-Point Reliable Library (MPFR) | 4.2.2 | https://www.mpfr.org/ |
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#!/bin/bash ../.port_include.sh
|
||||
port=milkytracker
|
||||
version=1.03.00
|
||||
workdir=MilkyTracker-$version
|
||||
useconfigure=true
|
||||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port='milkytracker'
|
||||
version='1.06'
|
||||
workdir="MilkyTracker-${version}"
|
||||
useconfigure='true'
|
||||
files=(
|
||||
"https://github.com/milkytracker/MilkyTracker/archive/v$version.tar.gz#72d5357e303380b52383b66b51f944a77cd77e2b3bfeb227d87cc0e72ab292f7"
|
||||
"https://github.com/milkytracker/MilkyTracker/archive/v$version.tar.gz#6e70590dfed324e6d6ac813e33d9f9dcfaa13b2f57fdec9e178e9dda05538cb0"
|
||||
)
|
||||
configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
|
||||
depends=("SDL2" "zlib")
|
||||
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Include strings.h
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h
|
||||
index 20eba8bc79b10ca7cb5f9eb02678c5e493eb55f9..e353345fb0bd485bea10f45954f28ba8dfd3683c 100644
|
||||
index 91e3a4a42f91722c0a2b14ccf0dd45cb64425efc..8f6c440fd05e4fea007a33e6e7541e73719f7580 100644
|
||||
--- a/src/ppui/BasicTypes.h
|
||||
+++ b/src/ppui/BasicTypes.h
|
||||
@@ -30,6 +30,7 @@ typedef signed short pp_int16;
|
||||
|
||||
@@ -4,19 +4,24 @@ Date: Tue, 27 Apr 2021 18:34:53 +1000
|
||||
Subject: [PATCH] Remove OpenGL
|
||||
|
||||
---
|
||||
src/ppui/sdl/DisplayDevice_SDL.cpp | 42 ++----------------------------
|
||||
1 file changed, 2 insertions(+), 40 deletions(-)
|
||||
src/ppui/sdl/DisplayDevice_SDL.cpp | 47 ++----------------------------
|
||||
1 file changed, 2 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/src/ppui/sdl/DisplayDevice_SDL.cpp b/src/ppui/sdl/DisplayDevice_SDL.cpp
|
||||
index a4b966cff12fb73d73f970ac610e23bf9df604b0..7ecedc7a369cd862a0e6bd1a9221ff12252e1da1 100644
|
||||
index b20974dc87976afb035d1d5f51372be73d20da58..05b2e126559269656cb6bb6f7f77d5deb657099b 100644
|
||||
--- a/src/ppui/sdl/DisplayDevice_SDL.cpp
|
||||
+++ b/src/ppui/sdl/DisplayDevice_SDL.cpp
|
||||
@@ -26,30 +26,8 @@
|
||||
@@ -25,35 +25,8 @@
|
||||
|
||||
SDL_Window* PPDisplayDevice::CreateWindow(pp_int32& w, pp_int32& h, pp_int32& bpp, Uint32 flags)
|
||||
{
|
||||
size_t namelen = 0;
|
||||
- size_t namelen = 0;
|
||||
- char rendername[256] = { 0 };
|
||||
- PFNGLGETSTRINGPROC glGetStringAPI = NULL;
|
||||
- bool opengl_disable = false;
|
||||
- if( getenv("NO_OPENGL") != NULL ){
|
||||
- opengl_disable = true;
|
||||
- }else printf("DISPLAY: set environmentvar NO_OPENGL=1 to disable hardware acceleration\n");
|
||||
-
|
||||
- for (int it = 0; it < SDL_GetNumRenderDrivers(); it++)
|
||||
- {
|
||||
@@ -27,7 +32,7 @@ index a4b966cff12fb73d73f970ac610e23bf9df604b0..7ecedc7a369cd862a0e6bd1a9221ff12
|
||||
- strncat(rendername, info.name, sizeof(rendername) - namelen);
|
||||
- strncat(rendername, " ", sizeof(rendername) - namelen);
|
||||
-
|
||||
- if (strncmp("opengles2", info.name, 9) == 0)
|
||||
- if ( !opengl_disable && strncmp("opengles2", info.name, 9) == 0)
|
||||
- {
|
||||
- drv_index = it;
|
||||
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
|
||||
@@ -38,12 +43,12 @@ index a4b966cff12fb73d73f970ac610e23bf9df604b0..7ecedc7a369cd862a0e6bd1a9221ff12
|
||||
- }
|
||||
-
|
||||
// Create SDL window
|
||||
- SDL_Window* theWindow = SDL_CreateWindow("MilkyTracker", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, SDL_WINDOW_OPENGL | flags);
|
||||
- SDL_Window* theWindow = SDL_CreateWindow("MilkyTracker", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, opengl_disable ? flags : SDL_WINDOW_OPENGL | flags);
|
||||
+ SDL_Window* theWindow = SDL_CreateWindow("MilkyTracker", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, flags);
|
||||
|
||||
if (theWindow == NULL)
|
||||
{
|
||||
@@ -59,7 +37,7 @@ SDL_Window* PPDisplayDevice::CreateWindow(pp_int32& w, pp_int32& h, pp_int32& bp
|
||||
@@ -63,7 +36,7 @@ SDL_Window* PPDisplayDevice::CreateWindow(pp_int32& w, pp_int32& h, pp_int32& bp
|
||||
w = getDefaultWidth();
|
||||
h = getDefaultHeight();
|
||||
|
||||
@@ -52,7 +57,7 @@ index a4b966cff12fb73d73f970ac610e23bf9df604b0..7ecedc7a369cd862a0e6bd1a9221ff12
|
||||
|
||||
if (theWindow == NULL)
|
||||
{
|
||||
@@ -69,21 +47,6 @@ SDL_Window* PPDisplayDevice::CreateWindow(pp_int32& w, pp_int32& h, pp_int32& bp
|
||||
@@ -73,21 +46,6 @@ SDL_Window* PPDisplayDevice::CreateWindow(pp_int32& w, pp_int32& h, pp_int32& bp
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +79,7 @@ index a4b966cff12fb73d73f970ac610e23bf9df604b0..7ecedc7a369cd862a0e6bd1a9221ff12
|
||||
// Prevent window from being resized below minimum
|
||||
SDL_SetWindowMinimumSize(theWindow, w, h);
|
||||
fprintf(stderr, "SDL: Minimum window size set to %dx%d.\n", w, h);
|
||||
@@ -105,7 +68,6 @@ PPDisplayDevice::PPDisplayDevice(pp_int32 width,
|
||||
@@ -109,7 +67,6 @@ PPDisplayDevice::PPDisplayDevice(pp_int32 width,
|
||||
|
||||
bFullScreen = fullScreen;
|
||||
|
||||
|
||||
+3
-3
@@ -9,15 +9,15 @@ Subject: [PATCH] Set C++ standard to C++26 and remove some unnecessary
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4bdecf1b51d6ab14865dd242c98531bbc4d0ebb8..2e7f4339fd056b1bc0f3bd10c1397ce15d77b92b 100644
|
||||
index 2764969ddd22088e52aadd66aaa0c2b05d07fd33..aac86dbfb5030c0156e03ca4b954ebabdeb2eb03 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -22,8 +22,8 @@
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
project(MilkyTracker)
|
||||
|
||||
-# Set C++ standard to C++98
|
||||
-set(CMAKE_CXX_STANDARD 98)
|
||||
-# Set C++ standard to C++11
|
||||
-set(CMAKE_CXX_STANDARD 11)
|
||||
+# Set C++ standard to C++26
|
||||
+set(CMAKE_CXX_STANDARD 26)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
@@ -8,10 +8,10 @@ Subject: [PATCH] Link against the needed serenity libraries
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
|
||||
index f4243a0fff9a462c68add0f6f5e11d956546f93e..02f67c087a4c60a168fdab74f1d9c8f52f340618 100644
|
||||
index 4af4b6588685d7dc3ad38a38d8b4a9f42e1e11b5..7153323cb9eb5647621fc72eef3bd79926bf990d 100644
|
||||
--- a/src/tracker/CMakeLists.txt
|
||||
+++ b/src/tracker/CMakeLists.txt
|
||||
@@ -374,4 +374,7 @@ else()
|
||||
@@ -456,4 +456,7 @@ else()
|
||||
set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Linus Groh <[email protected]>
|
||||
Date: Thu, 15 Oct 2026 09:23:47 +0200
|
||||
Subject: [PATCH] Remove the CMP0004 policy workaround
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aac86dbfb5030c0156e03ca4b954ebabdeb2eb03..3ab48d4dd2376ee0ba35f38cc6be6c3bf94e74f6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -162,10 +162,6 @@ elseif(HAIKU)
|
||||
message(STATUS "Enabled MIDI support (Haiku)")
|
||||
add_subdirectory(src/midi)
|
||||
else()
|
||||
- # Workaround for SDL bug #3295, which occurs in SDL2 <2.0.5
|
||||
- # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
|
||||
- cmake_policy(SET CMP0004 OLD)
|
||||
-
|
||||
find_package(SDL2 REQUIRED)
|
||||
endif()
|
||||
|
||||
@@ -25,3 +25,8 @@ Link against the needed serenity libraries
|
||||
Replace tmpnam with mkstemp
|
||||
|
||||
|
||||
## `0006-Remove-the-CMP0004-policy-workaround.patch`
|
||||
|
||||
Remove the CMP0004 policy workaround
|
||||
|
||||
|
||||
Reference in new issue
Block a user