diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-01 09:17:31 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-01 09:17:31 +0200 |
| commit | bc5403e423a30a892b61373aee88c6eb9a40044f (patch) | |
| tree | 5e296376851d0548601407a3d515ae1b2647b903 /packages | |
| parent | 2176368d92b651603af225902b4cddd858461847 (diff) | |
| parent | debe50411065467f44177495179a9881974d6495 (diff) | |
Merge branch 'master' into upstream
Conflicts:
recipes/gst-rtsp-server-1.0.recipe
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package | 1 | ||||
| -rw-r--r-- | packages/gstreamer-sdk/gstreamer-sdk.package | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package b/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package index 2e4374a1..173be5a8 100644 --- a/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package +++ b/packages/gstreamer-1.0-sdk/gstreamer-1.0-sdk.package @@ -55,7 +55,6 @@ class SDKPackage(package.SDKPackage): }, } osx_framework_library = ('GStreamer', 'lib/GStreamer') - ios_framework_library = ('GStreamer', 'lib/GStreamer') def prepare(self): diff --git a/packages/gstreamer-sdk/gstreamer-sdk.package b/packages/gstreamer-sdk/gstreamer-sdk.package index 7da0171f..1e7aaf94 100644 --- a/packages/gstreamer-sdk/gstreamer-sdk.package +++ b/packages/gstreamer-sdk/gstreamer-sdk.package @@ -65,7 +65,6 @@ class SDKPackage(package.SDKPackage): }, } osx_framework_library = ('GStreamer', 'lib/GStreamer') - ios_framework_library = ('GStreamer', 'lib/GStreamer') def prepare(self): |