Commit 65307dd1 authored by Sebastian Dröge's avatar Sebastian Dröge

gst: Update versioning

parent 296e1bf3
......@@ -19,14 +19,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(alsa_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libdl \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstinterfaces-0.11 \
libgstaudio-0.11
libgstinterfaces-1.0 \
libgstaudio-1.0
LOCAL_MODULE:= libgstalsa
......@@ -39,8 +39,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
$(TARGET_OUT)/lib/libgstalsa.so:
......
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_app_COPY_HEADERS_TO := gstreamer-0.11/gst/app
gst_app_COPY_HEADERS_TO := gstreamer-1.0/gst/app
gst_app_COPY_HEADERS := \
../gst-libs/gst/app/gstappbuffer.h \
../gst-libs/gst/app/gstappsink.h \
......@@ -20,14 +20,14 @@ app_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstapp-0.11
LOCAL_MODULE:= libgstapp-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
......@@ -10,13 +10,13 @@ app_plugin_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(app_plugin_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstapp-0.11
libgstapp-1.0
LOCAL_MODULE:= libgstapp
......@@ -27,8 +27,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_audio_COPY_HEADERS_TO := gstreamer-0.11/gst/audio
gst_audio_COPY_HEADERS_TO := gstreamer-1.0/gst/audio
gst_audio_COPY_HEADERS_BASE := \
gst-libs/gst/audio/audio.h \
gst-libs/gst/audio/gstaudioclock.h \
......@@ -39,15 +39,15 @@ audio_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstinterfaces-0.11
libgstinterfaces-1.0
LOCAL_MODULE:= libgstaudio-0.11
LOCAL_MODULE:= libgstaudio-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
......@@ -15,14 +15,14 @@ audioconvert_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(audioconvert_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstaudio-0.11 \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstaudio-1.0 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstpbutils-0.11
libgstpbutils-1.0
LOCAL_MODULE:= libgstaudioconvert
......@@ -33,8 +33,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -11,13 +11,13 @@ decodebin_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstpbutils-0.11
libgstpbutils-1.0
LOCAL_MODULE:= libgstdecodebin
......@@ -28,8 +28,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -13,13 +13,13 @@ decodebin2_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstpbutils-0.11
libgstpbutils-1.0
LOCAL_MODULE:= libgstdecodebin2
......@@ -30,8 +30,8 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H \
#
LOCAL_PRELINK_MODULE := false
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -12,8 +12,8 @@ gdp_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(gdp_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
......@@ -28,8 +28,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_interfaces_COPY_HEADERS_TO := gstreamer-0.11/gst/interfaces
gst_interfaces_COPY_HEADERS_TO := gstreamer-1.0/gst/interfaces
gst_interfaces_COPY_HEADERS_BASE := \
gst-libs/gst/interfaces/colorbalance.h \
gst-libs/gst/interfaces/colorbalancechannel.h \
......@@ -45,14 +45,14 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(interfaces_LOCAL_SRC_FILES_BASE)) \
$(addprefix ../android/,$(interfaces_LOCAL_SRC_FILES_ANDROID))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstinterfaces-0.11
LOCAL_MODULE:= libgstinterfaces-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
......@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
GST_PBUTILS_DIR := gst-libs/gst/pbutils/
gst_pbutils_COPY_HEADERS_TO := gstreamer-0.11/gst/pbutils
gst_pbutils_COPY_HEADERS_TO := gstreamer-1.0/gst/pbutils
gst_pbutils_COPY_HEADERS_BASE := \
gst-libs/gst/pbutils/descriptions.h \
gst-libs/gst/pbutils/install-plugins.h \
......@@ -45,15 +45,15 @@ $(BUILT_SOURCES):
LOCAL_SHARED_LIBRARIES := \
libgstvideo-0.11 \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstvideo-1.0 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstpbutils-0.11
LOCAL_MODULE:= libgstpbutils-1.0
LOCAL_CFLAGS := -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
#
......
......@@ -19,15 +19,15 @@ playbin_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstpbutils-0.11 \
libgstinterfaces-0.11 \
libgstvideo-0.11
libgstpbutils-1.0 \
libgstinterfaces-1.0 \
libgstvideo-1.0
LOCAL_MODULE:= libgstplaybin
......@@ -38,8 +38,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -12,13 +12,13 @@ LOCAL_SRC_FILES:= $(addprefix ../,$(queue2_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgstpbutils-0.11
libgstpbutils-1.0
LOCAL_MODULE:= libgstqueue2
......@@ -29,7 +29,7 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H \
#
LOCAL_PRELINK_MODULE := false
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
include $(BUILD_SHARED_LIBRARY)
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_riffs_COPY_HEADERS_TO := gstreamer-0.11/gst/riff
gst_riffs_COPY_HEADERS_TO := gstreamer-1.0/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.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0 \
libgsttag-0.11 \
libgstaudio-0.11
libgsttag-1.0 \
libgstaudio-1.0
LOCAL_MODULE:= libgstriff-0.11
LOCAL_MODULE:= libgstriff-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_rtp_COPY_HEADERS_TO := gstreamer-0.11/gst/rtp
gst_rtp_COPY_HEADERS_TO := gstreamer-1.0/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.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstrtp-0.11
LOCAL_MODULE:= libgstrtp-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
#
......
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_rtsp_COPY_HEADERS_TO := gstreamer-0.11/gst/rtsp
gst_rtsp_COPY_HEADERS_TO := gstreamer-1.0/gst/rtsp
gst_rtsp_COPY_HEADERS_BASE := \
gst-libs/gst/rtsp/gstrtspbase64.h \
gst-libs/gst/rtsp/gstrtspdefs.h \
......@@ -34,14 +34,14 @@ rtsp_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstrtsp-0.11
LOCAL_MODULE:= libgstrtsp-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DINET_ADDRSTRLEN=16 -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_sdp_COPY_HEADERS_TO := gstreamer-0.11/gst/sdp
gst_sdp_COPY_HEADERS_TO := gstreamer-1.0/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.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstsdp-0.11
LOCAL_MODULE:= libgstsdp-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
#
......
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_tag_COPY_HEADERS_TO := gstreamer-0.11/gst/tag
gst_tag_COPY_HEADERS_TO := gstreamer-1.0/gst/tag
gst_tag_COPY_HEADERS := \
../gst-libs/gst/tag/gsttagdemux.h \
../gst-libs/gst/tag/tag.h
......@@ -22,14 +22,14 @@ tag_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(tag_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgsttag-0.11
LOCAL_MODULE:= libgsttag-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
......@@ -18,8 +18,8 @@ tcp_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
......@@ -34,8 +34,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -10,9 +10,9 @@ typefindfunctions_LOCAL_SRC_FILES:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(typefindfunctions_LOCAL_SRC_FILES))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstpbutils-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libgstpbutils-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
......@@ -27,8 +27,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.11
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-1.0
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-1.0
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
LOCAL_PATH:= $(call my-dir)
#----------------------------------------
# include
gst_video_COPY_HEADERS_TO := gstreamer-0.11/gst/video
gst_video_COPY_HEADERS_TO := gstreamer-1.0/gst/video
gst_video_COPY_HEADERS_BASE := \
gst-libs/gst/video/gstvideofilter.h \
gst-libs/gst/video/gstvideosink.h \
......@@ -24,14 +24,14 @@ video_LOCAL_SRC_FILES_BASE:= \
LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE))
LOCAL_SHARED_LIBRARIES := \
libgstreamer-0.11 \
libgstbase-0.11 \
libgstreamer-1.0 \
libgstbase-1.0 \
libglib-2.0 \
libgthread-2.0 \
libgmodule-2.0 \
libgobject-2.0
LOCAL_MODULE:= libgstvideo-0.11
LOCAL_MODULE:= libgstvideo-1.0
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTREAMER_BUILT_FOR_ANDROID \
$(GST_PLUGINS_BASE_CFLAGS)
......
......@@ -37,11 +37,12 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
[AM_DEFAULT_VERBOSITY=1
AC_SUBST(AM_DEFAULT_VERBOSITY)])
dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
dnl we override it here if we need to for the release candidate of new series
GST_MAJORMINOR=0.11
AC_SUBST(GST_MAJORMINOR)
dnl our libraries and install dirs use GST_API_VERSION in the filename
dnl to allow side-by-side installation of different API versions
GST_API_VERSION=1.0
AC_SUBST(GST_API_VERSION)
AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
[GStreamer API Version])
dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION
......@@ -49,7 +50,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
dnl sets GST_LT_LDFLAGS
AS_LIBTOOL(GST, 28, 0, 0)
AS_LIBTOOL(GST, 0, 0, 0)
dnl FIXME: this macro doesn't actually work;
dnl the generated libtool script has no support for the listed tags.
......@@ -74,7 +75,7 @@ dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it
AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
AG_GST_GETTEXT([gst-plugins-base-$GST_MAJORMINOR])
AG_GST_GETTEXT([gst-plugins-base-$GST_API_VERSION])
dnl *** check for arguments to configure ***
......@@ -243,15 +244,15 @@ ORC_CHECK([0.4.11])
dnl checks for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1)
AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes)
AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes)
AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes)
AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes)
AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes)
AG_GST_CHECK_GST_CONTROLLER($GST_API_VERSION, [$GST_REQ], yes)
AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
dnl Check for documentation xrefs
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
AC_SUBST(GLIB_PREFIX)
AC_SUBST(GST_PREFIX)
......@@ -363,7 +364,7 @@ AG_GST_DEFAULT_ELEMENTS
dnl needed for encoding-target
GST_DATADIR="$GST_PREFIX/share"
AC_DEFINE_UNQUOTED(GST_DATADIR, "$GST_DATADIR", [system wide data directory])
AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR", [major/minor version])
AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION", [major/minor version])
dnl behaviour of speex based audio resampler
AC_MSG_CHECKING(which audio resample format to use for integer)
......@@ -922,7 +923,7 @@ sed \
-e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \
-e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \
-e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \
-e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \
-e 's/.* GST_API_VERSION$/#define GST_API_VERSION "'$GST_API_VERSION'"/' \
-e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \
-e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
-e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \
......
......@@ -4,7 +4,7 @@
DOCS_ARE_INCOMPLETE_PLEASE_FIXME=yespleasedo
# The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@
#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
DOC_MODULE=gst-plugins-base-libs
# for upload-doc.mak
......@@ -57,16 +57,16 @@ extra_files =
# contains GtkObjects/GObjects and you want to document signals and properties.
GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) -DGST_USE_UNSTABLE_API
GTKDOC_LIBS = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/sdp/libgstsdp-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/sdp/libgstsdp-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
$(GST_BASE_LIBS)
GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
......
......@@ -30,10 +30,10 @@ find the header files and libraries. This is done with the
The following interactive shell session demonstrates how
<application>pkg-config</application> is used:
<programlisting>
$ pkg-config --cflags gstreamer-plugins-base-&GST_MAJORMINOR;
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-&GST_MAJORMINOR; -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
$ pkg-config --libs gstreamer-plugins-base-&GST_MAJORMINOR;
-Wl,--export-dynamic -pthread -lgstreamer-&GST_MAJORMINOR; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0
$ pkg-config --cflags gstreamer-plugins-base-&GST_API_VERSION;
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-&GST_API_VERSION; -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
$ pkg-config --libs gstreamer-plugins-base-&GST_API_VERSION;
-Wl,--export-dynamic -pthread -lgstreamer-&GST_API_VERSION; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0
</programlisting>
</para>
......
......@@ -6,9 +6,9 @@
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>GStreamer Base Plugins &GST_MAJORMINOR; Library Reference Manual</title>
<title>GStreamer Base Plugins &GST_API_VERSION; Library Reference Manual</title>
<releaseinfo>
for GStreamer Base Library &GST_MAJORMINOR; (&GST_VERSION;)
for GStreamer Base Library &GST_API_VERSION; (&GST_VERSION;)
<ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/</ulink>.
</releaseinfo>
</bookinfo>
......@@ -25,8 +25,8 @@
<title>App Library</title>
<para>
This library should be linked to by getting cflags and libs from
<filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
<filename>-lgstapp-&GST_MAJORMINOR;</filename> to the library flags.
<filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding
<filename>-lgstapp-&GST_API_VERSION;</filename> to the library flags.
</para>
<para>
To use it the functionality, insert an appsrc or appsink element into a pipeline and call the appropriate functions on the element.
......@@ -39,8 +39,8 @@
<title>Audio Library</title>
<para>
This library should be linked to by getting cflags and libs from
<filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
<filename>-lgstaudio-&GST_MAJORMINOR;</filename> to the library flags.
<filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding
<filename>-lgstaudio-&GST_API_VERSION;</filename> to the library flags.
</para>
<xi:include href="xml/gstaudio.xml" />
<xi:include href="xml/gstaudiocdsrc.xml" />
......@@ -71,8 +71,8 @@
</para>
<para>
This library should be linked to by getting cflags and libs from
<filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
<filename>-lgstfft-&GST_MAJORMINOR;</filename> to the library flags.
<filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding
<filename>-lgstfft-&GST_API_VERSION;</filename> to the library flags.
</para>
<xi:include href="xml/gstfft.xml" />
<xi:include href="xml/gstffts16.xml" />
......@@ -85,8 +85,8 @@
<title>Interfaces Library</title>
<para>
This library should be linked to by getting cflags and libs from
<filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
<filename>-lgstinterfaces-&GST_MAJORMINOR;</filename> to the library flags.
<filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding
<filename>-lgstinterfaces-&GST_API_VERSION;</filename> to the library flags.
</para>
<xi:include href="xml/gstnavigation.xml" />
<xi:include href="xml/gsttuner.xml" />
......@@ -98,8 +98,8 @@
<title>Riff Media Library</title>
<para>
This library should be linked to by getting cflags and libs from
<filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
<filename>-lgstriff-&GST_MAJORMINOR;</filename> to the library flags.
<filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding
<filename>-lgstriff-&GST_API_VERSION;</filename> to the library flags.
</para>
<xi:include href="xml/gstriff.xml" />
</chapter>
......@@ -108,8 +108,8 @@
<title>RTP Library</title>
<para>
This library should be linked to by getting cflags and libs from
<filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
<filename>-lgstrtp-&GST_MAJORMINOR;</filename> to the library flags.
<filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding
<filename>-lgstrtp-&GST_API_VERSION;</filename> to the library flags.
</para>