diff --git a/android/alsa.mk b/android/alsa.mk index 3815a0eb0b..0cb30e1627 100644 --- a/android/alsa.mk +++ b/android/alsa.mk @@ -19,14 +19,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(alsa_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ libdl \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstinterfaces-0.10 \ - libgstaudio-0.10 + libgstinterfaces-0.11 \ + libgstaudio-0.11 LOCAL_MODULE:= libgstalsa @@ -37,7 +37,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include \ @@ -53,8 +53,8 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 $(TARGET_OUT)/lib/libgstalsa.so: diff --git a/android/app.mk b/android/app.mk index 8ce87f8a7b..c57965794b 100644 --- a/android/app.mk +++ b/android/app.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_app_COPY_HEADERS_TO := gstreamer-0.10/gst/app +gst_app_COPY_HEADERS_TO := gstreamer-0.11/gst/app gst_app_COPY_HEADERS := \ ../gst-libs/gst/app/gstappbuffer.h \ ../gst-libs/gst/app/gstappsink.h \ @@ -22,14 +22,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(app_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstapp-0.10 +LOCAL_MODULE:= libgstapp-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/app \ @@ -37,7 +37,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/app \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/app_plugin.mk b/android/app_plugin.mk index a4cfeb84f6..7d69ab7000 100644 --- a/android/app_plugin.mk +++ b/android/app_plugin.mk @@ -10,13 +10,13 @@ app_plugin_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(app_plugin_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstapp-0.10 + libgstapp-0.11 LOCAL_MODULE:= libgstapp @@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -41,7 +41,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/audio.mk b/android/audio.mk index 7111b98cf5..96cdaacd3f 100644 --- a/android/audio.mk +++ b/android/audio.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_audio_COPY_HEADERS_TO := gstreamer-0.10/gst/audio +gst_audio_COPY_HEADERS_TO := gstreamer-0.11/gst/audio gst_audio_COPY_HEADERS_BASE := \ gst-libs/gst/audio/audio.h \ gst-libs/gst/audio/gstaudioclock.h \ @@ -44,15 +44,15 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(audio_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstinterfaces-0.10 + libgstinterfaces-0.11 -LOCAL_MODULE:= libgstaudio-0.10 +LOCAL_MODULE:= libgstaudio-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/audio \ @@ -60,7 +60,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/audio \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/audioconvert.mk b/android/audioconvert.mk index 5b69254b9a..ef2537f848 100644 --- a/android/audioconvert.mk +++ b/android/audioconvert.mk @@ -14,14 +14,14 @@ audioconvert_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(audioconvert_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstaudio-0.10 \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstaudio-0.11 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstpbutils-0.10 + libgstpbutils-0.11 LOCAL_MODULE:= libgstaudioconvert @@ -31,7 +31,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/audio \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -47,7 +47,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/decodebin.mk b/android/decodebin.mk index b67f6861c3..68d8821e5f 100644 --- a/android/decodebin.mk +++ b/android/decodebin.mk @@ -13,13 +13,13 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(decodebin_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstpbutils-0.10 + libgstpbutils-0.11 LOCAL_MODULE:= libgstdecodebin @@ -29,7 +29,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -45,7 +45,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/decodebin2.mk b/android/decodebin2.mk index b44ce11171..929219d43a 100644 --- a/android/decodebin2.mk +++ b/android/decodebin2.mk @@ -16,13 +16,13 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(decodebin2_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstpbutils-0.10 + libgstpbutils-0.11 LOCAL_MODULE:= libgstdecodebin2 @@ -32,7 +32,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -48,7 +48,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/gdp.mk b/android/gdp.mk index 67fc6499c2..f8b0b53535 100644 --- a/android/gdp.mk +++ b/android/gdp.mk @@ -12,13 +12,13 @@ gdp_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(gdp_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstdataprotocol-0.10 + libgstdataprotocol-0.11 LOCAL_MODULE:= libgstgdp @@ -28,7 +28,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -44,7 +44,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/interfaces.mk b/android/interfaces.mk index 91bb1d5456..9190867c93 100644 --- a/android/interfaces.mk +++ b/android/interfaces.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_interfaces_COPY_HEADERS_TO := gstreamer-0.10/gst/interfaces +gst_interfaces_COPY_HEADERS_TO := gstreamer-0.11/gst/interfaces gst_interfaces_COPY_HEADERS_BASE := \ gst-libs/gst/interfaces/colorbalance.h \ gst-libs/gst/interfaces/colorbalancechannel.h \ @@ -48,14 +48,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(interfaces_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(interfaces_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstinterfaces-0.10 +LOCAL_MODULE:= libgstinterfaces-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/interfaces \ @@ -63,7 +63,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/interfaces \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/netbuffer.mk b/android/netbuffer.mk index c3efd8bdc9..5a42f8c3bf 100644 --- a/android/netbuffer.mk +++ b/android/netbuffer.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_netbuffer_COPY_HEADERS_TO := gstreamer-0.10/gst/netbuffer +gst_netbuffer_COPY_HEADERS_TO := gstreamer-0.11/gst/netbuffer gst_netbuffer_COPY_HEADERS := \ ../gst-libs/gst/netbuffer/gstnetbuffer.h @@ -15,14 +15,14 @@ netbuffer_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(netbuffer_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstnetbuffer-0.10 +LOCAL_MODULE:= libgstnetbuffer-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/netbuffer \ @@ -30,7 +30,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/../gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/pbutils.mk b/android/pbutils.mk index facd6a97ad..30d624c5ab 100644 --- a/android/pbutils.mk +++ b/android/pbutils.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_pbutils_COPY_HEADERS_TO := gstreamer-0.10/gst/pbutils +gst_pbutils_COPY_HEADERS_TO := gstreamer-0.11/gst/pbutils gst_pbutils_COPY_HEADERS_BASE := \ gst-libs/gst/pbutils/descriptions.h \ gst-libs/gst/pbutils/install-plugins.h \ @@ -31,14 +31,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(pbutils_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(pbutils_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstpbutils-0.10 +LOCAL_MODULE:= libgstpbutils-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/pbutils \ @@ -46,7 +46,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/pbutils \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/playbin.mk b/android/playbin.mk index cb7fa108fe..a0ef2d7226 100644 --- a/android/playbin.mk +++ b/android/playbin.mk @@ -23,15 +23,15 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(playbin_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstpbutils-0.10 \ - libgstinterfaces-0.10 \ - libgstvideo-0.10 + libgstpbutils-0.11 \ + libgstinterfaces-0.11 \ + libgstvideo-0.11 LOCAL_MODULE:= libgstplaybin @@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -58,7 +58,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/queue2.mk b/android/queue2.mk index 65f1f1ebbf..9f080beb33 100644 --- a/android/queue2.mk +++ b/android/queue2.mk @@ -14,13 +14,13 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(queue2_LOCAL_SRC_FILES_BASE)) \ LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstpbutils-0.10 + libgstpbutils-0.11 LOCAL_MODULE:= libgstqueue2 @@ -30,7 +30,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/playback \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -46,7 +46,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/riff.mk b/android/riff.mk index bae94a786d..c557cb23f0 100644 --- a/android/riff.mk +++ b/android/riff.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_riffs_COPY_HEADERS_TO := gstreamer-0.10/gst/riff +gst_riffs_COPY_HEADERS_TO := gstreamer-0.11/gst/riff gst_riffs_COPY_HEADERS := \ ../gst-libs/gst/riff/riff-ids.h \ ../gst-libs/gst/riff/riff-media.h \ @@ -19,17 +19,17 @@ riff_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(riff_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgsttag-0.10 \ - libgstaudio-0.10 + libgsttag-0.11 \ + libgstaudio-0.11 -LOCAL_MODULE:= libgstriff-0.10 +LOCAL_MODULE:= libgstriff-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/riff \ @@ -37,7 +37,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/rtp.mk b/android/rtp.mk index 7a8a8bcf72..573e846664 100644 --- a/android/rtp.mk +++ b/android/rtp.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_rtp_COPY_HEADERS_TO := gstreamer-0.10/gst/rtp +gst_rtp_COPY_HEADERS_TO := gstreamer-0.11/gst/rtp gst_rtp_COPY_HEADERS := \ ../gst-libs/gst/rtp/gstbasertpaudiopayload.h \ ../gst-libs/gst/rtp/gstbasertpdepayload.h \ @@ -26,14 +26,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(rtp_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ libdl \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstrtp-0.10 +LOCAL_MODULE:= libgstrtp-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/rtp \ @@ -41,7 +41,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../ \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/rtsp.mk b/android/rtsp.mk index 7f628e39fb..cb14ca32ee 100644 --- a/android/rtsp.mk +++ b/android/rtsp.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_rtsp_COPY_HEADERS_TO := gstreamer-0.10/gst/rtsp +gst_rtsp_COPY_HEADERS_TO := gstreamer-0.11/gst/rtsp gst_rtsp_COPY_HEADERS_BASE := \ gst-libs/gst/rtsp/gstrtspbase64.h \ gst-libs/gst/rtsp/gstrtspdefs.h \ @@ -38,14 +38,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(rtsp_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstrtsp-0.10 +LOCAL_MODULE:= libgstrtsp-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/rtsp \ @@ -53,7 +53,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/rtsp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/sdp.mk b/android/sdp.mk index ae680268bf..ced65dae2e 100644 --- a/android/sdp.mk +++ b/android/sdp.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_sdp_COPY_HEADERS_TO := gstreamer-0.10/gst/sdp +gst_sdp_COPY_HEADERS_TO := gstreamer-0.11/gst/sdp gst_sdp_COPY_HEADERS := \ ../gst-libs/gst/sdp/gstsdp.h \ ../gst-libs/gst/sdp/gstsdpmessage.h @@ -16,14 +16,14 @@ sdp_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(sdp_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstsdp-0.10 +LOCAL_MODULE:= libgstsdp-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/sdp \ @@ -31,7 +31,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/tag.mk b/android/tag.mk index c0c10305bb..8c5743fd08 100644 --- a/android/tag.mk +++ b/android/tag.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_tag_COPY_HEADERS_TO := gstreamer-0.10/gst/tag +gst_tag_COPY_HEADERS_TO := gstreamer-0.11/gst/tag gst_tag_COPY_HEADERS := \ ../gst-libs/gst/tag/gsttagdemux.h \ ../gst-libs/gst/tag/tag.h @@ -20,21 +20,21 @@ tag_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(tag_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgsttag-0.10 +LOCAL_MODULE:= libgsttag-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst/tag \ $(LOCAL_PATH)/../gst-libs \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include diff --git a/android/tcp.mk b/android/tcp.mk index 29fe211ad5..ce0b619d48 100644 --- a/android/tcp.mk +++ b/android/tcp.mk @@ -20,13 +20,13 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(tcp_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 \ - libgstdataprotocol-0.10 + libgstdataprotocol-0.11 LOCAL_MODULE:= libgsttcp @@ -36,7 +36,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst/tcp \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -52,7 +52,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/typefindfunctions.mk b/android/typefindfunctions.mk index cb660b9c9f..eb49a9df32 100644 --- a/android/typefindfunctions.mk +++ b/android/typefindfunctions.mk @@ -10,8 +10,8 @@ typefindfunctions_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(typefindfunctions_LOCAL_SRC_FILES)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ @@ -24,7 +24,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include @@ -41,7 +41,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID # LOCAL_PRELINK_MODULE := false -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11 include $(BUILD_SHARED_LIBRARY) diff --git a/android/video.mk b/android/video.mk index f03ec55381..15093d533e 100644 --- a/android/video.mk +++ b/android/video.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) #---------------------------------------- # include -gst_video_COPY_HEADERS_TO := gstreamer-0.10/gst/video +gst_video_COPY_HEADERS_TO := gstreamer-0.11/gst/video gst_video_COPY_HEADERS_BASE := \ gst-libs/gst/video/gstvideofilter.h \ gst-libs/gst/video/gstvideosink.h \ @@ -28,14 +28,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE)) \ $(addprefix ../android/,$(video_LOCAL_SRC_FILES_ANDROID)) LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ + libgstreamer-0.11 \ + libgstbase-0.11 \ libglib-2.0 \ libgthread-2.0 \ libgmodule-2.0 \ libgobject-2.0 -LOCAL_MODULE:= libgstvideo-0.10 +LOCAL_MODULE:= libgstvideo-0.11 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst-libs/gst/video \ @@ -43,7 +43,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH) \ $(LOCAL_PATH)/gst-libs/gst/video \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ + $(TARGET_OUT_HEADERS)/gstreamer-0.11 \ $(TARGET_OUT_HEADERS)/glib-2.0 \ $(TARGET_OUT_HEADERS)/glib-2.0/glib \ external/libxml2/include