diff options
| -rw-r--r-- | .cvsversion | 0 | ||||
| -rw-r--r-- | configure.in | 19 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 6 | ||||
| -rw-r--r-- | src/demuxers/Makefile.am | 8 |
4 files changed, 25 insertions, 8 deletions
diff --git a/.cvsversion b/.cvsversion deleted file mode 100644 index e69de29bb..000000000 --- a/.cvsversion +++ /dev/null diff --git a/configure.in b/configure.in index b7d58b110..293f7594e 100644 --- a/configure.in +++ b/configure.in @@ -177,9 +177,9 @@ LIBMPEG2_CFLAGS="" dnl default include path removed, no more needed. LIBA52_CFLAGS="" LIBFFMPEG_CFLAGS="" -AC_ARG_ENABLE(altivec, [ --enable-altivec use assembly codes for Motorola 74xx CPUs], - enable_altivec=yes, enable_altivec=no) - +AC_ARG_ENABLE(altivec, [ --disable-altivec use assembly codes for Motorola 74xx CPUs], + enable_altivec=no, enable_altivec=yes) + if test x$enable_mlib = x; then AC_ARG_ENABLE(mlib, [ --disable-mlib make a version not using mediaLib], @@ -401,6 +401,14 @@ AM_CONDITIONAL(HAVE_ZLIB, [test x"$have_zlib" = "xyes"]) dnl +dnl ASF build can be optional +dnl +AC_ARG_ENABLE(asf, [ --disable-asf do not build ASF demuxer], + enable_asf=no, enable_asf=yes) +AM_CONDITIONAL(BUILD_ASF, test x"$enable_asf" = "xyes") + + +dnl dnl ip_mreqn dnl AC_CHECK_IP_MREQN @@ -912,7 +920,9 @@ echo " - avi - mpeg" echo " - mpeg_block - mpeg_audio" echo " - mpeg_elem - mpeg_pes" echo " - mpeg_ts - qt" -echo " - asf" +if test x"$enable_asf" = "xyes"; then + echo " - asf" +fi if test x"$no_oggvorbis" = "xno"; then echo " - ogg" fi @@ -925,5 +935,6 @@ echo " - stdin - rtp" echo " - http" if test x"$have_cdrom_ioctls" = "xyes"; then echo " - dvd - vcd" + echo " - cda" fi echo "---" diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index 5b2715eea..56add63d0 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -216,8 +216,8 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/lib/xine/plugins/xineplug_inp_cda.la %{prefix}/lib/xine/plugins/xineplug_inp_cda.so # demuxer plugins -%{prefix}/lib/xine/plugins/xineplug_dmx_asf.la -%{prefix}/lib/xine/plugins/xineplug_dmx_asf.so +@BUILD_ASF_TRUE@%{prefix}/lib/xine/plugins/xineplug_dmx_asf.la +@BUILD_ASF_TRUE@%{prefix}/lib/xine/plugins/xineplug_dmx_asf.so %{prefix}/lib/xine/plugins/xineplug_dmx_avi.la %{prefix}/lib/xine/plugins/xineplug_dmx_avi.so %{prefix}/lib/xine/plugins/xineplug_dmx_mpeg.la @@ -331,6 +331,8 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/doc/xine/xine-lib-API/* %changelog +* Sat Dec 8 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> +- ASF plugin is optional. * Thu Dec 6 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> - Add cda plugins. * Wed Nov 14 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index e1d311d88..fc121d011 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -13,16 +13,20 @@ if HAVE_ZLIB qt_modules = xineplug_dmx_qt.la endif +if BUILD_ASF +asf_module = xineplug_dmx_asf.la +endif + ## # IMPORTANT: # --------- # All of xine demuxer plugins should be named like the scheme "xineplug_dmx_" # -lib_LTLIBRARIES = $(ogg_module) $(qt_modules) xineplug_dmx_avi.la \ +lib_LTLIBRARIES = $(ogg_module) $(qt_modules) $(asf_module) xineplug_dmx_avi.la \ xineplug_dmx_mpeg_block.la xineplug_dmx_mpeg.la \ xineplug_dmx_mpeg_elem.la xineplug_dmx_mpeg_audio.la \ xineplug_dmx_mpeg_pes.la xineplug_dmx_mpeg_ts.la \ - xineplug_dmx_asf.la xineplug_dmx_cda.la + xineplug_dmx_cda.la xineplug_dmx_ogg_la_SOURCES = demux_ogg.c xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@ |