ffmpeg: switch to SRCPV with PE bump

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index c855877e8d5ff4fc1514560229e4ca8aee58d17d..2b4d26e8f668b7c271d5417aefc51ac94cb62193 100644 (file)
--- 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 6dfc1859ed2e2f1b03282e0eb34b096634586c83..956d0cb09b5a5afc2bf23f994332e13acf56d3ca 100644 (file)
--- 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 = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "1"

diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index fc9bdf2dee9cee745d4f2242f818d9c44ebd0e97..5c84ea7a010f11233b00eaec0201e7d308ffa12a 100644 (file)
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -2,8 +2,7 @@ require ffmpeg.inc
 
 DEPENDS += "schroedinger libgsm"
 
-PE = "1"
-PV = "0.5.0+${PR}+gitr${SRCREV}" 
+PV = "0.5.0+${PR}+gitr${SRCPV}"
 PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"

diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 620783c07da6cddcb36fa5e713cbd5c8286a5098..3b8da50b44a64455769da8b7f3b764fc3ccabac1 100644 (file)
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -4,7 +4,6 @@ DEPENDS += "schroedinger libgsm"
 
 SRCREV = "22521"
 
-PE = "1"
 PV = "0.5.0+${PR}+svnr${SRCPV}"
 PR = "${INC_PR}.0"