]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / gstreamer / gstreamer-0.8.9 / no-libxml2.patch
1 diff -ur gstreamer-0.8.9/configure gstreamer-0.8.9-jeh3/configure
2 --- gstreamer-0.8.9/configure   2005-02-08 04:45:25.000000000 -0500
3 +++ gstreamer-0.8.9-jeh3/configure      2005-03-03 22:34:09.213409312 -0500
4 @@ -25655,10 +25655,10 @@
5  
6  
7  
8 -if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
9 +if test "x$GST_DISABLE_LOADSAVE" = "xyes"
10  then
11 -  { echo "$as_me:$LINENO: Registry and load/save are disabled, not checking for libxml2" >&5
12 -echo "$as_me: Registry and load/save are disabled, not checking for libxml2" >&6;}
13 +  { echo "$as_me:$LINENO: Load/save are disabled, not checking for libxml2" >&5
14 +echo "$as_me: Load/save are disabled, not checking for libxml2" >&6;}
15  else
16  
17        LIBXML2_REQ=2.4.9
18 diff -ur gstreamer-0.8.9/configure.ac gstreamer-0.8.9-jeh3/configure.ac
19 --- gstreamer-0.8.9/configure.ac        2005-02-08 04:44:47.000000000 -0500
20 +++ gstreamer-0.8.9-jeh3/configure.ac   2005-03-03 22:34:09.215409008 -0500
21 @@ -275,9 +275,9 @@
22  AC_SUBST(GLIB_ONLY_LIBS)
23    
24  dnl === libxml 2 ===
25 -if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
26 +if test "x$GST_DISABLE_LOADSAVE" = "xyes"
27  then
28 -  AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2])
29 +  AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2])
30  else
31    dnl check for libxml2 with minimum req version
32    GST_LIBXML2_CHECK(2.4.9)
33 diff -ur gstreamer-0.8.9/gst/gstconfig.h.in gstreamer-0.8.9-jeh3/gst/gstconfig.h.in
34 --- gstreamer-0.8.9/gst/gstconfig.h.in  2004-07-26 06:09:02.000000000 -0400
35 +++ gstreamer-0.8.9-jeh3/gst/gstconfig.h.in     2005-03-03 22:36:13.860460080 -0500
36 @@ -61,10 +61,11 @@
37  
38  /***** Deal with XML stuff, we have to handle both loadsave and registry *****/
39  
40 -#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
41 +#if (! defined(GST_DISABLE_LOADSAVE) )
42  # include <libxml/parser.h>
43  #else
44 -# define GST_DISABLE_LOADSAVE_REGISTRY
45 +/* misnomer but we cannot rename symbols */
46 +# define GST_DISABLE_LOADSAVE_REGISTRY 
47  #endif
48  
49  #ifdef WIN32
50 Only in gstreamer-0.8.9-jeh3/gst: gstconfig.h.in.orig
51 diff -ur gstreamer-0.8.9/gst/indexers/gstindexers.c gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c
52 --- gstreamer-0.8.9/gst/indexers/gstindexers.c  2004-03-15 14:20:30.000000000 -0500
53 +++ gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c     2005-03-03 22:34:09.228407032 -0500
54 @@ -30,7 +30,9 @@
55    gboolean res = TRUE;
56  
57    res &= gst_mem_index_plugin_init (plugin);
58 +#ifndef GST_DISABLE_LOADSAVE_REGISTRY
59    res &= gst_file_index_plugin_init (plugin);
60 +#endif
61  
62    return res;
63  }
64 diff -ur gstreamer-0.8.9/gst/registries/gstxmlregistry.h gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h
65 --- gstreamer-0.8.9/gst/registries/gstxmlregistry.h     2004-03-15 10:08:32.000000000 -0500
66 +++ gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h        2005-03-03 22:34:09.229406880 -0500
67 @@ -25,6 +25,7 @@
68  #define __GST_XML_REGISTRY_H__
69  
70  #include <gst/gstregistry.h>
71 +#include <stdio.h>
72  
73  G_BEGIN_DECLS
74  
75 Only in gstreamer-0.8.9-jeh3/win32: gstconfig.h.orig