diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-15 21:31:22 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-15 21:31:22 +0100 |
| commit | 82764c90dc25198ab8d45b8ac917dbdb0a846629 (patch) | |
| tree | f86a85eb26282ed9106e43115e95cd24565f3613 /recipes/ffmpeg/ffmpeg_svn.bb | |
| parent | 05091813906152ad819b7b8944d9bfca74c14ba2 (diff) | |
| parent | 87166e57766b738053cd062d248f4d7a0bc0c1be (diff) | |
| download | openembedded-82764c90dc25198ab8d45b8ac917dbdb0a846629.tar.gz | |
Merge branch 'martin_jansa/srcpv' into shr/merge
Conflicts:
recipes/e17/e-wm_svn.bb
recipes/efl1/e-wm-illume-dict-pl_git.bb
recipes/efl1/elementary_svn.bb
recipes/efl1/emotion_svn.bb
recipes/efl1/libefso_svn.bb
recipes/freesmartphone/dbus-hlid_git.bb
recipes/freesmartphone/frameworkd_git.bb
recipes/freesmartphone/fso-abyss_git.bb
recipes/freesmartphone/fso-apm_git.bb
recipes/freesmartphone/fso-gpsd_git.bb
recipes/freesmartphone/fso-gsm0710muxd_git.bb
recipes/freesmartphone/fso-monitord_git.bb
recipes/freesmartphone/fso-specs_git.bb
recipes/freesmartphone/fso-term_git.bb
recipes/freesmartphone/fsodeviced_git.bb
recipes/freesmartphone/fsogpsd_git.bb
recipes/freesmartphone/fsonetworkd_git.bb
recipes/freesmartphone/fsoraw_svn.bb
recipes/freesmartphone/fsotimed_git.bb
recipes/freesmartphone/fsousaged_git.bb
recipes/freesmartphone/gsmd2_git.bb
recipes/freesmartphone/illume-theme-freesmartphone_git.bb
recipes/freesmartphone/libframeworkd-glib_git.bb
recipes/freesmartphone/libfso-glib_git.bb
recipes/freesmartphone/libfsobasics_git.bb
recipes/freesmartphone/libfsoframework_git.bb
recipes/freesmartphone/libfsoresource_git.bb
recipes/freesmartphone/libfsotransport_git.bb
recipes/freesmartphone/libgsm0710_git.bb
recipes/freesmartphone/libgsm0710mux_git.bb
recipes/freesmartphone/libpersistence_git.bb
recipes/freesmartphone/mickeydbus_git.bb
recipes/freesmartphone/mickeyterm_git.bb
recipes/freesmartphone/multicat_git.bb
recipes/freesmartphone/opimd-utils_git.bb
recipes/freesmartphone/pycd_git.bb
recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
recipes/freesmartphone/zhone_git.bb
recipes/libgee/libgee_git.bb
recipes/libnl/libnl2_git.bb
recipes/matchbox2/matchbox-panel-2_svn.bb
recipes/mesa/mesa-dri_git.bb
recipes/navit/navit_svn.bb
recipes/openmoko-projects/openmoko-agpsui_svn.bb
recipes/openmoko-projects/paroli_git.bb
recipes/openmoko2/libmokoui2_svn.bb
recipes/openmoko2/openmoko-alsa-scenarios.bb
recipes/opkg/opkg.inc
recipes/python/python-pyrtc_git.bb
recipes/serial-utils/serial-forward.bb
recipes/vala-terminal/vala-terminal_git.bb
recipes/xorg-driver/xf86-video-glamo_git.bb
Diffstat (limited to 'recipes/ffmpeg/ffmpeg_svn.bb')
| -rw-r--r-- | recipes/ffmpeg/ffmpeg_svn.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 179168d9bd..37b009aee1 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -5,7 +5,7 @@ DEPENDS += "schroedinger libgsm" SRCREV = "20231" PE = "1" -PV = "0.5.0+${PR}+svnr${SRCREV}" +PV = "0.5.0+${PR}+svnr${SRCPV}" PR = "r0" DEFAULT_PREFERENCE = "-1" |