From fb1cbf546300d9f8efdf21c6ac66f7c2f1dfd4f3 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Sat, 27 Jan 2024 20:32:54 -0500
Subject: Improve build and add dependencies

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 subprojects/packagefiles/ffmpeg/meson.build          |  8 ++++----
 .../packagefiles/libcdio-paranoia/meson.build        | 20 ++++++++++++++++++++
 subprojects/packagefiles/libdvdcss/meson.build       | 16 ++++++++++++++++
 subprojects/packagefiles/libdvdnav/meson.build       | 16 ++++++++++++++++
 subprojects/packagefiles/libdvdread/meson.build      | 16 ++++++++++++++++
 5 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 subprojects/packagefiles/libcdio-paranoia/meson.build
 create mode 100644 subprojects/packagefiles/libdvdcss/meson.build
 create mode 100644 subprojects/packagefiles/libdvdnav/meson.build
 create mode 100644 subprojects/packagefiles/libdvdread/meson.build

(limited to 'subprojects/packagefiles')

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index cff10e9..6700f5d 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -55,14 +55,16 @@ ext_proj = import('unstable-external_project')
 proj = ext_proj.add_project('configure',
   configure_options: [
     '--prefix=@PREFIX@',
-    '--libdir=@PREFIX@@LIBDIR@',
-    '--incdir=@PREFIX@@INCLUDEDIR@',
+    '--libdir=@PREFIX@/@LIBDIR@',
+    '--incdir=@PREFIX@/@INCLUDEDIR@',
     '--enable-pic',
     '--enable-static',
     '--disable-shared',
     '--disable-all',
     '--disable-autodetect',
     '--disable-everything',
+    '--disable-programs',
+    '--disable-doc',
     '--disable-htmlpages',
     '--disable-manpages',
     '--disable-podpages',
@@ -105,6 +107,4 @@ avformat = proj.dependency('avformat')
 avcodec = proj.dependency('avcodec')
 swresample = proj.dependency('swresample')
 swscale = proj.dependency('swscale')
-
 av_inc_dep = declare_dependency(include_directories: include_directories('.', 'build/'))
-av_lib_dir = join_paths(meson.project_build_root(), 'dist/usr/locallib')
diff --git a/subprojects/packagefiles/libcdio-paranoia/meson.build b/subprojects/packagefiles/libcdio-paranoia/meson.build
new file mode 100644
index 0000000..45b2c12
--- /dev/null
+++ b/subprojects/packagefiles/libcdio-paranoia/meson.build
@@ -0,0 +1,20 @@
+project('libcdio-paranoia', 'c', version: 'git-3653413', meson_version: '>=0.57.0')
+
+ext_proj = import('unstable-external_project')
+
+run_command('autoreconf', '-fi', check: true)
+
+proj = ext_proj.add_project('configure',
+  configure_options: [
+    '--prefix=@PREFIX@',
+    '--libdir=@PREFIX@/@LIBDIR@',
+    '--includedir=@PREFIX@/@INCLUDEDIR@',
+    '--config-cache',
+    '--disable-cxx',
+    '--disable-example-progs'
+  ],
+  cross_configure_options: [],
+  verbose: true)
+
+meson.override_dependency('libcdio_paranoia', proj.dependency('cdio_paranoia'))
+meson.override_dependency('libcdio_cdda', proj.dependency('cdio_cdda'))
diff --git a/subprojects/packagefiles/libdvdcss/meson.build b/subprojects/packagefiles/libdvdcss/meson.build
new file mode 100644
index 0000000..caa0deb
--- /dev/null
+++ b/subprojects/packagefiles/libdvdcss/meson.build
@@ -0,0 +1,16 @@
+project('libdvdcss', 'c', version: 'git-d0b6a29', meson_version: '>=0.57.0')
+
+ext_proj = import('unstable-external_project')
+
+run_command('autoreconf', '-fi', check: true)
+
+proj = ext_proj.add_project('configure',
+  configure_options: [
+    '--prefix=@PREFIX@',
+    '--libdir=@PREFIX@/@LIBDIR@',
+    '--includedir=@PREFIX@/@INCLUDEDIR@'
+  ],
+  cross_configure_options: [],
+  verbose: true)
+
+meson.override_dependency('libdvdcss', proj.dependency('dvdcss'))
diff --git a/subprojects/packagefiles/libdvdnav/meson.build b/subprojects/packagefiles/libdvdnav/meson.build
new file mode 100644
index 0000000..3d220da
--- /dev/null
+++ b/subprojects/packagefiles/libdvdnav/meson.build
@@ -0,0 +1,16 @@
+project('libdvdnav', 'c', version: 'git-9831fe0', meson_version: '>=0.57.0')
+
+ext_proj = import('unstable-external_project')
+
+run_command('autoreconf', '-fi', check: true)
+
+proj = ext_proj.add_project('configure',
+  configure_options: [
+    '--prefix=@PREFIX@',
+    '--libdir=@PREFIX@/@LIBDIR@',
+    '--includedir=@PREFIX@/@INCLUDEDIR@'
+  ],
+  cross_configure_options: [],
+  verbose: true)
+
+meson.override_dependency('libdvdnav', proj.dependency('dvdnav'))
diff --git a/subprojects/packagefiles/libdvdread/meson.build b/subprojects/packagefiles/libdvdread/meson.build
new file mode 100644
index 0000000..8511017
--- /dev/null
+++ b/subprojects/packagefiles/libdvdread/meson.build
@@ -0,0 +1,16 @@
+project('libdvdread', 'c', version: 'git-ba2227b', meson_version: '>=0.57.0')
+
+ext_proj = import('unstable-external_project')
+
+run_command('autoreconf', '-fi', check: true)
+
+proj = ext_proj.add_project('configure',
+  configure_options: [
+    '--prefix=@PREFIX@',
+    '--libdir=@PREFIX@/@LIBDIR@',
+    '--includedir=@PREFIX@/@INCLUDEDIR@'
+  ],
+  cross_configure_options: [],
+  verbose: true)
+
+meson.override_dependency('libdvdread', proj.dependency('dvdread'))
-- 
cgit v1.2.3-101-g0448