Enable the DV plugin on Windows and Android

4 files changed, 14 insertions, 47 deletions

diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe
index 3f68cd30..777d46bb 100644
--- a/recipes/gst-plugins-good-1.0.recipe
+++ b/recipes/gst-plugins-good-1.0.recipe
@@ -12,9 +12,7 @@ class Recipe(recipe.Recipe):
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'jpeg', 'libpng',
             'speex', 'gdk-pixbuf', 'libsoup',
             'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib',
-            'libvpx']
-    platform_deps = {Platform.LINUX: ['libdv'],
-                     Platform.DARWIN: ['libdv']}
+            'libvpx', 'libdv']
 
 
     files_lang = ['gst-plugins-good-1.0']
@@ -54,6 +52,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstaudioparsers%(mext)s',
              'lib/gstreamer-1.0/libgstauparse%(mext)s',
              'lib/gstreamer-1.0/libgstavi%(mext)s',
+             'lib/gstreamer-1.0/libgstdv%(mext)s',
              'lib/gstreamer-1.0/libgstflac%(mext)s',
              'lib/gstreamer-1.0/libgstflv%(mext)s',
              'lib/gstreamer-1.0/libgstflxdec%(mext)s',
@@ -94,15 +93,6 @@ class Recipe(recipe.Recipe):
             ]
     }
 
-    platform_files_codecs = {
-        Platform.LINUX: [
-             'lib/gstreamer-1.0/libgstdv%(mext)s',
-            ],
-        Platform.DARWIN: [
-             'lib/gstreamer-1.0/libgstdv%(mext)s',
-            ]
-    }
-
     platform_files_sys = {
         Platform.WINDOWS: [
              'lib/gstreamer-1.0/libgstdirectsoundsink%(mext)s',
@@ -122,9 +112,9 @@ class Recipe(recipe.Recipe):
         self.append_env['CPPFLAGS'] = " -Wno-error "
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options += '--disable-aalib --disable-esd '\
-                '--disable-dv --disable-gtk-doc'
+                '--disable-gtk-doc'
         if self.config.target_platform == Platform.ANDROID:
-            self.configure_options += '--disable-libdv --disable-pulse'
+            self.configure_options += '--disable-pulse'
         if self.config.target_platform == Platform.DARWIN:
             self.configure_options += '--disable-gtk-doc'
         if self.config.target_platform == Platform.LINUX:
diff --git a/recipes/gst-plugins-good-static.recipe b/recipes/gst-plugins-good-static.recipe
index 8a70d9e7..97f27ba1 100644
--- a/recipes/gst-plugins-good-static.recipe
+++ b/recipes/gst-plugins-good-static.recipe
@@ -8,9 +8,7 @@ class Recipe(custom.GStreamerStatic):
     extra_configure_options = ' --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-esd --disable-gconf --disable-hal --disable-jack --disable-shout2'
     deps = ['gstreamer', 'gst-plugins-base', 'jpeg', 'libpng',
             'speex', 'gdk-pixbuf', 'libsoup', 'cairo',
-            'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib' ]
-    platform_deps = {Platform.LINUX: ['libdv'],
-                     Platform.DARWIN: ['libdv']}
+            'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib', 'libdv' ]
 
     files_plugins_core_devel = [
              'libgstautodetect',
@@ -48,6 +46,7 @@ class Recipe(custom.GStreamerStatic):
              'libgstaudioparsers',
              'libgstauparse',
              'libgstavi',
+             'libgstdv',
              'libgstflac',
              'libgstflv',
              'libgstflxdec',
@@ -87,15 +86,6 @@ class Recipe(custom.GStreamerStatic):
              ]
     }
 
-    platform_files_plugins_codecs_devel = {
-        Platform.LINUX: [
-             'libgstdv',
-            ],
-        Platform.DARWIN: [
-             'libgstdv',
-            ]
-    }
-
     platform_files_plugins_sys_devel = {
         Platform.WINDOWS: [
              'libgstdirectsoundsink',
@@ -111,10 +101,7 @@ class Recipe(custom.GStreamerStatic):
 
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
-            self.configure_options += '--disable-aalib --disable-esd '\
-                '--disable-dv'
-        if self.config.target_platform == Platform.ANDROID:
-            self.configure_options += '--disable-libdv '
+            self.configure_options += '--disable-aalib --disable-esd '
         if self.config.target_platform == Platform.LINUX:
             self.use_system_libs = True
         if self.config.variants.nodebug:
diff --git a/recipes/gst-plugins-good.recipe b/recipes/gst-plugins-good.recipe
index 58989a15..827a233f 100644
--- a/recipes/gst-plugins-good.recipe
+++ b/recipes/gst-plugins-good.recipe
@@ -11,10 +11,7 @@ class Recipe(recipe.Recipe):
     deps = ['gstreamer', 'gst-plugins-base', 'jpeg', 'libpng',
             'speex', 'gdk-pixbuf', 'libsoup','taglib',
             'orc', 'wavpack', 'flac', 'bzip2', 'zlib',
-            'cairo']
-    platform_deps = {Platform.LINUX: ['libdv'],
-                     Platform.DARWIN: ['libdv']}
-
+            'cairo', 'libdv']
 
     files_lang = ['gst-plugins-good-0.10']
 
@@ -54,6 +51,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-0.10/libgstaudioparsers%(mext)s',
              'lib/gstreamer-0.10/libgstauparse%(mext)s',
              'lib/gstreamer-0.10/libgstavi%(mext)s',
+             'lib/gstreamer-0.10/libgstdv%(mext)s',
              'lib/gstreamer-0.10/libgstflac%(mext)s',
              'lib/gstreamer-0.10/libgstflv%(mext)s',
              'lib/gstreamer-0.10/libgstflxdec%(mext)s',
@@ -93,15 +91,6 @@ class Recipe(recipe.Recipe):
             ]
     }
 
-    platform_files_plugins_codecs = {
-        Platform.LINUX: [
-             'lib/gstreamer-0.10/libgstdv%(mext)s',
-            ],
-        Platform.DARWIN: [
-             'lib/gstreamer-0.10/libgstdv%(mext)s',
-            ]
-    }
-
     platform_files_plugins_sys = {
         Platform.WINDOWS: [
              'lib/gstreamer-0.10/libgstdirectsoundsink%(mext)s',
@@ -118,11 +107,11 @@ class Recipe(recipe.Recipe):
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options += '--disable-aalib --disable-esd '\
-                '--disable-dv --disable-gtk-doc'
+                '--disable-gtk-doc'
         if self.config.target_platform == Platform.DARWIN:
             self.configure_options += '--disable-gtk-doc'
         if self.config.target_platform == Platform.ANDROID:
-            self.configure_options += '--disable-libdv --disable-pulse'
+            self.configure_options += '--disable-pulse'
         if self.config.target_platform == Platform.LINUX:
             self.use_system_libs = True
         if self.config.variants.nodebug:
diff --git a/recipes/libdv.recipe b/recipes/libdv.recipe
index 6480d3cf..dae2e7db 100644
--- a/recipes/libdv.recipe
+++ b/recipes/libdv.recipe
@@ -5,14 +5,15 @@ class Recipe(recipe.Recipe):
     name = 'libdv'
     version = '1.0.0'
     licenses = [License.LGPLv2_1Plus]
+    autoreconf = True
 
     files_libs = ['libdv']
-    files_bins = ['dvconnect', 'encodedv', 'dubdv']
     files_devel = ['include/libdv', 'lib/pkgconfig/libdv.pc']
 
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
-            self.configure_options = ' --disable-xv --without-x'
+            self.configure_options = ' --disable-asm --disable-xv --without-x'
+            self.append_env = {'LDFLAGS': '-lpthread'}
         if self.config.target_platform == Platform.DARWIN:
             self.configure_options += ' --disable-asm --disable-xv --without-x'
         if self.config.target_platform == Platform.ANDROID: