Skip to content

Commit

Permalink
Remove override attribute for libvpx and x264 git revisions on build …
Browse files Browse the repository at this point in the history
…from source

We can ensure that the correct version of libvpx and x264 is provided by locking
the cookbook versions in this cookbook's metadata (which we do). If somebody wants
to override this then let them.
  • Loading branch information
Jamie Winsor committed Sep 9, 2011
1 parent 94842ac commit 9b40e96
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions README.md
Expand Up @@ -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.

Expand Down
3 changes: 0 additions & 3 deletions attributes/default.rb
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion metadata.rb
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions recipes/source.rb
Expand Up @@ -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(
Expand Down

0 comments on commit 9b40e96

Please sign in to comment.