diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:20:13 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:55:15 +0200 |
| commit | 65307dd1323ba8200893b51c917bb175f11e5e4f (patch) | |
| tree | 912add0a6a266875674857cec245db23017be3fd | |
| parent | 296e1bf3dd756c939a622422ced3e639fa0cce04 (diff) | |
gst: Update versioning
101 files changed, 708 insertions, 707 deletions
diff --git a/android/alsa.mk b/android/alsa.mk index b370591ed..abfec20e7 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.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: diff --git a/android/app.mk b/android/app.mk index ffa94595e..d4f8541fc 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.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) diff --git a/android/app_plugin.mk b/android/app_plugin.mk index 179e6c8f6..a52444a57 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.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) diff --git a/android/audio.mk b/android/audio.mk index cb613a510..66510653b 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.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) diff --git a/android/audioconvert.mk b/android/audioconvert.mk index 059b295c2..3afb78976 100644 --- a/android/audioconvert.mk +++ b/android/audioconvert.mk @@ -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) diff --git a/android/decodebin.mk b/android/decodebin.mk index 3a94feeab..3e3ab2bc1 100644 --- a/android/decodebin.mk +++ b/android/decodebin.mk @@ -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) diff --git a/android/decodebin2.mk b/android/decodebin2.mk index c9d32f25e..821f08053 100644 --- a/android/decodebin2.mk +++ b/android/decodebin2.mk @@ -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) diff --git a/android/gdp.mk b/android/gdp.mk index 826b7bfb5..47cfc30f4 100644 --- a/android/gdp.mk +++ b/android/gdp.mk @@ -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) diff --git a/android/interfaces.mk b/android/interfaces.mk index 6e0387a0a..1f8f31b65 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.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) diff --git a/android/pbutils.mk b/android/pbutils.mk index 52ca383f9..6ace129c1 100644 --- a/android/pbutils.mk +++ b/android/pbutils.mk @@ -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) # diff --git a/android/playbin.mk b/android/playbin.mk index b81bf9e0e..dfb2cf581 100644 --- a/android/playbin.mk +++ b/android/playbin.mk @@ -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) diff --git a/android/queue2.mk b/android/queue2.mk index 29b99298c..146f35008 100644 --- a/android/queue2.mk +++ b/android/queue2.mk @@ -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) diff --git a/android/riff.mk b/android/riff.mk index 958235b37..a1113a654 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.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) diff --git a/android/rtp.mk b/android/rtp.mk index f39f86c3c..02e3dada8 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.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) # diff --git a/android/rtsp.mk b/android/rtsp.mk index 4f61f4e9f..8404eeec0 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.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) diff --git a/android/sdp.mk b/android/sdp.mk index 7d0e7e870..aa7b7f4c7 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.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) # diff --git a/android/tag.mk b/android/tag.mk index 7ca9081cb..982e9327a 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.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) diff --git a/android/tcp.mk b/android/tcp.mk index a5dfb3971..a741b9cdc 100644 --- a/android/tcp.mk +++ b/android/tcp.mk @@ -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) diff --git a/android/typefindfunctions.mk b/android/typefindfunctions.mk index c1c267cd7..d0ca0f404 100644 --- a/android/typefindfunctions.mk +++ b/android/typefindfunctions.mk @@ -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) diff --git a/android/video.mk b/android/video.mk index f92949a1a..5ae9df57b 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.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) diff --git a/configure.ac b/configure.ac index 3fb339c63..744e0c441 100644 --- a/configure.ac +++ b/configure.ac @@ -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}\"," \ diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index b5f21fe5c..03575cc43 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -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) diff --git a/docs/libs/compiling.sgml b/docs/libs/compiling.sgml index 70a130c52..56ce728c1 100644 --- a/docs/libs/compiling.sgml +++ b/docs/libs/compiling.sgml @@ -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> diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml index 328dba7c0..823c20c7d 100644 --- a/docs/libs/gst-plugins-base-libs-docs.sgml +++ b/docs/libs/gst-plugins-base-libs-docs.sgml @@ -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> <xi:include href="xml/gstrtpbaseaudiopayload.xml" /> <xi:include href="xml/gstrtpbasedepayload.xml" /> @@ -123,8 +123,8 @@ <title>RTSP 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>-lgstrtsp-&GST_MAJORMINOR;</filename> to the library flags. + <filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding + <filename>-lgstrtsp-&GST_API_VERSION;</filename> to the library flags. </para> <xi:include href="xml/gstrtspconnection.xml" /> <xi:include href="xml/gstrtspdefs.xml" /> @@ -139,8 +139,8 @@ <title>SDP 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>-lgstsdp-&GST_MAJORMINOR;</filename> to the library flags. + <filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding + <filename>-lgstsdp-&GST_API_VERSION;</filename> to the library flags. </para> <xi:include href="xml/gstsdpmessage.xml" /> </chapter> @@ -149,8 +149,8 @@ <title>Tag Support 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>-lgsttag-&GST_MAJORMINOR;</filename> to the library flags. + <filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding + <filename>-lgsttag-&GST_API_VERSION;</filename> to the library flags. </para> <xi:include href="xml/gsttag.xml" /> <xi:include href="xml/gsttagvorbis.xml" /> @@ -168,8 +168,8 @@ <title>Base Utils 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>-lgstpbutils-&GST_MAJORMINOR;</filename> to the library + <filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding + <filename>-lgstpbutils-&GST_API_VERSION;</filename> to the library flags. </para> <xi:include href="xml/gstpbutils.xml" /> @@ -186,8 +186,8 @@ <title>Video 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>-lgstvideo-&GST_MAJORMINOR;</filename> to the library flags. + <filename>gstreamer-plugins-base-&GST_API_VERSION;.pc</filename> and adding + <filename>-lgstvideo-&GST_API_VERSION;</filename> to the library flags. </para> <xi:include href="xml/gstvideo.xml" /> <xi:include href="xml/gstvideooverlaycomposition.xml" /> diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 9946922f5..3db8af5fd 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj ## Process this file with automake to produce Makefile.in # The name of the module, e.g. 'glib'. -#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@ +#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@ MODULE=gst-plugins-base DOC_MODULE=$(MODULE)-plugins diff --git a/docs/plugins/gst-plugins-base-plugins-docs.sgml b/docs/plugins/gst-plugins-base-plugins-docs.sgml index dfabd2dbc..5b784899f 100644 --- a/docs/plugins/gst-plugins-base-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-base-plugins-docs.sgml @@ -7,9 +7,9 @@ <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>GStreamer Base Plugins &GST_MAJORMINOR; Plugins Reference Manual</title> + <title>GStreamer Base Plugins &GST_API_VERSION; Plugins Reference Manual</title> <releaseinfo> - for GStreamer Base Plugins &GST_MAJORMINOR; (&GST_VERSION;) + for GStreamer Base Plugins &GST_API_VERSION; (&GST_VERSION;) The latest version of this documentation can be found on-line at <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base/html/</ulink>. </releaseinfo> diff --git a/docs/version.entities.in b/docs/version.entities.in index 79a68981d..286989f56 100644 --- a/docs/version.entities.in +++ b/docs/version.entities.in @@ -1,2 +1,2 @@ -<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@"> +<!ENTITY GST_API_VERSION "@GST_API_VERSION@"> <!ENTITY GST_VERSION "@VERSION@"> diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am index 38cde48a8..b08901e22 100644 --- a/ext/alsa/Makefile.am +++ b/ext/alsa/Makefile.am @@ -17,8 +17,8 @@ libgstalsa_la_CFLAGS = \ $(GST_CFLAGS) \ $(ALSA_CFLAGS) libgstalsa_la_LIBADD = \ - $(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/interfaces/libgstinterfaces-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(ALSA_LIBS) diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am index 3088260c3..f4690a6a3 100644 --- a/ext/cdparanoia/Makefile.am +++ b/ext/cdparanoia/Makefile.am @@ -7,7 +7,7 @@ libgstcdparanoia_la_CFLAGS = \ $(GST_CFLAGS) \ $(CDPARANOIA_CFLAGS) libgstcdparanoia_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(CDPARANOIA_LIBS) diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am index e8fdc7cb4..d828442b9 100644 --- a/ext/libvisual/Makefile.am +++ b/ext/libvisual/Makefile.am @@ -3,8 +3,8 @@ plugin_LTLIBRARIES = libgstlibvisual.la libgstlibvisual_la_SOURCES = visual.c libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) libgstlibvisual_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) $(LIBVISUAL_LIBS) libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am index 3d2382156..f9ed4ed78 100644 --- a/ext/ogg/Makefile.am +++ b/ext/ogg/Makefile.am @@ -21,8 +21,8 @@ noinst_HEADERS = \ libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS) libgstogg_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(OGG_LIBS) diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am index 9a225d7b7..0109e014b 100644 --- a/ext/pango/Makefile.am +++ b/ext/pango/Makefile.am @@ -20,7 +20,7 @@ libgstpango_la_CFLAGS = \ $(GST_CFLAGS) \ $(PANGO_CFLAGS) libgstpango_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(PANGO_LIBS) diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am index c4a5eec29..ff423a9e4 100644 --- a/ext/theora/Makefile.am +++ b/ext/theora/Makefile.am @@ -11,8 +11,8 @@ libgsttheora_la_SOURCES = gsttheora.c \ libgsttheora_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(THEORA_CFLAGS) libgsttheora_la_LIBADD = \ - $(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/tag/libgsttag-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(THEORA_LIBS) diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am index 81799bd60..b97029e0d 100644 --- a/ext/vorbis/Makefile.am +++ b/ext/vorbis/Makefile.am @@ -15,8 +15,8 @@ libgstvorbis_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(VORBIS_CFLAGS) ## AM_PATH_VORBIS also sets VORBISENC_LIBS libgstvorbis_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_LIBS) \ $(VORBIS_LIBS) $(VORBISENC_LIBS) libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -32,8 +32,8 @@ libgstivorbisdec_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -DTREMOR $(IVORBIS_CFLAGS) libgstivorbisdec_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_LIBS) $(IVORBIS_LIBS) libgstivorbisdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstivorbisdec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 18bb190dd..76350f5e6 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstapp-@GST_API_VERSION@.la glib_enum_define = GST_APP glib_gen_prefix = __gst_app @@ -11,18 +11,18 @@ built_headers = gstapp-marshal.h BUILT_SOURCES = $(built_sources) $(built_headers) -nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES = \ +nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = \ $(built_sources) -libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c gstappsink.c -libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ +libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c +libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstapp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -libgstapp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -libgstapp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static +libgstapp_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) +libgstapp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstapp_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static -libgstapp_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/app -libgstapp_@GST_MAJORMINOR@include_HEADERS = \ +libgstapp_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/app +libgstapp_@GST_API_VERSION@include_HEADERS = \ gstappsrc.h \ gstappsink.h @@ -31,33 +31,33 @@ CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = gstapp-marshal.list if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstApp-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstApp-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstapp_@GST_MAJORMINOR@include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstapp_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/app/%',$(libgstapp_@GST_MAJORMINOR@include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libgstapp_@GST_API_VERSION@include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstapp_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstapp_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='gst/app/%',$(libgstapp_@GST_API_VERSION@include_HEADERS)) -GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@.la +GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstApp \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --library=libgstapp-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstBase-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --library=libgstapp-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-base-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-app-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg-export gstreamer-app-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -77,24 +77,24 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstapp -:SHARED libgstapp-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstapp -:SHARED libgstapp-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstapp_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstapp_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstapp_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstapp_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstapp_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libgstapp_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstapp_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstapp_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstapp_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/app \ - -:HEADERS $(libgstapp_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/app \ + -:HEADERS $(libgstapp_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 5ae0a901d..dbd9cb1da 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -12,14 +12,14 @@ built_headers = audio-enumtypes.h audio-marshal.h BUILT_SOURCES = $(built_sources) $(built_headers) lib_LTLIBRARIES = \ - libgstaudio-@GST_MAJORMINOR@.la + libgstaudio-@GST_API_VERSION@.la EXTRA_DIST = audio-marshal.list CLEANFILES = $(BUILT_SOURCES) # FIXME 0.11: rename GstBaseAudioSink to GstAudioBaseSink or merge with GstAudioSink -libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \ +libgstaudio_@GST_API_VERSION@_la_SOURCES = \ audio.c \ gstaudioringbuffer.c \ gstaudioclock.c \ @@ -39,10 +39,10 @@ libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \ streamvolume.c \ gstaudioiec61937.c -nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES = $(built_sources) $(built_headers) +nodist_libgstaudio_@GST_API_VERSION@_la_SOURCES = $(built_sources) $(built_headers) -libgstaudio_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio -libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ +libgstaudio_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/audio +libgstaudio_@GST_API_VERSION@include_HEADERS = \ audio.h \ gstaudioringbuffer.h \ gstaudioclock.h \ @@ -62,50 +62,50 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ streamvolume.h \ gstaudioiec61937.h -nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ +nodist_libgstaudio_@GST_API_VERSION@include_HEADERS = \ audio-enumtypes.h -libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstaudio_@GST_MAJORMINOR@_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ +libgstaudio_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstaudio_@GST_API_VERSION@_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) -libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstaudio_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) include $(top_srcdir)/common/gst-glib-gen.mak if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstaudio_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) -gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libgstaudio_@GST_API_VERSION@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstaudio_@GST_API_VERSION@include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstaudio_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstaudio_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='gst/audio/%',$(libgstaudio_@GST_API_VERSION@include_HEADERS)) +gir_cincludes+=$(patsubst %,--c-include='gst/audio/%',$(nodist_libgstaudio_@GST_API_VERSION@include_HEADERS)) -GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMINOR@.la +GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstAudio \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --warn-all \ --strip-prefix=Gst \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ $(gir_cincludes) \ --add-include-path=$(builddir)/../interfaces \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --library=libgstaudio-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstBase-@GST_MAJORMINOR@ \ - --include=GstInterfaces-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --library=libgstaudio-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ + --include=GstInterfaces-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-base-@GST_MAJORMINOR@ \ - --pkg gstreamer-interfaces-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-audio-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg gstreamer-interfaces-@GST_API_VERSION@ \ + --pkg-export gstreamer-audio-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -126,25 +126,25 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../interfaces \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstaudio -:SHARED libgstaudio-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstaudio -:SHARED libgstaudio-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstaudio_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudio_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstaudio_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstaudio_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libgstaudio_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstaudio_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstaudio_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstaudio_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ - -:HEADERS $(libgstaudio_@GST_MAJORMINOR@include_HEADERS) \ - $(nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \ + -:HEADERS $(libgstaudio_@GST_API_VERSION@include_HEADERS) \ + $(nodist_libgstaudio_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index 62c6d57d4..5b5ef3782 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -1,8 +1,8 @@ -lib_LTLIBRARIES = libgstfft-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstfft-@GST_API_VERSION@.la -libgstfft_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/fft +libgstfft_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/fft -libgstfft_@GST_MAJORMINOR@_include_HEADERS = \ +libgstfft_@GST_API_VERSION@_include_HEADERS = \ gstfft.h \ gstffts16.h \ gstffts32.h \ @@ -23,7 +23,7 @@ noinst_HEADERS = \ _kiss_fft_guts_f32.h \ _kiss_fft_guts_f64.h -libgstfft_@GST_MAJORMINOR@_la_SOURCES = \ +libgstfft_@GST_API_VERSION@_la_SOURCES = \ gstfft.c \ gstffts16.c \ gstffts32.c \ @@ -38,34 +38,34 @@ libgstfft_@GST_MAJORMINOR@_la_SOURCES = \ kiss_fftr_f32.c \ kiss_fftr_f64.c -libgstfft_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(LIBM) -libgstfft_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -libgstfft_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstfft_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(LIBM) +libgstfft_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) +libgstfft_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) EXTRA_DIST = kiss_version if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstFft-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstFft-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_MAJORMINOR@_include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/fft/%',$(libgstfft_@GST_MAJORMINOR@_include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_API_VERSION@_include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstfft_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='gst/fft/%',$(libgstfft_@GST_API_VERSION@_include_HEADERS)) -GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@.la +GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstFft \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --library=libgstfft-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --library=libgstfft-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-fft-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg-export gstreamer-fft-@GST_API_VERSION@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -84,22 +84,22 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am - androgenizer -:PROJECT libgstfft -:SHARED libgstfft-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstfft -:SHARED libgstfft-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstfft_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(libgstfft_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstfft_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstfft_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstfft_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstfft_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstfft_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstfft_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/fft \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/fft \ -:HEADERS $(libgstfftinclude_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index fcfdab17c..f22103c38 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -1,6 +1,6 @@ -lib_LTLIBRARIES = libgstinterfaces-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstinterfaces-@GST_API_VERSION@.la libgstinterfacesincludedir = \ - $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces + $(includedir)/gstreamer-@GST_API_VERSION@/gst/interfaces headers_interfaces = \ navigation.h \ @@ -28,19 +28,19 @@ libgstinterfacesinclude_HEADERS = \ nodist_libgstinterfacesinclude_HEADERS = \ interfaces-enumtypes.h -libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ +libgstinterfaces_@GST_API_VERSION@_la_SOURCES = \ navigation.c \ tuner.c \ tunernorm.c \ tunerchannel.c -nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ +nodist_libgstinterfaces_@GST_API_VERSION@_la_SOURCES = \ $(built_sources) \ interfaces-marshal.h -libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(LIBM) -libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstinterfaces_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstinterfaces_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(LIBM) +libgstinterfaces_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) BUILT_SOURCES = \ $(built_sources) \ @@ -53,32 +53,32 @@ CLEANFILES = $(BUILT_SOURCES) include $(top_srcdir)/common/gst-glib-gen.mak if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstInterfaces-@GST_API_VERSION@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstinterfacesinclude_HEADERS)) gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstinterfacesinclude_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstinterfaces_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstinterfaces_@GST_API_VERSION@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/interfaces/%',$(libgstinterfacesinclude_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/interfaces/%',$(nodist_libgstinterfacesinclude_HEADERS)) -GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@GST_MAJORMINOR@.la +GstInterfaces-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --library=libgstinterfaces-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --library=libgstinterfaces-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-interfaces-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg-export gstreamer-interfaces-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -98,23 +98,23 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstinterfaces -:SHARED libgstinterfaces-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstinterfaces -:SHARED libgstinterfaces-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstinterfaces_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libgstinterfaces_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstinterfaces_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstinterfaces_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstinterfaces_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/interfaces \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/interfaces \ -:HEADERS $(libgstinterfacesinclude_HEADERS) \ $(nodist_libgstinterfacesinclude_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 92ef6569a..03701e174 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libgstpbutils-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstpbutils-@GST_API_VERSION@.la headers_pbutils = \ pbutils.h \ @@ -19,7 +19,7 @@ glib_gen_basename = pbutils built_headers_configure = \ gstpluginsbaseversion.h -libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \ +libgstpbutils_@GST_API_VERSION@_la_SOURCES = \ gstpluginsbaseversion.c \ pbutils.c \ codec-utils.c \ @@ -31,26 +31,26 @@ libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \ gstdiscoverer.c \ gstdiscoverer-types.c -nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES = \ +nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES = \ pbutils-enumtypes.c \ pbutils-marshal.c -libgstpbutils_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/pbutils -libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \ +libgstpbutils_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/pbutils +libgstpbutils_@GST_API_VERSION@include_HEADERS = \ $(headers_pbutils) -nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS = \ +nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS = \ $(built_headers_configure) \ pbutils-enumtypes.h noinst_HEADERS = \ pbutils-private.h EXTRA_DIST = pbutils-marshal.list -libgstpbutils_@GST_MAJORMINOR@_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ +libgstpbutils_@GST_API_VERSION@_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_LIBS) -libgstpbutils_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstpbutils_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstpbutils_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstpbutils_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) BUILT_SOURCES = \ pbutils-enumtypes.c \ @@ -66,34 +66,34 @@ DISTCLEANFILES = $(built_headers_configure) include $(top_srcdir)/common/gst-glib-gen.mak if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstpbutils_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/pbutils/%',$(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) -gir_cincludes+=$(patsubst %,--c-include='gst/pbutils/%',$(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libgstpbutils_@GST_API_VERSION@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstpbutils_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='gst/pbutils/%',$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) +gir_cincludes+=$(patsubst %,--c-include='gst/pbutils/%',$(nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS)) -GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJORMINOR@.la +GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstPbutils \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --library=libgstpbutils-@GST_MAJORMINOR@.la \ - --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-@GST_MAJORMINOR@` \ - --library=gstreamer-@GST_MAJORMINOR@ \ - --include=Gst-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --library=libgstpbutils-@GST_API_VERSION@.la \ + --library-path=`$(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ + --library=gstreamer-@GST_API_VERSION@ \ + --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-pbutils-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg-export gstreamer-pbutils-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -113,24 +113,24 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstpbutils -:SHARED libgstpbutils-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstpbutils -:SHARED libgstpbutils-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstpbutils_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libgstpbutils_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstpbutils_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstpbutils_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstpbutils_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstpbutils_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstpbutils_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstpbutils_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstpbutils_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/pbutils \ - -:HEADERS $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS) \ - $(nodist_libgstpbutils_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/pbutils \ + -:HEADERS $(libgstpbutils_@GST_API_VERSION@include_HEADERS) \ + $(nodist_libgstpbutils_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/pbutils/encoding-target.c b/gst-libs/gst/pbutils/encoding-target.c index 678cf7ed4..aee5ba499 100644 --- a/gst-libs/gst/pbutils/encoding-target.c +++ b/gst-libs/gst/pbutils/encoding-target.c @@ -56,8 +56,8 @@ /* * Location of profile files * - * $GST_DATADIR/gstreamer-GST_MAJORMINOR/encoding-profile - * $HOME/gstreamer-GST_MAJORMINOR/encoding-profile + * $GST_DATADIR/gstreamer-GST_API_VERSION/encoding-profile + * $HOME/gstreamer-GST_API_VERSION/encoding-profile * * Naming convention * $(target.category)/$(target.name).gep @@ -887,7 +887,7 @@ gst_encoding_target_load (const gchar * name, const gchar * category, /* Try from local profiles */ tldir = - g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_MAJORMINOR, + g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, NULL); target = gst_encoding_target_subload (tldir, category, lfilename, error); g_free (tldir); @@ -895,7 +895,7 @@ gst_encoding_target_load (const gchar * name, const gchar * category, if (target == NULL) { /* Try from system-wide profiles */ tldir = - g_build_filename (GST_DATADIR, "gstreamer-" GST_MAJORMINOR, + g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, NULL); target = gst_encoding_target_subload (tldir, category, lfilename, error); g_free (tldir); @@ -1010,7 +1010,7 @@ gst_encoding_target_save (GstEncodingTarget * target, GError ** error) lfilename = g_strdup_printf ("%s" GST_ENCODING_TARGET_SUFFIX, target->name); filename = - g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_MAJORMINOR, + g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, target->category, lfilename, NULL); g_free (lfilename); @@ -1064,13 +1064,13 @@ gst_encoding_list_available_categories (void) /* First try user-local categories */ topdir = - g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_MAJORMINOR, + g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, NULL); res = get_categories (topdir); g_free (topdir); /* Extend with system-wide categories */ - topdir = g_build_filename (GST_DATADIR, "gstreamer-" GST_MAJORMINOR, + topdir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, NULL); tmp1 = get_categories (topdir); g_free (topdir); @@ -1181,13 +1181,13 @@ gst_encoding_list_all_targets (const gchar * categoryname) /* Get user-locals */ topdir = - g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_MAJORMINOR, + g_build_filename (g_get_user_data_dir (), "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, NULL); res = get_all_targets (topdir, categoryname); g_free (topdir); /* Get system-wide */ - topdir = g_build_filename (GST_DATADIR, "gstreamer-" GST_MAJORMINOR, + topdir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION, GST_ENCODING_TARGET_DIRECTORY, NULL); tmp1 = get_all_targets (topdir, categoryname); g_free (topdir); diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 452dea33f..24dd94113 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -1,36 +1,36 @@ -lib_LTLIBRARIES = libgstriff-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstriff-@GST_API_VERSION@.la -libgstriff_@GST_MAJORMINOR@_la_SOURCES = \ +libgstriff_@GST_API_VERSION@_la_SOURCES = \ riff.c \ riff-media.c \ riff-read.c -libgstriff_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff -libgstriff_@GST_MAJORMINOR@include_HEADERS = \ +libgstriff_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/riff +libgstriff_@GST_API_VERSION@include_HEADERS = \ riff-ids.h \ riff-media.h \ riff-read.h -libgstriff_@GST_MAJORMINOR@_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ +libgstriff_@GST_API_VERSION@_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) -libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstriff_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstRiff-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstRiff-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_MAJORMINOR@include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/riff/%',$(libgstriff_@GST_MAJORMINOR@include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_API_VERSION@include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstriff_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='gst/riff/%',$(libgstriff_@GST_API_VERSION@include_HEADERS)) -GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINOR@.la +GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstRiff \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ @@ -38,18 +38,18 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINO --add-include-path=$(builddir)/../tag \ --add-include-path=$(builddir)/../audio \ --add-include-path=$(builddir)/../interfaces \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --library=libgstriff-@GST_MAJORMINOR@.la \ - --include=GstAudio-@GST_MAJORMINOR@ \ - --include=GstTag-@GST_MAJORMINOR@ \ - --include=Gst-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --library=libgstriff-@GST_API_VERSION@.la \ + --include=GstAudio-@GST_API_VERSION@ \ + --include=GstTag-@GST_API_VERSION@ \ + --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-tag-@GST_MAJORMINOR@ \ - --pkg gstreamer-audio-@GST_MAJORMINOR@ \ - --pkg gstreamer-interfaces-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-riff-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-tag-@GST_API_VERSION@ \ + --pkg gstreamer-audio-@GST_API_VERSION@ \ + --pkg gstreamer-interfaces-@GST_API_VERSION@ \ + --pkg-export gstreamer-riff-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -72,23 +72,23 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(builddir)/../tag \ --includedir=$(builddir)/../audio \ --includedir=$(builddir)/../interfaces \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am - androgenizer -:PROJECT libgstriff -:SHARED libgstriff-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstriff -:SHARED libgstriff-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstriff_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstriff_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstriff_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstriff_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstriff_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstriff_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstriff_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstriff_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ - -:HEADERS $(libgstriff_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \ + -:HEADERS $(libgstriff_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index 72124483f..446d9b171 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -1,4 +1,4 @@ -libgstrtpincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/rtp +libgstrtpincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtp libgstrtpinclude_HEADERS = gstrtpbuffer.h \ gstrtcpbuffer.h \ @@ -7,45 +7,45 @@ libgstrtpinclude_HEADERS = gstrtpbuffer.h \ gstrtpbasepayload.h \ gstrtpbasedepayload.h -lib_LTLIBRARIES = libgstrtp-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstrtp-@GST_API_VERSION@.la -libgstrtp_@GST_MAJORMINOR@_la_SOURCES = gstrtpbuffer.c \ +libgstrtp_@GST_API_VERSION@_la_SOURCES = gstrtpbuffer.c \ gstrtcpbuffer.c \ gstrtppayloads.c \ gstrtpbaseaudiopayload.c \ gstrtpbasepayload.c \ gstrtpbasedepayload.c -libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstrtp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) -libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstrtp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstrtp_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) +libgstrtp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstRtp-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtpinclude_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtp_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtp_@GST_API_VERSION@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/rtp/%',$(libgstrtpinclude_HEADERS)) -GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@.la +GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstRtp \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --library=libgstrtp-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstBase-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --library=libgstrtp-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-base-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-rtp-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -65,23 +65,23 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstrtp -:SHARED libgstrtp-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstrtp -:SHARED libgstrtp-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstrtp_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtp_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstrtp_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstrtp_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtp_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstrtp_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstrtp_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/rtp \ - -:HEADERS $(libgstrtp_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/rtp \ + -:HEADERS $(libgstrtp_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 8822f6a67..b6b2d8f9c 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -1,4 +1,4 @@ -libgstrtspincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/rtsp +libgstrtspincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtsp libgstrtspinclude_HEADERS = gstrtsptransport.h \ gstrtspurl.h \ @@ -11,12 +11,12 @@ libgstrtspinclude_HEADERS = gstrtsptransport.h \ #gstrtspextreal.h #gstrtspextwms.h -lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstrtsp-@GST_API_VERSION@.la built_sources = gstrtsp-marshal.c gstrtsp-enumtypes.c built_headers = gstrtsp-marshal.h gstrtsp-enumtypes.h -libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtsptransport.c \ +libgstrtsp_@GST_API_VERSION@_la_SOURCES = gstrtsptransport.c \ gstrtspurl.c \ gstrtspmessage.c \ gstrtspconnection.c \ @@ -24,7 +24,7 @@ libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtsptransport.c \ gstrtspextension.c \ gstrtsprange.c -nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = $(built_sources) +nodist_libgstrtsp_@GST_API_VERSION@_la_SOURCES = $(built_sources) nodist_libgstrtspinclude_HEADERS = gstrtsp-enumtypes.h noinst_HEADERS = gstrtsp.h @@ -32,9 +32,9 @@ noinst_HEADERS = gstrtsp.h #gstrtspextwms.c #rtspextreal.c -libgstrtsp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) -libgstrtsp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) -libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstrtsp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) +libgstrtsp_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) +libgstrtsp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) BUILT_SOURCES = $(built_headers) $(built_sources) EXTRA_DIST = gstrtsp-marshal.list @@ -48,20 +48,20 @@ glib_gen_basename = gstrtsp include $(top_srcdir)/common/gst-glib-gen.mak if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtspinclude_HEADERS)) gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtspinclude_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtsp_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtsp_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstrtsp_@GST_API_VERSION@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/rtsp/%',$(libgstrtspinclude_HEADERS)) gir_cincludes+=$(patsubst %,--c-include='gst/rtsp/%',$(nodist_libgstrtspinclude_HEADERS)) -GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINOR@.la +GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstRtsp \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ @@ -69,16 +69,16 @@ GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINO -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --library=libgstrtsp-@GST_MAJORMINOR@.la \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --library=libgstrtsp-@GST_API_VERSION@.la \ --include=Gio-2.0 \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstSdp-@GST_MAJORMINOR@ \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstSdp-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ --pkg gio-2.0 \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-sdp-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-rtsp-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-sdp-@GST_API_VERSION@ \ + --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -99,23 +99,23 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstrtsp -:SHARED libgstrtsp-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstrtsp -:SHARED libgstrtsp-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstrtsp_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtsp_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstrtsp_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstrtsp_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libgstrtsp_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrtsp_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstrtsp_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstrtsp_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/rtsp \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/rtsp \ -:HEADERS $(libgstrtspinclude_HEADERS) \ $(nodist_libgstrtspinclude_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am index a59815eec..7011261bd 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am @@ -1,39 +1,39 @@ -libgstsdpincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/sdp +libgstsdpincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/sdp libgstsdpinclude_HEADERS = gstsdp.h \ gstsdpmessage.h -lib_LTLIBRARIES = libgstsdp-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstsdp-@GST_API_VERSION@.la -libgstsdp_@GST_MAJORMINOR@_la_SOURCES = gstsdpmessage.c +libgstsdp_@GST_API_VERSION@_la_SOURCES = gstsdpmessage.c -libgstsdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) -libgstsdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) -libgstsdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstsdp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) +libgstsdp_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) +libgstsdp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstSdp-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstSdp-@GST_API_VERSION@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstsdpinclude_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstsdp_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstsdp_@GST_API_VERSION@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/sdp/%',$(libgstsdpinclude_HEADERS)) -GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@.la +GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstSdp \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --library=libgstsdp-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --library=libgstsdp-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-sdp-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ --output $@ \ $(gir_headers) \ $(gir_sources) @@ -52,22 +52,22 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstsdp -:SHARED libgstsdp-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstsdp -:SHARED libgstsdp-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstsdp_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstsdp_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstsdp_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstsdp_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstsdp_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstsdp_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstsdp_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstsdp_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/sdp \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/sdp \ -:HEADERS $(libgstsdpinclude_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index 977dd53d2..f0c642f9c 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -1,21 +1,21 @@ libgsttagincludedir = \ - $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tag + $(includedir)/gstreamer-@GST_API_VERSION@/gst/tag libgsttaginclude_HEADERS = \ tag.h gsttagdemux.h gsttagmux.h xmpwriter.h -lib_LTLIBRARIES = libgsttag-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgsttag-@GST_API_VERSION@.la -libgsttag_@GST_MAJORMINOR@_la_SOURCES = \ +libgsttag_@GST_API_VERSION@_la_SOURCES = \ gstvorbistag.c gstid3tag.c gstxmptag.c gstexiftag.c \ lang.c licenses.c tags.c gsttagdemux.c gsttagmux.c \ gsttageditingprivate.c id3v2.c id3v2frames.c xmpwriter.c -libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ +libgsttag_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ZLIB_CFLAGS) \ - -DLICENSE_TRANSLATIONS_PATH=\"$(pkgdatadir)/@GST_MAJORMINOR@/license-translations.dict\" -libgsttag_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(ZLIB_LIBS) -libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + -DLICENSE_TRANSLATIONS_PATH=\"$(pkgdatadir)/@GST_API_VERSION@/license-translations.dict\" +libgsttag_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(ZLIB_LIBS) +libgsttag_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) # lang-tables.dat contains generated static data and is included by lang.c # licenses-tables.dat contains generated data and is included by licenses.c @@ -24,30 +24,30 @@ EXTRA_DIST = lang-tables.dat licenses-tables.dat license-translations.dict noinst_HEADERS = gsttageditingprivate.h id3v2.h if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstTag-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstTag-@GST_API_VERSION@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgsttaginclude_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgsttag_@GST_MAJORMINOR@_la_SOURCES)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgsttag_@GST_API_VERSION@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/tag/%',$(libgsttaginclude_HEADERS)) -GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@.la +GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstTag \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --library=libgsttag-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstBase-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --library=libgsttag-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-base-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-tag-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg-export gstreamer-tag-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -67,8 +67,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) @@ -102,20 +102,20 @@ update-licenses: mklicensestables # translations come from an external source here, so we don't want the # strings retranslated, but also we don't want to create 30 1kB .mo files, # so just do something for now, we can change it later if someone really cares. -licensetransdir = $(pkgdatadir)/@GST_MAJORMINOR@ +licensetransdir = $(pkgdatadir)/@GST_API_VERSION@ licensetrans_DATA = $(srcdir)/license-translations.dict #endif Android.mk: Makefile.am - androgenizer -:PROJECT libgsttag -:SHARED libgsttag-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgsttag -:SHARED libgsttag-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgsttag_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttag_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgsttag_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgsttag_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgsttag_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgsttag_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgsttag_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgsttag_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \ -:HEADERS $(libgsttaginclude_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c index 208c3a742..22124e148 100644 --- a/gst-libs/gst/tag/id3v2frames.c +++ b/gst-libs/gst/tag/id3v2frames.c @@ -167,7 +167,7 @@ id3v2_parse_frame (ID3TagsWorking * work) work->parse_data = uncompressed_data; #else GST_WARNING ("Compressed ID3v2 tag frame could not be decompressed, because" - " libgsttag-" GST_MAJORMINOR " was compiled without zlib support"); + " libgsttag-" GST_API_VERSION " was compiled without zlib support"); g_free (uu_data); return FALSE; #endif diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 0574a9997..4321bbfc1 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -8,13 +8,13 @@ built_sources = video-enumtypes.c video-marshal.c built_headers = video-enumtypes.h video-marshal.h BUILT_SOURCES = $(built_sources) $(built_headers) -lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = video-marshal.list -libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \ +libgstvideo_@GST_API_VERSION@_la_SOURCES = \ colorbalance.c \ colorbalancechannel.c \ video.c \ @@ -26,10 +26,10 @@ libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \ videoorientation.c \ videooverlay.c -nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = $(BUILT_SOURCES) +nodist_libgstvideo_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES) -libgstvideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video -libgstvideo_@GST_MAJORMINOR@include_HEADERS = \ +libgstvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video +libgstvideo_@GST_API_VERSION@include_HEADERS = \ colorbalance.h \ colorbalancechannel.h \ video.h \ @@ -39,44 +39,44 @@ libgstvideo_@GST_MAJORMINOR@include_HEADERS = \ gstvideopool.h \ videoorientation.h \ videooverlay.h -nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS = $(built_headers) +nodist_libgstvideo_@GST_API_VERSION@include_HEADERS = $(built_headers) -libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) -libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstvideo_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) +libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) include $(top_srcdir)/common/gst-glib-gen.mak if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir +BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) -gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES)) -gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/video/%',$(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) -gir_cincludes+=$(patsubst %,--c-include='gst/video/%',$(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS)) +gir_headers=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_API_VERSION@include_HEADERS)) +gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_API_VERSION@include_HEADERS)) +gir_sources=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_API_VERSION@_la_SOURCES)) +gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_API_VERSION@_la_SOURCES)) +gir_cincludes=$(patsubst %,--c-include='gst/video/%',$(libgstvideo_@GST_API_VERSION@include_HEADERS)) +gir_cincludes+=$(patsubst %,--c-include='gst/video/%',$(nodist_libgstvideo_@GST_API_VERSION@include_HEADERS)) -GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMINOR@.la +GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(INTROSPECTION_SCANNER) -v --namespace GstVideo \ - --nsversion=@GST_MAJORMINOR@ \ + --nsversion=@GST_API_VERSION@ \ --strip-prefix=Gst \ --warn-all \ $(gir_cincludes) \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ - --library=libgstvideo-@GST_MAJORMINOR@.la \ - --include=Gst-@GST_MAJORMINOR@ \ - --include=GstBase-@GST_MAJORMINOR@ \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ + --library=libgstvideo-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_MAJORMINOR@ \ - --pkg gstreamer-base-@GST_MAJORMINOR@ \ - --pkg-export gstreamer-video-@GST_MAJORMINOR@ \ + --pkg gstreamer-@GST_API_VERSION@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg-export gstreamer-video-@GST_API_VERSION@ \ --add-init-section="gst_init(NULL,NULL);" \ --output $@ \ $(gir_headers) \ @@ -96,25 +96,25 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_MAJORMINOR@` \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_MAJORMINOR@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libgstvideo -:SHARED libgstvideo-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstvideo -:SHARED libgstvideo-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES) \ - $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideo_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstvideo_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstvideo_@GST_API_VERSION@_la_SOURCES) \ + $(nodist_libgstvideo_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideo_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstvideo_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstvideo_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/tag \ - -:HEADERS $(libgstvideo_@GST_MAJORMINOR@include_HEADERS) \ - $(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS) \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/tag \ + -:HEADERS $(libgstvideo_@GST_API_VERSION@include_HEADERS) \ + $(nodist_libgstvideo_@GST_API_VERSION@include_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-plugins-base.spec.in b/gst-plugins-base.spec.in index 79f57a5b5..3d01c1953 100644 --- a/gst-plugins-base.spec.in +++ b/gst-plugins-base.spec.in @@ -1,4 +1,4 @@ -%define majorminor @GST_MAJORMINOR@ +%define majorminor @GST_API_VERSION@ %define gstreamer gstreamer011 %define gst_minver 0.11.0 diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am index 8fe5d2132..a29eefc17 100644 --- a/gst/adder/Makefile.am +++ b/gst/adder/Makefile.am @@ -9,7 +9,7 @@ nodist_libgstadder_la_SOURCES = $(ORC_NODIST_SOURCES) libgstadder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstadder_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) libgstadder_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/app/Makefile.am b/gst/app/Makefile.am index 217062327..5e344a613 100644 --- a/gst/app/Makefile.am +++ b/gst/app/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstapp.la libgstapp_la_SOURCES = gstapp.c libgstapp_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la +libgstapp_la_LIBADD = $(GST_BASE_LIBS) $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstapp_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am index 1626479e8..a61c86ed2 100644 --- a/gst/audioconvert/Makefile.am +++ b/gst/audioconvert/Makefile.am @@ -14,7 +14,7 @@ nodist_libgstaudioconvert_la_SOURCES = $(ORC_NODIST_SOURCES) libgstaudioconvert_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudioconvert_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM) libgstaudioconvert_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am index bcb6625d8..557d1c861 100644 --- a/gst/audiorate/Makefile.am +++ b/gst/audiorate/Makefile.am @@ -6,7 +6,7 @@ libgstaudiorate_la_SOURCES = gstaudiorate.c libgstaudiorate_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiorate_la_LIBADD = $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la libgstaudiorate_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am index 9c2999c8d..0c7e871c7 100644 --- a/gst/audioresample/Makefile.am +++ b/gst/audioresample/Makefile.am @@ -20,7 +20,7 @@ libgstaudioresample_la_CFLAGS = \ $(ORC_CFLAGS) libgstaudioresample_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) $(ORC_TEST_LIBS) \ diff --git a/gst/audiotestsrc/Makefile.am b/gst/audiotestsrc/Makefile.am index 9536c6758..a7c019def 100644 --- a/gst/audiotestsrc/Makefile.am +++ b/gst/audiotestsrc/Makefile.am @@ -4,7 +4,7 @@ libgstaudiotestsrc_la_SOURCES = gstaudiotestsrc.c libgstaudiotestsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudiotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiotestsrc_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstaudiotestsrc_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am index dace539bb..4849e689d 100644 --- a/gst/encoding/Makefile.am +++ b/gst/encoding/Makefile.am @@ -18,7 +18,7 @@ nodist_libgstencodebin_la_SOURCES = $(built_sources) libgstencodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstencodebin_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ $(GST_LIBS) libgstencodebin_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index 891e79449..afec33384 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -19,10 +19,10 @@ nodist_libgstplayback_la_SOURCES = $(built_sources) libgstplayback_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags) libgstplayback_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstplayback_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_LIBS) libgstplayback_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am index f64cdc369..4dfda7c5b 100644 --- a/gst/typefind/Makefile.am +++ b/gst/typefind/Makefile.am @@ -6,7 +6,7 @@ libgsttypefindfunctions_la_CFLAGS = \ $(GST_CFLAGS) $(GIO_CFLAGS) libgsttypefindfunctions_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttypefindfunctions_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) libgsttypefindfunctions_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/videoconvert/Makefile.am b/gst/videoconvert/Makefile.am index e9c8f7853..4ef3697c1 100644 --- a/gst/videoconvert/Makefile.am +++ b/gst/videoconvert/Makefile.am @@ -10,7 +10,7 @@ libgstvideoconvert_la_CFLAGS = \ $(GST_CFLAGS) \ $(ORC_CFLAGS) libgstvideoconvert_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am index 1d68f80d4..ecd3c9bc9 100644 --- a/gst/videoscale/Makefile.am +++ b/gst/videoscale/Makefile.am @@ -16,7 +16,7 @@ nodist_libgstvideoscale_la_SOURCES = $(ORC_NODIST_SOURCES) libgstvideoscale_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideoscale_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM) libgstvideoscale_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am index 129ad76ed..5096b9b1b 100644 --- a/gst/videotestsrc/Makefile.am +++ b/gst/videotestsrc/Makefile.am @@ -11,7 +11,7 @@ nodist_libgstvideotestsrc_la_SOURCES = $(ORC_NODIST_SOURCES) libgstvideotestsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideotestsrc_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM) libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am index ed3a1fbda..dbdf8bf33 100644 --- a/gst/volume/Makefile.am +++ b/gst/volume/Makefile.am @@ -8,8 +8,8 @@ nodist_libgstvolume_la_SOURCES = $(ORC_NODIST_SOURCES) libgstvolume_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvolume_la_LIBADD = \ - $(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/interfaces/libgstinterfaces-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 75423fc55..f42081428 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -1,30 +1,30 @@ ### all of the standard pc files we need to generate pcverfiles = \ - gstreamer-audio-@GST_MAJORMINOR@.pc \ - gstreamer-app-@GST_MAJORMINOR@.pc \ - gstreamer-fft-@GST_MAJORMINOR@.pc \ - gstreamer-interfaces-@GST_MAJORMINOR@.pc \ - gstreamer-pbutils-@GST_MAJORMINOR@.pc \ - gstreamer-riff-@GST_MAJORMINOR@.pc \ - gstreamer-rtp-@GST_MAJORMINOR@.pc \ - gstreamer-rtsp-@GST_MAJORMINOR@.pc \ - gstreamer-sdp-@GST_MAJORMINOR@.pc \ - gstreamer-tag-@GST_MAJORMINOR@.pc \ - gstreamer-video-@GST_MAJORMINOR@.pc \ - gstreamer-plugins-base-@GST_MAJORMINOR@.pc + gstreamer-audio-@GST_API_VERSION@.pc \ + gstreamer-app-@GST_API_VERSION@.pc \ + gstreamer-fft-@GST_API_VERSION@.pc \ + gstreamer-interfaces-@GST_API_VERSION@.pc \ + gstreamer-pbutils-@GST_API_VERSION@.pc \ + gstreamer-riff-@GST_API_VERSION@.pc \ + gstreamer-rtp-@GST_API_VERSION@.pc \ + gstreamer-rtsp-@GST_API_VERSION@.pc \ + gstreamer-sdp-@GST_API_VERSION@.pc \ + gstreamer-tag-@GST_API_VERSION@.pc \ + gstreamer-video-@GST_API_VERSION@.pc \ + gstreamer-plugins-base-@GST_API_VERSION@.pc pcverfiles_uninstalled = \ - gstreamer-audio-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-app-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-fft-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-pbutils-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-riff-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-rtp-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-rtsp-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-sdp-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-tag-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-video-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-plugins-base-@GST_MAJORMINOR@-uninstalled.pc + gstreamer-audio-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-app-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-fft-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-interfaces-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-pbutils-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-riff-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-rtp-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-rtsp-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-sdp-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-tag-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-video-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-plugins-base-@GST_API_VERSION@-uninstalled.pc all-local: $(pcverfiles) $(pcverfiles_uninstalled) @@ -33,9 +33,9 @@ cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY)) cp_verbose_0 = @echo " CP $@"; ### how to generate versioned .pc files from .pc files in this dir -%-@GST_MAJORMINOR@.pc: %.pc +%-@GST_API_VERSION@.pc: %.pc $(cp_verbose_0)cp $< $@ -%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc +%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc $(cp_verbose_0)cp $< $@ pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgconfig/gstreamer-app-uninstalled.pc.in b/pkgconfig/gstreamer-app-uninstalled.pc.in index b989798ee..68a3e38b6 100644 --- a/pkgconfig/gstreamer-app-uninstalled.pc.in +++ b/pkgconfig/gstreamer-app-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/app Name: GStreamer Application Library, Uninstalled Description: Helper functions and base classes for application integration, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-app.pc.in b/pkgconfig/gstreamer-app.pc.in index 8152effe5..aa1e552b2 100644 --- a/pkgconfig/gstreamer-app.pc.in +++ b/pkgconfig/gstreamer-app.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Application Library Description: Helper functions and base classes for application integration -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstapp-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstapp-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-audio-uninstalled.pc.in b/pkgconfig/gstreamer-audio-uninstalled.pc.in index ce55cf94b..a55ee9dda 100644 --- a/pkgconfig/gstreamer-audio-uninstalled.pc.in +++ b/pkgconfig/gstreamer-audio-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/audio Name: GStreamer Audio Library, Uninstalled Description: Audio helper functions and base classes, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-interfaces-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-interfaces-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-audio.pc.in b/pkgconfig/gstreamer-audio.pc.in index 5743ccf95..cad6aa3cc 100644 --- a/pkgconfig/gstreamer-audio.pc.in +++ b/pkgconfig/gstreamer-audio.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Audio library Description: Audio helper functions and base classes -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ gstreamer-interfaces-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-interfaces-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstaudio-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstaudio-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-fft-uninstalled.pc.in b/pkgconfig/gstreamer-fft-uninstalled.pc.in index 163f3f065..87cbbca12 100644 --- a/pkgconfig/gstreamer-fft-uninstalled.pc.in +++ b/pkgconfig/gstreamer-fft-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/fft Name: GStreamer FFT Library, Uninstalled Description: FFT implementation, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la @LIBM@ +Requires: gstreamer-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/fft/libgstfft-@GST_API_VERSION@.la @LIBM@ Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-fft.pc.in b/pkgconfig/gstreamer-fft.pc.in index 5680a0c6d..7f2d2ca7f 100644 --- a/pkgconfig/gstreamer-fft.pc.in +++ b/pkgconfig/gstreamer-fft.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer FFT Library Description: FFT implementation -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstfft-@GST_MAJORMINOR@ @LIBM@ +Libs: -L${libdir} -lgstfft-@GST_API_VERSION@ @LIBM@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in index 676a23fbf..481e93416 100644 --- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in +++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/interfaces Name: GStreamer Interfaces Library, Uninstalled Description: Interfaces for GStreamer elements, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-interfaces.pc.in b/pkgconfig/gstreamer-interfaces.pc.in index 24749be89..de3d6cd32 100644 --- a/pkgconfig/gstreamer-interfaces.pc.in +++ b/pkgconfig/gstreamer-interfaces.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Interfaces Library Description: Interfaces for GStreamer elements -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstinterfaces-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstinterfaces-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in index e08758c97..b935237bf 100644 --- a/pkgconfig/gstreamer-pbutils-uninstalled.pc.in +++ b/pkgconfig/gstreamer-pbutils-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/pbutils Name: GStreamer Base Utils Library, Uninstalled Description: General utility functions, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-pbutils.pc.in b/pkgconfig/gstreamer-pbutils.pc.in index e1626a454..31369e524 100644 --- a/pkgconfig/gstreamer-pbutils.pc.in +++ b/pkgconfig/gstreamer-pbutils.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Base Utils Library Description: General utility functions -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstpbutils-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstpbutils-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in index d93037e0e..c4d91ff65 100644 --- a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in +++ b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in @@ -9,7 +9,7 @@ pluginsdir=@abs_top_builddir@ Name: GStreamer Base Plugins Libraries, Uninstalled Description: Streaming media framework, base plugins libraries, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Libs: -L@abs_top_builddir@/gst-libs/gst/audio -L@abs_top_builddir@/gst-libs/gst/fft -L@abs_top_builddir@/gst-libs/gst/interfaces -L@abs_top_builddir@/gst-libs/gst/riff -L@abs_top_builddir@/gst-libs/gst/rtp -L@abs_top_builddir@/gst-libs/gst/rtsp -L@abs_top_builddir@/gst-libs/gst/sdp -L@abs_top_builddir@/gst-libs/gst/tag -L@abs_top_builddir@/gst-libs/gst/pbutils -L@abs_top_builddir@/gst-libs/gst/video -L@abs_top_builddir@/gst-libs/gst/app Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-plugins-base.pc.in b/pkgconfig/gstreamer-plugins-base.pc.in index 088e9246b..6512f2d41 100644 --- a/pkgconfig/gstreamer-plugins-base.pc.in +++ b/pkgconfig/gstreamer-plugins-base.pc.in @@ -1,12 +1,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ -pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ +pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@ Name: GStreamer Base Plugins Libraries Description: Streaming media framework, base plugins libraries -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ Libs: -L${libdir} Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-riff-uninstalled.pc.in b/pkgconfig/gstreamer-riff-uninstalled.pc.in index 2592ba14f..a68c22e43 100644 --- a/pkgconfig/gstreamer-riff-uninstalled.pc.in +++ b/pkgconfig/gstreamer-riff-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/riff Name: GStreamer RIFF Library, Uninstalled Description: RIFF helper functions, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-riff.pc.in b/pkgconfig/gstreamer-riff.pc.in index 0858276bf..000ef3e64 100644 --- a/pkgconfig/gstreamer-riff.pc.in +++ b/pkgconfig/gstreamer-riff.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer RIFF Library Description: RIFF helper functions -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstriff-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstriff-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-rtp-uninstalled.pc.in b/pkgconfig/gstreamer-rtp-uninstalled.pc.in index 96c66cd74..11fe9927d 100644 --- a/pkgconfig/gstreamer-rtp-uninstalled.pc.in +++ b/pkgconfig/gstreamer-rtp-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/rtp Name: GStreamer RTP Library, Uninstalled Description: RTP base classes and helper functions, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/rtp/libgstrtp-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-rtp.pc.in b/pkgconfig/gstreamer-rtp.pc.in index ff74a9d12..56e45226e 100644 --- a/pkgconfig/gstreamer-rtp.pc.in +++ b/pkgconfig/gstreamer-rtp.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer RTP Library Description: RTP base classes and helper functions -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstrtp-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstrtp-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in index 22ef0bfb3..e2846a4d0 100644 --- a/pkgconfig/gstreamer-rtsp-uninstalled.pc.in +++ b/pkgconfig/gstreamer-rtsp-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/rtsp Name: GStreamer RTSP Library, Uninstalled Description: RTSP base classes and helper functions, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-sdp-@GST_MAJORMINOR@ gio-2.0 -Libs: @abs_top_builddir@/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ gstreamer-sdp-@GST_API_VERSION@ gio-2.0 +Libs: @abs_top_builddir@/gst-libs/gst/rtsp/libgstrtsp-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-rtsp.pc.in b/pkgconfig/gstreamer-rtsp.pc.in index 684292548..5e8a17a92 100644 --- a/pkgconfig/gstreamer-rtsp.pc.in +++ b/pkgconfig/gstreamer-rtsp.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer RTSP Library Description: RTSP base classes and helper functions -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-sdp-@GST_MAJORMINOR@ gio-2.0 +Requires: gstreamer-@GST_API_VERSION@ gstreamer-sdp-@GST_API_VERSION@ gio-2.0 Version: @VERSION@ -Libs: -L${libdir} -lgstrtsp-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstrtsp-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-sdp-uninstalled.pc.in b/pkgconfig/gstreamer-sdp-uninstalled.pc.in index 1cabc50f5..a67e03734 100644 --- a/pkgconfig/gstreamer-sdp-uninstalled.pc.in +++ b/pkgconfig/gstreamer-sdp-uninstalled.pc.in @@ -12,6 +12,6 @@ Description: SDP helper functions, uninstalled Version: @VERSION@ Requires: glib-2.0 Requires.private: gio-2.0 -Libs: @abs_top_builddir@/gst-libs/gst/sdp/libgstsdp-@GST_MAJORMINOR@.la +Libs: @abs_top_builddir@/gst-libs/gst/sdp/libgstsdp-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-sdp.pc.in b/pkgconfig/gstreamer-sdp.pc.in index 4ca410516..7c93eb021 100644 --- a/pkgconfig/gstreamer-sdp.pc.in +++ b/pkgconfig/gstreamer-sdp.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -12,6 +12,6 @@ Description: SDP helper functions Requires: glib-2.0 Requires.private: gio-2.0 Version: @VERSION@ -Libs: -L${libdir} -lgstsdp-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstsdp-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-tag-uninstalled.pc.in b/pkgconfig/gstreamer-tag-uninstalled.pc.in index b953a4c1a..9acd1acc3 100644 --- a/pkgconfig/gstreamer-tag-uninstalled.pc.in +++ b/pkgconfig/gstreamer-tag-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/tag Name: GStreamer Tag Library, Uninstalled Description: Tag base classes and helper functions, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-tag.pc.in b/pkgconfig/gstreamer-tag.pc.in index a7a564c3b..43b6063c9 100644 --- a/pkgconfig/gstreamer-tag.pc.in +++ b/pkgconfig/gstreamer-tag.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Tag Library Description: Tag base classes and helper functions -Requires: gstreamer-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgsttag-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgsttag-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-video-uninstalled.pc.in b/pkgconfig/gstreamer-video-uninstalled.pc.in index 450be2bc2..9eda02830 100644 --- a/pkgconfig/gstreamer-video-uninstalled.pc.in +++ b/pkgconfig/gstreamer-video-uninstalled.pc.in @@ -10,7 +10,7 @@ typelibdir=@abs_top_builddir@/gst-libs/gst/video Name: GStreamer Video Library, Uninstalled Description: Video base classes and helper functions, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ -Libs: @abs_top_builddir@/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ +Libs: @abs_top_builddir@/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-video.pc.in b/pkgconfig/gstreamer-video.pc.in index 59a217d74..84e748436 100644 --- a/pkgconfig/gstreamer-video.pc.in +++ b/pkgconfig/gstreamer-video.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ datarootdir=${prefix}/share datadir=${datarootdir} girdir=${datadir}/gir-1.0 @@ -9,8 +9,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Video Library Description: Video base classes and helper functions -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstvideo-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstvideo-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index df14448b8..cf8938f93 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -3,12 +3,12 @@ plugin_LTLIBRARIES = libgstximagesink.la libgstximagesink_la_SOURCES = ximagesink.c ximage.c ximagepool.c libgstximagesink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) libgstximagesink_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(X_LIBS) $(XSHM_LIBS) libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la +libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la libgstximagesink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = ximagesink.h ximagepool.h diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am index 9669e72ca..db923f4c1 100644 --- a/sys/xvimage/Makefile.am +++ b/sys/xvimage/Makefile.am @@ -3,13 +3,13 @@ plugin_LTLIBRARIES = libgstxvimagesink.la libgstxvimagesink_la_SOURCES = xvimagesink.c xvimage.c xvimagepool.c libgstxvimagesink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) libgstxvimagesink_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) $(LIBM) libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la +libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la libgstxvimagesink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = xvimagesink.h xvimagepool.h diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index d426f3b5d..db023faf4 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -183,15 +183,15 @@ libs_libsabi_CFLAGS = \ $(AM_CFLAGS) libs_libsabi_LDADD = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@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/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@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/tag/libgsttag-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/app/libgstapp-@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/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@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/tag/libgsttag-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -201,8 +201,8 @@ libs_audio_CFLAGS = \ $(AM_CFLAGS) libs_audio_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -212,8 +212,8 @@ libs_audiocdsrc_CFLAGS = \ $(AM_CFLAGS) libs_audiocdsrc_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -222,7 +222,7 @@ libs_discoverer_CFLAGS = \ $(AM_CFLAGS) \ -DGST_TEST_FILE="\"$(abs_top_srcdir)/tests/files/partialframe.mjpeg\"" libs_discoverer_LDADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(LDADD) libs_fft_CFLAGS = \ @@ -231,7 +231,7 @@ libs_fft_CFLAGS = \ $(AM_CFLAGS) libs_fft_LDADD = \ - $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -241,7 +241,7 @@ libs_mixer_CFLAGS = \ $(AM_CFLAGS) libs_mixer_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -251,7 +251,7 @@ libs_navigation_CFLAGS = \ $(AM_CFLAGS) libs_navigation_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -259,14 +259,14 @@ libs_rtp_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) libs_rtp_LDADD = \ - $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(LDADD) libs_rtsp_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) libs_rtsp_LDADD = \ - $(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(LDADD) libs_tag_CFLAGS = \ @@ -274,22 +274,22 @@ libs_tag_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) libs_tag_LDADD = \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(LDADD) libs_pbutils_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) libs_pbutils_LDADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(LDADD) libs_profile_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(AM_CFLAGS) libs_profile_LDADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la $(LDADD) + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la $(LDADD) libs_xmpwriter_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ @@ -297,7 +297,7 @@ libs_xmpwriter_CFLAGS = \ $(AM_CFLAGS) libs_xmpwriter_LDADD = \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -309,7 +309,7 @@ elements_appsink_CFLAGS = \ $(AM_CFLAGS) elements_appsink_LDADD = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la \ $(LDADD) elements_appsrc_CFLAGS = \ @@ -317,7 +317,7 @@ elements_appsrc_CFLAGS = \ $(AM_CFLAGS) elements_appsrc_LDADD = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la \ $(LDADD) elements_alsa_CFLAGS = \ @@ -325,8 +325,8 @@ elements_alsa_CFLAGS = \ $(AM_CFLAGS) elements_alsa_LDADD = \ - $(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/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(LDADD) elements_audioconvert_CFLAGS = \ @@ -335,14 +335,14 @@ elements_audioconvert_CFLAGS = \ $(AM_CFLAGS) elements_audioconvert_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) elements_audiorate_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) elements_audiorate_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) @@ -356,13 +356,13 @@ elements_gdppay_LDADD = $(LDADD) elements_playbin_LDADD = $(GST_BASE_LIBS) $(LDADD) elements_playbin_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) -elements_playbin_compressed_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la $(GST_BASE_LIBS) $(LDADD) +elements_playbin_compressed_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la $(GST_BASE_LIBS) $(LDADD) elements_playbin_compressed_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_decodebin_LDADD = $(GST_BASE_LIBS) $(LDADD) elements_decodebin_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) -elements_encodebin_LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la $(GST_BASE_LIBS) $(LDADD) +elements_encodebin_LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la $(GST_BASE_LIBS) $(LDADD) elements_encodebin_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_subparse_LDADD = $(LDADD) @@ -374,9 +374,9 @@ elements_audioresample_CFLAGS = \ $(AM_CFLAGS) elements_audioresample_LDADD = \ - $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -384,7 +384,7 @@ elements_textoverlay_LDADD = $(GST_BASE_LIBS) $(LDADD) elements_textoverlay_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_volume_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_CONTROLLER_LIBS) \ $(GST_BASE_LIBS) \ $(LDADD) @@ -422,7 +422,7 @@ elements_videoscale_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(AM_CFLAGS) elements_videoscale_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(LDADD) gst_typefindfunctions_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) @@ -434,7 +434,7 @@ libs_video_CFLAGS = \ $(AM_CFLAGS) libs_video_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) @@ -467,8 +467,8 @@ pipelines_simple_launch_lines_CFLAGS = \ $(AM_CFLAGS) pipelines_simple_launch_lines_LDADD = \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(LDADD) diff --git a/tests/check/libs/pbutils.c b/tests/check/libs/pbutils.c index 5cf3efcc0..f9fd38c6a 100644 --- a/tests/check/libs/pbutils.c +++ b/tests/check/libs/pbutils.c @@ -623,7 +623,7 @@ GST_START_TEST (test_pb_utils_installer_details) /* uri source */ detail1 = gst_missing_uri_source_installer_detail_new ("http"); fail_unless (detail1 != NULL); - fail_unless (g_str_has_prefix (detail1, "gstreamer|0.11|")); + fail_unless (g_str_has_prefix (detail1, "gstreamer|1.0|")); fail_unless (g_str_has_suffix (detail1, "|urisource-http")); msg = gst_missing_uri_source_message_new (el, "http"); fail_unless (msg != NULL); @@ -637,7 +637,7 @@ GST_START_TEST (test_pb_utils_installer_details) /* uri sink */ detail1 = gst_missing_uri_sink_installer_detail_new ("http"); fail_unless (detail1 != NULL); - fail_unless (g_str_has_prefix (detail1, "gstreamer|0.11|")); + fail_unless (g_str_has_prefix (detail1, "gstreamer|1.0|")); fail_unless (g_str_has_suffix (detail1, "|urisink-http")); msg = gst_missing_uri_sink_message_new (el, "http"); fail_unless (msg != NULL); @@ -651,7 +651,7 @@ GST_START_TEST (test_pb_utils_installer_details) /* element */ detail1 = gst_missing_element_installer_detail_new ("deinterlace"); fail_unless (detail1 != NULL); - fail_unless (g_str_has_prefix (detail1, "gstreamer|0.11|")); + fail_unless (g_str_has_prefix (detail1, "gstreamer|1.0|")); fail_unless (g_str_has_suffix (detail1, "|element-deinterlace")); msg = gst_missing_element_message_new (el, "deinterlace"); fail_unless (msg != NULL); @@ -667,7 +667,7 @@ GST_START_TEST (test_pb_utils_installer_details) 2, "channels", G_TYPE_INT, 6, NULL); detail1 = gst_missing_decoder_installer_detail_new (caps); fail_unless (detail1 != NULL); - fail_unless (g_str_has_prefix (detail1, "gstreamer|0.11|")); + fail_unless (g_str_has_prefix (detail1, "gstreamer|1.0|")); fail_unless (g_str_has_suffix (detail1, "|decoder-audio/x-spiffy, spiffyversion=(int)2")); msg = gst_missing_decoder_message_new (el, caps); @@ -684,7 +684,7 @@ GST_START_TEST (test_pb_utils_installer_details) caps = gst_caps_new_simple ("audio/x-spiffy", "spiffyversion", G_TYPE_INT, 2, "channels", G_TYPE_INT, 6, NULL); detail1 = gst_missing_encoder_installer_detail_new (caps); - fail_unless (g_str_has_prefix (detail1, "gstreamer|0.11|")); + fail_unless (g_str_has_prefix (detail1, "gstreamer|1.0|")); fail_unless (g_str_has_suffix (detail1, "|encoder-audio/x-spiffy, spiffyversion=(int)2")); fail_unless (detail1 != NULL); diff --git a/tests/check/libs/profile.c b/tests/check/libs/profile.c index 91264110a..5d3a5b212 100644 --- a/tests/check/libs/profile.c +++ b/tests/check/libs/profile.c @@ -292,7 +292,7 @@ GST_START_TEST (test_saving_profile) /* Check we can load it */ profile_file_name = - g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", + g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", "encoding-profiles", "herding", "myponytarget2.gep", NULL); GST_DEBUG ("Loading target from '%s'", profile_file_name); loaded = gst_encoding_target_load_from_file (profile_file_name, NULL); @@ -416,7 +416,7 @@ GST_START_TEST (test_loading_profile) /* Test loading using fully specified path */ profile_file_name = - g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", + g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", "encoding-profiles", "herding", "myponytarget.gep", NULL); GST_DEBUG ("Loading target from '%s'", profile_file_name); @@ -550,12 +550,12 @@ remove_profile_file (void) gchar *profile_file_name; profile_file_name = - g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", + g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", "encoding-profiles", "herding", "myponytarget.gep", NULL); g_unlink (profile_file_name); g_free (profile_file_name); profile_file_name = - g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", + g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", "encoding-profiles", "herding", "myponytarget2.gep", NULL); g_unlink (profile_file_name); g_free (profile_file_name); @@ -569,10 +569,10 @@ create_profile_file (void) GError *error = NULL; profile_dir = - g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", + g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", "encoding-profiles", "herding", NULL); profile_file_name = - g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", + g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", "encoding-profiles", "herding", "myponytarget.gep", NULL); g_mkdir_with_parents (profile_dir, S_IRUSR | S_IWUSR | S_IXUSR); if (!g_file_set_contents (profile_file_name, profile_string, @@ -604,7 +604,7 @@ profile_suite (void) gchar *gst_dir; /* cehck if we can create profiles */ - gst_dir = g_build_filename (g_get_user_data_dir (), "gstreamer-0.11", NULL); + gst_dir = g_build_filename (g_get_user_data_dir (), "gstreamer-1.0", NULL); can_write = (g_access (gst_dir, R_OK | W_OK | X_OK) == 0); g_free (gst_dir); diff --git a/tests/examples/app/Makefile.am b/tests/examples/app/Makefile.am index 4f17ad79d..3679e2819 100644 --- a/tests/examples/app/Makefile.am +++ b/tests/examples/app/Makefile.am @@ -5,7 +5,7 @@ noinst_PROGRAMS = appsrc_ex appsrc-stream appsrc-stream2 appsrc-ra \ appsrc_ex_SOURCES = appsrc_ex.c appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsrc_ex_LDADD = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) appsrc_stream_SOURCES = appsrc-stream.c @@ -27,6 +27,6 @@ appsrc_seekable_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) appsink_src_SOURCES = appsink-src.c appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsink_src_LDADD = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) diff --git a/tests/examples/encoding/Makefile.am b/tests/examples/encoding/Makefile.am index adec75c7d..81e9f6a99 100644 --- a/tests/examples/encoding/Makefile.am +++ b/tests/examples/encoding/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = gstcapslist.h noinst_PROGRAMS = $(examples) -LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ +LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) \ $(GST_LIBS) AM_CFLAGS = -I$(top_builddir)/gst-libs \ diff --git a/tests/examples/fft/Makefile.am b/tests/examples/fft/Makefile.am index c5a2d96fa..ed5589e28 100644 --- a/tests/examples/fft/Makefile.am +++ b/tests/examples/fft/Makefile.am @@ -3,6 +3,6 @@ noinst_PROGRAMS = fftrange fftrange_SOURCES = fftrange.c fftrange_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) fftrange_LDADD = \ - $(top_builddir)/gst-libs/gst/fft/libgstfft-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/fft/libgstfft-$(GST_API_VERSION).la \ $(GST_LIBS) diff --git a/tests/examples/overlay/Makefile.am b/tests/examples/overlay/Makefile.am index 23c25467f..f56935ba5 100644 --- a/tests/examples/overlay/Makefile.am +++ b/tests/examples/overlay/Makefile.am @@ -8,7 +8,7 @@ EXAMPLES += gtk-videooverlay gtk_videooverlay_SOURCES = gtk-videooverlay.c gtk_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) gtk_videooverlay_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) endif @@ -18,7 +18,7 @@ EXAMPLES += qt-videooverlay qt_videooverlay_SOURCES = qt-videooverlay.cpp qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) qt_videooverlay_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) endif @@ -28,7 +28,7 @@ EXAMPLES += qtgv-videooverlay qtgv_videooverlay_SOURCES = qtgv-videooverlay.cpp qtgv-videooverlay.h qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) qtgv_videooverlay_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) # qt moc support, according to http://qtnode.net/wiki/Qt_with_autotools diff --git a/tests/examples/playback/Makefile.am b/tests/examples/playback/Makefile.am index 026f674b6..894b562ea 100644 --- a/tests/examples/playback/Makefile.am +++ b/tests/examples/playback/Makefile.am @@ -1,8 +1,8 @@ noinst_PROGRAMS = playback-test LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_LIBS) $(GTK_LIBS) $(LIBM) AM_CFLAGS = -I$(top_builddir)/gst-libs $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) diff --git a/tests/examples/seek/Makefile.am b/tests/examples/seek/Makefile.am index cb2508780..c046f1c50 100644 --- a/tests/examples/seek/Makefile.am +++ b/tests/examples/seek/Makefile.am @@ -11,8 +11,8 @@ examples = $(GTK_EXAMPLES) stepping stepping2 noinst_PROGRAMS = $(examples) LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_API_VERSION@.la \ $(GST_LIBS) $(GTK_LIBS) $(LIBM) AM_CFLAGS = -I$(top_builddir)/gst-libs $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am index 7aebee289..18f1fb7fc 100644 --- a/tests/icles/Makefile.am +++ b/tests/icles/Makefile.am @@ -8,7 +8,7 @@ stress_videooverlay_SOURCES = stress-videooverlay.c stress_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) stress_videooverlay_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) if HAVE_GTK_X11 @@ -18,15 +18,15 @@ test_colorkey_SOURCES = test-colorkey.c test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) test_colorkey_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) test_videooverlay_SOURCES = test-videooverlay.c test_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) test_videooverlay_LDADD = \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) endif diff --git a/tools/Makefile.am b/tools/Makefile.am index 6e4deeda2..6d1d99540 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,13 +1,13 @@ bin_SCRIPTS = \ - gst-visualise-@GST_MAJORMINOR@ + gst-visualise-@GST_API_VERSION@ man_MANS = \ - gst-visualise-@GST_MAJORMINOR@.1 + gst-visualise-@GST_API_VERSION@.1 bin_PROGRAMS = \ - gst-discoverer-@GST_MAJORMINOR@ + gst-discoverer-@GST_API_VERSION@ -gst_discoverer_@GST_MAJORMINOR@_SOURCES = gst-discoverer.c +gst_discoverer_@GST_API_VERSION@_SOURCES = gst-discoverer.c CLEANFILES = $(man_MANS) $(bin_SCRIPTS) $(bin_PROGRAMS) @@ -15,22 +15,22 @@ EXTRA_DIST = \ gst-visualise-m.m gst-visualise.1.in -LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ +LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) # generate versioned scripts from templates -%-@GST_MAJORMINOR@: %-m.m - $(AM_V_GEN)sed -e s,\@GST_MAJORMINOR\@,@GST_MAJORMINOR@,g $< > $@ && \ +%-@GST_API_VERSION@: %-m.m + $(AM_V_GEN)sed -e s,\@GST_API_VERSION\@,@GST_API_VERSION@,g $< > $@ && \ chmod +x $@ # generate man pages -%-@GST_MAJORMINOR@.1: %.1.in +%-@GST_API_VERSION@.1: %.1.in $(AM_V_GEN)sed \ - -e s,gst-visualise,gst-visualise-@GST_MAJORMINOR@,g \ + -e s,gst-visualise,gst-visualise-@GST_API_VERSION@,g \ $< >$@ all: all-am chmod @@ -42,9 +42,9 @@ Android.mk: Makefile.am androgenizer -:PROJECT gst-discoverer \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:EXECUTABLE gst-discoverer -:TAGS eng debug \ - -:SOURCES $(gst_discoverer_@GST_MAJORMINOR@_SOURCES) \ + -:SOURCES $(gst_discoverer_@GST_API_VERSION@_SOURCES) \ -:CFLAGS $(DEFS) $(AM_CFLAGS) \ - -:LDFLAGS -lgstpbutils-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \ + -:LDFLAGS -lgstpbutils-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/tools/gst-visualise-m.m b/tools/gst-visualise-m.m index 798929b18..eea4b598c 100644 --- a/tools/gst-visualise-m.m +++ b/tools/gst-visualise-m.m @@ -52,7 +52,7 @@ sub visualise(@) my $pipe; $pipe = $vis unless $pipe = $pipes{$vis}; - $command = "gst-launch-@GST_MAJORMINOR@ $cfg{AUDIOSRC} ! $pipe ! { queue ! videoconvert ! $cfg{VIDEOSINK} }"; + $command = "gst-launch-@GST_API_VERSION@ $cfg{AUDIOSRC} ! $pipe ! { queue ! videoconvert ! $cfg{VIDEOSINK} }"; print "Running $command\n"; system ("PATH=\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools $command"); } diff --git a/win32/common/config.h b/win32/common/config.h index 4e521d345..051fdd15c 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -78,7 +78,7 @@ #define GST_LICENSE "LGPL" /* major/minor version */ -#define GST_MAJORMINOR "0.11" +#define GST_API_VERSION "0.11" /* package name in plugins */ #define GST_PACKAGE_NAME "GStreamer Base Plug-ins source release" |