summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch13
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch55
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff14
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb35
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb35
5 files changed, 49 insertions, 103 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
deleted file mode 100644
index 15f56492f7..0000000000
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac
2===================================================================
3--- gst-ffmpeg-0.10.1.orig/gst-libs/ext/ffmpeg/configure.ac 2008-03-19 23:21:04.000000000 +0000
4+++ gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac 2008-03-19 23:21:31.000000000 +0000
5@@ -775,7 +775,7 @@
6
7 dnl Check for SDL, used in ffplay, and ffserver
8 AC_FF_ALLOW_DISABLE(CONFIG_FFPLAY, ffplay, ffmpeg media player,[
9- AM_PATH_SDL(, CONFIG_FFPLAY=yes, CONFIG_FPFLAY=no)
10+ CONFIG_FPFLAY=no
11 ])
12
13 dnl media server or not?
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
deleted file mode 100644
index 9ffcafff73..0000000000
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1The AC_LANG sections upset libtool 2.2.2, easiest fix is to remove them.
2Using a .cpp file in a Makefile means configure.ac must use AC_PROG_CXX
3so patch out the section from the makefile too.
4
5RP - 14/4/08
6
7Index: gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac
8===================================================================
9--- gst-ffmpeg-0.10.1.orig/gst-libs/ext/ffmpeg/configure.ac 2008-04-14 23:55:25.000000000 +0100
10+++ gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/configure.ac 2008-04-14 23:56:18.000000000 +0100
11@@ -742,26 +742,7 @@
12
13 dnl Beos Audio
14 AC_FF_ALLOW_DISABLE(CONFIG_AUDIO_BEOS, audio-beos, BeOS audio support,[
15- if test x$TARGET_OS = xbeos; then
16- AC_LANG_CPLUSPLUS
17- AC_CHECK_HEADER(SoundPlayer.h,[
18- OLD_CXXFLAGS="$CXXFLAGS"
19- CXXFLAGS="$CXXFLAGS -lbe -lmedia"
20- AC_MSG_CHECKING(For BeOS audio libraries)
21- AC_TRY_COMPILE([
22-#include <Application.h>
23-#include <SoundPlayer.h>
24- ],[
25- BSoundPlayer *p = new BSoundPlayer(NULL,NULL,NULL);
26- ],[ CONFIG_AUDIO_BEOS=yes && AC_MSG_RESULT(yes) ],[
27- CONFIG_AUDIO_BEOS=no && AC_MSG_RESULT(no)
28- ])
29- CXXFLAGS="$OLD_CXXFLAGS"
30- ], CONFIG_AUDIO_BEOS=no)
31- AC_LANG_C
32- else
33 CONFIG_AUDIO_BEOS=no
34- fi
35 ])
36
37 dnl Check for freetype2, used in vook/libdrawtext.so
38Index: gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/libavformat/Makefile.am
39===================================================================
40--- gst-ffmpeg-0.10.1.orig/gst-libs/ext/ffmpeg/libavformat/Makefile.am 2008-04-14 23:58:44.000000000 +0100
41+++ gst-ffmpeg-0.10.1/gst-libs/ext/ffmpeg/libavformat/Makefile.am 2008-04-14 23:58:55.000000000 +0100
42@@ -24,13 +24,6 @@
43 audiooss_SRC = audio.c
44 endif
45
46-if CONFIG_AUDIO_BEOS
47-audiobeos_SRC = beosaudio.cpp
48-audiobeos_LIBS = \
49- -lbe \
50- -lmedia
51-endif
52-
53 if CONFIG_VIDEO4LINUX
54 v4l_SRC = grab.c v4l2.c
55 endif
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
new file mode 100644
index 0000000000..bffdb8a698
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
@@ -0,0 +1,14 @@
1Lower the rank of ffmpeg plugin so codecs that hook into accelerated pieces (e.g. dsp or hw engines) can get picked over this
2Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
3
4--- /tmp/gstffmpegdec.c 2009-03-05 09:31:15.000000000 +0100
5+++ gst-ffmpeg-0.10.6/ext/ffmpeg/gstffmpegdec.c 2009-03-05 09:33:09.000000000 +0100
6@@ -2588,7 +2588,7 @@
7 case CODEC_ID_MSMPEG4V3:
8 case CODEC_ID_H264:
9 case CODEC_ID_COOK:
10- rank = GST_RANK_PRIMARY;
11+ rank = GST_RANK_SECONDARY;
12 break;
13 case CODEC_ID_DVVIDEO:
14 /* we have a good dv decoder, fast on both ppc as well as x86. they say
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
deleted file mode 100644
index 599492ff52..0000000000
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1DESCRIPTION = "FFmpeg-based GStreamer plug-in"
2SECTION = "multimedia"
3PRIORITY = "optional"
4LICENSE = "LGPLv2+ & GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://gst-libs/ext/ffmpeg/libavcodec/libpostproc/postprocess.h;beginline=1;endline=17;md5=a0c398349079dbd0ce70f03de8bc193a \
7 file://gst-libs/ext/ffmpeg/ffserver.c;beginlin=1;endline=18;md5=49bde48d6d5c631f6f49d74ed491ea08"
8HOMEPAGE = "http://www.gstreamer.net/"
9DEPENDS = "gstreamer zlib gst-plugins-base"
10PR = "r4"
11
12inherit autotools pkgconfig
13
14SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
15 file://no_beos.patch;patch=1 \
16 file://configure_fix.patch;patch=1"
17
18FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
19FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
20FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
21
22EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
23 --disable-vorbis --disable-vorbistest --disable-encoders \
24 --disable-v4l --disable-audio-oss --disable-dv1394 \
25 --disable-vhook --disable-ffmpeg --disable-ffserver \
26 --enable-pp --disable-decoder-vorbis --with-pic=no --disable-altivec"
27
28# We do this because the install program is called with -s which causes it to
29# call "strip" and it then mangles cross compiled stuff..
30PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
31
32# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
33CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
34
35acpaths = "-I ${S}/common/m4"
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
new file mode 100644
index 0000000000..98731dbb84
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
@@ -0,0 +1,35 @@
1DESCRIPTION = "FFmpeg-based GStreamer plug-in"
2SECTION = "multimedia"
3PRIORITY = "optional"
4LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://ext/libpostproc/gstpostproc.c;beginline=1;endline=18;md5=5896e445e41681324381f5869ee33d38 \
7 file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
8 file://ext/ffmpeg/gstffmpeg.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9 \
9 file://gst-libs/ext/ffmpeg/LICENSE;md5=524b5ee4bdbbf755ebbb76727ba80b0d \
10 file://gst-libs/ext/ffmpeg/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11 file://gst-libs/ext/ffmpeg/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
12 file://gst-libs/ext/ffmpeg/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
13 file://gst-libs/ext/ffmpeg/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
14HOMEPAGE = "http://www.gstreamer.net/"
15DEPENDS = "gstreamer gst-plugins-base zlib"
16
17inherit autotools pkgconfig
18
19SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
20 file://lower-rank.diff \
21"
22
23SRC_URI[md5sum] = "0d23197ba7ac06ea34fa66d38469ebe5"
24SRC_URI[sha256sum] = "ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e"
25
26PR = "r0"
27
28EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" "
29
30FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
31FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
32FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
33
34# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
35CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-28 10:56:56 +0000