From cdc656560538827d51d6f4378668b6463584a0aa Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Wed, 4 Feb 2015 14:54:55 +0100
Subject: [PATCH] validate: Move the fault_injection plugin to gst/plugins/

https://bugzilla.gnome.org/show_bug.cgi?id=743994
---
 validate/Makefile.am                               |  1 -
 validate/configure.ac                              |  3 ++-
 validate/fault_injection/socket_interposer.h       | 27 ----------------------
 validate/gst/Makefile.am                           |  2 +-
 validate/gst/plugins/Makefile.am                   |  2 ++
 .../{ => gst/plugins}/fault_injection/Makefile.am  |  3 ---
 .../plugins}/fault_injection/socket_interposer.c   |  3 +--
 7 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 validate/fault_injection/socket_interposer.h
 create mode 100644 validate/gst/plugins/Makefile.am
 rename validate/{ => gst/plugins}/fault_injection/Makefile.am (89%)
 rename validate/{ => gst/plugins}/fault_injection/socket_interposer.c (99%)

diff --git a/validate/Makefile.am b/validate/Makefile.am
index cace8ad..b86d70a 100644
--- a/validate/Makefile.am
+++ b/validate/Makefile.am
@@ -3,7 +3,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 SUBDIRS = 	\
 	common 	\
 	data	\
-	fault_injection \
 	gst 	\
 	launcher \
 	tools 	\
diff --git a/validate/configure.ac b/validate/configure.ac
index ca34dc8..45a0112 100644
--- a/validate/configure.ac
+++ b/validate/configure.ac
@@ -282,11 +282,12 @@ Makefile
 common/Makefile
 common/m4/Makefile
 data/Makefile
-fault_injection/Makefile
 gst/Makefile
 gst/validate/Makefile
 gst/preload/Makefile
 gst/overrides/Makefile
+gst/plugins/Makefile
+gst/plugins/fault_injection/Makefile
 tests/Makefile
 tests/check/Makefile
 pkgconfig/Makefile
diff --git a/validate/fault_injection/socket_interposer.h b/validate/fault_injection/socket_interposer.h
deleted file mode 100644
index bc08578..0000000
--- a/validate/fault_injection/socket_interposer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2014 YouView TV Ltd
- *  Author: Mariusz Buras <mariusz.buras@youview.com>
- *
- * socket_interposer.h : overrides for standard socket functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _SOCKET_INTERPOSER_H_
-#define _SOCKET_INTERPOSER_H_
-
-#endif /* _SOCKET_INTERPOSER_H_ */
diff --git a/validate/gst/Makefile.am b/validate/gst/Makefile.am
index 7e44971..cfb90f3 100644
--- a/validate/gst/Makefile.am
+++ b/validate/gst/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = validate overrides
+SUBDIRS = validate overrides plugins
 
 if HAVE_LD_PRELOAD
 SUBDIRS += preload
diff --git a/validate/gst/plugins/Makefile.am b/validate/gst/plugins/Makefile.am
new file mode 100644
index 0000000..ef75b10
--- /dev/null
+++ b/validate/gst/plugins/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = fault_injection
+
diff --git a/validate/fault_injection/Makefile.am b/validate/gst/plugins/fault_injection/Makefile.am
similarity index 89%
rename from validate/fault_injection/Makefile.am
rename to validate/gst/plugins/fault_injection/Makefile.am
index 8a43028..46bdd2b 100644
--- a/validate/fault_injection/Makefile.am
+++ b/validate/gst/plugins/fault_injection/Makefile.am
@@ -3,9 +3,6 @@ plugin_LTLIBRARIES = libfaultinjection.la
 libfaultinjection_la_SOURCES = \
 	socket_interposer.c
 
-noinst_HEADERS = \
-	socket_interposer.h
-
 libfaultinjection_la_CFLAGS = $(GST_ALL_CFLAGS)
 libfaultinjection_la_LIBADD = $(GST_ALL_LIBS) $(top_builddir)/gst/validate/libgstvalidate-@GST_API_VERSION@.la
 libfaultinjection_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_ALL_LDFLAGS)
diff --git a/validate/fault_injection/socket_interposer.c b/validate/gst/plugins/fault_injection/socket_interposer.c
similarity index 99%
rename from validate/fault_injection/socket_interposer.c
rename to validate/gst/plugins/fault_injection/socket_interposer.c
index 6e027d5..8e90fd5 100644
--- a/validate/fault_injection/socket_interposer.c
+++ b/validate/gst/plugins/fault_injection/socket_interposer.c
@@ -28,9 +28,8 @@
 #include "config.h"
 #endif
 
-#include "socket_interposer.h"
 #include <gst/gst.h>
-#include "../gst/validate/gst-validate-scenario.h"
+#include "../../validate/gst-validate-scenario.h"
 
 #if defined(__gnu_linux__) && !defined(__ANDROID__) && !defined (ANDROID)
 
-- 
2.7.4