diff options
Diffstat (limited to 'multimedia/xine-lib')
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/PLIST | 57 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/disabled-patch-aa | 56 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/disabled-patch-ab | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/disabled-patch-ac | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ad | 21 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 193 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-at | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-au | 12 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-av | 30 |
11 files changed, 142 insertions, 292 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index ac567b6a2a0..826567150f4 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.6 2004/03/11 17:26:02 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.7 2004/03/28 20:14:22 mycroft Exp $ # -DISTNAME= xine-lib-1-rc3a -PKGNAME= xine-lib-1rc3a +DISTNAME= xine-lib-1-rc3b +PKGNAME= xine-lib-1rc3b CATEGORIES?= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} @@ -16,6 +16,7 @@ PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES +AUTOCONF_REQD= 2.58 USE_PKGLOCALEDIR= YES USE_BUILDLINK3= YES USE_LIBTOOL= YES @@ -28,13 +29,19 @@ CONFIGURE_ENV+= have_libpng="yes" CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include" CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng" +.include "../../mk/bsd.prefs.mk" + .if !exists(${X11BASE}/lib/libXv.so) PLIST_SUBST+= XV_WORKAROUND="@comment " .else PLIST_SUBST+= XV_WORKAROUND="" .endif +pre-configure:: + cd ${WRKSRC} && ${AUTOCONF} + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/autoconf.mk" diff --git a/multimedia/xine-lib/PLIST b/multimedia/xine-lib/PLIST index ae031e2ebb4..d00589eeecd 100644 --- a/multimedia/xine-lib/PLIST +++ b/multimedia/xine-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/03/11 17:26:02 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/03/28 20:14:22 mycroft Exp $ bin/xine-config include/xine.h include/xine/attributes.h @@ -48,86 +48,52 @@ lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.a ${XV_WORKAROUND}lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.so lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.a lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so +lib/xine/plugins/1.0.0/xineplug_ao_out_file.a +lib/xine/plugins/1.0.0/xineplug_ao_out_file.so lib/xine/plugins/1.0.0/xineplug_ao_out_none.a lib/xine/plugins/1.0.0/xineplug_ao_out_none.so lib/xine/plugins/1.0.0/xineplug_ao_out_sun.a lib/xine/plugins/1.0.0/xineplug_ao_out_sun.so -lib/xine/plugins/1.0.0/xineplug_decode_28k8.a -lib/xine/plugins/1.0.0/xineplug_decode_28k8.so lib/xine/plugins/1.0.0/xineplug_decode_a52.a lib/xine/plugins/1.0.0/xineplug_decode_a52.so -lib/xine/plugins/1.0.0/xineplug_decode_adpcm.a -lib/xine/plugins/1.0.0/xineplug_decode_adpcm.so -lib/xine/plugins/1.0.0/xineplug_decode_cinepak.a -lib/xine/plugins/1.0.0/xineplug_decode_cinepak.so -lib/xine/plugins/1.0.0/xineplug_decode_cyuv.a -lib/xine/plugins/1.0.0/xineplug_decode_cyuv.so +lib/xine/plugins/1.0.0/xineplug_decode_bitplane.a +lib/xine/plugins/1.0.0/xineplug_decode_bitplane.so lib/xine/plugins/1.0.0/xineplug_decode_dts.a lib/xine/plugins/1.0.0/xineplug_decode_dts.so +lib/xine/plugins/1.0.0/xineplug_decode_dvaudio.a +lib/xine/plugins/1.0.0/xineplug_decode_dvaudio.so lib/xine/plugins/1.0.0/xineplug_decode_faad.a lib/xine/plugins/1.0.0/xineplug_decode_faad.so lib/xine/plugins/1.0.0/xineplug_decode_ff.a lib/xine/plugins/1.0.0/xineplug_decode_ff.so -lib/xine/plugins/1.0.0/xineplug_decode_fli.a -lib/xine/plugins/1.0.0/xineplug_decode_fli.so lib/xine/plugins/1.0.0/xineplug_decode_gsm610.a lib/xine/plugins/1.0.0/xineplug_decode_gsm610.so -lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.a -lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.so lib/xine/plugins/1.0.0/xineplug_decode_image.a lib/xine/plugins/1.0.0/xineplug_decode_image.so -lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.a -lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.so -lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.a -lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.so -lib/xine/plugins/1.0.0/xineplug_decode_logpcm.a -lib/xine/plugins/1.0.0/xineplug_decode_logpcm.so lib/xine/plugins/1.0.0/xineplug_decode_lpcm.a lib/xine/plugins/1.0.0/xineplug_decode_lpcm.so lib/xine/plugins/1.0.0/xineplug_decode_mad.a lib/xine/plugins/1.0.0/xineplug_decode_mad.so lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.a lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.so -lib/xine/plugins/1.0.0/xineplug_decode_msrle.a -lib/xine/plugins/1.0.0/xineplug_decode_msrle.so -lib/xine/plugins/1.0.0/xineplug_decode_msvc.a -lib/xine/plugins/1.0.0/xineplug_decode_msvc.so lib/xine/plugins/1.0.0/xineplug_decode_nsf.a lib/xine/plugins/1.0.0/xineplug_decode_nsf.so -lib/xine/plugins/1.0.0/xineplug_decode_pcm.a -lib/xine/plugins/1.0.0/xineplug_decode_pcm.so -lib/xine/plugins/1.0.0/xineplug_decode_qtrle.a -lib/xine/plugins/1.0.0/xineplug_decode_qtrle.so -lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.a -lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.so -lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.a -lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.so lib/xine/plugins/1.0.0/xineplug_decode_real.a lib/xine/plugins/1.0.0/xineplug_decode_real.so lib/xine/plugins/1.0.0/xineplug_decode_real_audio.a lib/xine/plugins/1.0.0/xineplug_decode_real_audio.so lib/xine/plugins/1.0.0/xineplug_decode_rgb.a lib/xine/plugins/1.0.0/xineplug_decode_rgb.so -lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.a -lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.so -lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.a -lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.so lib/xine/plugins/1.0.0/xineplug_decode_spu.a lib/xine/plugins/1.0.0/xineplug_decode_spu.so lib/xine/plugins/1.0.0/xineplug_decode_spucc.a lib/xine/plugins/1.0.0/xineplug_decode_spucc.so lib/xine/plugins/1.0.0/xineplug_decode_sputext.a lib/xine/plugins/1.0.0/xineplug_decode_sputext.so -lib/xine/plugins/1.0.0/xineplug_decode_svq1.a -lib/xine/plugins/1.0.0/xineplug_decode_svq1.so lib/xine/plugins/1.0.0/xineplug_decode_vorbis.a lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so -lib/xine/plugins/1.0.0/xineplug_decode_wc3video.a -lib/xine/plugins/1.0.0/xineplug_decode_wc3video.so lib/xine/plugins/1.0.0/xineplug_decode_yuv.a lib/xine/plugins/1.0.0/xineplug_decode_yuv.so -lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.a -lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.so lib/xine/plugins/1.0.0/xineplug_dmx_asf.a lib/xine/plugins/1.0.0/xineplug_dmx_asf.so lib/xine/plugins/1.0.0/xineplug_dmx_audio.a @@ -136,10 +102,16 @@ lib/xine/plugins/1.0.0/xineplug_dmx_avi.a lib/xine/plugins/1.0.0/xineplug_dmx_avi.so lib/xine/plugins/1.0.0/xineplug_dmx_fli.a lib/xine/plugins/1.0.0/xineplug_dmx_fli.so +lib/xine/plugins/1.0.0/xineplug_dmx_flv.a +lib/xine/plugins/1.0.0/xineplug_dmx_flv.so lib/xine/plugins/1.0.0/xineplug_dmx_games.a lib/xine/plugins/1.0.0/xineplug_dmx_games.so +lib/xine/plugins/1.0.0/xineplug_dmx_iff.a +lib/xine/plugins/1.0.0/xineplug_dmx_iff.so lib/xine/plugins/1.0.0/xineplug_dmx_image.a lib/xine/plugins/1.0.0/xineplug_dmx_image.so +lib/xine/plugins/1.0.0/xineplug_dmx_matroska.a +lib/xine/plugins/1.0.0/xineplug_dmx_matroska.so lib/xine/plugins/1.0.0/xineplug_dmx_mng.a lib/xine/plugins/1.0.0/xineplug_dmx_mng.so lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.a @@ -206,8 +178,6 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_none.a lib/xine/plugins/1.0.0/xineplug_vo_out_none.so lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.a lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so -lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.a -lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.a lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a @@ -235,7 +205,6 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxine1.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/libxine1.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libxine1.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libxine1.mo share/xine/libxine1/fonts/cc-16.xinefont.gz diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 9894cb79798..b99eefa8b9a 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.2 2004/03/11 17:26:02 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2004/03/28 20:14:22 mycroft Exp $ -SHA1 (xine-lib-1-rc3a.tar.gz) = 6ccf01f697693e31f78a51acf2f20d6d24e25586 -Size (xine-lib-1-rc3a.tar.gz) = 6121483 bytes +SHA1 (xine-lib-1-rc3b.tar.gz) = 0ab8e26526f81480d028cafcf7d83aa48cc5151c +Size (xine-lib-1-rc3b.tar.gz) = 6422089 bytes SHA1 (patch-aa) = b8493cabd3f9d9eb57d414265ea1eac4db71fa08 SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0 -SHA1 (patch-ad) = ed65116acfa1f32a0508338a11567589bc2b4123 +SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938 SHA1 (patch-af) = 0d2860c863c4121288289b88d46433a94dde120b -SHA1 (patch-ag) = ebfc011fdef1831caa0f6a7e10a2c77fc2b420fb +SHA1 (patch-ag) = 23fca3bd89be1f852456d31e46f6449b577c0dad SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97 SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99 @@ -18,3 +18,6 @@ SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba +SHA1 (patch-at) = b43d07b20f209a31df454620673a21f174550cf9 +SHA1 (patch-au) = 666ecb544f904178465bdd7854642a40f4ce4970 +SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa diff --git a/multimedia/xine-lib/patches/disabled-patch-aa b/multimedia/xine-lib/patches/disabled-patch-aa deleted file mode 100644 index d6b2aa820f1..00000000000 --- a/multimedia/xine-lib/patches/disabled-patch-aa +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: disabled-patch-aa,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - ---- configure.ac.orig 2003-08-02 11:45:26.000000000 +0000 -+++ configure.ac 2003-10-05 09:10:13.000000000 +0000 -@@ -301,6 +301,9 @@ - AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) - AC_SUBST(NET_LIBS) - -+WINE_LIBS="" -+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",) -+AC_SUBST(WINE_LIBS) - - dnl --------------------------------------------- - dnl zlib -@@ -330,7 +333,7 @@ - AC_CHECK_LIB(GL, glBegin, - [AC_CHECK_HEADER(GL/gl.h, - [ ac_have_opengl="yes" -- OPENGL_LIBS="-lGL" -+ OPENGL_LIBS="-lGL -lm" - AC_CHECK_LIB(glut, glutInit, dnl check for glut - [ ac_have_glut="yes" - GLUT_LIBS="-lglut" -@@ -348,7 +351,7 @@ - ], - [])], - [], -- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]) -+ [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS]) - AC_SUBST(OPENGL_LIBS) - AC_SUBST(GLUT_LIBS) - AC_SUBST(GLU_LIBS) -@@ -456,8 +459,7 @@ - dnl --------------------------------------------- - - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, -- [X_LIBS="$X_LIBS -lXinerama" -- AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) -+ [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) - ac_have_xinerama="yes"],, - [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) - AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") -@@ -761,9 +763,10 @@ - dnl --------------------------------------------- - dnl gnome-vfs support - dnl --------------------------------------------- --PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, -- no_gnome_vfs=no, -- no_gnome_vfs=yes) -+dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, -+dnl no_gnome_vfs=no, -+dnl no_gnome_vfs=yes) -+no_gnome_vfs=yes - AC_SUBST(GNOME_VFS_CFLAGS) - AC_SUBST(GNOME_VFS_LIBS) - if test x"$no_gnome_vfs" != "xyes"; then diff --git a/multimedia/xine-lib/patches/disabled-patch-ab b/multimedia/xine-lib/patches/disabled-patch-ab deleted file mode 100644 index bc326c2ec0c..00000000000 --- a/multimedia/xine-lib/patches/disabled-patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: disabled-patch-ab,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - ---- aclocal.m4.orig 2003-08-02 13:49:37.000000000 +0000 -+++ aclocal.m4 2003-10-06 04:36:36.000000000 +0000 -@@ -6620,7 +6620,7 @@ - XVID_LIBS="-L$xvid_prefix/lib" - fi - -- XVID_LIBS="$XVID_LIBS -lxvidcore" -+ XVID_LIBS="$XVID_LIBS -lxvidcore -lm" - - AC_MSG_CHECKING(for XviD) - no_xvid="" diff --git a/multimedia/xine-lib/patches/disabled-patch-ac b/multimedia/xine-lib/patches/disabled-patch-ac deleted file mode 100644 index 2718dae2bd8..00000000000 --- a/multimedia/xine-lib/patches/disabled-patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: disabled-patch-ac,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - ---- xvid.m4.orig 2003-07-13 19:29:04.000000000 +0000 -+++ xvid.m4 2003-10-06 04:44:40.000000000 +0000 -@@ -18,7 +18,7 @@ - XVID_LIBS="-L$xvid_prefix/lib" - fi - -- XVID_LIBS="$XVID_LIBS -lxvidcore" -+ XVID_LIBS="$XVID_LIBS -lxvidcore -lm" - - AC_MSG_CHECKING(for XviD) - no_xvid="" diff --git a/multimedia/xine-lib/patches/patch-ad b/multimedia/xine-lib/patches/patch-ad index 779569ebdba..6f82c90010c 100644 --- a/multimedia/xine-lib/patches/patch-ad +++ b/multimedia/xine-lib/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +$NetBSD: patch-ad,v 1.2 2004/03/28 20:14:22 mycroft Exp $ ---- src/input/libdvdnav/vm.c.orig 2003-07-19 19:55:20.000000000 +0200 -+++ src/input/libdvdnav/vm.c 2003-08-24 11:25:12.000000000 +0200 -@@ -35,6 +35,7 @@ +--- src/input/libdvdnav/vm.c.orig 2004-03-16 20:21:22.000000000 +0000 ++++ src/input/libdvdnav/vm.c 2004-03-28 02:03:44.000000000 +0000 +@@ -36,6 +36,7 @@ #include <assert.h> #include <sys/types.h> #include <sys/stat.h> @@ -10,16 +10,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ #include <fcntl.h> #include "ifo_types.h" -@@ -133,10 +134,11 @@ - - static void dvd_read_name(char *name, const char *device) { - int fd, i; --#if !defined(__FreeBSD__) && !defined(WIN32) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(WIN32) - off64_t off; - #else - off_t off; -+#define lseek64 lseek - #endif - uint8_t data[DVD_VIDEO_LB_LEN]; - diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index aa144571835..54bdf8d1d0a 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,145 +1,56 @@ -$NetBSD: patch-ag,v 1.2 2004/03/11 17:26:02 jmmv Exp $ +$NetBSD: patch-ag,v 1.3 2004/03/28 20:14:22 mycroft Exp $ ---- configure.orig 2003-12-28 16:25:26.000000000 +0100 -+++ configure -@@ -463,7 +463,7 @@ ac_includes_default="\ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XVMC_TRUE HAVE_XVMC_FALSE HAVE_XVMC_STATIC_TRUE HAVE_XVMC_STATIC_FALSE XVMC_LIB HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS FIG2DEV LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS WINE_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XVMC_TRUE HAVE_XVMC_FALSE HAVE_XVMC_STATIC_TRUE HAVE_XVMC_STATIC_FALSE XVMC_LIB HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS FIG2DEV LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -2980,6 +2980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ -+ '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -3844,6 +3845,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ -+ '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -26427,6 +26429,64 @@ fi - - +--- configure.ac.orig 2004-03-16 21:44:17.000000000 +0000 ++++ configure.ac 2004-03-28 02:13:31.000000000 +0000 +@@ -347,6 +347,9 @@ + AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) + AC_SUBST(NET_LIBS) +WINE_LIBS="" -+echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5 -+echo $ECHO_N "checking for i386_set_ldt in -li386... $ECHO_C" >&6 -+if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-li386 $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char i386_set_ldt (); -+int -+main () -+{ -+i386_set_ldt (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_i386_i386_set_ldt=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_i386_i386_set_ldt=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_i386_i386_set_ldt" >&5 -+echo "${ECHO_T}$ac_cv_lib_i386_i386_set_ldt" >&6 -+if test $ac_cv_lib_i386_i386_set_ldt = yes; then -+ WINE_LIBS="-li386 $WINE_LIBS" -+fi -+ - echo "$as_me:$LINENO: checking for gzsetparams in -lz" >&5 - echo $ECHO_N "checking for gzsetparams in -lz... $ECHO_C" >&6 - if test "${ac_cv_lib_z_gzsetparams+set}" = set; then -@@ -26727,7 +26787,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS $LIBS" -+LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26923,7 +26983,7 @@ echo "${ECHO_T}$ac_cv_header_GL_gl_h" >& - fi - if test $ac_cv_header_GL_gl_h = yes; then - ac_have_opengl="yes" -- OPENGL_LIBS="-lGL" -+ OPENGL_LIBS="-lGL -lm" - echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 - echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 - if test "${ac_cv_lib_glut_glutInit+set}" = set; then -@@ -27805,7 +27865,6 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 - echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6 - if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then -- X_LIBS="$X_LIBS -lXinerama" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_XINERAMA 1 -@@ -33140,6 +33199,7 @@ fi - - - -+if false; then - succeeded=no - - if test -z "$PKG_CONFIG"; then -@@ -33234,6 +33294,8 @@ echo "${ECHO_T}$GNOME_VFS_LIBS" >&6 - else - no_gnome_vfs=yes - fi -+fi ++AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",) ++AC_SUBST(WINE_LIBS) + + dnl --------------------------------------------- + dnl IPv6 +@@ -385,7 +388,7 @@ + AC_CHECK_LIB(GL, glBegin, + [AC_CHECK_HEADER(GL/gl.h, + [ ac_have_opengl="yes" +- OPENGL_LIBS="-lGL" ++ OPENGL_LIBS="-lGL -lm" + AC_CHECK_LIB(glut, glutInit, dnl check for glut + [ ac_have_glut="yes" + GLUT_LIBS="-lglut" +@@ -403,7 +406,7 @@ + ], + [])], + [], +- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]) ++ [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS]) + AC_SUBST(OPENGL_LIBS) + AC_SUBST(GLUT_LIBS) + AC_SUBST(GLU_LIBS) +@@ -580,8 +583,7 @@ + dnl --------------------------------------------- + + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, +- [X_LIBS="$X_LIBS -lXinerama" +- AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) ++ [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) + ac_have_xinerama="yes"],, + [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) + dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") +@@ -993,9 +995,10 @@ + dnl gnome-vfs support + dnl --------------------------------------------- + +-PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, +- no_gnome_vfs=no, +- no_gnome_vfs=yes) ++dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, ++dnl no_gnome_vfs=no, ++dnl no_gnome_vfs=yes) +no_gnome_vfs=yes - - - -@@ -40710,6 +40772,7 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t - s,@HAVE_X11_TRUE@,$HAVE_X11_TRUE,;t t - s,@HAVE_X11_FALSE@,$HAVE_X11_FALSE,;t t - s,@NET_LIBS@,$NET_LIBS,;t t -+s,@WINE_LIBS@,$WINE_LIBS,;t t - s,@HAVE_ZLIB_TRUE@,$HAVE_ZLIB_TRUE,;t t - s,@HAVE_ZLIB_FALSE@,$HAVE_ZLIB_FALSE,;t t - s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t + AC_SUBST(GNOME_VFS_CFLAGS) + AC_SUBST(GNOME_VFS_LIBS) + if test x"$no_gnome_vfs" != "xyes"; then diff --git a/multimedia/xine-lib/patches/patch-at b/multimedia/xine-lib/patches/patch-at new file mode 100644 index 00000000000..a1aa951803c --- /dev/null +++ b/multimedia/xine-lib/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.1 2004/03/28 20:14:22 mycroft Exp $ + +--- m4/xvid.m4.orig 2004-03-16 20:21:15.000000000 +0000 ++++ m4/xvid.m4 2004-03-28 02:26:26.000000000 +0000 +@@ -18,7 +18,7 @@ + XVID_LIBS="-L$xvid_prefix/$XINE_LIBNAME" + fi + +- XVID_LIBS="$XVID_LIBS -lxvidcore" ++ XVID_LIBS="$XVID_LIBS -lxvidcore -lm" + + AC_MSG_CHECKING(for XviD) + no_xvid="" diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au new file mode 100644 index 00000000000..d2d6fce2a11 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-au @@ -0,0 +1,12 @@ +$NetBSD: patch-au,v 1.1 2004/03/28 20:14:22 mycroft Exp $ + +--- src/xine-engine/xine.c.orig 2004-03-16 21:40:16.000000000 +0000 ++++ src/xine-engine/xine.c 2004-03-28 03:36:37.000000000 +0000 +@@ -1321,6 +1321,7 @@ + pthread_mutex_init(&this->port_ticket->lock, NULL); + pthread_mutex_init(&this->port_ticket->revoke_lock, NULL); + pthread_cond_init(&this->port_ticket->issued, NULL); ++ pthread_cond_init(&this->port_ticket->revoked, NULL); + + return this; + } diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av new file mode 100644 index 00000000000..74a9b4bf4a5 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-av @@ -0,0 +1,30 @@ +$NetBSD: patch-av,v 1.1 2004/03/28 20:14:22 mycroft Exp $ + +--- src/libreal/xine_decoder.c.orig 2004-03-16 20:21:33.000000000 +0000 ++++ src/libreal/xine_decoder.c 2004-03-28 05:20:49.000000000 +0000 +@@ -99,6 +99,15 @@ + } rv_init_t; + + ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++void *__ctype_b=NULL; ++void ___brk_addr(void) {exit(0);} ++char **__environ={NULL}; ++#undef stderr ++FILE *stderr=NULL; ++#endif ++ ++ + void *__builtin_vec_new(uint32_t size); + void __builtin_vec_delete(void *mem); + void __pure_virtual(void); +@@ -574,8 +583,7 @@ + * exported plugin catalog entry + */ + +-static uint32_t supported_types[] = { BUF_VIDEO_RV20, +- BUF_VIDEO_RV30, ++static uint32_t supported_types[] = { BUF_VIDEO_RV30, + BUF_VIDEO_RV40, + 0 }; + |