From 60b4ebfbf3be78dba9dc7c65ab2bdaa0b218c0c2 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Mon, 21 Oct 2024 19:22:50 -0400
Subject: Everything before initial synced list

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 subprojects/packagefiles/ffmpeg/meson.build        |  7 +++++-
 .../packagefiles/libplacebo/cache_ref_rect.diff    | 28 ++++++++++++++++++++++
 subprojects/packagefiles/linmath.h/meson.build     |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 subprojects/packagefiles/libplacebo/cache_ref_rect.diff

(limited to 'subprojects/packagefiles')

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('.'))
-- 
cgit v1.2.3-101-g0448