Add meson build system for playback/player/{gst-play,gtk} and network/http-launchHEADmaster

11 files changed, 43 insertions, 81 deletions

diff --git a/meson.build b/meson.build
index e68f76f..866679c 100644
--- a/meson.build
+++ b/meson.build
@@ -1 +1,3 @@
 project('gst-examples', 'c', license : 'LGPL')
+subdir('playback')
+subdir('network')
diff --git a/network/http-launch/meson.build b/network/http-launch/meson.build
new file mode 100644
index 0000000..f9ebc69
--- /dev/null
+++ b/network/http-launch/meson.build
@@ -0,0 +1,3 @@
+gst_dep = dependency('gstreamer-1.0')
+gio_dep = dependency('gio-2.0')
+executable('http-launch', 'http-launch.c', dependencies : [gst_dep, gio_dep])
diff --git a/network/meson.build b/network/meson.build
new file mode 100644
index 0000000..d53f422
--- /dev/null
+++ b/network/meson.build
@@ -0,0 +1 @@
+subdir('http-launch')
diff --git a/playback/meson.build b/playback/meson.build
new file mode 100644
index 0000000..66bf6d5
--- /dev/null
+++ b/playback/meson.build
@@ -0,0 +1 @@
+subdir('player')
diff --git a/playback/player/android/Makefile.am b/playback/player/android/Makefile.am
deleted file mode 100644
index 27d8ada..0000000
--- a/playback/player/android/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-EXTRA_DIST = \
-	     build.gradle \
-	     gradle.properties \
-	     settings.gradle \
-	     app/build.gradle \
-	     app/proguard-rules.pro \
-	     app/src/main/AndroidManifest.xml \
-	     app/src/main/java/org/freedesktop/gstreamer/Player.java \
-	     app/src/main/java/org/freedesktop/gstreamer/player/GStreamerSurfaceView.java \
-	     app/src/main/java/org/freedesktop/gstreamer/player/Play.java \
-	     app/src/main/jni/Android.mk \
-	     app/src/main/jni/Application.mk \
-	     app/src/main/jni/player.c \
-	     app/src/main/res/layout/main.xml \
-	     app/src/main/res/values/strings.xml
diff --git a/playback/player/gst-play/Makefile.am b/playback/player/gst-play/Makefile.am
deleted file mode 100644
index 184e8c1..0000000
--- a/playback/player/gst-play/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-bin_PROGRAMS = gst-play
-
-gst_play_SOURCES = gst-play.c gst-play-kb.c gst-play-kb.h
-
-LDADD = $(GSTREAMER_LIBS) $(GLIB_LIBS) $(LIBM)
-
-AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GLIB_CFLAGS) $(WARNING_CFLAGS)
-
-noinst_HEADERS = gst-play-kb.h
diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build
new file mode 100644
index 0000000..719b55b
--- /dev/null
+++ b/playback/player/gst-play/meson.build
@@ -0,0 +1,12 @@
+gst_dep = dependency('gstreamer-1.0')
+gstplayer_dep = dependency('gstreamer-player-1.0', version: '>= 1.7.1.1')
+
+cc = meson.get_compiler('c')
+m_dep = cc.find_library('m', required : true)
+
+executable('gst-play',
+    ['gst-play.c',
+     'gst-play-kb.c',
+     'gst-play-kb.h'],
+    dependencies : [gst_dep, gstplayer_dep, m_dep])
+
diff --git a/playback/player/gtk/Makefile.am b/playback/player/gtk/Makefile.am
deleted file mode 100644
index 45623e5..0000000
--- a/playback/player/gtk/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-bin_PROGRAMS = gtk-play
-
-gtk-play-resources.c: resources/gresources.xml \
-	resources/media_info_dialog.ui	\
-	resources/toolbar.css						\
-	resources/toolbar.ui
-	$(AM_V_GEN)												\
-	glib-compile-resources						\
-	--sourcedir=$(srcdir)/resources		\
-	--target=$@												\
-	--generate-source									\
-	--c-name as												\
-	$(srcdir)/resources/gresources.xml
-
-gtk-play-resources.h: resources/gresources.xml \
-	resources/media_info_dialog.ui	\
-	resources/toolbar.css						\
-	resources/toolbar.ui
-	$(AM_V_GEN)												\
-	glib-compile-resources  					\
-	--sourcedir=$(srcdir)/resources   \
-	--target=$@												\
-	--generate-header									\
-	--c-name as												\
-	$(srcdir)/resources/gresources.xml
-
-BUILT_SOURCES: gtk-play-resources.c gtk-play-resources.h
-
-gtk_play_SOURCES = gtk-play.c gtk-play-resources.c gtk-video-renderer.c
-
-LDADD = $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS)
-
-AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS)
-
-noinst_HEADERS = gtk-play-resources.h gtk-video-renderer.h
diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build
new file mode 100644
index 0000000..08aae4f
--- /dev/null
+++ b/playback/player/gtk/meson.build
@@ -0,0 +1,22 @@
+glib_dep = dependency('glib-2.0', version: '>= 2.38')
+gobject_dep = dependency('gobject-2.0', version: '>= 2.38')
+gmodule_dep = dependency('gmodule-2.0')
+gst_dep = dependency('gstreamer-1.0')
+gsttag_dep = dependency('gstreamer-tag-1.0')
+gstplayer_dep = dependency('gstreamer-player-1.0', version: '>= 1.7.1.1')
+gtk_dep = dependency('gtk+-3.0')
+x11_dep = dependency('x11', required: false)
+
+gnome = import('gnome')
+
+gtk_play_resources = gnome.compile_resources('gtk-play-resources', 'resources/gresources.xml',
+  source_dir : './resources',
+  c_name : 'gtk_play')
+
+executable('gtk-play',
+    sources: ['gtk-play.c',
+      gtk_play_resources,
+     'gtk-video-renderer.h',
+     'gtk-video-renderer.c'],
+    dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep])
+
diff --git a/playback/player/ios/Makefile.am b/playback/player/ios/Makefile.am
deleted file mode 100644
index c6da505..0000000
--- a/playback/player/ios/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-EXTRA_DIST = \
-	GstPlay/AppDelegate.h \
-	GstPlay/AppDelegate.m \
-	GstPlay/EaglUIVIew.h \
-	GstPlay/EaglUIVIew.m \
-	GstPlay/en.lproj/InfoPlist.strings \
-	GstPlay/fonts.conf \
-	GstPlay/gst_ios_init.h \
-	GstPlay/gst_ios_init.m \
-	GstPlay/GstPlay-Info.plist \
-	GstPlay/GstPlay-Prefix.pch \
-	GstPlay/LibraryViewController.h \
-	GstPlay/LibraryViewController.m \
-	GstPlay/main.m \
-	GstPlay/MainStoryboard_iPad.storyboard \
-	GstPlay/MainStoryboard_iPhone.storyboard \
-	GstPlay/Ubuntu-R.ttf \
-	GstPlay/VideoViewController.h \
-	GstPlay/VideoViewController.m \
-	GstPlay.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
-	GstPlay.xcodeproj/project.pbxproj
-
diff --git a/playback/player/meson.build b/playback/player/meson.build
new file mode 100644
index 0000000..06877e9
--- /dev/null
+++ b/playback/player/meson.build
@@ -0,0 +1,2 @@
+subdir('gst-play')
+subdir('gtk')