From c3b343f3241af8328e4f43bb6431a1d12e8b0388 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Thu, 11 Oct 2012 10:03:14 +0200
Subject: [PATCH] Add codecparsers submodule.

---
 .gitmodules      |  3 +++
 Makefile.am      |  2 +-
 autogen.sh       | 11 +++++++++++
 configure.ac     |  1 +
 ext/Makefile.am  | 29 +++++++++++++++++++++++++++++
 ext/codecparsers |  1 +
 6 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 .gitmodules
 create mode 100644 ext/Makefile.am
 create mode 160000 ext/codecparsers

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e40ceed
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ext/codecparsers"]
+	path = ext/codecparsers
+	url = git://gitorious.org/vaapi/gstreamer-codecparsers.git
diff --git a/Makefile.am b/Makefile.am
index a204514..08a5e2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = debian.upstream gst-libs gst pkgconfig tests docs
+SUBDIRS = debian.upstream gst-libs gst pkgconfig tests docs ext
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
diff --git a/autogen.sh b/autogen.sh
index 3d7ffd8..4314352 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,6 +15,17 @@ cd "$srcdir"
 
 mkdir -p m4
 
+GIT=`which git`
+if test -z "$GIT"; then
+    echo "*** No git found ***"
+    exit 1
+else
+    if test ! -f ext/codecparsers/autogen.sh; then
+        $GIT submodule init
+    fi
+    $GIT submodule update
+fi
+
 GTKDOCIZE=`which gtkdocize`
 if test -z "$GTKDOCIZE"; then
     echo "*** No gtk-doc support ***"
diff --git a/configure.ac b/configure.ac
index 98ad413..eb97a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,6 +530,7 @@ debian.upstream/libgstvaapi-x11.install.in
     docs/reference/libs/libs-docs.xml
     docs/reference/plugins/Makefile
     docs/reference/plugins/plugins-docs.xml
+    ext/Makefile
     gst-libs/Makefile
     gst-libs/gst/Makefile
     gst-libs/gst/codecparsers/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
new file mode 100644
index 0000000..bad55d5
--- /dev/null
+++ b/ext/Makefile.am
@@ -0,0 +1,29 @@
+EXTRA_DIST =
+
+codecparsers_srcdir = \
+	$(top_srcdir)/ext/codecparsers/gst-libs/gst/codecparsers
+
+codecparsers_source_c = \
+	gsth264parser.c		\
+	gstjpegparser.c		\
+	gstmpeg4parser.c	\
+	gstmpegvideoparser.c	\
+	gstvc1parser.c		\
+	parserutils.c		\
+	$(NULL)
+
+EXTRA_DIST += $(codecparsers_source_c:%.c=$(codecparsers_srcdir)/%.c)
+
+codecparsers_source_h = \
+	gsth264parser.h		\
+	gstjpegparser.h		\
+	gstmpeg4parser.h	\
+	gstmpegvideoparser.h	\
+	gstvc1parser.h		\
+	parserutils.h		\
+	$(NULL)
+
+EXTRA_DIST += $(codecparsers_source_h:%.h=$(codecparsers_srcdir)/%.h)
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/ext/codecparsers b/ext/codecparsers
new file mode 160000
index 0000000..70dfc67
--- /dev/null
+++ b/ext/codecparsers
@@ -0,0 +1 @@
+Subproject commit 70dfc67bc6953363a4273bbd0381f09433cea36f
-- 
2.7.4