From 4a2a73b13faebff621b91c8653abb04df9d79e40 Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Tue, 27 Nov 2012 19:25:06 -0500 Subject: [PATCH] gst-dvm: Create a gst-dvm library using part of androidcamera --- gst-libs/gst/dvm/Makefile.am | 28 ++++++++++++++++++++++ {sys/androidcamera => gst-libs/gst/dvm}/gst-dvm.c | 0 {sys/androidcamera => gst-libs/gst/dvm}/gst-dvm.h | 0 pkgconfig/gstreamer-dvm-uninstalled.pc.in | 12 ++++++++++ pkgconfig/gstreamer-dvm.pc.in | 12 ++++++++++ sys/androidcamera/Makefile.am | 2 -- .../gst-android-graphics-imageformat.c | 3 ++- .../gst-android-graphics-surfacetexture.c | 3 ++- sys/androidcamera/gst-android-hardware-camera.c | 3 ++- sys/androidcamera/gst-androidcamera.c | 2 +- sys/androidcamera/gstahcsrc.c | 2 +- 11 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 gst-libs/gst/dvm/Makefile.am rename {sys/androidcamera => gst-libs/gst/dvm}/gst-dvm.c (100%) rename {sys/androidcamera => gst-libs/gst/dvm}/gst-dvm.h (100%) create mode 100644 pkgconfig/gstreamer-dvm-uninstalled.pc.in create mode 100644 pkgconfig/gstreamer-dvm.pc.in diff --git a/gst-libs/gst/dvm/Makefile.am b/gst-libs/gst/dvm/Makefile.am new file mode 100644 index 0000000..d2f4d2a --- /dev/null +++ b/gst-libs/gst/dvm/Makefile.am @@ -0,0 +1,28 @@ +lib_LTLIBRARIES = libgstdvm-@GST_MAJORMINOR@.la +libgstdvmincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dvm + +libgstdvminclude_HEADERS = \ + gst-dvm.h + +libgstdvm_@GST_MAJORMINOR@_la_SOURCES = \ + gst-dvm.c + +libgstdvm_@GST_MAJORMINOR@_la_CFLAGS = \ + $(GST_PLUGINS_BAD_CFLAGS) \ + $(GST_CFLAGS) +libgstdvm_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) +libgstdvm_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + +Android.mk: $(BUILT_SOURCES) Makefile.am + androgenizer -:PROJECT libgstdvm -:STATIC libgstdvm-@GST_MAJORMINOR@ \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstdvm_@GST_MAJORMINOR@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstdvm_@GST_MAJORMINOR@_la_CFLAGS) \ + -:LDFLAGS $(libgstdvm_@GST_MAJORMINOR@_la_LDFLAGS) \ + $(libgstdvm_@GST_MAJORMINOR@_la_LIBADD) \ + -ldl \ + -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/dvm \ + -:HEADERS $(libgstdvminclude_HEADERS) + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + > $@ diff --git a/sys/androidcamera/gst-dvm.c b/gst-libs/gst/dvm/gst-dvm.c similarity index 100% rename from sys/androidcamera/gst-dvm.c rename to gst-libs/gst/dvm/gst-dvm.c diff --git a/sys/androidcamera/gst-dvm.h b/gst-libs/gst/dvm/gst-dvm.h similarity index 100% rename from sys/androidcamera/gst-dvm.h rename to gst-libs/gst/dvm/gst-dvm.h diff --git a/pkgconfig/gstreamer-dvm-uninstalled.pc.in b/pkgconfig/gstreamer-dvm-uninstalled.pc.in new file mode 100644 index 0000000..c1de57e --- /dev/null +++ b/pkgconfig/gstreamer-dvm-uninstalled.pc.in @@ -0,0 +1,12 @@ +prefix= +exec_prefix= +libdir=${pcfiledir}/../gst-libs/gst/dvm +includedir=${pcfiledir}/../gst-libs + +Name: GStreamer DVM, Uninstalled +Description: Dalvik Virtual Machine helpers, Uninstalled +Requires: gstreamer-@GST_MAJORMINOR@ +Version: @VERSION@ +Libs: -L${libdir} ${libdir}/libgstdvm-@GST_MAJORMINOR@.la +Cflags: -I${includedir} + diff --git a/pkgconfig/gstreamer-dvm.pc.in b/pkgconfig/gstreamer-dvm.pc.in new file mode 100644 index 0000000..a3203a5 --- /dev/null +++ b/pkgconfig/gstreamer-dvm.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ + +Name: GStreamer DVM +Description: Dalvik Virtual Machine helpers +Requires: gstreamer-@GST_MAJORMINOR@ +Version: @VERSION@ +Libs: -L${libdir} -lgstdvm-@GST_MAJORMINOR@ +Cflags: -I${includedir} + diff --git a/sys/androidcamera/Makefile.am b/sys/androidcamera/Makefile.am index 1d832a7..f2a6ac5 100644 --- a/sys/androidcamera/Makefile.am +++ b/sys/androidcamera/Makefile.am @@ -2,7 +2,6 @@ plugin_LTLIBRARIES = libgstandroidcamera.la libgstandroidcamera_la_SOURCES = \ gst-androidcamera.c \ - gst-dvm.c \ gst-android-hardware-camera.c \ gst-android-graphics-surfacetexture.c \ gst-android-graphics-imageformat.c \ @@ -12,7 +11,6 @@ libgstandroidcamera_la_SOURCES = \ JAVA_SOURCE = com/gstreamer/GstAhcCallback.java noinst_HEADERS = \ - gst-dvm.h \ gstahcsrc.h \ gstahccallback.h \ gst-android-hardware-camera.h \ diff --git a/sys/androidcamera/gst-android-graphics-imageformat.c b/sys/androidcamera/gst-android-graphics-imageformat.c index afa724e..3140af0 100644 --- a/sys/androidcamera/gst-android-graphics-imageformat.c +++ b/sys/androidcamera/gst-android-graphics-imageformat.c @@ -23,7 +23,8 @@ #include "config.h" #endif -#include "gst-dvm.h" +#include + #include "gst-android-graphics-imageformat.h" diff --git a/sys/androidcamera/gst-android-graphics-surfacetexture.c b/sys/androidcamera/gst-android-graphics-surfacetexture.c index a532ec9..bb78f02 100644 --- a/sys/androidcamera/gst-android-graphics-surfacetexture.c +++ b/sys/androidcamera/gst-android-graphics-surfacetexture.c @@ -23,7 +23,8 @@ #include "config.h" #endif -#include "gst-dvm.h" +#include + #include "gst-android-graphics-surfacetexture.h" diff --git a/sys/androidcamera/gst-android-hardware-camera.c b/sys/androidcamera/gst-android-hardware-camera.c index 8e104e7..945c6e6 100644 --- a/sys/androidcamera/gst-android-hardware-camera.c +++ b/sys/androidcamera/gst-android-hardware-camera.c @@ -23,7 +23,8 @@ #include "config.h" #endif -#include "gst-dvm.h" +#include + #include "gstahccallback.h" #include "gst-android-hardware-camera.h" #include "stdio.h" diff --git a/sys/androidcamera/gst-androidcamera.c b/sys/androidcamera/gst-androidcamera.c index 68c6a6b..6aa2d41 100644 --- a/sys/androidcamera/gst-androidcamera.c +++ b/sys/androidcamera/gst-androidcamera.c @@ -23,8 +23,8 @@ #endif #include +#include -#include "gst-dvm.h" #include "gst-android-hardware-camera.h" #include "gstahcsrc.h" diff --git a/sys/androidcamera/gstahcsrc.c b/sys/androidcamera/gstahcsrc.c index 2ca92cb..6f8f056 100644 --- a/sys/androidcamera/gstahcsrc.c +++ b/sys/androidcamera/gstahcsrc.c @@ -73,9 +73,9 @@ #include #include #include +#include #include "gstahcsrc.h" -#include "gst-dvm.h" /* GObject */ static void gst_ahc_src_set_property (GObject * object, guint prop_id, -- 2.7.4