summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-10-21 19:22:50 -0400
committerAndrew Opalach <andrew@akon.city> 2024-10-21 19:22:50 -0400
commit60b4ebfbf3be78dba9dc7c65ab2bdaa0b218c0c2 (patch)
tree08ff2ce7975f523112e7ad2fe4f797b4fc7db5de /subprojects
parent2f9a0945bfeee3296cec3d38d094e4c49f9cb65f (diff)
downloadcamu-60b4ebfbf3be78dba9dc7c65ab2bdaa0b218c0c2.tar.gz
camu-60b4ebfbf3be78dba9dc7c65ab2bdaa0b218c0c2.tar.bz2
camu-60b4ebfbf3be78dba9dc7c65ab2bdaa0b218c0c2.zip
Everything before initial synced list
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/BLAKE3.wrap2
-rw-r--r--subprojects/ffmpeg.wrap20
-rw-r--r--subprojects/packagefiles/ffmpeg/meson.build7
-rw-r--r--subprojects/packagefiles/libplacebo/cache_ref_rect.diff28
-rw-r--r--subprojects/packagefiles/linmath.h/meson.build2
-rw-r--r--subprojects/shaderc.wrap2
-rw-r--r--subprojects/stb.wrap2
-rw-r--r--subprojects/stela.wrap (renamed from subprojects/sekihi.wrap)2
8 files changed, 55 insertions, 10 deletions
diff --git a/subprojects/BLAKE3.wrap b/subprojects/BLAKE3.wrap
index 0a26602..e8048cc 100644
--- a/subprojects/BLAKE3.wrap
+++ b/subprojects/BLAKE3.wrap
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/BLAKE3-team/BLAKE3.git
-revision = 8fc36186b84385d36d8339606e4d1ea6ff471965
+revision = 1.5.1
depth = 1
patch_directory = BLAKE3
method = cmake
diff --git a/subprojects/ffmpeg.wrap b/subprojects/ffmpeg.wrap
index 8a97530..779104a 100644
--- a/subprojects/ffmpeg.wrap
+++ b/subprojects/ffmpeg.wrap
@@ -1,14 +1,26 @@
[wrap-file]
-directory = ffmpeg-7.0
+directory = ffmpeg-7.1
+#directory = ffmpeg-7.0.2
+#directory = ffmpeg-7.0.1
+#directory = ffmpeg-7.0
#directory = ffmpeg-6.1.1
#directory = ffmpeg-5.1.4
-source_url = https://www.ffmpeg.org/releases/ffmpeg-7.0.tar.gz
+source_url = https://ffmpeg.org/releases/ffmpeg-7.1.tar.gz
+#source_url = https://ffmpeg.org/releases/ffmpeg-7.0.2.tar.gz
+#source_url = https://ffmpeg.org/releases/ffmpeg-7.0.1.tar.gz
+#source_url = https://www.ffmpeg.org/releases/ffmpeg-7.0.tar.gz
#source_url = https://www.ffmpeg.org/releases/ffmpeg-6.1.1.tar.gz
#source_url = https://www.ffmpeg.org/releases/ffmpeg-5.1.4.tar.gz
-source_filename = ffmpeg-7.0.tar.gz
+source_filename = ffmpeg-7.1.tar.gz
+#source_filename = ffmpeg-7.0.2.tar.gz
+#source_filename = ffmpeg-7.0.1.tar.gz
+#source_filename = ffmpeg-7.0.tar.gz
#source_filename = ffmpeg-6.1.1.tar.gz
#source_filename = ffmpeg-5.1.4.tar.gz
-source_hash = 943a2a28044947c17a905c39075494b0da46ec0795224c2c61eff986518321eb
+source_hash = 42a7dc0d1583885d1b8f6559fa7ce28f97acafea6803de6a8f73e3ba229348bd
+#source_hash = 1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054
+#source_hash = e273eae00b4f833595654c1ee2b2349240e0332f9dbf3c4cadd39df9819ff052
+#source_hash = 943a2a28044947c17a905c39075494b0da46ec0795224c2c61eff986518321eb
#source_hash = b0aee531e4a91fed6bc031445dfc3ad8eb36de1fcb0fa2acdb589ecc9f8dc9cb
#source_hash = ad1d83e0f022ba405928ea4985c9cab978c4698bb7937738a1085808c3eb78b4
patch_directory = ffmpeg
diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 3fb1539..8092783 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -1,4 +1,4 @@
-project('ffmpeg', 'c', version: '7.0', meson_version: '>=0.57.0')
+project('ffmpeg', 'c', version: '7.0.1', meson_version: '>=0.57.0')
compiler = meson.get_compiler('c')
@@ -23,6 +23,8 @@ extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
if is_windows
if is_64bit
extra_options += ['--target-os=win64', '--arch=x86_64']
+ else
+ extra_options += ['--target-os=win32', '--arch=x86']
endif
if is_msvc
extra_options += ['--toolchain=msvc']
@@ -61,6 +63,7 @@ proj = ext_proj.add_project('configure',
'--incdir=@PREFIX@/@INCLUDEDIR@',
'--enable-pic',
'--enable-static',
+ '--disable-logging',
'--disable-shared',
'--disable-all',
'--disable-autodetect',
@@ -95,6 +98,8 @@ proj = ext_proj.add_project('configure',
'--enable-avcodec',
'--enable-swresample',
'--enable-swscale',
+ '--disable-indevs',
+ '--disable-outdevs',
'--enable-demuxer=' + demuxers,
'--enable-decoder=' + decoders,
'--enable-parser=' + parsers,
diff --git a/subprojects/packagefiles/libplacebo/cache_ref_rect.diff b/subprojects/packagefiles/libplacebo/cache_ref_rect.diff
new file mode 100644
index 0000000..647d637
--- /dev/null
+++ b/subprojects/packagefiles/libplacebo/cache_ref_rect.diff
@@ -0,0 +1,28 @@
+diff --git a/src/renderer.c b/src/renderer.c
+index 7622523..54869b9 100644
+--- a/src/renderer.c
++++ b/src/renderer.c
+@@ -31,6 +31,7 @@ struct cached_frame {
+ struct pl_color_space color;
+ struct pl_icc_profile profile;
+ pl_rect2df crop;
++ pl_rect2df ref_rect;
+ pl_tex tex;
+ int comps;
+ bool evict; // for garbage collection
+@@ -3473,6 +3474,7 @@ retry:
+ can_reuse = f->tex->params.w == out_w &&
+ f->tex->params.h == out_h &&
+ pl_rect2d_eq(f->crop, img->crop) &&
++ pl_rect2d_eq(f->ref_rect, pass.ref_rect) &&
+ f->params_hash == par_info.hash &&
+ pl_color_space_equal(&f->color, &target->color) &&
+ pl_icc_profile_equal(&f->profile, &target->profile);
+@@ -3568,6 +3570,7 @@ retry:
+
+ f->params_hash = par_info.hash;
+ f->crop = img->crop;
++ f->ref_rect = pass.ref_rect;
+ f->color = inter_pass.img.color;
+ f->comps = inter_pass.img.comps;
+ f->profile = target->profile;
diff --git a/subprojects/packagefiles/linmath.h/meson.build b/subprojects/packagefiles/linmath.h/meson.build
index d3ab07d..19438fa 100644
--- a/subprojects/packagefiles/linmath.h/meson.build
+++ b/subprojects/packagefiles/linmath.h/meson.build
@@ -1,2 +1,2 @@
project('linmath.h', 'c', version: 'git-3eef828')
-linmath = declare_dependency(include_directories: include_directories('.'))
+linmath_h = declare_dependency(include_directories: include_directories('.'))
diff --git a/subprojects/shaderc.wrap b/subprojects/shaderc.wrap
index 7b9c266..fb5c1ee 100644
--- a/subprojects/shaderc.wrap
+++ b/subprojects/shaderc.wrap
@@ -1,5 +1,5 @@
[wrap-git]
url = https://github.com/google/shaderc.git
-revision = f59f0d11b80fd622383199c867137ededf89d43b
+revision = 5d0f6ed6e46d3c0ccd23151c6a1486c2ec90c037
depth = 1
method = cmake
diff --git a/subprojects/stb.wrap b/subprojects/stb.wrap
index f8193df..d14fad7 100644
--- a/subprojects/stb.wrap
+++ b/subprojects/stb.wrap
@@ -1,5 +1,5 @@
[wrap-git]
url = https://github.com/nothings/stb.git
-revision = ae721c50eaf761660b4f90cc590453cdb0c2acd0
+revision = 013ac3beddff3dbffafd5177e7972067cd2b5083
depth = 1
patch_directory = stb
diff --git a/subprojects/sekihi.wrap b/subprojects/stela.wrap
index 160b2d3..7807a8c 100644
--- a/subprojects/sekihi.wrap
+++ b/subprojects/stela.wrap
@@ -1,4 +1,4 @@
[wrap-git]
-url = https://git.akon.city/sekihi
+url = https://git.akon.city/stela
revision = master
depth = 1