[oe-commits] Paul Menzel : ffmpeg: Convert recipe to use INC_PR.
git version control
git at git.openembedded.org
Tue Mar 16 09:20:11 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 356d0ec42b023761e1e9e1a6bd5f3ab83b87033f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=356d0ec42b023761e1e9e1a6bd5f3ab83b87033f
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date: Mon Mar 15 12:34:27 2010 +0000
ffmpeg: Convert recipe to use INC_PR.
Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>
---
recipes/ffmpeg/ffmpeg.inc | 2 ++
recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb | 2 +-
recipes/ffmpeg/ffmpeg_0.5.bb | 2 +-
recipes/ffmpeg/ffmpeg_git.bb | 2 +-
recipes/ffmpeg/ffmpeg_svn.bb | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index cdb3f7e..3ec06bc 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -10,6 +10,8 @@ ARM_INSTRUCTION_SET = "arm"
DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
RSUGGESTS = "mplayer"
+INC_PR = "r9"
+
inherit autotools pkgconfig
LEAD_SONAME = "libavcodec.so"
diff --git a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 6e347b1..54991f5 100644
--- a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -1,6 +1,6 @@
require ffmpeg.inc
-PR = "r9"
+PR = "${INC_PR}.0"
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
file://configure.patch;patch=0 \
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index b80fa88..e39e41e 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
DEPENDS += "schroedinger libgsm"
PE = "1"
-PR = "r5"
+PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "1"
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index 1cfc3e2..fc9bdf2 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
PE = "1"
PV = "0.5.0+${PR}+gitr${SRCREV}"
-PR = "r0"
+PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index ec30821..620783c 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -6,7 +6,7 @@ SRCREV = "22521"
PE = "1"
PV = "0.5.0+${PR}+svnr${SRCPV}"
-PR = "r0"
+PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
More information about the Openembedded-commits
mailing list