summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2012-10-03 12:10:12 +0200
committerAndoni Morales Alastruey <ylatuya@gmail.com>2012-10-03 12:12:28 +0200
commit709389bef6cbdfae24495ee7624d61a03482e606 (patch)
tree8bc7c7f1a37e4c1b8277c9fc1f3175be170809cf
parent489c50f9bcb74d9dfe799f5a2ba964e71c20b395 (diff)
gst-android: fix plugins -> shared library differences
-rwxr-xr-xdata/ndk-build/gstreamer.mk3
-rw-r--r--recipes/gst-android.recipe10
2 files changed, 12 insertions, 1 deletions
diff --git a/data/ndk-build/gstreamer.mk b/data/ndk-build/gstreamer.mk
index abc306ec..5550ee14 100755
--- a/data/ndk-build/gstreamer.mk
+++ b/data/ndk-build/gstreamer.mk
@@ -119,6 +119,9 @@ GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,playback,playbin)
GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,uridecodebin,decodebin2)
GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,encoding,encodebin)
GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,soup,souphttpsrc)
+GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,gstsiren,siren)
+GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,sdp,sdpelem)
+GSTREAMER_PLUGINS_LIBS := $(call fix-plugin-name,gstrtpmanager,rtpmanager)
GSTREAMER_PLUGINS_LIBS := $(subst gstgnonlin,gnl,$(GSTREAMER_PLUGINS_LIBS))
# Generate the plugins' declaration strings
diff --git a/recipes/gst-android.recipe b/recipes/gst-android.recipe
index 2b78b2cb..7fbf8337 100644
--- a/recipes/gst-android.recipe
+++ b/recipes/gst-android.recipe
@@ -26,6 +26,11 @@ class Recipe(recipe.Recipe):
# Create a plugins.mk file with lists of plugins grouped by categories
cookbook = CookBook(self.config)
+ # For plugins named differently
+ replacements = {'decodebin2': 'uridecodebin', 'playbin': 'playback',
+ 'encodebin': 'encoding', 'souphttpsrc': 'soup',
+ 'siren': 'gstsiren', 'sdpelem': 'sdp',
+ 'rtpmanager': 'gstrtpmanager'}
f = open(os.path.join(ndk_build_dir, 'plugins.mk'), 'w')
for c in ['core', 'playback', 'codecs', 'vis', 'effects', 'net',
'codecs_gpl', 'codecs_restricted', 'net_restricted', 'sys']:
@@ -43,7 +48,10 @@ class Recipe(recipe.Recipe):
if hasattr(r, 'platform_files_%s' % c):
for e in getattr(r, 'platform_files_%s' % c).get(self.config.target_platform, []):
plugins.append(e[25:-8])
- f.write('GSTREAMER_PLUGINS_%s := %s\n' % (c.upper(), ' '.join(plugins)))
+ plugins = ' '.join(plugins)
+ for k,v in replacements.iteritems():
+ plugins = plugins.replace(k, v)
+ f.write('GSTREAMER_PLUGINS_%s := %s\n' % (c.upper(), plugins))
f.close()