diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:33:26 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:38:30 +0200 |
| commit | 53bfb2398c16d2065ffa2bc6cd34c83e15347014 (patch) | |
| tree | 3793fb7c6cb4799ec2c029b433636cb60fe7625b /packages/ffmpeg | |
| parent | 576cfbfba8880ea4421369d35236c696188b144d (diff) | |
| parent | 245f7d129f3dba351b3c8ef284df69a86261904c (diff) | |
Merge branch 'shared/file-pr-revert' into org.openembedded.dev
Conflicts:
packages/busybox/busybox_1.11.3.bb
packages/dsplink/codec-engine_2.10.bb
packages/gdb/gdb_6.3.bb
packages/gdb/gdb_6.4.bb
packages/gdb/gdb_6.6.bb
packages/gdb/gdb_6.8.bb
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/kexecboot/linux-kexecboot_2.6.26.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/linux/linux-rp_2.6.26.bb
packages/mozilla/fennec_hg.bb
packages/python/python_2.5.2.bb
packages/tasks/task-xfce-base.bb
packages/xorg-driver/xf86-video-omapfb_git.bb
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
Diffstat (limited to 'packages/ffmpeg')
| -rw-r--r-- | packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 2 | ||||
| -rw-r--r-- | packages/ffmpeg/ffmpeg_git.bb | 2 | ||||
| -rw-r--r-- | packages/ffmpeg/ffmpeg_svn.bb | 2 | ||||
| -rw-r--r-- | packages/ffmpeg/omapfbplay_git.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index 687070402b..3e05040854 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,6 +1,6 @@ require ffmpeg.inc -FILE_PR = "r8" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index bec9da190e..aa955b1648 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm" PE = "1" PV = "0.4.9+${PR}+gitr${SRCREV}" -FILE_PR = "r34" +PR = "r34" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb index 1ee591a1ad..2433565bbe 100644 --- a/packages/ffmpeg/ffmpeg_svn.bb +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -6,7 +6,7 @@ SRCREV ?= "12186" PE = "1" PV = "0.4.9+svnr${SRCREV}" -FILE_PR = "r0" +PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index 096e0b568a..00c0804ad3 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -FILE_PR = "r13" +PR = "r13" inherit module-base |