summaryrefslogtreecommitdiffstats
path: root/meta/packages/gstreamer/gst-ffmpeg-0.10.1
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/gstreamer/gst-ffmpeg-0.10.1')
-rw-r--r--meta/packages/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch13
-rw-r--r--meta/packages/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch55
2 files changed, 0 insertions, 68 deletions
diff --git a/meta/packages/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch b/meta/packages/gstreamer/gst-ffmpeg-0.10.1/configure_fix.patch
deleted file mode 100644
index 15f56492f7..0000000000
--- a/meta/packages/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/packages/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch b/meta/packages/gstreamer/gst-ffmpeg-0.10.1/no_beos.patch
deleted file mode 100644
index 9ffcafff73..0000000000
--- a/meta/packages/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