mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 03:19:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

more 0.10 -> 0,11 changes

Browse source
This commit is contained in:
Wim Taymans 2010-12-06 18:12:51 +01:00
parent b69326697c
commit dc5162a07e
5 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/amrnb.mk
View file

@ -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)

10
android/amrwbdec.mk
View file

@ -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)

24
android/asf.mk
View file

@ -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)

10
android/mpegaudioparse.mk
View file

@ -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)

2
configure.ac
View file

@ -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\"/" \