finished full meson support

Author: noasakurajin

.gitignore

@@ -7,3 +7,7 @@ qtcreator-build-*/
 scripts/valgrind.txt
 transcoder-manager-*-win32.zip
 build
+
+.cache
+subprojects/Catch2-*
+subprojects/packagecache

example/api2-samples/meson.build

@@ -1,12 +1,12 @@
 project(
-    'AvCppSamples',
+    'libavcpp_samples',
     'cpp',
     version: '2.0.99'
 )
 
-libavcpp = subproject('libavcpp')
+libavcpp = subproject('avcpp')
 
-avcpp_dep = libavcpp.get_variable('libavcpp_dep')
+avcpp_dep = libavcpp.get_variable('avcpp_dep')
 
 samples = [
     'api2-decode',

meson.build

@@ -1,6 +1,5 @@
 project(
-    'AvCpp', 
-    'c', 
+    'avcpp_setup',
     'cpp',
     meson_version: '>= 0.50.0',
     default_options : [
@@ -10,10 +9,12 @@ project(
     version: '2.0.99',
 )
 
-#add_project_arguments('-std=gnu++17', language : 'cpp')
-cc = meson.get_compiler('cpp')
-
-subproject('libavcpp')
-subproject('AvCppSamples')
+subproject('avcpp')
 
+if get_option('build_samples')
+    subproject('avcpp_samples')
+endif
 
+if get_option('build_tests')
+    subproject('avcpp_tests')
+endif

meson_options.txt

@@ -0,0 +1,2 @@
+option('build_samples', type : 'boolean', value : true, description: 'set to false if you do not want to compile the sample programs.')
+option('build_tests', type : 'boolean', value : true, description: 'set to false if you do not want to compile the tests.')

src/meson.build

@@ -1,6 +1,5 @@
 project(
-    'libavcpp', 
-    'c', 
+    'avcpp',
     'cpp',
     meson_version: '>= 0.50.0',
     default_options : [
@@ -10,12 +9,11 @@ project(
     version: '2.0.99',
 )
 
-#add_project_arguments('-std=gnu++17', language : 'cpp')
+#getting all of the dependencies
 cc = meson.get_compiler('cpp')
 
-libavcpp_deps = [
+avcpp_deps = [
     dependency('threads', required : true),
-    #dependency('FFmpeg', required : true, method : 'cmake', components : ['AVCODEC AVFORMAT AVUTIL AVDEVICE AVFILTER SWSCALE SWRESAMPLE']),
     dependency('libavcodec', required: true),
     dependency('libavformat', required: true),
     dependency('libavutil', required: true),
@@ -26,9 +24,11 @@ libavcpp_deps = [
     cc.find_library('dl', required : false),
 ]
 
-libavcpp_incdir = include_directories('.')
+#setting the include dir to the current folder (src)
+avcpp_incdir = include_directories('.','filters')
 
-libavcpp_sources = [
+#listing all the source files
+avcpp_sources = [
     'audioresampler.cpp',
     'averror.cpp',
     'avtime.cpp',
@@ -39,7 +39,6 @@ libavcpp_sources = [
     'formatcontext.cpp',
     'format.cpp',
     'frame.cpp',
-    #'libavcpp.pc.in',
     'packet.cpp',
     'pixelformat.cpp',
     'rational.cpp',
@@ -48,21 +47,34 @@ libavcpp_sources = [
     'stream.cpp',
     'timestamp.cpp',
     'videorescaler.cpp',
+
+    'filters/buffersink.cpp',
+    'filters/buffersrc.cpp',
+    'filters/filtercontext.cpp',
+    'filters/filter.cpp',
+    'filters/filtergraph.cpp',
+    'filters/filterpad.cpp',
+
 ]
 
-libavcpp = library(
-    'libavcpp', 
-    libavcpp_sources, 
+#defining how to build the library
+avcpp = library(
+    'avcpp', 
+    avcpp_sources, 
     version : meson.project_version(), 
     soversion : '0', 
-    include_directories : libavcpp_incdir,
-    dependencies: libavcpp_deps
+    include_directories : avcpp_incdir,
+    dependencies: avcpp_deps
 )
 
-libavcpp_dep = declare_dependency(
-    include_directories : libavcpp_incdir,
-    link_with : libavcpp,
-    dependencies : libavcpp_deps,
+#export the dependency information
+avcpp_dep = declare_dependency(
+    include_directories : avcpp_incdir,
+    link_with : avcpp,
+    dependencies : avcpp_deps,
     version: meson.project_version()
 )
 
+#generate pkg-config
+pkg = import('pkgconfig')
+pkg.generate(avcpp)

subprojects/libavcpp renamed to subprojects/avcpp

@@ -0,0 +1 @@
+../tests/

subprojects/AvCppSamples renamed to subprojects/avcpp_samples

@@ -0,0 +1,10 @@
+[wrap-file]
+directory = Catch2-2.11.3
+
+source_url = https://github.com/catchorg/Catch2/archive/v2.11.3.zip
+source_filename = Catch2-2.11.3.zip
+source_hash = c5a0a7510379c6f37f70b329986a335a7b8489d67ac417ce8f4262d0cae4cc5d
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/catch2/2.11.3/1/get_zip
+patch_filename = catch2-2.11.3-1-wrap.zip
+patch_hash = 63c09cb68280435040ad304b3dd87ecfe69dbc216608991d0a82569a63119e57

subprojects/avcpp_tests

@@ -0,0 +1,53 @@
+project(
+    'avcpp_tests',
+    'cpp',
+    version: '0.0.1',
+    meson_version: '>= 0.50.0',
+    default_options : [
+        'c_std=c11', 
+        'cpp_std=c++17'
+    ]
+)
+
+#get catch2
+catch2 = dependency('catch2', required: false)
+if not catch2.found()
+    catch2_proj = subproject('catch2')
+    catch2 = catch2_proj.get_variable('catch2_dep')
+endif
+
+#create main_test as library and export the dependency
+main_test = static_library(
+    'main_test', 
+    'test-main.cpp', 
+    dependencies: catch2
+)
+
+main_test_dep = declare_dependency(
+    link_with : main_test,
+    dependencies : catch2,
+    version: meson.project_version()
+)
+
+#getting the dependencies for libavcpp
+libavcpp = subproject('avcpp')
+deps = [libavcpp.get_variable('avcpp_dep')]
+
+#make both dependencies into one array
+deps += main_test_dep
+
+tests = [
+    'Frame',
+    'AvDeleter',
+    'Packet',
+]
+
+#create all the tests
+foreach test_obj : tests
+    exe = executable(
+        test_obj, 
+        test_obj + '.cpp',
+        dependencies: deps
+    )
+    test(test_obj + ' Test', exe)
+endforeach