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 cdb3f7ee16977b3aa8fa13b7444b03a25f29d8f4..3ec06bc792f2a0de800e11a191424a01e5d8f455 100644 (file)
--- 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 6e347b16f1698fd07a052fa38bbc8260c41cdcfc..54991f5c0f6cde28250417a711b5c9696df55324 100644 (file)
--- 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 b80fa8893b72895f3a374f57462768baf2ae8c5c..e39e41e1602f21f347d6de595341811581fa4182 100644 (file)
--- 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 1cfc3e2f8964dda1e7beaea220c3d2f409102e1c..fc9bdf2dee9cee745d4f2242f818d9c44ebd0e97 100644 (file)
--- 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 ec3082179a52a9c76083de89be203a9622a8f2a5..620783c07da6cddcb36fa5e713cbd5c8286a5098 100644 (file)
--- 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"