haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

MPV: fix build

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-03-31 14:24:16 +10:00
parent 5b67c9a46d
commit 6c4273820b
2 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-video/mpv/mpv-0.37.0.recipe
View File

@@ -5,7 +5,7 @@ types."
HOMEPAGE="https://mpv.io/"
COPYRIGHT="2013-2024 MPV Developers"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="1d2d4adbaf048a2fa6ee134575032c4b2dad9a7efafd5b3e69b88db935afaddf"
SOURCE_FILENAME="mpv-$portVersion.tar.gz"

65
media-video/mpv/patches/mpv-0.37.0.patchset
View File

@@ -1,4 +1,4 @@
From 2978938c7b8227b0699644a6c3eed1e8a7098cf9 Mon Sep 17 00:00:00 2001
From 97b042bfbd0a5f49b2339fb88908a37a88e908c8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 6 Mar 2024 21:40:44 +1000
Subject: disable setlocale for haiku
@@ -25,7 +25,7 @@ index 27cf9b4..cdad83e 100644
2.43.2
From af074823c0c320ba0586679f6f2a34aa4c4b903d Mon Sep 17 00:00:00 2001
From 6279671a31df31efb0a4c2871586c53792860148 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Thu, 11 May 2023 21:00:50 -0300
Subject: Fix build on Haiku
@@ -49,7 +49,7 @@ index 482e4a8..5675921 100644
2.43.2
From 105840f8eec05cd2a680f2ae95aea11a45063b96 Mon Sep 17 00:00:00 2001
From 7ef22621b8ca9bc422d79b546cb772059a8a09e3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 31 Mar 2024 00:52:47 +1000
Subject: Add Haiku video output module
@@ -144,7 +144,7 @@ index 50129fb..fda0b78 100644
#endif
diff --git a/video/out/vo_haiku.cpp b/video/out/vo_haiku.cpp
new file mode 100644
index 0000000..bc285a5
index 0000000..cc3c4a9
--- /dev/null
+++ b/video/out/vo_haiku.cpp
@@ -0,0 +1,501 @@
@@ -652,3 +652,60 @@ index 0000000..bc285a5
--
2.43.2
From 65b7590fdfef29df1baf1d8835120328fb9268a2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 31 Mar 2024 04:03:26 +0000
Subject: Use _Static_assert
diff --git a/audio/out/ao_audiotrack.c b/audio/out/ao_audiotrack.c
index 1392699..088cb9a 100644
--- a/audio/out/ao_audiotrack.c
+++ b/audio/out/ao_audiotrack.c
@@ -704,7 +704,7 @@ static int init(struct ao *ao)
AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER,
AudioFormat.CHANNEL_OUT_7POINT1_SURROUND,
};
- static_assert(MP_ARRAY_SIZE(layout_map) == MP_ARRAY_SIZE(layouts), "");
+ _Static_assert(MP_ARRAY_SIZE(layout_map) == MP_ARRAY_SIZE(layouts), "");
if (p->format == AudioFormat.ENCODING_IEC61937) {
p->channel_config = AudioFormat.CHANNEL_OUT_STEREO;
} else {
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index 1dc1b18..a887be9 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -1402,14 +1402,14 @@ done:
static inline void copy_frame_info_to_mp(struct frame_info *pl,
struct mp_frame_perf *mp) {
- static_assert(MP_ARRAY_SIZE(pl->info) == MP_ARRAY_SIZE(mp->perf), "");
+ _Static_assert(MP_ARRAY_SIZE(pl->info) == MP_ARRAY_SIZE(mp->perf), "");
assert(pl->count <= VO_PASS_PERF_MAX);
mp->count = MPMIN(pl->count, VO_PASS_PERF_MAX);
for (int i = 0; i < mp->count; ++i) {
const struct pl_dispatch_info *pass = &pl->info[i];
- static_assert(VO_PERF_SAMPLE_COUNT >= MP_ARRAY_SIZE(pass->samples), "");
+ _Static_assert(VO_PERF_SAMPLE_COUNT >= MP_ARRAY_SIZE(pass->samples), "");
assert(pass->num_samples <= MP_ARRAY_SIZE(pass->samples));
struct mp_pass_perf *perf = &mp->perf[i];
diff --git a/video/zimg.c b/video/zimg.c
index 5ff300c..627db51 100644
--- a/video/zimg.c
+++ b/video/zimg.c
@@ -32,7 +32,7 @@
#include "zimg.h"
#include "config.h"
-static_assert(MP_IMAGE_BYTE_ALIGN >= ZIMG_ALIGN, "");
+_Static_assert(MP_IMAGE_BYTE_ALIGN >= ZIMG_ALIGN, "");
#define HAVE_ZIMG_ALPHA (ZIMG_API_VERSION >= ZIMG_MAKE_API_VERSION(2, 4))
--
2.43.2