How about this one? This should fix the iconv errors. Please test.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- Makefile 6 Apr 2006 21:47:43 -0000 1.98
+++ Makefile 6 Jul 2006 18:44:55 -0000
@@ -5,9 +5,9 @@
COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV &
more"
-DISTNAME= MPlayer-1.0pre7
+DISTNAME= MPlayer-1.0pre8
DIST_SUBDIR= mplayer
-PKGNAME= ${DISTNAME:L}p15
+PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@@ -18,11 +18,13 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m ogg pthread stdc++ termcap util z
+WANTLIB= c m ncurses ogg pthread stdc++ util z
+
+MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
+ http://www2.mplayerhq.hu/MPlayer/releases/ \
+ http://www.mplayerhq.hu/MPlayer/releases/ \
+ http://ftp.lug.udel.edu/MPlayer/releases/
-MASTER_SITES= http://www2.mplayerhq.hu/MPlayer/releases/
-MASTER_SITES+= http://www.mplayerhq.hu/MPlayer/releases/
-MASTER_SITES+= http://ftp.lug.udel.edu/MPlayer/releases/
# The skins tarball changes on a daily basis so it is mirrored
# locally, do NOT change this.
#MASTER_SITES0= http://www2.mplayerhq.hu/MPlayer/Skin/
@@ -42,7 +44,10 @@
jpeg::graphics/jpeg \
ungif::graphics/libungif \
cdda_paranoia,cdda_interface:cdparanoia->=3.a9.8:audio/cdparanoia \
- theora::multimedia/libtheora
+ theora::multimedia/libtheora \
+ speex::audio/speex \
+ fribidi::devel/fribidi \
+ mpcdec::audio/libmpcdec
CONFDIR= ${SYSCONFDIR}/mplayer
SUBST_VARS= CONFDIR
@@ -54,7 +59,8 @@
--disable-nas \
--disable-liblzo \
--disable-caca \
- --disable-vidix \
+ --disable-internal-vidix \
+ --disable-external-vidix \
--disable-xvid \
--disable-libdv \
--disable-smb \
@@ -66,7 +72,9 @@
--enable-cdparanoia \
--with-extraincdir=${LOCALBASE}/include/libpng:${LOCALBASE}/include \
--with-extralibdir=${LOCALBASE}/lib \
- --confdir=${CONFDIR}
+ --confdir=${CONFDIR} \
+ --charset=noconv
+
CONFIGURE_ENV+= TMPDIR="${WRKBUILD}"
.if ${MACHINE_ARCH:Mi386}
@@ -117,11 +125,14 @@
CONFIGURE_ARGS+=--enable-gui \
--enable-gl
USE_X11= Yes
-LIB_DEPENDS+= gtk,gdk::x11/gtk+ \
- mp3lame:lame-*:audio/lame
+LIB_DEPENDS+= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
+ mp3lame:lame-*:audio/lame \
+ cairo::graphics/cairo
BUILD_DEPENDS+= :pkgconfig->=0.15.0p0:devel/pkgconfig
-WANTLIB+= GL X11 Xext Xi Xinerama Xv Xxf86dga Xxf86vm glib gmodule intl
-WANTLIB+= freetype fontconfig
+WANTLIB+= GL X11 Xext Xinerama Xv Xxf86dga Xxf86vm atk-1.0.0.0 \
+ freetype fontconfig glib-2.0.0.0 gmodule-2.0.0.0 \
+ gobject-2.0.0.0 intl pango-1.0.0.0 pangocairo-1.0.0.0 \
+ pangoft2-1.0.0.0
.endif
.if ${FLAVOR:L:Msdl}
@@ -177,8 +188,8 @@
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplayer
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mplayer
- ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/Skin/${SKIN}
- ${INSTALL_DATA} ${WRKDIR}/${SKIN}/* ${PREFIX}/share/mplayer/Skin/${SKIN}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/skins/${SKIN}
+ ${INSTALL_DATA} ${WRKDIR}/${SKIN}/*
${PREFIX}/share/mplayer/skins/${SKIN}
cd ${WRKDIST}/etc; ${INSTALL_DATA} input.conf menu.conf codecs.conf \
${PREFIX}/share/examples/mplayer
${INSTALL_DATA} ${WRKDIST}/etc/example.conf \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.25
diff -u -r1.25 distinfo
--- distinfo 9 May 2005 12:24:38 -0000 1.25
+++ distinfo 6 Jul 2006 18:44:55 -0000
@@ -1,8 +1,8 @@
-MD5 (mplayer/MPlayer-1.0pre7.tar.bz2) = 5fadd6957d3aab989cd760ff38fb8fdf
+MD5 (mplayer/MPlayer-1.0pre8.tar.bz2) = f82bb2bc51b6cd5e5dd96f88f6f98582
MD5 (mplayer/default-1.7.tar.bz2) = 7e1d16c2f8a32469f4354cb043eecc5d
-RMD160 (mplayer/MPlayer-1.0pre7.tar.bz2) =
a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
+RMD160 (mplayer/MPlayer-1.0pre8.tar.bz2) =
23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
RMD160 (mplayer/default-1.7.tar.bz2) = 5f78ff9db296d8fd53ef6603ec8a227eeb602dd1
-SHA1 (mplayer/MPlayer-1.0pre7.tar.bz2) =
df1e8d4f2f44d72c6f7989932f3b272e815ecb80
+SHA1 (mplayer/MPlayer-1.0pre8.tar.bz2) =
8a0929b84dcb37d47c062230ce693b64b3e30921
SHA1 (mplayer/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
-SIZE (mplayer/MPlayer-1.0pre7.tar.bz2) = 6868877
+SIZE (mplayer/MPlayer-1.0pre8.tar.bz2) = 8166628
SIZE (mplayer/default-1.7.tar.bz2) = 173439
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.11
diff -u -r1.11 patch-Makefile
--- patches/patch-Makefile 9 May 2005 12:24:38 -0000 1.11
+++ patches/patch-Makefile 6 Jul 2006 18:44:55 -0000
@@ -1,21 +1,21 @@
-$OpenBSD: patch-Makefile,v 1.11 2005/05/09 12:24:38 biorn Exp $
---- Makefile.orig Sat Apr 16 22:18:12 2005
-+++ Makefile Wed Apr 20 06:35:54 2005
-@@ -259,7 +259,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
+$OpenBSD$
+--- Makefile.orig Sun Jun 11 20:35:47 2006
++++ Makefile Thu Jul 6 00:08:11 2006
+@@ -426,7 +426,7 @@ LIBS_MENCODER = libmpcodecs/libmpencoder
+ $(LIBC_LIB) \
- ifeq ($(MENCODER),yes)
$(PRG_MENCODER): $(MENCODER_DEP)
-- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER)
libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB)
$(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+ $(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER)
libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB)
$(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
+- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)
++ $(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)
endif
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
-@@ -325,8 +325,6 @@ ifeq ($(GUI),yes)
- @if test ! -d $(prefix)/share/applications ; then mkdir -p
$(prefix)/share/applications ; fi
+@@ -485,8 +485,6 @@ ifeq ($(GUI),yes)
+ @$(INSTALL) -d $(prefix)/share/applications
$(INSTALL) -m 644 etc/mplayer.desktop
$(prefix)/share/applications/mplayer.desktop
endif
-- @if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
+- @$(INSTALL) -d $(CONFDIR)
- @if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf
$(CONFDIR)/codecs.conf.old ; fi
- ifeq ($(DVDKIT_SHARED),yes)
- ifeq ($(DVDKIT2),yes)
- if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
+
+ uninstall:
+ -rm -f $(BINDIR)/$(PRG) $(BINDIR)/gmplayer $(MANDIR)/man1/mplayer.1
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.37
diff -u -r1.37 patch-configure
--- patches/patch-configure 17 Jan 2006 07:41:58 -0000 1.37
+++ patches/patch-configure 6 Jul 2006 18:44:55 -0000
@@ -1,43 +1,8 @@
-$OpenBSD: patch-configure,v 1.37 2006/01/17 07:41:58 jakemsr Exp $
---- configure.orig Wed Apr 13 04:46:35 2005
-+++ configure Sun Dec 25 17:31:12 2005
-@@ -475,6 +475,9 @@ if test -z "$_target" ; then
- if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
- -z "`echo $CFLAGS | grep -- -m32`" ]; then
- host_arch=x86_64
-+ elif [ "`$_cc -dumpmachine | grep amd64 | cut -d- -f1`" = "amd64" -a \
-+ -z "`echo $CFLAGS | grep -- -m32`" ]; then
-+ host_arch=x86_64
- else
- host_arch=i386
- fi
-@@ -484,7 +487,7 @@ if test -z "$_target" ; then
- sparc) host_arch=sparc ;;
- sparc64) host_arch=sparc64 ;;
- parisc*|hppa*|9000*) host_arch=hppa ;;
-- arm*) host_arch=arm ;;
-+ zaurus|cats) host_arch=arm ;;
- s390) host_arch=s390 ;;
- s390x) host_arch=s390x ;;
- mips) host_arch=mips ;;
-@@ -710,10 +713,15 @@ fi
-
- x86_exts_check()
- {
-+ case $host_arch in
-+ x86_64) pparam="3dnow 3dnowext mmx mmxext xmm sse2"
-+ ;;
-+ *)
- pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | _head 1`
- if test -z "$pparam" ; then
- pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | _head 1`
- fi
-+ esac
-
- _mmx=no
- _3dnow=no
-@@ -2195,7 +2203,7 @@ fi
-
+$OpenBSD$
+--- configure.orig Sun Jun 11 20:35:47 2006
++++ configure Thu Jul 6 00:09:49 2006
+@@ -2970,7 +2970,7 @@ fi
+ echores "$_rpath"
echocheck "iconv"
-if test "$_iconv" = auto ; then
@@ -45,7 +10,7 @@
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
-@@ -3789,6 +3797,8 @@ if test "$_aa" = yes ; then
+@@ -4137,6 +4137,8 @@ if test "$_aa" = yes ; then
_def_aa='#define HAVE_AA 1'
if cygwin ; then
_ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
@@ -54,7 +19,7 @@
fi
_vosrc="$_vosrc vo_aa.c"
_vomodules="aa $_vomodules"
-@@ -4730,7 +4740,7 @@ echores "$_sgiaudio"
+@@ -5089,7 +5091,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@@ -62,20 +27,8 @@
+if linux || bsdos || freebsd || netbsd || sunos || darwin || openbsd ; then
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
- echores "ok"
-@@ -5323,7 +5333,10 @@ _inc_faad="-I`pwd`/libfaad2"
- if test "$_faad_internal" = auto ; then
- # the faad check needs a config.h file
- if not test -f "config.h" ; then
-- > config.h
-+ cat > config.h << EOF
-+/* C99 lrintf function available */
-+$_def_lrintf
-+EOF
- fi
- # internal faad: check if our dear gcc is able to compile it...
- cp "`pwd`/libfaad2/cfft.c" $TMPC
-@@ -6115,7 +6128,7 @@ if test "$_tv_bsdbt848" = auto ; then
+ _vcd="yes"
+@@ -6723,7 +6725,7 @@ if test "$_tv_bsdbt848" = auto ; then
if test "$_tv" = yes ; then
cat > $TMPC <<EOF
#include <sys/types.h>
@@ -84,7 +37,16 @@
#include <dev/ic/bt8xx.h>
#else
#include <machine/ioctl_bt848.h>
-@@ -6775,7 +6788,7 @@ CACA_LIB = $_ld_caca
+@@ -7105,7 +7107,7 @@ elif test -z "$_charset" ; then
+ if test "$_gtk1" = yes ; then
+ _charset=`cat ${_mp_help}.charset`
+ else
+- _charset="UTF-8"
++ _charset="646"
+ fi
+ fi
+ if test "$_charset" ; then
+@@ -7453,7 +7455,7 @@ CACA_LIB = $_ld_caca
# audio output
ALSA_LIB = $_ld_alsa
NAS_LIB = $_ld_nas
@@ -93,12 +55,12 @@
ARTS_INC = $_inc_arts
ESD_LIB = $_ld_esd
ESD_INC = $_inc_esd
-@@ -7041,7 +7054,7 @@ $_def_malloc
+@@ -7764,7 +7766,7 @@ $_def_malloc
$_def_memalign
#ifndef HAVE_MEMALIGN
# define memalign(a,b) malloc(b)
-#define MEMALIGN_HACK 1
-+/* #define MEMALIGN_HACK 1 */
++/* #undef MEMALIGN_HACK 1 */
#endif
/* Define this if your system has the "alloca.h" header file */
Index: patches/patch-libaf_af_c
===================================================================
RCS file: patches/patch-libaf_af_c
diff -N patches/patch-libaf_af_c
--- patches/patch-libaf_af_c 4 Sep 2005 23:51:52 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-$OpenBSD: patch-libaf_af_c,v 1.2 2005/09/04 23:51:52 espie Exp $
---- libaf/af.c.orig Sat Aug 27 13:31:21 2005
-+++ libaf/af.c Sun Sep 4 00:17:07 2005
-@@ -370,7 +370,8 @@ int af_init(af_stream_t* s, int force_ou
-
- // If force_output isn't set do not compensate for output format
- if(!force_output){
-- memcpy(&s->output, s->last->data, sizeof(af_data_t));
-+ if (s->last)
-+ memcpy(&s->output, s->last->data, sizeof(af_data_t));
- return 0;
- }
-
-@@ -378,7 +379,7 @@ int af_init(af_stream_t* s, int force_ou
- if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
- af_instance_t* af = NULL; // New filter
- // Check output frequency if not OK fix with resample
-- if(s->last->data->rate!=s->output.rate){
-+ if(!s->last || s->last->data->rate!=s->output.rate){
- // try to find a filter that can change samplrate
- af = af_control_any_rev(s, AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET,
- &(s->output.rate));
-@@ -395,7 +396,7 @@ int af_init(af_stream_t* s, int force_ou
- af = af_prepend(s,s->first,resampler);
- }
- else{
-- if(!strcmp(s->last->info->name,"format"))
-+ if(s->last && !strcmp(s->last->info->name,"format"))
- af = af_prepend(s,s->last,resampler);
- else
- af = af_append(s,s->last,resampler);
-@@ -423,8 +424,8 @@ int af_init(af_stream_t* s, int force_ou
-
- // Check number of output channels fix if not OK
- // If needed always inserted last -> easy to screw up other filters
-- if(s->last->data->nch!=s->output.nch){
-- if(!strcmp(s->last->info->name,"format"))
-+ if(!s->last || s->last->data->nch!=s->output.nch){
-+ if(s->last && !strcmp(s->last->info->name,"format"))
- af = af_prepend(s,s->last,"channels");
- else
- af = af_append(s,s->last,"channels");
-@@ -436,8 +437,8 @@ int af_init(af_stream_t* s, int force_ou
- }
-
- // Check output format fix if not OK
-- if(s->last->data->format != s->output.format){
-- if(strcmp(s->last->info->name,"format"))
-+ if(!s->last || s->last->data->format != s->output.format){
-+ if(!s->last || strcmp(s->last->info->name,"format"))
- af = af_append(s,s->last,"format");
- else
- af = s->last;
Index: patches/patch-libao2_ao_sun_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libao2_ao_sun_c,v
retrieving revision 1.1
diff -u -r1.1 patch-libao2_ao_sun_c
--- patches/patch-libao2_ao_sun_c 22 Jan 2006 06:28:25 -0000 1.1
+++ patches/patch-libao2_ao_sun_c 6 Jul 2006 18:44:55 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-libao2_ao_sun_c,v 1.1 2006/01/22 06:28:25 biorn Exp $
---- libao2/ao_sun.c.orig Thu Jan 6 23:56:54 2005
-+++ libao2/ao_sun.c Thu Jan 19 18:00:16 2006
-@@ -66,7 +66,57 @@ static enum {
+--- libao2/ao_sun.c.orig Sun Jun 11 20:35:42 2006
++++ libao2/ao_sun.c Thu Jul 6 00:08:11 2006
+@@ -65,7 +65,57 @@ static enum {
+ } enable_sample_timing;
- extern int verbose;
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+int sun_mixer_get_dev(int fd, int *dev, char *id)
@@ -59,7 +59,7 @@
// convert an OSS audio format specification into a sun audio encoding
static int af2sunfmt(int format)
{
-@@ -366,13 +416,21 @@ static void setup_device_paths()
+@@ -365,13 +415,21 @@ static void setup_device_paths()
audio_dev = "/dev/audio";
}
@@ -81,7 +81,7 @@
if (ao_subdevice) audio_dev = ao_subdevice;
}
-@@ -396,6 +454,14 @@ static int control(int cmd,void *arg){
+@@ -395,6 +453,14 @@ static int control(int cmd,void *arg){
if ( fd != -1 )
{
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
@@ -96,7 +96,7 @@
float volume;
struct audio_info info;
ioctl( fd,AUDIO_GETINFO,&info);
-@@ -410,9 +476,11 @@ static int control(int cmd,void *arg){
+@@ -409,9 +475,11 @@ static int control(int cmd,void *arg){
/ AUDIO_MID_BALANCE;
vol->right = volume;
}
@@ -109,7 +109,7 @@
return CONTROL_ERROR;
}
case AOCONTROL_SET_VOLUME:
-@@ -423,10 +491,18 @@ static int control(int cmd,void *arg){
+@@ -422,10 +490,18 @@ static int control(int cmd,void *arg){
if ( !sun_mixer_device ) /* control function is used before init? */
setup_device_paths();
@@ -129,7 +129,7 @@
float volume;
AUDIO_INITINFO(&info);
volume = vol->right > vol->left ? vol->right : vol->left;
-@@ -441,9 +517,11 @@ static int control(int cmd,void *arg){
+@@ -440,9 +516,11 @@ static int control(int cmd,void *arg){
info.output_muted = (volume == 0);
#endif
ioctl( fd,AUDIO_SETINFO,&info );
Index: patches/patch-libavcodec_bitstream_h
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libavcodec_bitstream_h,v
retrieving revision 1.1
diff -u -r1.1 patch-libavcodec_bitstream_h
--- patches/patch-libavcodec_bitstream_h 1 Oct 2005 13:40:35 -0000
1.1
+++ patches/patch-libavcodec_bitstream_h 6 Jul 2006 18:44:55 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-libavcodec_bitstream_h,v 1.1 2005/10/01 13:40:35 espie Exp $
---- libavcodec/bitstream.h.orig Sat Oct 1 14:36:49 2005
-+++ libavcodec/bitstream.h Sat Oct 1 14:36:58 2005
-@@ -360,7 +360,7 @@ for examples see get_bits, show_bits, sk
+$OpenBSD$
+--- libavcodec/bitstream.h.orig Sun Jun 11 20:35:48 2006
++++ libavcodec/bitstream.h Thu Jul 6 00:08:11 2006
+@@ -374,7 +374,7 @@ for examples see get_bits, show_bits, sk
static inline int unaligned32_be(const void *v)
{
-#ifdef CONFIG_ALIGN
+#if 1
- const uint8_t *p=v;
- return (((p[0]<<8) | p[1])<<16) | (p[2]<<8) | (p[3]);
+ const uint8_t *p=v;
+ return (((p[0]<<8) | p[1])<<16) | (p[2]<<8) | (p[3]);
#else
Index: patches/patch-libavcodec_wmv2_c
===================================================================
RCS file: patches/patch-libavcodec_wmv2_c
diff -N patches/patch-libavcodec_wmv2_c
--- patches/patch-libavcodec_wmv2_c 8 Sep 2005 16:35:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libavcodec_wmv2_c,v 1.1 2005/09/08 16:35:01 fgsch Exp $
---- libavcodec/wmv2.c.orig Sat Apr 16 17:41:13 2005
-+++ libavcodec/wmv2.c Wed Sep 7 17:00:16 2005
-@@ -513,9 +513,12 @@ static int16_t *wmv2_pred_motion(Wmv2Con
- B = s->current_picture.motion_val[0][xy - wrap];
- C = s->current_picture.motion_val[0][xy + 2 - wrap];
-
-- diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1]));
-+ if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag)
-+ diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1]));
-+ else
-+ diff=0;
-
-- if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag &&
diff >= 8)
-+ if(diff >= 8)
- type= get_bits1(&s->gb);
- else
- type= 2;
Index: patches/patch-libfaad2_common_h
===================================================================
RCS file: patches/patch-libfaad2_common_h
diff -N patches/patch-libfaad2_common_h
--- patches/patch-libfaad2_common_h 23 Nov 2005 00:05:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libfaad2_common_h,v 1.1 2005/11/23 00:05:39 biorn Exp $
---- libfaad2/common.h.orig Tue Nov 22 22:00:39 2005
-+++ libfaad2/common.h Tue Nov 22 22:12:29 2005
-@@ -341,7 +341,7 @@ char *strchr(), *strrchr();
- }
- return i;
- }
-- #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
-+ #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) &&
!defined(HAVE_LRINTF)
- #define HAS_LRINTF
- // from http://www.stereopsis.com/FPU.html
- static INLINE int lrintf(float f)
Index: patches/patch-libmpcodecs_Makefile
===================================================================
RCS file: patches/patch-libmpcodecs_Makefile
diff -N patches/patch-libmpcodecs_Makefile
--- patches/patch-libmpcodecs_Makefile 11 Jun 2005 14:03:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpcodecs_Makefile,v 1.1 2005/06/11 14:03:17 espie Exp $
---- libmpcodecs/Makefile.orig Sat Jun 11 15:56:18 2005
-+++ libmpcodecs/Makefile Sat Jun 11 15:56:29 2005
-@@ -50,7 +50,7 @@ OBJS=$(SRCS:.c=.o)
- SRCS2=$(ENCODER_SRCS)
- OBJS2=$(SRCS2:.c=.o)
-
--CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader
$(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-+CFLAGS = -I.. $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader
$(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-
- .SUFFIXES: .c .o
-
Index: patches/patch-libmpcodecs_ad_pcm_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpcodecs_ad_pcm_c,v
retrieving revision 1.2
diff -u -r1.2 patch-libmpcodecs_ad_pcm_c
--- patches/patch-libmpcodecs_ad_pcm_c 16 Oct 2005 21:29:30 -0000 1.2
+++ patches/patch-libmpcodecs_ad_pcm_c 6 Jul 2006 18:44:55 -0000
@@ -1,23 +1,12 @@
-$OpenBSD: patch-libmpcodecs_ad_pcm_c,v 1.2 2005/10/16 21:29:30 espie Exp $
---- libmpcodecs/ad_pcm.c.orig Sun Feb 27 00:02:09 2005
-+++ libmpcodecs/ad_pcm.c Sun Oct 16 23:23:48 2005
+$OpenBSD$
+--- libmpcodecs/ad_pcm.c.orig Sun Jun 11 20:35:41 2006
++++ libmpcodecs/ad_pcm.c Thu Jul 6 00:08:11 2006
@@ -20,6 +20,8 @@ LIBAD_EXTERN(pcm)
static int init(sh_audio_t *sh_audio)
{
WAVEFORMATEX *h=sh_audio->wf;
+ if (!h)
-+ return 0;
++ return 0;
sh_audio->i_bps=h->nAvgBytesPerSec;
sh_audio->channels=h->nChannels;
sh_audio->samplerate=h->nSamplesPerSec;
-@@ -96,8 +98,8 @@ static int control(sh_audio_t *sh,int cm
-
- static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int
minlen,int maxlen)
- {
-- int len=sh_audio->channels*sh_audio->samplesize-1;
-- len=(minlen+len)&(~len); // sample align
-+ unsigned len = sh_audio->channels*sh_audio->samplesize;
-+ len = maxlen - maxlen % len; // sample align
- len=demux_read_data(sh_audio->ds,buf,len);
- return len;
- }
Index: patches/patch-libmpdemux_Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpdemux_Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-libmpdemux_Makefile
--- patches/patch-libmpdemux_Makefile 11 Jun 2005 14:03:17 -0000 1.2
+++ patches/patch-libmpdemux_Makefile 6 Jul 2006 18:44:55 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-libmpdemux_Makefile,v 1.2 2005/06/11 14:03:17 espie Exp $
---- libmpdemux/Makefile.orig Sat Jun 11 15:41:01 2005
-+++ libmpdemux/Makefile Sat Jun 11 15:41:10 2005
-@@ -37,7 +37,7 @@ endif
+$OpenBSD$
+--- libmpdemux/Makefile.orig Sun Jun 11 20:35:46 2006
++++ libmpdemux/Makefile Thu Jul 6 00:08:12 2006
+@@ -157,7 +157,7 @@ endif
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
-CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC)
$(DVB_INC)
- CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)
+ CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
CPLUSPLUS = $(CC)
Index: patches/patch-libmpdemux_asfheader_c
===================================================================
RCS file: patches/patch-libmpdemux_asfheader_c
diff -N patches/patch-libmpdemux_asfheader_c
--- patches/patch-libmpdemux_asfheader_c 6 Apr 2006 21:47:43 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-libmpdemux_asfheader_c,v 1.1 2006/04/06 21:47:43 biorn Exp $
---- libmpdemux/asfheader.c.orig Sat Dec 25 12:31:32 2004
-+++ libmpdemux/asfheader.c Thu Apr 6 20:30:42 2006
-@@ -189,7 +189,7 @@ int read_asf_header(demuxer_t *demuxer){
- while ((pos = find_asf_guid(hdr, asf_stream_header_guid, pos, hdr_len)) >=
0)
- {
- ASF_stream_header_t *streamh = (ASF_stream_header_t *)&hdr[pos];
-- char *buffer;
-+ uint8_t *buffer;
- pos += sizeof(ASF_stream_header_t);
- if (pos > hdr_len) goto len_err_out;
- le2me_ASF_stream_header_t(streamh);
-@@ -222,7 +222,9 @@ int read_asf_header(demuxer_t *demuxer){
- asf_scrambling_h=buffer[0];
- asf_scrambling_w=(buffer[2]<<8)|buffer[1];
- asf_scrambling_b=(buffer[4]<<8)|buffer[3];
-- asf_scrambling_w/=asf_scrambling_b;
-+ if(asf_scrambling_b>0){
-+ asf_scrambling_w/=asf_scrambling_b;
-+ }
- } else {
- asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1;
- }
Index: patches/patch-libmpdemux_aviheader_c
===================================================================
RCS file: patches/patch-libmpdemux_aviheader_c
diff -N patches/patch-libmpdemux_aviheader_c
--- patches/patch-libmpdemux_aviheader_c 6 Apr 2006 21:47:43 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-libmpdemux_aviheader_c,v 1.1 2006/04/06 21:47:43 biorn Exp $
---- libmpdemux/aviheader.c.orig Thu Apr 6 20:46:29 2006
-+++ libmpdemux/aviheader.c Thu Apr 6 20:50:41 2006
-@@ -224,11 +224,13 @@ while(1){
-
- print_avisuperindex_chunk(s);
-
-- msize = sizeof (uint32_t) * s->wLongsPerEntry * s->nEntriesInUse;
-- s->aIndex = malloc(msize);
-- memset (s->aIndex, 0, msize);
-- s->stdidx = malloc (s->nEntriesInUse * sizeof (avistdindex_chunk));
-- memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk));
-+ //// Check and fix this useless crap
-+ if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
-+ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size:
%u\n",s->wLongsPerEntry);
-+ s->wLongsPerEntry = sizeof(avisuperindex_entry)/4;
-+ }
-+ s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry));
-+ s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk));
-
- // now the real index of indices
- for (i=0; i<s->nEntriesInUse; i++) {
Index: patches/patch-libmpdemux_demux_mov_c
===================================================================
RCS file: patches/patch-libmpdemux_demux_mov_c
diff -N patches/patch-libmpdemux_demux_mov_c
--- patches/patch-libmpdemux_demux_mov_c 22 Jan 2006 06:28:25 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_mov_c,v 1.1 2006/01/22 06:28:25 biorn Exp $
---- libmpdemux/demux_mov.c.orig Thu Mar 31 00:10:07 2005
-+++ libmpdemux/demux_mov.c Wed Jan 18 22:05:11 2006
-@@ -865,6 +865,7 @@ static void lschunks(demuxer_t* demuxer,
- // ([int32_t size,int32_t type,some data ],repeat)
- } my_stdata;
- #endif
-+ int version, adjust;
- sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
- sh->format=trak->fourcc;
-
-@@ -911,8 +912,27 @@ static void lschunks(demuxer_t* demuxer,
- // 32 char[4] atom type (fourc charater code -> esds)
- // 36 char[] atom data (len=size-8)
-
-+ version=char2short(trak->stdata,8);
-+ if (version > 1)
-+ mp_msg(MSGT_DEMUX, MSGL_WARN, "MOV: version %d sound atom may
not parse correctly!\n", version);
- trak->samplebytes=sh->samplesize=char2short(trak->stdata,18)/8;
-- trak->nchannels=sh->channels=char2short(trak->stdata,16);
-+
-+ /* I can't find documentation, but so far this is the case.
-Corey */
-+ switch (char2short(trak->stdata,16)) {
-+ case 1:
-+ trak->nchannels = 1; break;
-+ case 2:
-+ trak->nchannels = 2; break;
-+ case 3:
-+ trak->nchannels = 6; break;
-+ default:
-+ mp_msg(MSGT_DEMUX, MSGL_WARN,
-+ "MOV: unable to determine audio channels, assuming 2
(got %d)\n",
-+ char2short(trak->stdata,16));
-+ trak->nchannels = 2;
-+ }
-+ sh->channels = trak->nchannels;
-+
- /*printf("MOV: timescale: %d samplerate: %d durmap: %d (%d) ->
%d (%d)\n",
- trak->timescale, char2short(trak->stdata,24),
trak->durmap[0].dur,
- trak->durmap[0].num, trak->timescale/trak->durmap[0].dur,
-@@ -966,8 +986,18 @@ static void lschunks(demuxer_t* demuxer,
- }
- }
-
-- if((trak->stdata[9]==0 || trak->stdata[9]==1) &&
trak->stdata_len >= 36) { // version 0 with extra atoms
-- int adjust = (trak->stdata[9]==1)?48:0;
-+ switch (version) {
-+ case 0:
-+ adjust = 0; break;
-+ case 1:
-+ adjust = 48; break;
-+ case 2:
-+ adjust = 68; break;
-+ default:
-+ mp_msg(MSGT_DEMUX, MSGL_WARN, "MOV: unknown sound atom
version (%d); may not work!\n", version);
-+ adjust = 68;
-+ }
-+ if (trak->stdata_len >= 36 + adjust) {
- int atom_len = char2int(trak->stdata,28+adjust);
- switch(char2int(trak->stdata,32+adjust)) { // atom type
- case MOV_FOURCC('e','s','d','s'): {
Index: patches/patch-libmpdemux_demuxer_c
===================================================================
RCS file: patches/patch-libmpdemux_demuxer_c
diff -N patches/patch-libmpdemux_demuxer_c
--- patches/patch-libmpdemux_demuxer_c 17 Jan 2006 07:41:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-libmpdemux_demuxer_c,v 1.3 2006/01/17 07:41:58 jakemsr Exp $
---- libmpdemux/demuxer.c.orig Sun Apr 3 07:08:26 2005
-+++ libmpdemux/demuxer.c Sun Dec 25 19:45:16 2005
-@@ -168,7 +168,7 @@ extern int tv_param_on;
-
- extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds);
- extern int demux_open_tv(demuxer_t *demuxer);
--#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2))
-+#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) ||
defined(HAVE_TV_BSDBT848))
- extern void demux_close_tv(demuxer_t *demuxer);
- #endif
- #endif
-@@ -199,7 +199,7 @@ void free_demuxer(demuxer_t *demuxer){
- demux_close_nuv(demuxer); break;
- case DEMUXER_TYPE_MPEG_TY:
- demux_close_ty(demuxer); break;
--#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2))
-+#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) ||
defined(HAVE_TV_BSDBT848))
- case DEMUXER_TYPE_TV:
- demux_close_tv(demuxer); break;
- #endif
-@@ -1350,7 +1350,12 @@ switch(file_format){
-
- case DEMUXER_TYPE_MPEG_TY:
- case DEMUXER_TYPE_MPEG_PS: {
-- sh_video=d_video->sh;sh_video->ds=d_video;
-+ if (d_video)
-+ sh_video=d_video->sh;
-+ else
-+ sh_video = NULL;
-+ if (sh_video)
-+ sh_video->ds=d_video;
- // if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for
VCD
-
- if(audio_id!=-2) {
-@@ -1404,8 +1409,8 @@ pts_from_bps=0; // !!!
- if ((sh_video=demuxer->video->sh) && sh_video->bih)
- mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps
%5.1f kbps (%4.1f kbyte/s)\n",
- (char *)&sh_video->bih->biCompression,
-- sh_video->bih->biWidth,
-- sh_video->bih->biHeight,
-+ (long) sh_video->bih->biWidth,
-+ (long) sh_video->bih->biHeight,
- sh_video->bih->biBitCount,
- sh_video->fps,
- sh_video->i_bps*0.008f,
Index: patches/patch-libmpdemux_demuxer_h
===================================================================
RCS file: patches/patch-libmpdemux_demuxer_h
diff -N patches/patch-libmpdemux_demuxer_h
--- patches/patch-libmpdemux_demuxer_h 23 Feb 2006 11:34:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-libmpdemux_demuxer_h,v 1.2 2006/02/23 11:34:54 biorn Exp $
---- libmpdemux/demuxer.h.orig Sun Apr 3 16:08:26 2005
-+++ libmpdemux/demuxer.h Wed Feb 22 13:25:21 2006
-@@ -155,17 +155,19 @@ inline static demux_packet_t* new_demux_
- dp->flags=0;
- dp->refcount=1;
- dp->master=NULL;
-- dp->buffer=len?(unsigned char*)malloc(len+8):NULL;
-- if(len) memset(dp->buffer+len,0,8);
-+ dp->buffer=NULL;
-+ if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8)))
-+ memset(dp->buffer + len, 0, 8);
-+ else
-+ dp->len = 0;
- return dp;
- }
-
- inline static void resize_demux_packet(demux_packet_t* dp, int len)
- {
-- if(len)
-+ if(len > 0)
- {
- dp->buffer=(unsigned char *)realloc(dp->buffer,len+8);
-- memset(dp->buffer+len,0,8);
- }
- else
- {
-@@ -173,6 +175,10 @@ inline static void resize_demux_packet(d
- dp->buffer=NULL;
- }
- dp->len=len;
-+ if (dp->buffer)
-+ memset(dp->buffer + len, 0, 8);
-+ else
-+ dp->len = 0;
- }
-
- inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){
Index: patches/patch-libmpdemux_realrtsp_rtsp_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpdemux_realrtsp_rtsp_c,v
retrieving revision 1.2
diff -u -r1.2 patch-libmpdemux_realrtsp_rtsp_c
--- patches/patch-libmpdemux_realrtsp_rtsp_c 27 Aug 2005 21:11:49 -0000
1.2
+++ patches/patch-libmpdemux_realrtsp_rtsp_c 6 Jul 2006 18:44:55 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-libmpdemux_realrtsp_rtsp_c,v 1.2 2005/08/27 21:11:49 espie Exp
$
---- libmpdemux/realrtsp/rtsp.c.orig Sat Aug 27 13:09:55 2005
-+++ libmpdemux/realrtsp/rtsp.c Sat Aug 27 13:10:08 2005
-@@ -274,7 +274,7 @@ static char *rtsp_get(rtsp_t *s) {
-
+--- libmpdemux/realrtsp/rtsp.c.orig Sun Jun 11 20:35:46 2006
++++ libmpdemux/realrtsp/rtsp.c Thu Jul 6 00:08:12 2006
+@@ -280,7 +280,7 @@ static char *rtsp_get(rtsp_t *s) {
+ read_stream(s->s, buffer, 1);
while (n<BUF_SIZE) {
read_stream(s->s, &(buffer[n]), 1);
- if ((buffer[n-1]==0x0d)&&(buffer[n]==0x0a)) break;
Index: patches/patch-libmpdemux_tv_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpdemux_tv_c,v
retrieving revision 1.1
diff -u -r1.1 patch-libmpdemux_tv_c
--- patches/patch-libmpdemux_tv_c 17 Jan 2006 07:41:58 -0000 1.1
+++ patches/patch-libmpdemux_tv_c 6 Jul 2006 18:44:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libmpdemux_tv_c,v 1.1 2006/01/17 07:41:58 jakemsr Exp $
---- libmpdemux/tv.c.orig Sat Jan 29 04:24:43 2005
-+++ libmpdemux/tv.c Sun Dec 25 19:34:31 2005
-@@ -286,6 +286,10 @@ static int open_tv(tvi_handle_t *tvh)
+--- libmpdemux/tv.c.orig Sun Jun 11 20:35:46 2006
++++ libmpdemux/tv.c Thu Jul 6 00:08:12 2006
+@@ -307,6 +307,10 @@ static int open_tv(tvi_handle_t *tvh)
mp_msg(MSGT_TV, MSGL_V, "Selected channel list: %s (including %d
channels)\n",
chanlists[tvh->chanlist].name, chanlists[tvh->chanlist].count);
Index: patches/patch-libmpdemux_tvi_bsdbt848_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpdemux_tvi_bsdbt848_c,v
retrieving revision 1.1
diff -u -r1.1 patch-libmpdemux_tvi_bsdbt848_c
--- patches/patch-libmpdemux_tvi_bsdbt848_c 17 Jan 2006 07:41:58 -0000
1.1
+++ patches/patch-libmpdemux_tvi_bsdbt848_c 6 Jul 2006 18:44:56 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-libmpdemux_tvi_bsdbt848_c,v 1.1 2006/01/17 07:41:58 jakemsr
Exp $
---- libmpdemux/tvi_bsdbt848.c.orig Mon Dec 27 09:30:14 2004
-+++ libmpdemux/tvi_bsdbt848.c Mon Jan 16 21:35:44 2006
+$OpenBSD$
+--- libmpdemux/tvi_bsdbt848.c.orig Sun Jun 11 20:35:46 2006
++++ libmpdemux/tvi_bsdbt848.c Thu Jul 6 00:08:12 2006
@@ -40,9 +40,12 @@
#include <string.h>
@@ -12,10 +12,10 @@
+#include <sys/ioctl.h>
#include <sys/audioio.h>
+#include <string.h>
- #elif __FreeBSD_version >= 502100
- #include <dev/bktr/ioctl_meteor.h>
- #include <dev/bktr/ioctl_bt848.h>
-@@ -51,15 +54,17 @@
+ #elif defined(__DragonFly__)
+ #include <dev/video/meteor/ioctl_meteor.h>
+ #include <dev/video/bktr/ioctl_bt848.h>
+@@ -54,15 +57,17 @@
#include <machine/ioctl_bt848.h>
#endif
@@ -32,9 +32,9 @@
#endif
+#endif
- #include "../libaf/af_format.h"
- #include "../libvo/img_format.h"
-@@ -126,7 +131,7 @@ typedef struct {
+ #include "libaf/af_format.h"
+ #include "libvo/img_format.h"
+@@ -129,7 +134,7 @@ typedef struct {
int tunerfd;
int tunerready;
u_long tunerfreq;
@@ -43,63 +43,62 @@
/* Other */
-@@ -137,10 +142,35 @@ typedef struct {
+@@ -140,9 +145,34 @@ typedef struct {
#include "tvi_def.h"
+static int chnlsets[17] = {
-+ CHNLSET_NABCST, /* us-bcast */
-+ CHNLSET_CABLEIRC, /* us-cable */
-+ CHNLSET_CABLEHRC, /* us-cable-hrc */
-+ CHNLSET_JPNBCST, /* japan-bcast */
-+ CHNLSET_JPNCABLE, /* japan-cable */
-+ CHNLSET_WEUROPE, /* europe-west */
-+ CHNLSET_XUSSR, /* europe-east ? */
-+ CHNLSET_WEUROPE, /* italy ? */
-+ CHNLSET_AUSTRALIA, /* newzealand ? */
-+ CHNLSET_AUSTRALIA, /* australia */
-+ CHNLSET_WEUROPE, /* ireland ? */
-+ CHNLSET_FRANCE, /* france */
-+ CHNLSET_XUSSR, /* china-bcast ? */
-+ CHNLSET_WEUROPE, /* southafrica ? */
-+ CHNLSET_WEUROPE, /* argentina ? */
-+ CHNLSET_XUSSR, /* russia */
-+ NULL, /* NULL */
++ CHNLSET_NABCST, /* us-bcast */
++ CHNLSET_CABLEIRC, /* us-cable */
++ CHNLSET_CABLEHRC, /* us-cable-hrc */
++ CHNLSET_JPNBCST, /* japan-bcast */
++ CHNLSET_JPNCABLE, /* japan-cable */
++ CHNLSET_WEUROPE, /* europe-west */
++ CHNLSET_XUSSR, /* europe-east ? */
++ CHNLSET_WEUROPE, /* italy ? */
++ CHNLSET_AUSTRALIA, /* newzealand ? */
++ CHNLSET_AUSTRALIA, /* australia */
++ CHNLSET_WEUROPE, /* ireland ? */
++ CHNLSET_FRANCE, /* france */
++ CHNLSET_XUSSR, /* china-bcast ? */
++ CHNLSET_WEUROPE, /* southafrica ? */
++ CHNLSET_WEUROPE, /* argentina ? */
++ CHNLSET_XUSSR, /* russia */
++ NULL, /* NULL */
+};
+
+static int sources[6] = { METEOR_INPUT_DEV1, METEOR_INPUT_DEV0,
METEOR_INPUT_DEV2,
+ METEOR_INPUT_DEV3, METEOR_INPUT_DEV_RGB, METEOR_INPUT_DEV_SVIDEO };
+
++
static priv_t *G_private=NULL;
static int getinput(int innumber);
-
+static int getsource(int insrc);
-+
+
static void processframe(int signal)
{
- struct timeval curtime;
-@@ -209,6 +239,19 @@ static int control(priv_t *priv, int cmd
+@@ -212,6 +242,19 @@ static int control(priv_t *priv, int cmd
return(TVI_CONTROL_TRUE);
}
+ case TVI_CONTROL_TUN_SET_CHANLIST:
-+ {
-+ priv->tunertype = chnlsets[(int)*(void **)arg];
-+
-+ if(ioctl(priv->tunerfd, TVTUNER_SETTYPE, &priv->tunertype) < 0)
-+ {
-+ perror("SETTYPE:ioctl");
-+ return(0);
-+ }
-+
-+ return(TVI_CONTROL_TRUE);
-+ }
-+
++ {
++ priv->tunertype = chnlsets[(int)*(void **)arg];
++
++ if(ioctl(priv->tunerfd, TVTUNER_SETTYPE, &priv->tunertype) < 0)
++ {
++ perror("SETTYPE:ioctl");
++ return(0);
++ }
++
++ return(TVI_CONTROL_TRUE);
++ }
++
case TVI_CONTROL_TUN_GET_TUNER:
case TVI_CONTROL_TUN_SET_TUNER:
-@@ -216,23 +259,25 @@ static int control(priv_t *priv, int cmd
+@@ -219,23 +262,24 @@ static int control(priv_t *priv, int cmd
case TVI_CONTROL_SPC_GET_INPUT:
{
@@ -110,8 +109,7 @@
return(TVI_CONTROL_FALSE);
}
-+ priv->input = getsource(priv->source);
-+
++ priv->input = getsource(priv->source);
(int)*(void **)arg = priv->input;
return(TVI_CONTROL_TRUE);
}
@@ -129,22 +127,24 @@
return(0);
}
-@@ -259,7 +304,14 @@ static int control(priv_t *priv, int cmd
+@@ -261,8 +305,15 @@ static int control(priv_t *priv, int cmd
+ case TVI_CONTROL_AUD_SET_SAMPLERATE:
{
int dspspeed = (int)*(void **)arg;
-
+#if defined(__OpenBSD__)
+ audio_info_t audio_if;
+ AUDIO_INITINFO(&audio_if);
+ audio_if.record.sample_rate = dspspeed;
+ if (ioctl(priv->dspfd, AUDIO_SETINFO, &audio_if) == -1)
+#else
- if(ioctl(priv->dspfd, SNDCTL_DSP_SPEED, &dspspeed) == -1)
+
+- if(ioctl(priv->dspfd, SNDCTL_DSP_SPEED, &dspspeed) == -1)
++ if(ioctl(priv->dspfd, SNDCTL_DSP_SPEED, &dspspeed) == -1)
+#endif
{
perror("invalidaudiorate");
return(TVI_CONTROL_FALSE);
-@@ -470,6 +522,10 @@ static int init(priv_t *priv)
+@@ -473,7 +524,12 @@ static int init(priv_t *priv)
int marg;
int count;
u_short tmp_fps;
@@ -153,9 +153,11 @@
+audio_info_t audio_if;
+#endif
++
G_private = priv; /* Oooh, sick */
-@@ -482,7 +538,7 @@ priv->iformat = METEOR_FMT_PAL;
+ /* Video Configuration */
+@@ -485,7 +541,7 @@ priv->iformat = METEOR_FMT_PAL;
priv->maxheight = PAL_HEIGHT;
priv->maxwidth = PAL_WIDTH;
priv->maxfps = PAL_FPS;
@@ -164,7 +166,7 @@
priv->fps = priv->maxfps;
priv->starttime=0;
-@@ -569,10 +625,26 @@ if(priv->tunerfd < 0)
+@@ -572,10 +628,26 @@ if(priv->tunerfd < 0)
priv->tunerready = FALSE;
}
@@ -192,7 +194,7 @@
priv->dspdev = strdup("/dev/sound");
#else
priv->dspdev = strdup("/dev/dsp");
-@@ -580,7 +652,11 @@ priv->dspdev = strdup("/dev/dsp");
+@@ -583,7 +655,11 @@ priv->dspdev = strdup("/dev/dsp");
priv->dspsamplesize = 16;
priv->dspstereo = 1;
priv->dspspeed = 44100;
@@ -204,7 +206,7 @@
priv->dspbytesread = 0;
priv->dsprate = priv->dspspeed * priv->dspsamplesize/8*(priv->dspstereo+1);
priv->dspframesize = priv->dspspeed*priv->dspsamplesize/8/priv->fps *
-@@ -594,6 +670,34 @@ if((priv->dspfd = open (priv->dspdev, O_
+@@ -597,6 +673,31 @@ if((priv->dspfd = open (priv->dspdev, O_
marg = (256 << 16) | 12;
@@ -212,9 +214,6 @@
+
+ AUDIO_INITINFO(&audio_if);
+
-+ // audio_if.blocksize = 4096;
-+ // audio_if.hiwat = 256;
-+
+ audio_if.record.precision = priv->dspsamplesize;
+ audio_if.record.channels = priv->dspstereo+1;
+ audio_if.record.sample_rate = priv->dspspeed;
@@ -239,7 +238,7 @@
if (ioctl(priv->dspfd, SNDCTL_DSP_SETFRAGMENT, &marg ) < 0 )
{
perror("setfrag");
-@@ -611,6 +715,8 @@ if((priv->dspready == TRUE) &&
+@@ -614,6 +715,8 @@ if((priv->dspready == TRUE) &&
priv->dspready = FALSE;
}
@@ -248,7 +247,15 @@
return(1);
}
-@@ -655,6 +761,7 @@ return(1);
+@@ -623,6 +726,7 @@ static int start(priv_t *priv)
+ int tmp;
+ struct timeval curtime;
+ int marg;
++int tuner_audio;
+
+ fprintf(stderr,"START\n");
+ if(priv->videoready == FALSE) return(0);
+@@ -658,6 +762,7 @@ return(1);
static int uninit(priv_t *priv)
{
int marg;
@@ -256,23 +263,23 @@
if(priv->videoready == FALSE) return(0);
-@@ -677,6 +784,15 @@ if(ioctl(priv->btfd, METEORCAPTUR, &marg
+@@ -680,6 +785,15 @@ if(ioctl(priv->btfd, METEORCAPTUR, &marg
close(priv->btfd);
close(priv->dspfd);
-+ tuner_audio = AUDIO_MUTE;
-+ if(ioctl(priv->tunerfd, BT848_SAUDIO, &tuner_audio) < 0)
-+ {
-+ perror("tuner mute");
-+ priv->tunerready = FALSE;
-+ }
++tuner_audio = AUDIO_MUTE;
++if(ioctl(priv->tunerfd, BT848_SAUDIO, &tuner_audio) < 0)
++ {
++ perror("tuner mute");
++ priv->tunerready = FALSE;
++ }
+
+close(priv->tunerfd);
+
priv->dspfd = -1;
priv->btfd = -1;
-@@ -799,20 +915,20 @@ return(priv->dspbytesread * 1.0 / priv->
+@@ -802,13 +916,13 @@ return(priv->dspbytesread * 1.0 / priv->
static int get_audio_framesize(priv_t *priv)
{
int bytesavail;
@@ -288,20 +295,12 @@
if(ioctl(priv->dspfd, AUDIO_GETINFO, &auinf) < 0)
{
perror("AUDIO_GETINFO");
- return(TVI_CONTROL_FALSE);
- }
- else
-- bytesavail = auinf.record.seek; /* *priv->dspsamplesize; */
-+ bytesavail = auinf.record.seek; /* * priv->dspsamplesize/8 *
(priv->dspstereo+1); */
- #else
- if(ioctl(priv->dspfd, FIONREAD, &bytesavail) < 0)
- {
-@@ -824,24 +940,29 @@ if(ioctl(priv->dspfd, FIONREAD, &bytesav
+@@ -827,24 +941,28 @@ if(ioctl(priv->dspfd, FIONREAD, &bytesav
/* When mencoder wants audio data, it wants data..
it won't go do anything else until it gets it :( */
-if(bytesavail == 0) return FRAGSIZE;
-+ // if(bytesavail == 0) return FRAGSIZE;
++// if(bytesavail == 0) return FRAGSIZE;
return(bytesavail);
}
@@ -317,22 +316,22 @@
- case 4: return METEOR_INPUT_DEV_RGB; /* RGB */
- case 5: return METEOR_INPUT_DEV_SVIDEO; /* SVid */
- }
-
+-
+if (sources[innumber])
+ return sources[innumber];
-+
++
return 0;
-+}
+ }
+
+static int getsource(int insrc)
+{
-+int i;
++ int i;
+
+ for (i = 0; sources[i]; i++)
+ if (sources[i] == insrc)
+ return i;
+
+ return 0;
- }
++ }
#endif /* USE_TV */
Index: patches/patch-loader_ldt_keeper_c
===================================================================
RCS file: patches/patch-loader_ldt_keeper_c
diff -N patches/patch-loader_ldt_keeper_c
--- patches/patch-loader_ldt_keeper_c 28 Dec 2005 15:22:35 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-loader_ldt_keeper_c,v 1.1 2005/12/28 15:22:35 fgsch Exp $
---- loader/ldt_keeper.c.orig Fri Apr 15 20:17:12 2005
-+++ loader/ldt_keeper.c Wed Dec 28 14:30:44 2005
-@@ -243,7 +243,11 @@ ldt_fs_t* Setup_LDT_Keeper(void)
- {
- perror("install_fs");
- printf("Couldn't install fs segment, expect segfault\n");
-+#if defined(__OpenBSD__)
-+ printf("Did you set \"machdep.userldt\" to 1?\n");
-+#else
- printf("Did you reconfigure the kernel with \"options
USER_LDT\"?\n");
-+#endif
- }
- }
- #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
Index: patches/patch-mangle_h
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-mangle_h,v
retrieving revision 1.2
diff -u -r1.2 patch-mangle_h
--- patches/patch-mangle_h 2 Nov 2003 23:30:27 -0000 1.2
+++ patches/patch-mangle_h 6 Jul 2006 18:44:56 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-mangle_h,v 1.2 2003/11/02 23:30:27 brad Exp $
---- mangle.h.orig 2003-03-30 15:11:05.000000000 -0500
-+++ mangle.h 2003-10-26 19:53:32.000000000 -0500
+--- mangle.h.orig Sun Jun 11 20:35:47 2006
++++ mangle.h Thu Jul 6 00:08:12 2006
@@ -11,8 +11,10 @@
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
- (defined(__OpenBSD__) && !defined(__ELF__))
+ (defined(__OpenBSD__) && !defined(__ELF__)) || defined(__APPLE__)
#define MANGLE(a) "_" #a
+#define MANGLEA(a) _ ## a
#else
Index: patches/patch-mencoder_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-mencoder_c,v
retrieving revision 1.1
diff -u -r1.1 patch-mencoder_c
--- patches/patch-mencoder_c 10 Oct 2005 15:37:24 -0000 1.1
+++ patches/patch-mencoder_c 6 Jul 2006 18:44:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-mencoder_c,v 1.1 2005/10/10 15:37:24 espie Exp $
---- mencoder.c.orig Mon Oct 10 15:51:36 2005
-+++ mencoder.c Mon Oct 10 15:51:43 2005
-@@ -1829,6 +1829,7 @@ if(sh_audio && !demuxer2){
+--- mencoder.c.orig Sun Jun 11 20:35:47 2006
++++ mencoder.c Thu Jul 6 00:08:12 2006
+@@ -1511,6 +1511,7 @@ if(sh_audio && !demuxer2){
} // while(!at_eof)
Index: patches/patch-mplayer_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-mplayer_c,v
retrieving revision 1.3
diff -u -r1.3 patch-mplayer_c
--- patches/patch-mplayer_c 4 Sep 2005 23:51:52 -0000 1.3
+++ patches/patch-mplayer_c 6 Jul 2006 18:44:56 -0000
@@ -1,15 +1,7 @@
-$OpenBSD: patch-mplayer_c,v 1.3 2005/09/04 23:51:52 espie Exp $
---- mplayer.c.orig Fri Apr 15 14:14:24 2005
-+++ mplayer.c Sat Sep 3 14:36:01 2005
-@@ -184,6 +184,7 @@ static int max_framesize=0;
- #include "libmpcodecs/dec_video.h"
- #include "libmpcodecs/mp_image.h"
- #include "libmpcodecs/vf.h"
-+#include "libmpcodecs/vd.h"
-
- extern void vf_list_plugins();
-
-@@ -584,7 +585,7 @@ static void exit_sighandler(int x){
+$OpenBSD$
+--- mplayer.c.orig Sun Jun 11 20:35:47 2006
++++ mplayer.c Thu Jul 6 00:08:12 2006
+@@ -614,7 +614,7 @@ static void exit_sighandler(int x){
gdb_pid = fork();
mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n");
if (gdb_pid == 0) { // We are the child
@@ -18,46 +10,30 @@
mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n");
} else if (gdb_pid < 0)
mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n");
-@@ -986,13 +987,13 @@ static void log_sub(){
- if (!f) return;
- fprintf(f,
"----------------------------------------------------------\n");
- if (subdata->sub_uses_time) {
-- fprintf(f, "N: %s S: %02d:%02d:%02d.%02d E: %02d:%02d:%02d.%02d\n",
filename,
-+ fprintf(f, "N: %s S: %02lu:%02lu:%02lu.%02lu E:
%02lu:%02lu:%02lu.%02lu\n", filename,
- vo_sub_last->start/360000, (vo_sub_last->start/6000)%60,
- (vo_sub_last->start/100)%60, vo_sub_last->start%100,
- vo_sub_last->end/360000, (vo_sub_last->end/6000)%60,
- (vo_sub_last->end/100)%60, vo_sub_last->end%100);
- } else {
-- fprintf(f, "N: %s S: %d E: %d\n", filename, vo_sub_last->start,
vo_sub_last->end);
-+ fprintf(f, "N: %s S: %lu E: %lu\n", filename, vo_sub_last->start,
vo_sub_last->end);
- }
- for (i = 0; i < vo_sub_last->lines; i++) {
- fprintf(f, "%s\n", vo_sub_last->text[i]);
-@@ -3368,7 +3369,7 @@ if (stream->type==STREAMTYPE_DVDNAV && d
+@@ -4527,7 +4527,7 @@ if (stream->type==STREAMTYPE_DVDNAV && d
{
#ifdef USE_SUB
if (sh_video) {
-- mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsSubVisibility,
sub_visibility);
-+ mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsSubVisibility,
(long)sub_visibility);
+- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_SUB_VISIBILITY=%d\n",
sub_visibility);
++ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_SUB_VISIBILITY=%d\n",
(long)sub_visibility);
}
#endif
} break;
-@@ -3488,11 +3489,11 @@ if (stream->type==STREAMTYPE_DVDNAV && d
+@@ -4548,11 +4548,11 @@ if (stream->type==STREAMTYPE_DVDNAV && d
case MP_CMD_GET_VO_FULLSCREEN : {
if(video_out && vo_config_count)
-- mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsVoFullscreen, vo_fs);
-+ mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsVoFullscreen,
(long)vo_fs);
+- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_VO_FULLSCREEN=%d\n", vo_fs);
++ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_VO_FULLSCREEN=%d\n",
(long)vo_fs);
} break;
case MP_CMD_GET_PERCENT_POS : {
-- mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsPercentPos,
demuxer_get_percent_pos(demuxer));
-+ mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsPercentPos,
(long)demuxer_get_percent_pos(demuxer));
+- mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_PERCENT_POSITION=%d\n",
demuxer_get_percent_pos(demuxer));
++ mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_PERCENT_POSITION=%d\n",
(long)demuxer_get_percent_pos(demuxer));
} break;
- case MP_CMD_SWITCH_AUDIO :
- demuxer_switch_audio(demuxer);
-@@ -3500,7 +3501,7 @@ if (stream->type==STREAMTYPE_DVDNAV && d
+ case MP_CMD_GET_TIME_POS : {
+ float pos = 0;
+@@ -4570,7 +4570,7 @@ if (stream->type==STREAMTYPE_DVDNAV && d
case MP_CMD_RUN : {
#ifndef __MINGW32__
if(!fork()) {
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/x11/mplayer/pkg/PFRAG.no-no_x11,v
retrieving revision 1.5
diff -u -r1.5 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 9 Mar 2005 16:07:29 -0000 1.5
+++ pkg/PFRAG.no-no_x11 6 Jul 2006 18:44:56 -0000
@@ -3,37 +3,37 @@
share/applications/
share/applications/mplayer.desktop
share/mplayer/
-share/mplayer/Skin/
-share/mplayer/Skin/default/
-share/mplayer/Skin/default/README
-share/mplayer/Skin/default/VERSION
-share/mplayer/Skin/default/about.png
-share/mplayer/Skin/default/back.png
-share/mplayer/Skin/default/eq.png
-share/mplayer/Skin/default/eqb.png
-share/mplayer/Skin/default/exit.png
-share/mplayer/Skin/default/font.fnt
-share/mplayer/Skin/default/font.png
-share/mplayer/Skin/default/forward.png
-share/mplayer/Skin/default/fsb.png
-share/mplayer/Skin/default/iconify.png
-share/mplayer/Skin/default/load.png
-share/mplayer/Skin/default/main.png
-share/mplayer/Skin/default/menu.png
-share/mplayer/Skin/default/menus.png
-share/mplayer/Skin/default/next.png
-share/mplayer/Skin/default/pause.png
-share/mplayer/Skin/default/play.png
-share/mplayer/Skin/default/playbar.png
-share/mplayer/Skin/default/plb.png
-share/mplayer/Skin/default/pos.png
-share/mplayer/Skin/default/prev.png
-share/mplayer/Skin/default/skin
-share/mplayer/Skin/default/stop.png
-share/mplayer/Skin/default/sub.png
-share/mplayer/Skin/default/subload.png
-share/mplayer/Skin/default/symbols.fnt
-share/mplayer/Skin/default/symbols.png
-share/mplayer/Skin/default/volume.png
+share/mplayer/skins/
+share/mplayer/skins/default/
+share/mplayer/skins/default/README
+share/mplayer/skins/default/VERSION
+share/mplayer/skins/default/about.png
+share/mplayer/skins/default/back.png
+share/mplayer/skins/default/eq.png
+share/mplayer/skins/default/eqb.png
+share/mplayer/skins/default/exit.png
+share/mplayer/skins/default/font.fnt
+share/mplayer/skins/default/font.png
+share/mplayer/skins/default/forward.png
+share/mplayer/skins/default/fsb.png
+share/mplayer/skins/default/iconify.png
+share/mplayer/skins/default/load.png
+share/mplayer/skins/default/main.png
+share/mplayer/skins/default/menu.png
+share/mplayer/skins/default/menus.png
+share/mplayer/skins/default/next.png
+share/mplayer/skins/default/pause.png
+share/mplayer/skins/default/play.png
+share/mplayer/skins/default/playbar.png
+share/mplayer/skins/default/plb.png
+share/mplayer/skins/default/pos.png
+share/mplayer/skins/default/prev.png
+share/mplayer/skins/default/skin
+share/mplayer/skins/default/stop.png
+share/mplayer/skins/default/sub.png
+share/mplayer/skins/default/subload.png
+share/mplayer/skins/default/symbols.fnt
+share/mplayer/skins/default/symbols.png
+share/mplayer/skins/default/volume.png
share/pixmaps/
-share/pixmaps/mplayer-desktop.xpm
+share/pixmaps/mplayer.xpm
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/mplayer/pkg/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- pkg/PLIST 9 May 2005 12:24:38 -0000 1.20
+++ pkg/PLIST 6 Jul 2006 18:44:56 -0000
@@ -4,39 +4,44 @@
@man man/man1/mencoder.1
@man man/man1/mplayer.1
share/doc/mplayer/
-share/doc/mplayer/amiga.html
+share/doc/mplayer/advaudio.html
share/doc/mplayer/aspect.html
+share/doc/mplayer/audio-codecs.html
+share/doc/mplayer/audio-formats.html
share/doc/mplayer/audio.html
share/doc/mplayer/bsd.html
share/doc/mplayer/bugreports.html
share/doc/mplayer/bugreports_advusers.html
share/doc/mplayer/bugreports_fix.html
+share/doc/mplayer/bugreports_regression_test.html
share/doc/mplayer/bugreports_report.html
+share/doc/mplayer/bugreports_security.html
share/doc/mplayer/bugreports_what.html
share/doc/mplayer/bugreports_where.html
share/doc/mplayer/bugs-audio.html
share/doc/mplayer/bugs-special.html
share/doc/mplayer/bugs.html
share/doc/mplayer/cd-dvd.html
+share/doc/mplayer/codec-importing.html
share/doc/mplayer/codecs.html
share/doc/mplayer/commandline.html
+share/doc/mplayer/containers.html
share/doc/mplayer/control.html
-share/doc/mplayer/custommatrices.html
share/doc/mplayer/drives.html
share/doc/mplayer/dvd.html
share/doc/mplayer/edl.html
+share/doc/mplayer/encoding-guide.html
+share/doc/mplayer/exotic_platforms.html
share/doc/mplayer/faq.html
share/doc/mplayer/features.html
-share/doc/mplayer/formats.html
share/doc/mplayer/gcc-296.html
share/doc/mplayer/gui.html
share/doc/mplayer/history.html
share/doc/mplayer/howtoread.html
-share/doc/mplayer/hp-ux.html
share/doc/mplayer/index.html
share/doc/mplayer/install.html
+share/doc/mplayer/installation_codecs.html
share/doc/mplayer/intro.html
-share/doc/mplayer/irix.html
share/doc/mplayer/joe-barr.html
share/doc/mplayer/linux.html
share/doc/mplayer/macos.html
@@ -48,28 +53,46 @@
share/doc/mplayer/menc-feat-mpeg.html
share/doc/mplayer/menc-feat-mpeg4.html
share/doc/mplayer/menc-feat-rescale.html
+share/doc/mplayer/menc-feat-selecting-codec.html
+share/doc/mplayer/menc-feat-selecting-input.html
share/doc/mplayer/menc-feat-streamcopy.html
share/doc/mplayer/menc-feat-telecine.html
+share/doc/mplayer/menc-feat-vcd-dvd.html
+share/doc/mplayer/menc-feat-video-for-windows.html
+share/doc/mplayer/menc-feat-x264.html
+share/doc/mplayer/menc-feat-xvid.html
share/doc/mplayer/mencoder.html
+share/doc/mplayer/mpeg_decoders.html
share/doc/mplayer/mplayer-binary.html
share/doc/mplayer/mpst.html
+share/doc/mplayer/mtrr.html
share/doc/mplayer/nvidia-opinions.html
-share/doc/mplayer/patches.html
+share/doc/mplayer/other.html
+share/doc/mplayer/output-trad.html
share/doc/mplayer/ports.html
-share/doc/mplayer/qnx.html
share/doc/mplayer/rtc.html
share/doc/mplayer/skin-file.html
share/doc/mplayer/skin-fonts.html
share/doc/mplayer/skin-gui.html
share/doc/mplayer/skin-overview.html
+share/doc/mplayer/skin-quality.html
share/doc/mplayer/skin.html
-share/doc/mplayer/solaris.html
+share/doc/mplayer/softreq.html
+share/doc/mplayer/sound-cards.html
share/doc/mplayer/streaming.html
share/doc/mplayer/subosd.html
+share/doc/mplayer/sync.html
+share/doc/mplayer/troubleshooting.html
share/doc/mplayer/tv-input.html
+share/doc/mplayer/tv.html
+share/doc/mplayer/tvout.html
+share/doc/mplayer/unix.html
share/doc/mplayer/usage.html
share/doc/mplayer/users-vs-dev.html
share/doc/mplayer/vcd.html
+share/doc/mplayer/video-cards.html
+share/doc/mplayer/video-codecs.html
+share/doc/mplayer/video-formats.html
share/doc/mplayer/video.html
share/doc/mplayer/windows.html
share/examples/mplayer/
@@ -80,6 +103,6 @@
share/examples/mplayer/menu.conf
@sample ${CONFDIR}/menu.conf
share/examples/mplayer/mplayer.conf
[EMAIL PROTECTED] share/mplayer/font/
!%%no_x11%%
[EMAIL PROTECTED] share/mplayer/font/
@extraunexec rm -rf ${CONFDIR}
