diff --git a/README.md b/README.md index b0d778351d..b3282b6555 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,6 @@ Attributes * +ffmpeg[:git_repository]+ - Location of the source Git repository if installing via `:source` * +ffmpeg[:git_revision]+ - Revision of the Git repository to install if installing via `:source`. Points to version 0.6.3 by default * +ffmpeg[:compile_flags]+ - Array of flags to use in compilation process if installing via `:source`. FFMPEG will be recompiled if this attribute is modified after initial compilation -* +ffmpeg[:libvpx][:revision]+ - Overrides the revision specified in the libvpx cookbook for the version of libvpx to configure and install if installing via `:source` -* +ffmpeg[:x264][:revision]+ - Overrides the revision specified in the x264 cookbook for the version of x264 to configure and install if installing via `:source` WARN: When specifying the `git_revision` attribute, use the hash of commit or a HEAD - not a tag. Sync action of Git provider will always attempt to update the git clone if a tag is used. diff --git a/attributes/default.rb b/attributes/default.rb index 1892554a25..abd6219469 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -41,6 +41,3 @@ # JW 07-06-11: Hash of commit or a HEAD should be used - not a tag. Sync action of Git # provider will always attempt to update the git clone if a tag is used. default[:ffmpeg][:git_revision] = "ace432f62cdcedf812e7c4d77fc5b03322170fa8" # 0.6.3 - -default[:ffmpeg][:libvpx][:revision] = "0491c2cfc89cded04de386ae691654c7653aac9b" -default[:ffmpeg][:x264][:revision] = "stable" diff --git a/metadata.rb b/metadata.rb index 5227efa4e9..82659bd847 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures FFMPEG from source or package" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.1.2" +version "0.1.3" supports "ubuntu", "10.04" diff --git a/recipes/source.rb b/recipes/source.rb index 9d5dbbbe70..007b12effa 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -28,9 +28,7 @@ end end -node.override[:x264][:git_revision] = node[:ffmpeg][:x264][:revision] include_recipe "x264::source" -node.override[:libvpx][:git_revision] = node[:ffmpeg][:libvpx][:revision] include_recipe "libvpx::source" yasm_package = value_for_platform(