From 9ed06008cd164e1b484dbb155d6162538e372a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 21 Feb 2013 11:01:28 +0100
Subject: [PATCH] Add OpenMAX IL target for Bellagio

Not tested since a very long time though.
---
 config/Makefile.am                   | 2 +-
 {omx => config/bellagio}/gstomx.conf | 0
 configure.ac                         | 7 ++++++-
 omx/Makefile.am                      | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename {omx => config/bellagio}/gstomx.conf (100%)

diff --git a/config/Makefile.am b/config/Makefile.am
index 113f4d9880..3b467a2804 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1 +1 @@
-SUBDIRS = rpi
+SUBDIRS = bellagio rpi
diff --git a/omx/gstomx.conf b/config/bellagio/gstomx.conf
similarity index 100%
rename from omx/gstomx.conf
rename to config/bellagio/gstomx.conf
diff --git a/configure.ac b/configure.ac
index 23952ef753..611a74f919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,7 +172,7 @@ AC_ARG_ENABLE(Bsymbolic,
                LDFLAGS="${SAVED_LDFLAGS}"])
 
 AC_ARG_WITH([omx-target],
-        AS_HELP_STRING([--with-omx-target],[Use this OpenMAX IL target (generic, rpi)]),
+        AS_HELP_STRING([--with-omx-target],[Use this OpenMAX IL target (generic, bellagio, rpi)]),
         [ac_cv_omx_target="$withval"], [ac_cv_omx_target="generic"])
 
 ac_cv_omx_target_struct_packing="none"
@@ -185,11 +185,15 @@ case "${ac_cv_omx_target}" in
     AC_DEFINE(USE_OMX_TARGET_RPI, 1, [Use RPi OpenMAX IL target])
     ac_cv_omx_target_struct_packing=4
     ;;
+  bellagio)
+    AC_DEFINE(USE_OMX_TARGET_BELLAGIO, 1, [Use Bellagio OpenMAX IL target])
+    ;;
   *)
     AC_ERROR([invalid OpenMAX IL target])
     ;;
 esac
 AM_CONDITIONAL(USE_OMX_TARGET_GENERIC, test "x$ac_cv_omx_target" = "xgeneric")
+AM_CONDITIONAL(USE_OMX_TARGET_BELLAGIO, test "x$ac_cv_omx_target" = "xbellagio")
 AM_CONDITIONAL(USE_OMX_TARGET_RPI, test "x$ac_cv_omx_target" = "xrpi")
 
 AC_ARG_WITH([omx-struct-packing],
@@ -310,6 +314,7 @@ common/Makefile
 common/m4/Makefile
 tools/Makefile
 config/Makefile
+config/bellagio/Makefile
 config/rpi/Makefile
 )
 
diff --git a/omx/Makefile.am b/omx/Makefile.am
index a1ba5fe1b8..da650c8719 100644
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -49,7 +49,7 @@ libgstomx_la_LIBADD = \
 	$(GST_LIBS)
 libgstomx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-EXTRA_DIST = openmax gstomx.conf
+EXTRA_DIST = openmax
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \