diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /gstreamer/files | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'gstreamer/files')
| -rw-r--r-- | gstreamer/files/lame-autoconf.patch | 18 | ||||
| -rw-r--r-- | gstreamer/files/try-esdsink.patch | 22 |
2 files changed, 0 insertions, 40 deletions
diff --git a/gstreamer/files/lame-autoconf.patch b/gstreamer/files/lame-autoconf.patch deleted file mode 100644 index db62dbd71d..0000000000 --- a/gstreamer/files/lame-autoconf.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- gst-plugins-0.8.4/configure.ac.old 2004-09-11 00:35:27.000000000 +0100 -+++ gst-plugins-0.8.4/configure.ac 2004-09-11 00:35:27.000000000 +0100 -@@ -1196,6 +1196,7 @@ - GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm") - ]) - dnl is lame presets available -+if test "x$HAVE_LAME" = "xyes"; then - LAME_CFLAGS="" - AC_TRY_RUN([ - #include <lame/lame.h> -@@ -1205,6 +1206,7 @@ - return 0; - } - ],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""]) -+fi - AC_SUBST(LAME_CFLAGS) - AC_SUBST(LAME_LIBS) - diff --git a/gstreamer/files/try-esdsink.patch b/gstreamer/files/try-esdsink.patch deleted file mode 100644 index 9c6242663c..0000000000 --- a/gstreamer/files/try-esdsink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c~ 2004-08-17 17:55:46.000000000 +0100 -+++ gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c 2004-08-17 18:04:00.000000000 +0100 -@@ -204,10 +204,16 @@ - if (!ret) { - ret = gst_element_factory_make ("osssink", NULL); - -- if (!ret) -- g_warning ("No GConf default audio sink key and osssink doesn't work"); -- else -+ if (!ret) { -+ ret = gst_element_factory_make ("esdsink", NULL); -+ -+ if (!ret) -+ g_warning ("No GConf default audio sink key and osssink & esdsink don't work"); -+ else -+ g_print ("GConf audio sink and osssink not found, using esdsink\n"); -+ } else { - g_print ("GConf audio sink not found, using osssink\n"); -+ } - } - - return ret; |