Improve build and add dependencies

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

9 files changed, 104 insertions, 4 deletions

diff --git a/subprojects/libcdio-paranoia.wrap b/subprojects/libcdio-paranoia.wrap
new file mode 100644
index 0000000..3ff07e8
--- /dev/null
+++ b/subprojects/libcdio-paranoia.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+url = https://github.com/rocky/libcdio-paranoia.git
+revision = 36534131998286bb41072e5b666f174d69d9281b
+depth = 1
+patch_directory = libcdio-paranoia
+
+[provide]
+dependency_names = libcdio_paranoia, libcdio_cdda
diff --git a/subprojects/libdvdcss.wrap b/subprojects/libdvdcss.wrap
new file mode 100644
index 0000000..acbc6f2
--- /dev/null
+++ b/subprojects/libdvdcss.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+url = https://code.videolan.org/videolan/libdvdcss.git
+revision = d0b6a291c24eda3727ad5c7a14956fc1fc82446d
+depth = 1
+patch_directory = libdvdcss
+
+[provide]
+dependency_names = libdvdcss
diff --git a/subprojects/libdvdnav.wrap b/subprojects/libdvdnav.wrap
new file mode 100644
index 0000000..6bc37a3
--- /dev/null
+++ b/subprojects/libdvdnav.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+url = https://code.videolan.org/videolan/libdvdnav.git
+revision = 9831fe01488bd0e9d1e3521195da6940cd8415eb
+depth = 1
+patch_directory = libdvdnav
+
+[provide]
+dependency_names = libdvdnav
diff --git a/subprojects/libdvdread.wrap b/subprojects/libdvdread.wrap
new file mode 100644
index 0000000..932fd51
--- /dev/null
+++ b/subprojects/libdvdread.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+url = https://code.videolan.org/videolan/libdvdread.git
+revision = ba2227bb8619724c2bfadcc4d8f25d741a3398ac
+depth = 1
+patch_directory = libdvdread
+
+[provide]
+dependency_names = libdvdread
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'))