From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Mon, 15 Mar 2010 12:34:27 +0000 (+0000)
Subject: ffmpeg: Convert recipe to use INC_PR.
X-Git-Tag: Release-2010-05/1~340^2~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356d0ec42b023761e1e9e1a6bd5f3ab83b87033f;p=openembedded.git

ffmpeg: Convert recipe to use INC_PR.

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index cdb3f7ee16..3ec06bc792 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 6e347b16f1..54991f5c0f 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 b80fa8893b..e39e41e160 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 1cfc3e2f89..fc9bdf2dee 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 ec3082179a..620783c07d 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"