Menu
▾
▴
[gst-cvs] gst-plugins-ugly: more 0.10 -> 0,11 changes
|
From: <wt...@ke...> - 2010-12-06 17:13:19
|
Module: gst-plugins-ugly Branch: 0.11 Commit: dc5162a07e31cca253a91d22c74f951e290dd751 URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=dc5162a07e31cca253a91d22c74f951e290dd751 Author: Wim Taymans <wim...@co...> Date: Mon Dec 6 18:12:51 2010 +0100 more 0.10 -> 0,11 changes --- android/amrnb.mk | 10 +++++----- android/amrwbdec.mk | 10 +++++----- android/asf.mk | 24 ++++++++++++------------ android/mpegaudioparse.mk | 10 +++++----- configure.ac | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/android/amrnb.mk b/android/amrnb.mk index c3f5432..67a2485 100644 --- a/android/amrnb.mk +++ b/android/amrnb.mk @@ -12,8 +12,8 @@ amrnb_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../ext/amrnb/,$(amrnb_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 \ @@ -25,7 +25,7 @@ LOCAL_MODULE:= libgstamrnb LOCAL_C_INCLUDES := \ $(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 \ @@ -42,7 +42,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/amrwbdec.mk b/android/amrwbdec.mk index f9acd4f..442a2e4 100644 --- a/android/amrwbdec.mk +++ b/android/amrwbdec.mk @@ -11,8 +11,8 @@ amrnb_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../ext/amrwbdec/,$(amrnb_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_MODULE:= libgstamrwbdec LOCAL_C_INCLUDES := \ $(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 # 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/asf.mk b/android/asf.mk index 19a117f..473ebdd 100644 --- a/android/asf.mk +++ b/android/asf.mk @@ -15,19 +15,19 @@ asf_LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= $(addprefix ../,$(asf_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 \ - libgstriff-0.10 \ - libgstaudio-0.10 \ - libgstinterfaces-0.10 \ - libgsttag-0.10 \ - libgstrtsp-0.10 \ - libgstsdp-0.10 \ - libgstrtp-0.10 + libgstriff-0.11 \ + libgstaudio-0.11 \ + libgstinterfaces-0.11 \ + libgsttag-0.11 \ + libgstrtsp-0.11 \ + libgstsdp-0.11 \ + libgstrtp-0.11 LOCAL_MODULE:= libgstasf @@ -36,7 +36,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../gst-libs \ $(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 @@ -52,7 +52,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/mpegaudioparse.mk b/android/mpegaudioparse.mk index 691ae52..5ef99f3 100644 --- a/android/mpegaudioparse.mk +++ b/android/mpegaudioparse.mk @@ -13,8 +13,8 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(mpegaudioparse_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 \ @@ -26,7 +26,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../gst/mpegaudioparse \ $(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 @@ -42,7 +42,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/configure.ac b/configure.ac index 8191562..fdb0a44 100644 --- a/configure.ac +++ b/configure.ac @@ -533,7 +533,7 @@ sed \ -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \ -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \ -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \ - -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \ + -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \ -e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \ -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \ -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \ |