pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Update to rc3b. Fixed a problem w...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f98070663787
branches:  trunk
changeset: 471454:f98070663787
user:      mycroft <mycroft%pkgsrc.org@localhost>
date:      Sun Mar 28 20:14:22 2004 +0000

description:
Update to rc3b.  Fixed a problem with the PLIST not including some .sos under
NetBSD.  Applied the same symbol hacks that are used to make the Linux
RealPlayer modules work with mplayer -- but also use the native RV2.0 codec
now.

                       17.03.2004 xine-lib 1-3c3b released
                                  This version adds support for Matroska
                                  files, Flash Video and Sierra VMD files, as
                                  well as OpenDML 2.0 support for the AVI
                                  demuxer. In addition, this new library can
                                  now handle a variety of file formats from
                                  the Amiga computer, including a variety of
                                  IFF files and MOD/S3M/XM/IT/etc music
                                  tracker formats (thanks to the ModPlug
                                  library). The new library version contains
                                  several new video decoders including Sierra
                                  video, Flash Video, Real Video 2.0 Duck
                                  TrueMotion v1, 8BPS, MZSH, ZLIB, ASV1,2,
                                  ATI VCR1 (all courtesy of ffmpeg). Network
                                  streaming drivers are enhanced, including
                                  secure HTTP, MMS, and RTP/UDP. As for video
                                  drivers, there is new support for the CACA
                                  library (colored ASCII art), and
                                  fixed/improved support for SDL and Sun
                                  PGX32 video. As always the core xine engine
                                  has been enhanced for greater stability so
                                  that you can just play your multimedia with
                                  ease.

diffstat:

 multimedia/xine-lib/Makefile.common           |   13 +-
 multimedia/xine-lib/PLIST                     |   57 +------
 multimedia/xine-lib/distinfo                  |   13 +-
 multimedia/xine-lib/patches/disabled-patch-aa |   56 -------
 multimedia/xine-lib/patches/disabled-patch-ab |   13 -
 multimedia/xine-lib/patches/disabled-patch-ac |   13 -
 multimedia/xine-lib/patches/patch-ad          |   21 +--
 multimedia/xine-lib/patches/patch-ag          |  189 ++++++-------------------
 multimedia/xine-lib/patches/patch-at          |   13 +
 multimedia/xine-lib/patches/patch-au          |   12 +
 multimedia/xine-lib/patches/patch-av          |   30 ++++
 11 files changed, 140 insertions(+), 290 deletions(-)

diffs (truncated from 602 to 300 lines):

diff -r ad8c52897f14 -r f98070663787 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common       Sun Mar 28 20:09:52 2004 +0000
+++ b/multimedia/xine-lib/Makefile.common       Sun Mar 28 20:14:22 2004 +0000
@@ -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 @@
 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+=                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 -r ad8c52897f14 -r f98070663787 multimedia/xine-lib/PLIST
--- a/multimedia/xine-lib/PLIST Sun Mar 28 20:09:52 2004 +0000
+++ b/multimedia/xine-lib/PLIST Sun Mar 28 20:14:22 2004 +0000
@@ -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 @@
 ${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.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.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/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 -r ad8c52897f14 -r f98070663787 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Sun Mar 28 20:09:52 2004 +0000
+++ b/multimedia/xine-lib/distinfo      Sun Mar 28 20:14:22 2004 +0000
@@ -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-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded
 SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
+SHA1 (patch-at) = b43d07b20f209a31df454620673a21f174550cf9
+SHA1 (patch-au) = 666ecb544f904178465bdd7854642a40f4ce4970
+SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
diff -r ad8c52897f14 -r f98070663787 multimedia/xine-lib/patches/disabled-patch-aa
--- a/multimedia/xine-lib/patches/disabled-patch-aa     Sun Mar 28 20:09:52 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ad8c52897f14 -r f98070663787 multimedia/xine-lib/patches/disabled-patch-ab
--- a/multimedia/xine-lib/patches/disabled-patch-ab     Sun Mar 28 20:09:52 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ad8c52897f14 -r f98070663787 multimedia/xine-lib/patches/disabled-patch-ac
--- a/multimedia/xine-lib/patches/disabled-patch-ac     Sun Mar 28 20:09:52 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index