pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib Many changes to pkgsrc for this, b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/49cbd28c3128
branches:  trunk
changeset: 493587:49cbd28c3128
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue May 10 00:16:42 2005 +0000

description:
Many changes to pkgsrc for this, but not a version update.

Change PLISTs to not hardcode 1.0.1 (or the version) but use
${PKGVERSION}. This will make it easier for later updates.
print-PLIST target produces ${PKGVERSION} and that is how I noticed this.

Move the xv plugin entries to PLIST.common from PLIST.NetBSD. Linux
and FreeBSD both have same xv plugin entries.

Remove dependency to win32-codecs. It is not needed and can be added
any time later for those extra codecs. Also, xine-lib supports
various Windows Media formats already (via builtin ffmpeg).

Move the i386 PLIST entries to own PLIST.i386 file.

Add MESSAGE.i386 to suggest installing win32-codecs if needed.
(If you have suggestions for other codecs or software to mention,
such as "Real" for this MESSAGE.i386, please let me know.)

Move COMMENT from Makefile.common to Makefile. (I will commit for
xine-arts and xine-esound next, since they didn't have their own
COMMENTs before.)

Bump PKGREVISION.

(Later I will add a couple patches for FreeBSD support and add
theora support.)

diffstat:

 multimedia/xine-lib/MESSAGE.i386     |   13 +
 multimedia/xine-lib/Makefile         |   10 +-
 multimedia/xine-lib/Makefile.common  |    3 +-
 multimedia/xine-lib/PLIST.Linux      |   70 +++---
 multimedia/xine-lib/PLIST.NetBSD     |    8 +-
 multimedia/xine-lib/PLIST.common     |  320 +++++++++++++++++-----------------
 multimedia/xine-lib/PLIST.common_end |    8 +-
 multimedia/xine-lib/PLIST.i386       |    5 +
 8 files changed, 223 insertions(+), 214 deletions(-)

diffs (truncated from 504 to 300 lines):

diff -r fe13d0a253af -r 49cbd28c3128 multimedia/xine-lib/MESSAGE.i386
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/MESSAGE.i386  Tue May 10 00:16:42 2005 +0000
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE.i386,v 1.1 2005/05/10 00:16:42 reed Exp $
+
+To watch or listen to Windows Media (.asf/.wmv/.wma), such as MS
+WMV 8 or 9 ASF video, or Quicktime files or streams, install the
+multimedia/win32-codecs package.  It is not required by default
+due to unclear licensing.
+
+The win32-codecs package is not needed for MS Windows Media Audio 2
+and MS Windows Media 7 ASF video, because xine-lib already supports
+these formats using built-in ffmpeg.
+
+===========================================================================
diff -r fe13d0a253af -r 49cbd28c3128 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Tue May 10 00:12:18 2005 +0000
+++ b/multimedia/xine-lib/Makefile      Tue May 10 00:16:42 2005 +0000
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/05/02 11:29:35 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/10 00:16:42 reed Exp $
 
 .include "Makefile.common"
 
-.if ${MACHINE_ARCH} == "i386"
-DEPENDS+=              win32-codecs>=011227:../../multimedia/win32-codecs
-PLIST_SUBST+=          I386=""
-.else
-PLIST_SUBST+=          I386="@comment "
-.endif
+PKGREVISION=           1
+COMMENT=               Multimedia player library
 
 BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
diff -r fe13d0a253af -r 49cbd28c3128 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common       Tue May 10 00:12:18 2005 +0000
+++ b/multimedia/xine-lib/Makefile.common       Tue May 10 00:16:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/05/02 11:29:35 drochner Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/05/10 00:16:42 reed Exp $
 #
 
 DISTNAME=              xine-lib-1.0.1
@@ -9,7 +9,6 @@
 
 MAINTAINER=            jmmv%NetBSD.org@localhost
 HOMEPAGE=              http://xinehq.de/
-COMMENT=               Multimedia player library
 
 DISTINFO_FILE=         ${.CURDIR}/../../multimedia/xine-lib/distinfo
 PATCHDIR=              ${.CURDIR}/../../multimedia/xine-lib/patches
diff -r fe13d0a253af -r 49cbd28c3128 multimedia/xine-lib/PLIST.Linux
--- a/multimedia/xine-lib/PLIST.Linux   Tue May 10 00:12:18 2005 +0000
+++ b/multimedia/xine-lib/PLIST.Linux   Tue May 10 00:16:42 2005 +0000
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2005/05/07 21:57:02 reed Exp $
-lib/xine/plugins/1.0.1/vidix/cyberblade_vid.a
-lib/xine/plugins/1.0.1/vidix/cyberblade_vid.so
-lib/xine/plugins/1.0.1/vidix/mach64_vid.a
-lib/xine/plugins/1.0.1/vidix/mach64_vid.so
-lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.0.1/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.0.1/vidix/mga_vid.a
-lib/xine/plugins/1.0.1/vidix/mga_vid.so
-lib/xine/plugins/1.0.1/vidix/pm2_vid.a
-lib/xine/plugins/1.0.1/vidix/pm2_vid.so
-lib/xine/plugins/1.0.1/vidix/pm3_vid.a
-lib/xine/plugins/1.0.1/vidix/pm3_vid.so
-lib/xine/plugins/1.0.1/vidix/radeon_vid.a
-lib/xine/plugins/1.0.1/vidix/radeon_vid.so
-lib/xine/plugins/1.0.1/vidix/rage128_vid.a
-lib/xine/plugins/1.0.1/vidix/rage128_vid.so
-lib/xine/plugins/1.0.1/vidix/sis_vid.a
-lib/xine/plugins/1.0.1/vidix/sis_vid.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_alsa.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_alsa.so
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_video.a
-lib/xine/plugins/1.0.1/xineplug_decode_dxr3_video.so
-lib/xine/plugins/1.0.1/xineplug_inp_pvr.a
-lib/xine/plugins/1.0.1/xineplug_inp_pvr.so
-lib/xine/plugins/1.0.1/xineplug_inp_v4l.a
-lib/xine/plugins/1.0.1/xineplug_inp_v4l.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_dxr3.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_dxr3.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_fb.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_fb.so
-lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.0.1/xineplug_vo_out_vidix.so
+@comment $NetBSD: PLIST.Linux,v 1.4 2005/05/10 00:16:42 reed Exp $
+lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/cyberblade_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mach64_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mga_crtc2_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/mga_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/pm2_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/pm3_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/radeon_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/rage128_vid.so
+lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.a
+lib/xine/plugins/${PKGVERSION}/vidix/sis_vid.so
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_alsa.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_alsa.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_spu.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_spu.so
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_video.a
+lib/xine/plugins/${PKGVERSION}/xineplug_decode_dxr3_video.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_pvr.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_pvr.so
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_v4l.a
+lib/xine/plugins/${PKGVERSION}/xineplug_inp_v4l.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_dxr3.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_dxr3.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_fb.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_fb.so
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.a
+lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_vidix.so
diff -r fe13d0a253af -r 49cbd28c3128 multimedia/xine-lib/PLIST.NetBSD
--- a/multimedia/xine-lib/PLIST.NetBSD  Tue May 10 00:12:18 2005 +0000
+++ b/multimedia/xine-lib/PLIST.NetBSD  Tue May 10 00:16:42 2005 +0000
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2005/05/02 11:29:35 drochner Exp $
-lib/xine/plugins/1.0.1/xineplug_ao_out_sun.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_sun.so
-${HAVE_XV}lib/xine/plugins/1.0.1/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/1.0.1/xineplug_vo_out_xv.so
+@comment $NetBSD: PLIST.NetBSD,v 1.4 2005/05/10 00:16:42 reed Exp $
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.a
+lib/xine/plugins/${PKGVERSION}/xineplug_ao_out_sun.so
diff -r fe13d0a253af -r 49cbd28c3128 multimedia/xine-lib/PLIST.common
--- a/multimedia/xine-lib/PLIST.common  Tue May 10 00:12:18 2005 +0000
+++ b/multimedia/xine-lib/PLIST.common  Tue May 10 00:16:42 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2005/05/02 11:29:35 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2005/05/10 00:16:42 reed Exp $
 bin/xine-config
 include/xine.h
 include/xine/attributes.h
@@ -34,166 +34,164 @@
 include/xine/xmlparser.h
 lib/libxine.la
 lib/pkgconfig/libxine.pc
-lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.a
-lib/xine/plugins/1.0.1/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.0.1/post/xineplug_post_goom.a
-lib/xine/plugins/1.0.1/post/xineplug_post_goom.so
-lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.a
-lib/xine/plugins/1.0.1/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.0.1/post/xineplug_post_planar.a
-lib/xine/plugins/1.0.1/post/xineplug_post_planar.so
-lib/xine/plugins/1.0.1/post/xineplug_post_switch.a
-lib/xine/plugins/1.0.1/post/xineplug_post_switch.so
-lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/1.0.1/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.a
-lib/xine/plugins/1.0.1/post/xineplug_post_visualizations.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_file.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_file.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_none.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_none.so
-lib/xine/plugins/1.0.1/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.1/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.1/xineplug_decode_a52.a
-lib/xine/plugins/1.0.1/xineplug_decode_a52.so
-lib/xine/plugins/1.0.1/xineplug_decode_bitplane.a
-lib/xine/plugins/1.0.1/xineplug_decode_bitplane.so
-lib/xine/plugins/1.0.1/xineplug_decode_dts.a
-lib/xine/plugins/1.0.1/xineplug_decode_dts.so
-lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.a
-lib/xine/plugins/1.0.1/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.0.1/xineplug_decode_faad.a
-lib/xine/plugins/1.0.1/xineplug_decode_faad.so
-lib/xine/plugins/1.0.1/xineplug_decode_ff.a
-lib/xine/plugins/1.0.1/xineplug_decode_ff.so
-lib/xine/plugins/1.0.1/xineplug_decode_gsm610.a
-lib/xine/plugins/1.0.1/xineplug_decode_gsm610.so
-lib/xine/plugins/1.0.1/xineplug_decode_image.a
-lib/xine/plugins/1.0.1/xineplug_decode_image.so
-lib/xine/plugins/1.0.1/xineplug_decode_lpcm.a
-lib/xine/plugins/1.0.1/xineplug_decode_lpcm.so
-lib/xine/plugins/1.0.1/xineplug_decode_mad.a
-lib/xine/plugins/1.0.1/xineplug_decode_mad.so
-lib/xine/plugins/1.0.1/xineplug_decode_mpc.a
-lib/xine/plugins/1.0.1/xineplug_decode_mpc.so
-lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.a
-lib/xine/plugins/1.0.1/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.0.1/xineplug_decode_nsf.a
-lib/xine/plugins/1.0.1/xineplug_decode_nsf.so
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_qt.a
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_qt.so
-lib/xine/plugins/1.0.1/xineplug_decode_real.a
-lib/xine/plugins/1.0.1/xineplug_decode_real.so
-lib/xine/plugins/1.0.1/xineplug_decode_real_audio.a
-lib/xine/plugins/1.0.1/xineplug_decode_real_audio.so
-lib/xine/plugins/1.0.1/xineplug_decode_rgb.a
-lib/xine/plugins/1.0.1/xineplug_decode_rgb.so
-lib/xine/plugins/1.0.1/xineplug_decode_speex.a
-lib/xine/plugins/1.0.1/xineplug_decode_speex.so
-lib/xine/plugins/1.0.1/xineplug_decode_spu.a
-lib/xine/plugins/1.0.1/xineplug_decode_spu.so
-lib/xine/plugins/1.0.1/xineplug_decode_spucc.a
-lib/xine/plugins/1.0.1/xineplug_decode_spucc.so
-lib/xine/plugins/1.0.1/xineplug_decode_spucmml.a
-lib/xine/plugins/1.0.1/xineplug_decode_spucmml.so
-lib/xine/plugins/1.0.1/xineplug_decode_spudvb.a
-lib/xine/plugins/1.0.1/xineplug_decode_spudvb.so
-lib/xine/plugins/1.0.1/xineplug_decode_sputext.a
-lib/xine/plugins/1.0.1/xineplug_decode_sputext.so
-lib/xine/plugins/1.0.1/xineplug_decode_vorbis.a
-lib/xine/plugins/1.0.1/xineplug_decode_vorbis.so
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_w32dll.a
-${I386}lib/xine/plugins/1.0.1/xineplug_decode_w32dll.so
-lib/xine/plugins/1.0.1/xineplug_decode_yuv.a
-lib/xine/plugins/1.0.1/xineplug_decode_yuv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_asf.a
-lib/xine/plugins/1.0.1/xineplug_dmx_asf.so
-lib/xine/plugins/1.0.1/xineplug_dmx_audio.a
-lib/xine/plugins/1.0.1/xineplug_dmx_audio.so
-lib/xine/plugins/1.0.1/xineplug_dmx_avi.a
-lib/xine/plugins/1.0.1/xineplug_dmx_avi.so
-lib/xine/plugins/1.0.1/xineplug_dmx_fli.a
-lib/xine/plugins/1.0.1/xineplug_dmx_fli.so
-lib/xine/plugins/1.0.1/xineplug_dmx_flv.a
-lib/xine/plugins/1.0.1/xineplug_dmx_flv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_games.a
-lib/xine/plugins/1.0.1/xineplug_dmx_games.so
-lib/xine/plugins/1.0.1/xineplug_dmx_iff.a
-lib/xine/plugins/1.0.1/xineplug_dmx_iff.so
-lib/xine/plugins/1.0.1/xineplug_dmx_image.a
-lib/xine/plugins/1.0.1/xineplug_dmx_image.so
-lib/xine/plugins/1.0.1/xineplug_dmx_matroska.a
-lib/xine/plugins/1.0.1/xineplug_dmx_matroska.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mng.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mng.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/1.0.1/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.0.1/xineplug_dmx_nsv.a
-lib/xine/plugins/1.0.1/xineplug_dmx_nsv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_ogg.a
-lib/xine/plugins/1.0.1/xineplug_dmx_ogg.so
-lib/xine/plugins/1.0.1/xineplug_dmx_pva.a
-lib/xine/plugins/1.0.1/xineplug_dmx_pva.so
-lib/xine/plugins/1.0.1/xineplug_dmx_qt.a
-lib/xine/plugins/1.0.1/xineplug_dmx_qt.so
-lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.a
-lib/xine/plugins/1.0.1/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.0.1/xineplug_dmx_real.a
-lib/xine/plugins/1.0.1/xineplug_dmx_real.so
-lib/xine/plugins/1.0.1/xineplug_dmx_slave.a
-lib/xine/plugins/1.0.1/xineplug_dmx_slave.so
-lib/xine/plugins/1.0.1/xineplug_dmx_sputext.a
-lib/xine/plugins/1.0.1/xineplug_dmx_sputext.so
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/1.0.1/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.0.1/xineplug_flac.a
-lib/xine/plugins/1.0.1/xineplug_flac.so
-lib/xine/plugins/1.0.1/xineplug_inp_cdda.a
-lib/xine/plugins/1.0.1/xineplug_inp_cdda.so
-lib/xine/plugins/1.0.1/xineplug_inp_dvb.a
-lib/xine/plugins/1.0.1/xineplug_inp_dvb.so
-lib/xine/plugins/1.0.1/xineplug_inp_dvd.a
-lib/xine/plugins/1.0.1/xineplug_inp_dvd.so
-lib/xine/plugins/1.0.1/xineplug_inp_file.a
-lib/xine/plugins/1.0.1/xineplug_inp_file.so
-lib/xine/plugins/1.0.1/xineplug_inp_http.a
-lib/xine/plugins/1.0.1/xineplug_inp_http.so
-lib/xine/plugins/1.0.1/xineplug_inp_mms.a
-lib/xine/plugins/1.0.1/xineplug_inp_mms.so
-lib/xine/plugins/1.0.1/xineplug_inp_net.a
-lib/xine/plugins/1.0.1/xineplug_inp_net.so
-lib/xine/plugins/1.0.1/xineplug_inp_pnm.a
-lib/xine/plugins/1.0.1/xineplug_inp_pnm.so
-lib/xine/plugins/1.0.1/xineplug_inp_rtp.a
-lib/xine/plugins/1.0.1/xineplug_inp_rtp.so
-lib/xine/plugins/1.0.1/xineplug_inp_rtsp.a
-lib/xine/plugins/1.0.1/xineplug_inp_rtsp.so
-lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/1.0.1/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.0.1/xineplug_inp_vcd.a



Home | Main Index | Thread Index | Old Index