diff options
| author | Tom Rini <trini@bill-the-cat.bloom.county> | 2009-03-30 13:57:49 -0700 |
|---|---|---|
| committer | Tom Rini <trini@bill-the-cat.bloom.county> | 2009-03-30 13:57:49 -0700 |
| commit | 90cebee2ea4efc464c591d3f9677dc595f2a6a9a (patch) | |
| tree | 9c0f66fb2597edb97078157a0cb5891411ed518b | |
| parent | d24f5daa7fbf3dc23883de7a2fe3355d5a3515a7 (diff) | |
| parent | e65b621d52d270b42bea47267edb358a3d9b0b8a (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff | 12 | ||||
| -rw-r--r-- | recipes/gstreamer/gst-ffmpeg_0.10.7.bb | 32 |
3 files changed, 48 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index d9f5b902ae..34271bb4c2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9254,6 +9254,10 @@ sha256=840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2 md5=063a8184916426d6b79a97dea9636a78 sha256=c9a5f4c9b1eddd7cb042d83390072f832f19f3712d023e4d6568391e5eb4878a +[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.7.tar.bz2] +md5=6be89b26592f36ef631b22a68b8e06c4 +sha256=94bd5110a03837145afe5c81760f22bd7bef9ef455f4417340eeeb2b12e54fb0 + [http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/gst-fluendo-mp3-0.10.2.tar.bz2] md5=f3c32e0bc3ec1be461ce43e407a6a67f sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5 diff --git a/recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff b/recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff new file mode 100644 index 0000000000..874ba57777 --- /dev/null +++ b/recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff @@ -0,0 +1,12 @@ +Index: gst-ffmpeg-0.10.7/configure.ac +=================================================================== +--- gst-ffmpeg-0.10.7.orig/configure.ac 2009-03-21 00:44:01.000000000 +0000 ++++ gst-ffmpeg-0.10.7/configure.ac 2009-03-30 20:45:05.000000000 +0000 +@@ -337,7 +337,6 @@ + AC_SUBST(FFMPEG_SVN) + AC_SUBST(FFMPEG_REVISION) + AC_SUBST(FFMPEG_EXTERNALS_REVISION) +- AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg) + AC_MSG_NOTICE([Using included FFMpeg code]) + fi + diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.7.bb b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb new file mode 100644 index 0000000000..20cea128dd --- /dev/null +++ b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "FFmpeg-based GStreamer plug-in" +SECTION = "multimedia" +PRIORITY = "optional" +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 \ + file://configure-hack.diff;patch=1 \ + file://lower-rank.diff;patch=1 \ +" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" + +EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \ + --disable-vorbis --disable-vorbistest --disable-encoders \ + --disable-v4l --disable-audio-oss --disable-dv1394 \ + --disable-vhook --with-system-ffmpeg --disable-ffserver \ + --enable-pp --disable-decoder-vorbis" + +# We do this because the install program is called with -s which causes it to +# call "strip" and it then mangles cross compiled stuff.. +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" + +# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg +CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}" + |