diff options
Diffstat (limited to 'recipes/libxine/libxine-1.1.0/configure.patch')
| -rw-r--r-- | recipes/libxine/libxine-1.1.0/configure.patch | 244 |
1 files changed, 244 insertions, 0 deletions
diff --git a/recipes/libxine/libxine-1.1.0/configure.patch b/recipes/libxine/libxine-1.1.0/configure.patch new file mode 100644 index 0000000000..a0078a72f3 --- /dev/null +++ b/recipes/libxine/libxine-1.1.0/configure.patch @@ -0,0 +1,244 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: xine-lib-1.1.0/configure.ac +=================================================================== +--- xine-lib-1.1.0.orig/configure.ac 2005-07-21 21:10:10.000000000 +0000 ++++ xine-lib-1.1.0/configure.ac 2006-01-11 14:30:05.965735856 +0000 +@@ -715,6 +715,7 @@ + LIBS="$saved_libs" + fi + AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes") ++AM_CONDITIONAL(HAVE_XV, test x$ac_have_xvfoo = "xyes") + AC_SUBST(XVMC_LIB) + + +@@ -743,7 +744,7 @@ + AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) + fi + +-AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") ++AM_CONDITIONAL(HAVE_AA, [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"]) + + dnl --------------------------------------------- + dnl Checks for Color AsCii Art library +@@ -855,10 +856,7 @@ + dnl check for SDL + dnl --------------------------------------------- + +-AM_PATH_SDL(1.1.5, +- AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]), +- []) +-AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"]) ++AM_CONDITIONAL(HAVE_SDL, 0) + + + dnl --------------------------------------------- +@@ -1013,48 +1011,22 @@ + dnl Ogg/Theora libs. + dnl --------------------------------------------- + +-AM_PATH_OGG( +- [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]), +- AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***])) +- ], +- AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***])) +-AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"]) ++AM_CONDITIONAL(HAVE_THEORA, 0) + + + dnl --------------------------------------------- + dnl Ogg/Speex libs. + dnl --------------------------------------------- + +-PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes") +- +-if test "x$no_speex" = "xyes" ; then +- AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")]) +-fi +- +-if test "x$no_speex" = "xyes" ; then +- AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***]) +-else +- AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex]) +- +- dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h> +- dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not +- AC_CHECK_HEADER([speex/speex.h], +- AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>]) +- ) +- +- AC_SUBST(SPEEX_CFLAGS) +- AC_SUBST(SPEEX_LIBS) +-fi +-AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"]) ++AM_CONDITIONAL(HAVE_SPEEX, 0) + + + dnl --------------------------------------------- + dnl check for libFLAC + dnl --------------------------------------------- + +-AM_PATH_LIBFLAC([], +- AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***])) +-AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"]) ++AM_CONDITIONAL(HAVE_FLAC, 0) ++ + + dnl --------------------------------------------- + dnl External version of a52dec +@@ -1120,13 +1092,8 @@ + dnl MNG libs. + dnl --------------------------------------------- + +-AC_CHECK_LIB(mng, mng_initialize, +- [ AC_CHECK_HEADER(libmng.h, +- [ have_libmng=yes +- MNG_LIBS="-lmng" ], +- AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))], +- AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***])) +-AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes") ++MNG_LIBS="" ++AM_CONDITIONAL(HAVE_LIBMNG, 0) + AC_SUBST(MNG_LIBS) + + dnl --------------------------------------------- +@@ -1134,6 +1101,9 @@ + dnl --------------------------------------------- + + AC_PATH_PROG(WAND_CONFIG, Wand-config, no) ++if ( ! test -f "$WAND_CONFIG" ) && ( ! test -x "$WAND_CONFIG" ) ; then ++ WAND_CONFIG="no" ++fi + if test "$WAND_CONFIG" = "no" ; then + AC_MSG_RESULT([*** All Imagemagick dependent parts will be disabled, Wand-config not found. ***]) + else +@@ -1153,7 +1123,7 @@ + dnl freetype2 lib. + dnl --------------------------------------------- + +-AM_PATH_FREETYPE2() ++AM_CONDITIONAL(HAVE_FT2, 0) + + + dnl --------------------------------------------- +@@ -1196,37 +1166,21 @@ + dnl ESD support + dnl --------------------------------------------- + +-AM_PATH_ESD(0.2.8, +- AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]), +- AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***)) +-AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes") ++AM_CONDITIONAL(HAVE_ESD, 0) + + + dnl --------------------------------------------- + dnl ARTS support + dnl --------------------------------------------- + +-AM_PATH_ARTS(0.9.5, +- AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]), +- AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***)) +-AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes") ++AM_CONDITIONAL(HAVE_ARTS, 0) + + + dnl --------------------------------------------- + dnl gnome-vfs support + dnl --------------------------------------------- + +-PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, +- no_gnome_vfs=no, +- no_gnome_vfs=yes) +-AC_SUBST(GNOME_VFS_CFLAGS) +-AC_SUBST(GNOME_VFS_LIBS) +-if test x"$no_gnome_vfs" != "xyes"; then +-AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed]) +-else +-AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***) +-fi +-AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes") ++AM_CONDITIONAL(HAVE_GNOME_VFS, 0) + + + dnl --------------------------------------------- +@@ -1403,75 +1357,7 @@ + ],ISOC99_PRAGMA=no) + AC_MSG_RESULT($ISOC99_PRAGMA) + +- dnl +- dnl bitfield order +- dnl +- AC_MSG_CHECKING([bitfield ordering in structs]) +- +- dnl basic compile test for all platforms +- AC_COMPILE_IFELSE([ +-int main() { +- struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; } +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +- __attribute__((packed)) +-#endif +- bf = { 1,1,1,1 }; +- switch (0) case 0: case sizeof(bf) == 1:; +- return 0; +-} +-], [], AC_MSG_ERROR([compiler doesn't support bitfield structs])) +- +- +- dnl run test +- AC_RUN_IFELSE([ +-int main() { +- struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; } +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +- __attribute__((packed)) +-#endif +- bf = { 1,1,1,1 }; +- if (sizeof (bf) != 1) return 1; +- return *((unsigned char*) &bf) != 0x4b; } +-], bf_lsbf=1, [ +- AC_RUN_IFELSE([ +-int main() { +- struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; } +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +- __attribute__((packed)) +-#endif +- bf = { 1,1,1,1 }; +- if (sizeof (bf) != 1) return 1; +- return *((unsigned char*) &bf) != 0xa5; } +-], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])) +- ], +- [case "$host" in +- *-*-mingw32* | *-*-cygwin*) +- bf_lsbf=1 +- ;; +- *) +- AC_MSG_RESULT([unknown]) +- AC_MSG_ERROR([value of bitfield test isn't known for $host +-********************************************************************* +-Value of bitfield test can't be found out for cross-compiling and we +-don't know its value for host "$host". +- +-Because it's needed for VCD plugin, disable VCD by configure option +---disable-vcd or use external VCD library. +-*********************************************************************]) +- esac] +-) +- +- if test "x$cross_compiling" = "xyes"; then +- TEXT=" (guessed)" +- else +- TEXT="" +- fi +- if test "x$bf_lsbf" = "x1"; then +- AC_MSG_RESULT(LSBF${TEXT}) +- AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields]) +- else +- AC_MSG_RESULT(MSBF${TEXT}) +- fi ++ AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields]) + + AC_HAVE_HEADERS( errno.h fcntl.h \ + stdbool.h stdlib.h stdint.h stdio.h string.h \ |