[oe-commits] Martin Jansa : ffmpeg: add PE all recipes, because otherwise git. bb has always highest version
git version control
git at git.openembedded.org
Sun Nov 15 23:13:40 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: 1d15d092b3c0f40fea60af89c961f37afe783018
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1d15d092b3c0f40fea60af89c961f37afe783018
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Sun Nov 15 23:51:03 2009 +0100
ffmpeg: add PE all recipes, because otherwise git.bb has always highest version
---
recipes/ffmpeg/ffmpeg.inc | 2 ++
recipes/ffmpeg/ffmpeg_0.5.bb | 1 -
recipes/ffmpeg/ffmpeg_git.bb | 1 -
recipes/ffmpeg/ffmpeg_svn.bb | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index cdb3f7e..b9ed442 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -7,6 +7,8 @@ LICENSE = "LGPL"
ARM_INSTRUCTION_SET = "arm"
+PE = "2"
+
DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
RSUGGESTS = "mplayer"
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index b80fa88..609b792 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -2,7 +2,6 @@ require ffmpeg.inc
DEPENDS += "schroedinger libgsm"
-PE = "1"
PR = "r5"
DEFAULT_PREFERENCE = "1"
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index fac6430..3cf2aed 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -2,7 +2,6 @@ require ffmpeg.inc
DEPENDS += "schroedinger libgsm"
-PE = "2"
PV = "0.5.0+${PR}+gitr${SRCPV}"
PR = "r0"
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 945fdd4..6f913af 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -4,7 +4,6 @@ DEPENDS += "schroedinger libgsm"
SRCREV = "20231"
-PE = "1"
PV = "0.5.0+${PR}+svnr${SRCPV}"
PR = "r0"
More information about the Openembedded-commits
mailing list