Update deps, build fixes, cleanup

Signed-off-by: Andrew Opalach <andrew@akon.city>

4 files changed, 78 insertions, 25 deletions

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 36bae60..7481dea 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -107,10 +107,10 @@ if ffmpeg_image_codecs
   zlib = dependency('zlib', required: false)
   if zlib.found()
     extra_options += ['--enable-zlib']
-    decoders += ',png,apng,mjpeg,jpeg2000,webp,gif,'
+    decoders += ',png,apng,mjpeg,jpeg2000,webp,gif,psd'
     if not get_option('sink-only')
-      demuxers += ',image_png_pipe,image2,mjpeg,image2pipe,image_jpeg_pipe,image_webp_pipe,gif'
-      parsers += ',png,mjpeg,jpeg2000,webp,gif'
+      demuxers += ',image_png_pipe,image2,mjpeg,image2pipe,image_jpeg_pipe,image_webp_pipe,gif,image_psd_pipe'
+      parsers += ',png,mjpeg,jpeg2000,webp,gif,psd'
     endif
     deps += [zlib]
   else
diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
index 90911d5..7e91e5d 100644
--- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
+++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff
@@ -1,12 +1,12 @@
---- a/meson.build	2025-11-30 11:51:43.747121512 -0500
-+++ b/meson.build	2025-11-30 12:55:07.519116860 -0500
+--- a/meson.build	2026-07-02 16:36:02.258920727 -0400
++++ b/meson.build	2026-07-02 16:49:06.795636508 -0400
 @@ -1,4 +1,4 @@
 -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
 +project('ffmpeg', 'c', version: '3.3.9', meson_version: '>=0.57.0')
  
  compiler = meson.get_compiler('c')
  
-@@ -35,10 +35,6 @@
+@@ -40,10 +40,6 @@
    extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
  endif
  
@@ -17,27 +17,22 @@
  extra_options += ['--enable-static', '--disable-shared']
  
  if is_windows
-@@ -68,18 +64,7 @@
- decoders += ',dca,eac3'
+@@ -74,14 +70,6 @@
  decoders += ',pcm_dvd,mpegvideo,mpeg2video'
+ decoders += ',av1'
  #decoders += ',ass,srt'
--if get_option('codec-hwaccels').length() == 0
--  if not is_msvc
--    libdav1d = dependency('dav1d', required: false)
--    if libdav1d.found()
--      decoders += ',libdav1d'
--      extra_options += ['--enable-libdav1d']
--      deps += [libdav1d]
--    endif
+-#if get_option('codec-hwaccels').length() == 0
+-  libdav1d = dependency('dav1d', required: false)
+-  if libdav1d.found()
+-    decoders += ',libdav1d'
+-    extra_options += ['--enable-libdav1d']
+-    deps += [libdav1d]
 -  endif
--else
--  decoders += ',av1'
--endif
-+decoders += ',av1'
+-#endif
  
  demuxers = ''
  parsers = ''
-@@ -195,12 +180,8 @@
+@@ -197,12 +185,8 @@
  
  # Disable unused hwaccels.
  extra_options += [
@@ -50,7 +45,7 @@
    '--disable-nvenc',
    '--disable-vdpau',
    '--disable-audiotoolbox',
-@@ -243,6 +224,15 @@
+@@ -245,6 +229,15 @@
    args += ['-DCAMU_HAVE_SOXR']
  endif
  
@@ -66,7 +61,7 @@
  ext_proj = import('unstable-external_project')
  
  proj = ext_proj.add_project('configure',
-@@ -252,7 +242,6 @@
+@@ -254,7 +247,6 @@
      '--incdir=@PREFIX@/@INCLUDEDIR@',
      '--enable-pic',
      '--disable-all',
@@ -74,7 +69,7 @@
      '--disable-everything',
      '--disable-programs',
      '--disable-doc',
-@@ -277,11 +266,14 @@
+@@ -279,11 +271,14 @@
      '--enable-swscale',
      '--disable-indevs',
      '--disable-outdevs',
@@ -89,7 +84,7 @@
  avutil = proj.dependency('avutil')
  avformat = proj.dependency('avformat')
  avcodec = proj.dependency('avcodec')
-@@ -290,14 +282,14 @@
+@@ -292,14 +287,14 @@
  swscale = proj.dependency('swscale')
  include = include_directories('.', 'build/')
  meson.override_dependency('libavutil', declare_dependency(
diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.1.diff b/subprojects/packagefiles/ffmpeg/version_8.1.1.diff
new file mode 100644
index 0000000..8976dd2
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_8.1.1.diff
@@ -0,0 +1,29 @@
+--- a/meson.build	2025-08-23 18:44:34.634014892 -0400
++++ b/meson.build	2025-08-25 15:33:36.209533531 -0400
+@@ -1,4 +1,4 @@
+-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
++project('ffmpeg', 'c', version: '8.1.1', meson_version: '>=0.57.0')
+ 
+ compiler = meson.get_compiler('c')
+ 
+@@ -268,14 +268,14 @@
+ swscale = proj.dependency('swscale')
+ include = include_directories('.', 'build/')
+ meson.override_dependency('libavutil', declare_dependency(
+-  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: ''))
++  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '60.26.101'))
+ meson.override_dependency('libavformat', declare_dependency(
+-  dependencies: [avformat], include_directories: include, version: ''))
++  dependencies: [avformat], include_directories: include, version: '62.12.101'))
+ meson.override_dependency('libavcodec', declare_dependency(
+-  dependencies: [avcodec], include_directories: include, version: ''))
++  dependencies: [avcodec], include_directories: include, version: '62.28.101'))
+ meson.override_dependency('libavdevice', declare_dependency(
+-  dependencies: [avdevice], include_directories: include, version: ''))
++  dependencies: [avdevice], include_directories: include, version: '62.3.101'))
+ meson.override_dependency('libswresample', declare_dependency(
+-  dependencies: [swresample], include_directories: include, version: ''))
++  dependencies: [swresample], include_directories: include, version: '6.3.101'))
+ meson.override_dependency('libswscale', declare_dependency(
+-  dependencies: [swscale], include_directories: include, version: ''))
++  dependencies: [swscale], include_directories: include, version: '9.5.101'))
diff --git a/subprojects/packagefiles/ffmpeg/version_8.1.2.diff b/subprojects/packagefiles/ffmpeg/version_8.1.2.diff
new file mode 100644
index 0000000..e1b52a4
--- /dev/null
+++ b/subprojects/packagefiles/ffmpeg/version_8.1.2.diff
@@ -0,0 +1,29 @@
+--- a/meson.build	2025-08-23 18:44:34.634014892 -0400
++++ b/meson.build	2025-08-25 15:33:36.209533531 -0400
+@@ -1,4 +1,4 @@
+-project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0')
++project('ffmpeg', 'c', version: '8.1.2', meson_version: '>=0.57.0')
+ 
+ compiler = meson.get_compiler('c')
+ 
+@@ -268,14 +268,14 @@
+ swscale = proj.dependency('swscale')
+ include = include_directories('.', 'build/')
+ meson.override_dependency('libavutil', declare_dependency(
+-  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: ''))
++  dependencies: [avutil, deps], compile_args: args, include_directories: include, version: '60.26.102'))
+ meson.override_dependency('libavformat', declare_dependency(
+-  dependencies: [avformat], include_directories: include, version: ''))
++  dependencies: [avformat], include_directories: include, version: '62.12.102'))
+ meson.override_dependency('libavcodec', declare_dependency(
+-  dependencies: [avcodec], include_directories: include, version: ''))
++  dependencies: [avcodec], include_directories: include, version: '62.28.102'))
+ meson.override_dependency('libavdevice', declare_dependency(
+-  dependencies: [avdevice], include_directories: include, version: ''))
++  dependencies: [avdevice], include_directories: include, version: '62.3.102'))
+ meson.override_dependency('libswresample', declare_dependency(
+-  dependencies: [swresample], include_directories: include, version: ''))
++  dependencies: [swresample], include_directories: include, version: '6.3.102'))
+ meson.override_dependency('libswscale', declare_dependency(
+-  dependencies: [swscale], include_directories: include, version: ''))
++  dependencies: [swscale], include_directories: include, version: '9.5.102'))