x264: add new recipe and enable x264enc in gst-plugins-ugly

6 files changed, 42 insertions, 9 deletions

diff --git a/packages/gstreamer-codecs-restricted.package b/packages/gstreamer-codecs-restricted.package
index 5630881..72aeb34 100644
--- a/packages/gstreamer-codecs-restricted.package
+++ b/packages/gstreamer-codecs-restricted.package
@@ -17,7 +17,7 @@ class Package(package.Package):
     deps = ['gstreamer-core']
 
     files = ['a52dec:libs', 'opencore-amr:libs', 'libmad:libs', 'libmpeg2:libs',
-             'faad2:libs', 'libdca:libs',
+             'faad2:libs', 'libdca:libs', 'x264:libs',
              'gst-plugins-ugly:plugins_codecs_restricted',
              'gst-plugins-bad:plugins_codecs_restricted']
     files_devel = ['gst-plugins-ugly-static:plugins_codecs_restricted_devel',
diff --git a/recipes/gst-plugins-ugly-1.0-static.recipe b/recipes/gst-plugins-ugly-1.0-static.recipe
index dde0fbe..ebcde19 100644
--- a/recipes/gst-plugins-ugly-1.0-static.recipe
+++ b/recipes/gst-plugins-ugly-1.0-static.recipe
@@ -6,10 +6,10 @@ class Recipe(custom.GStreamerStatic):
     version = '1.0'
     gstreamer_version = '1.0'
     licenses = [License.LGPLv2Plus]
-    extra_configure_options = "--enable-static --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264"
+    extra_configure_options = "--enable-static --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame"
     commit = 'upstream/1.0'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
-            'libdvdread', 'libmpeg2', 'libmad']
+            'libdvdread', 'libmpeg2', 'libmad', 'x264']
 
     files_plugins_codecs_restricted_devel = [
              'libgsta52dec',
@@ -20,6 +20,7 @@ class Recipe(custom.GStreamerStatic):
              'libgstmpeg2dec',
              'libgstxingmux',
              'libgstrmdemux',
+             'libgstx264enc',
     ]
 
     files_plugins_dvd_devel = [
diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe
index 0d1b34e..5c7910f 100644
--- a/recipes/gst-plugins-ugly-1.0.recipe
+++ b/recipes/gst-plugins-ugly-1.0.recipe
@@ -6,11 +6,11 @@ class Recipe(recipe.Recipe):
     version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = "--disable-introspection --disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264 --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Ugly Plugins (GStreamer SDK)' "
+    configure_options = "--disable-introspection --disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Ugly Plugins (GStreamer SDK)' "
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'}
     commit = 'upstream/1.0'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
-            'libdvdread', 'libmpeg2', 'libmad']
+            'libdvdread', 'libmpeg2', 'libmad', 'x264']
 
     files_plugins_codecs_restricted = [
              'lib/gstreamer-1.0/libgsta52dec%(mext)s',
@@ -21,6 +21,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstmpeg2dec%(mext)s',
              'lib/gstreamer-1.0/libgstxingmux%(mext)s',
              'lib/gstreamer-1.0/libgstrmdemux%(mext)s',
+             'lib/gstreamer-1.0/libgstx264enc%(mext)s',
     ]
 
     files_plugins_dvd = [
diff --git a/recipes/gst-plugins-ugly-static.recipe b/recipes/gst-plugins-ugly-static.recipe
index c148734..91c4a7b 100644
--- a/recipes/gst-plugins-ugly-static.recipe
+++ b/recipes/gst-plugins-ugly-static.recipe
@@ -6,9 +6,9 @@ class Recipe(custom.GStreamerStatic):
     version = '0.10.19'
     gstreamer_version = '0.10'
     licenses = [License.LGPLv2Plus]
-    extra_configure_options = " --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264"
+    extra_configure_options = " --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame"
     deps = ['gstreamer', 'gst-plugins-base', 'a52dec', 'opencore-amr',
-            'libdvdread', 'libmpeg2', 'libmad']
+            'libdvdread', 'libmpeg2', 'libmad', 'x264']
 
     files_plugins_codecs_restricted_devel = [
              'libgsta52dec',
@@ -19,6 +19,7 @@ class Recipe(custom.GStreamerStatic):
              'libgstmpeg2dec',
              'libgstmpegaudioparse',
              'libgstrmdemux',
+             'libgstx264enc',
     ]
 
     files_plugins_dvd_devel = [
diff --git a/recipes/gst-plugins-ugly.recipe b/recipes/gst-plugins-ugly.recipe
index 7077c19..9c5112d 100644
--- a/recipes/gst-plugins-ugly.recipe
+++ b/recipes/gst-plugins-ugly.recipe
@@ -6,10 +6,10 @@ class Recipe(recipe.Recipe):
     version = '0.10.19'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = "--disable-introspection --disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264 --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Ugly Plugins (GStreamer SDK)' "
+    configure_options = "--disable-introspection --disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Ugly Plugins (GStreamer SDK)' "
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'}
     deps = ['gstreamer', 'gst-plugins-base', 'a52dec', 'opencore-amr',
-            'libdvdread', 'libmpeg2', 'libmad']
+            'libdvdread', 'libmpeg2', 'libmad', 'x264']
 
     files_plugins_codecs_restricted = [
              'lib/gstreamer-0.10/libgsta52dec%(mext)s',
@@ -20,6 +20,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-0.10/libgstmpeg2dec%(mext)s',
              'lib/gstreamer-0.10/libgstmpegaudioparse%(mext)s',
              'lib/gstreamer-0.10/libgstrmdemux%(mext)s',
+             'lib/gstreamer-0.10/libgstx264enc%(mext)s',
     ]
 
     files_plugins_dvd = [
diff --git a/recipes/x264.recipe b/recipes/x264.recipe
new file mode 100644
index 0000000..d6ca72c
--- /dev/null
+++ b/recipes/x264.recipe
@@ -0,0 +1,29 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(recipe.Recipe):
+    version = '20120827-2245'
+    name = 'x264'
+    licenses = [License.GPL]
+    stype = SourceType.TARBALL
+    configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\
+                    "--libdir=%(libdir)s %(options)s"
+    configure_options = '--enable-shared --enable-static --enable-pic'
+    force_configure = True
+    url = 'ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20120827-2245-stable.tar.bz2'
+    tarball_dirname= 'x264-snapshot-20120827-2245-stable'
+    new_env = {'AS': 'yasm'}
+
+    files_libs = ['libx264']
+    files_bins = ['x264']
+    files_devel = ['lib/pkgconfig/x264.pc', 'include/x264.h',
+                   'include/x264_config.h']
+
+    def prepare(self):
+        if self.config.target_platform == Platform.DARWIN:
+            if self.config.target_arch == Architecture.X86:
+                self.new_env = {'AS': 'yasm -O2 -f macho -DPREFIX'}
+        self.configure_options += ' --host=%s-pc-%s' % (self.config.target_arch, self.config.target_platform)
+        if self.config.target_platform == Platform.ANDROID:
+            if self.config.target_arch == Architecture.ARM:
+                self.configure_options += ' --disable-asm'