recipes: fix some recipes for android

10 files changed, 43 insertions, 3 deletions

diff --git a/recipes/flac.recipe b/recipes/flac.recipe
index 9f449c87..55e29899 100644
--- a/recipes/flac.recipe
+++ b/recipes/flac.recipe
@@ -27,3 +27,6 @@ class Recipe(recipe.Recipe):
         if self.config.target_platform == Platform.DARWIN:
             if self.config.target_arch == Architecture.X86:
                 self.configure_options += ' --disable-asm-optimizations'
+        if self.config.target_platform == Platform.ANDROID:
+            self.autoreconf = True
+            self.configure_options += ' --disable-cpplibs'
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 6676ee5b..4989fc4e 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -55,6 +55,7 @@ class Recipe(recipe.Recipe):
         if self.config.target_platform == Platform.ANDROID:
             # Hack to fix building of the glib/tests/private test
             self.make = '%s private_LDFLAGS=""' % self.make
+            self.configure_options += ' --enable-static'
         elif self.config.target_platform == Platform.WINDOWS:
             self.configure_options = '--with-libiconv=gnu'
         elif self.config.target_platform == Platform.DARWIN:
diff --git a/recipes/jasper.recipe b/recipes/jasper.recipe
index 9b79d0f4..eedea1e6 100644
--- a/recipes/jasper.recipe
+++ b/recipes/jasper.recipe
@@ -10,3 +10,7 @@ class Recipe(recipe.Recipe):
     files_libs = ['libjasper']
     files_bins = ['jasper']
     files_devel = ['include/jasper']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            self.autoreconf = True
diff --git a/recipes/libdca.recipe b/recipes/libdca.recipe
index 24de0259..ebcf8a20 100644
--- a/recipes/libdca.recipe
+++ b/recipes/libdca.recipe
@@ -9,3 +9,8 @@ class Recipe(recipe.Recipe):
     files_bins = ['extract_dca', 'extract_dcs', 'dcadec', 'dcsdec']
     files_devel = ['include/dca.h', 'include/dts.h',
                    'lib/pkgconfig/libdca.pc', 'lib/pkgconfig/libdts.pc']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            self.autoreconf = True
+            self.configure_options += ' --disable-oss'
diff --git a/recipes/libkate.recipe b/recipes/libkate.recipe
index 2264ee66..e8419b8e 100644
--- a/recipes/libkate.recipe
+++ b/recipes/libkate.recipe
@@ -9,3 +9,7 @@ class Recipe(recipe.Recipe):
 
     files_libs = ['libkate', 'liboggkate']
     files_devel = ['include/kate', 'lib/pkgconfig/kate.pc', 'lib/pkgconfig/oggkate.pc']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            self.autoreconf = True
diff --git a/recipes/libmms.recipe b/recipes/libmms.recipe
index e5b1fc25..c183e15b 100644
--- a/recipes/libmms.recipe
+++ b/recipes/libmms.recipe
@@ -8,3 +8,8 @@ class Recipe(recipe.Recipe):
 
     files_libs = ['libmms']
     files_devel = ['include/libmms', 'lib/pkgconfig/libmms.pc']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            self.autoreconf = True
+            self.append_env = {'LDFLAGS': '-liconv'}
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe
index a17ec9ac..fafaf4f7 100644
--- a/recipes/libvpx.recipe
+++ b/recipes/libvpx.recipe
@@ -44,6 +44,10 @@ class Recipe(recipe.Recipe):
                 platform = 'win64'
             else:
                 platform = 'win32'
+        # FIXME:
+        elif self.config.target_platform == Platform.ANDROID:
+                arch = 'armv5te'
+                platform = 'android'
         else:
             self.configure_options += '--enable-shared '
             platform = 'linux'
diff --git a/recipes/speex.recipe b/recipes/speex.recipe
index 9f3d71de..e4147e0c 100644
--- a/recipes/speex.recipe
+++ b/recipes/speex.recipe
@@ -11,3 +11,7 @@ class Recipe(recipe.Recipe):
     files_bins = ['speexdec', 'speexenc']
     files_devel = ['include/speex', 'lib/pkgconfig/speex.pc',
         'lib/pkgconfig/speexdsp.pc']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            self.autoreconf = True
diff --git a/recipes/tiff.recipe b/recipes/tiff.recipe
index 7e98db5c..2cbba5f2 100644
--- a/recipes/tiff.recipe
+++ b/recipes/tiff.recipe
@@ -15,3 +15,7 @@ class Recipe(recipe.Recipe):
     files_devel = ['include/tiffvers.h', 'include/tiffio.h', 'include/tiff.h',
         'include/tiffconf.h', 'include/tiffio.hxx',
         'lib/pkgconfig/libtiff-4.pc']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            self.configure_options += ' --disable-cxx'
diff --git a/recipes/wavpack.recipe b/recipes/wavpack.recipe
index 65834ec0..f3418e6e 100644
--- a/recipes/wavpack.recipe
+++ b/recipes/wavpack.recipe
@@ -1,14 +1,20 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+from cerbero.utils import shell
 
 
 class Recipe(recipe.Recipe):
     name = 'wavpack'
     version = '4.60.1'
     licenses = [License.BSD_like]
-    platform_deps = { Platform.WINDOWS: ['libiconv'],
-                      Platform.ANDROID: ['libiconv'] }
-    autoreconf = True
+    platform_deps = { Platform.WINDOWS: ['libiconv'] }
 
     files_libs = ['libwavpack']
     files_bins = ['wavpack']
     files_devel = ['include/wavpack', 'lib/pkgconfig/wavpack.pc']
+
+    def configure(self):
+        if self.config.target_platform == Platform.ANDROID:
+            shell.replace(os.path.join(self.build_dir, 'Makefile.in'),
+                {'SUBDIRS = src include cli man': 'SUBDIRS = src include man'})
+        super(Recipe, self).configure()
+