From 562168a4425f8fb7d66501bd11e7d437938973b9 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Fri, 30 Jul 2010 16:39:47 +0200 Subject: ffmpeg_svn.bb: bump SRCREV to make it build on armv4t again and bump PR of recipes that depend on it Signed-off-by: Klaus Kurzmann --- recipes/ekiga/opal_3.8.2.bb | 2 +- recipes/ffmpeg/ffmpeg_svn.bb | 4 ++-- recipes/gnash/gnash.inc | 2 +- recipes/gstreamer/gst-ffmpeg_0.10.10.bb | 2 ++ recipes/gstreamer/gst-ffmpeg_0.10.8.bb | 2 +- recipes/libvalhalla/libvalhalla.inc | 2 +- recipes/libxine/libxine_1.1.16.3.bb | 2 +- recipes/libxine/libxine_1.1.16.bb | 2 +- recipes/mediatomb/mediatomb_0.11.0.bb | 2 +- recipes/mplayer/mplayer_git.bb | 2 +- recipes/mplayer/mplayer_svn.bb | 2 +- recipes/opencv/gst-opencv_git.bb | 1 + recipes/opencv/opencv_svn.bb | 2 +- recipes/opencv/openscenegraph_2.9.6.bb | 2 +- recipes/opencv/openscenegraph_2.9.7.bb | 2 +- recipes/openmax/libomxil-bellagio_0.9.0.bb | 2 +- recipes/openmax/libomxil-bellagio_0.9.1.bb | 2 ++ recipes/openmax/libomxil-bellagio_0.9.2.bb | 2 ++ recipes/swfdec/swfdec-mozilla_0.9.2.bb | 2 +- recipes/totem/totem_2.30.0.bb | 2 ++ recipes/upnp/libdlna_0.2.3.bb | 1 + recipes/vlc/vlc_1.0.6.bb | 1 + recipes/xbmc/xbmc_svn.bb | 2 +- 23 files changed, 28 insertions(+), 17 deletions(-) (limited to 'recipes') diff --git a/recipes/ekiga/opal_3.8.2.bb b/recipes/ekiga/opal_3.8.2.bb index 8867b4b1a2..a8f4c645de 100644 --- a/recipes/ekiga/opal_3.8.2.bb +++ b/recipes/ekiga/opal_3.8.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Open Phone Abstraction Library, implementation of the ITU H.323 teleconferencing protocol, and successor of the openh323 library." LICENSE = "MPL" -PR = "r1" +PR = "r2" inherit gnome diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 902824b241..80c79b6c6a 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -6,10 +6,10 @@ LICENSE = "GPLv2+" DEPENDS += "virtual/libsdl schroedinger libgsm libvpx" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "23733" +SRCREV = "24596" PV = "0.6+${PR}+svnr${SRCPV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" diff --git a/recipes/gnash/gnash.inc b/recipes/gnash/gnash.inc index 159fb414df..a89444d240 100644 --- a/recipes/gnash/gnash.inc +++ b/recipes/gnash/gnash.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2" DEPENDS = "giflib libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb index 9b0269cc7f..d2b6901793 100644 --- a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb +++ b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb @@ -5,6 +5,8 @@ LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib" +PR = "r1" + inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb index 2bdc45b1ec..0cd0cebf87 100644 --- a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb +++ b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb @@ -11,7 +11,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ file://lower-rank.diff \ " -PR = "r3" +PR = "r4" FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" diff --git a/recipes/libvalhalla/libvalhalla.inc b/recipes/libvalhalla/libvalhalla.inc index 03b7cfd7aa..a637f7ebd9 100644 --- a/recipes/libvalhalla/libvalhalla.inc +++ b/recipes/libvalhalla/libvalhalla.inc @@ -4,7 +4,7 @@ SECTION = "libs/multimedia" LICENSE = "LGPLv2.1" DEPENDS = "sqlite3 curl ffmpeg libnfo" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "http://libvalhalla.geexbox.org/releases/${P}.tar.bz2;name=${PN}" diff --git a/recipes/libxine/libxine_1.1.16.3.bb b/recipes/libxine/libxine_1.1.16.3.bb index 68209bd31e..1bdfdaa70c 100644 --- a/recipes/libxine/libxine_1.1.16.3.bb +++ b/recipes/libxine/libxine_1.1.16.3.bb @@ -1,7 +1,7 @@ require libxine.inc PPDIR = "1.26" -PR = "r1" +PR = "r2" FILESPATHPKG .= ":libxine-1.1.16" diff --git a/recipes/libxine/libxine_1.1.16.bb b/recipes/libxine/libxine_1.1.16.bb index 5fb221db96..82a1ba1b20 100644 --- a/recipes/libxine/libxine_1.1.16.bb +++ b/recipes/libxine/libxine_1.1.16.bb @@ -1,7 +1,7 @@ require libxine.inc PPDIR = "1.25" -PR = "r0" +PR = "r1" SRC_URI += " \ diff --git a/recipes/mediatomb/mediatomb_0.11.0.bb b/recipes/mediatomb/mediatomb_0.11.0.bb index b9b4dab806..2f2da71099 100644 --- a/recipes/mediatomb/mediatomb_0.11.0.bb +++ b/recipes/mediatomb/mediatomb_0.11.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" HOMEPAGE = "http://mediatomb.cc/" LICENSE = "GPLv2" DEPENDS = "expat ffmpeg sqlite3 libexif js zlib file id3lib" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz \ file://curl.diff \ diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index b2fba4f829..75884ef4d0 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -35,7 +35,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc4+gitr${SRCPV}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "2" diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 82e46bdada..4623357044 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -43,7 +43,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc3+svnr${SRCPV}" -PR = "r22" +PR = "r23" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" diff --git a/recipes/opencv/gst-opencv_git.bb b/recipes/opencv/gst-opencv_git.bb index 239c4e91e8..70a68096c9 100644 --- a/recipes/opencv/gst-opencv_git.bb +++ b/recipes/opencv/gst-opencv_git.bb @@ -9,6 +9,7 @@ CFLAGS += " -I${STAGING_INCDIR}/opencv" PE = "1" PV = "0.10.0.1" +PR = "r1" PR_append = "+gitr${SRCPV}" SRCREV = "c767c38c847b0ee32b0a" SRC_URI = "git://github.com/Elleo/gst-opencv.git;protocol=git" diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb index c7404202f1..b8134a4fce 100644 --- a/recipes/opencv/opencv_svn.bb +++ b/recipes/opencv/opencv_svn.bb @@ -13,7 +13,7 @@ SRC_URI = "svn://code.ros.org/svn/opencv/trunk;module=opencv;proto=https \ SRCREV = "3241" PV = "2.1.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/opencv" diff --git a/recipes/opencv/openscenegraph_2.9.6.bb b/recipes/opencv/openscenegraph_2.9.6.bb index a1edf18973..c9c8d57a38 100644 --- a/recipes/opencv/openscenegraph_2.9.6.bb +++ b/recipes/opencv/openscenegraph_2.9.6.bb @@ -3,7 +3,7 @@ LICENSE = "OSGPL" DEPENDS = "libxml2 gtk+ ffmpeg poppler libxrandr" -PR = "r1" +PR = "r2" inherit cmake diff --git a/recipes/opencv/openscenegraph_2.9.7.bb b/recipes/opencv/openscenegraph_2.9.7.bb index df9c349811..e5c151e00d 100644 --- a/recipes/opencv/openscenegraph_2.9.7.bb +++ b/recipes/opencv/openscenegraph_2.9.7.bb @@ -3,7 +3,7 @@ LICENSE = "OSGPL" DEPENDS = "libxml2 gtk+ ffmpeg poppler libxrandr" -PR = "r1" +PR = "r2" inherit cmake diff --git a/recipes/openmax/libomxil-bellagio_0.9.0.bb b/recipes/openmax/libomxil-bellagio_0.9.0.bb index c65f485d12..2614488183 100644 --- a/recipes/openmax/libomxil-bellagio_0.9.0.bb +++ b/recipes/openmax/libomxil-bellagio_0.9.0.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2" DEPENDS = "alsa-lib ffmpeg \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" -PR = "r6" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" diff --git a/recipes/openmax/libomxil-bellagio_0.9.1.bb b/recipes/openmax/libomxil-bellagio_0.9.1.bb index 45700a2a33..3e8dc8657b 100644 --- a/recipes/openmax/libomxil-bellagio_0.9.1.bb +++ b/recipes/openmax/libomxil-bellagio_0.9.1.bb @@ -5,6 +5,8 @@ DEPENDS = "alsa-lib ffmpeg \ SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" +PR = "r1" + inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/recipes/openmax/libomxil-bellagio_0.9.2.bb b/recipes/openmax/libomxil-bellagio_0.9.2.bb index 599c5821e3..a38bd99ab9 100644 --- a/recipes/openmax/libomxil-bellagio_0.9.2.bb +++ b/recipes/openmax/libomxil-bellagio_0.9.2.bb @@ -5,6 +5,8 @@ DEPENDS = "alsa-lib ffmpeg \ SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" +PR = "r1" + inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/recipes/swfdec/swfdec-mozilla_0.9.2.bb b/recipes/swfdec/swfdec-mozilla_0.9.2.bb index 2009347b92..d68cd1e9ec 100644 --- a/recipes/swfdec/swfdec-mozilla_0.9.2.bb +++ b/recipes/swfdec/swfdec-mozilla_0.9.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -PR = "r2" +PR = "r3" DEPENDS = "swfdec glib-2.0" RDEPENDS_${PN} = "gst-ffmpeg" diff --git a/recipes/totem/totem_2.30.0.bb b/recipes/totem/totem_2.30.0.bb index bbd08714f7..5f869a457d 100644 --- a/recipes/totem/totem_2.30.0.bb +++ b/recipes/totem/totem_2.30.0.bb @@ -31,6 +31,8 @@ RRECOMMENDS_${PN} += "gst-plugin-playbin \ inherit gnome +PR = "r1" + SRC_URI += "file://gst-detect.diff" SRC_URI[archive.md5sum] = "ecee18e876f6adf5845f71ace87549ca" diff --git a/recipes/upnp/libdlna_0.2.3.bb b/recipes/upnp/libdlna_0.2.3.bb index c623724319..4c12e5c012 100644 --- a/recipes/upnp/libdlna_0.2.3.bb +++ b/recipes/upnp/libdlna_0.2.3.bb @@ -2,6 +2,7 @@ DESCRIPTION = "bdlna aims at being the reference open-source implementation of D LICENSE = "LGPLv2.1" DEPENDS = "sqlite3 ffmpeg" +PR = "r1" SRC_URI = "http://libdlna.geexbox.org/releases/libdlna-${PV}.tar.bz2 \ file://dlna.diff" diff --git a/recipes/vlc/vlc_1.0.6.bb b/recipes/vlc/vlc_1.0.6.bb index 81d621d19a..12da53049a 100644 --- a/recipes/vlc/vlc_1.0.6.bb +++ b/recipes/vlc/vlc_1.0.6.bb @@ -11,6 +11,7 @@ SRC_URI[sha256sum] = "f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e41 # ffmpeg from git (library version => 52) is required # libtool-native must be >= 2.2.4 DEPENDS += "libdvdcss libdvdread" +PR = "r1" EXTRA_OECONF += "\ --enable-dvdread \ diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb index fdc454086f..5b1d8bb93d 100644 --- a/recipes/xbmc/xbmc_svn.bb +++ b/recipes/xbmc/xbmc_svn.bb @@ -6,7 +6,7 @@ DEPENDS = "libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl libmodplug libmi SRCREV = "e2ab481ebe964321c358ab9d6402088c714adcbe" PV = "10.05" -PR = "r7" +PR = "r8" PR_append = "+gitr${SRCPV}" SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \ -- cgit 1.2.3-korg