diff options
23 files changed, 214 insertions, 687 deletions
diff --git a/graphics/gmplayer/DESCR b/graphics/gmplayer/DESCR index 290a89c0b28..7775780b112 100644 --- a/graphics/gmplayer/DESCR +++ b/graphics/gmplayer/DESCR @@ -1,13 +1,13 @@ -MPlayer is a movie player for LINUX (though it runs on most Unices, -and even on non-x86 architectures). It plays most MPEG, AVI and -ASF files (also some QT/MOV files, with CVID, VP31 video, and raw -audio), supported by many native and win32 DLL codecs. You can -watch VCD, DVD and even DivX movies too. The another big feature +MPlayer is a movie player for LINUX (runs on many other Unices, +and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV, +QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported +by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, +SVCD, DVD, 3ivx, and even DivX movies too. The another big feature of mplayer is the wide range of supported output drivers. It works -with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and -this way all drivers of SDL) and some lowlevel card-specific drivers -(for Matrox/3dfx/SiS) too! Most of them supports software or hardware -scaling, so you can enjoy movies in fullscreen. And what about the -nice big antialiased shaded subtitles (9 supported types!!!) with -european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, -korean fonts, and OSD... +with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you +can use GGI and SDL (and this way all their drivers) and some +lowlevel card-specific drivers (for Matrox, 3Dfx and Radeon) too! +Most of them supports software or hardware scaling, so you can enjoy +movies in fullscreen. And what about the nice big antialiased shaded +subtitles (10 supported types!!!) with european/ISO 8859-1,2 +(hungarian, english, czech, etc), cyrillic, korean fonts, and OSD... diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile index 83d917a10b9..06df466d77b 100644 --- a/graphics/gmplayer/Makefile +++ b/graphics/gmplayer/Makefile @@ -1,40 +1,40 @@ -# $NetBSD: Makefile,v 1.3 2002/04/30 13:25:49 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2002/04/30 15:09:57 veego Exp $ .include "../../graphics/mplayer/Makefile.common" -PKGNAME= ${DISTNAME:S/MP/gmp/} -MASTER_SITES+= http://www.mplayerhq.hu/MPlayer/Skin/ \ - http://www2.mplayerhq.hu/MPlayer/releases/ \ - http://www2.mplayerhq.hu/MPlayer/Skin/ \ - ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \ - ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp2.mplayerhq.hu/MPlayer/Skin/ -DIST_SUBDIR= gmplayer +PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} +MASTER_SITES+= http://www.mplayerhq.hu/MPlayer/Skin/ \ + http://www2.mplayerhq.hu/MPlayer/releases/ \ + http://www2.mplayerhq.hu/MPlayer/Skin/ \ + ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \ + ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp2.mplayerhq.hu/MPlayer/Skin/ +DIST_SUBDIR= gmplayer -COMMENT= Software only MPEG-1/2/4 video decoder with a GTK+ interface +COMMENT= Software only MPEG-1/2/4 video decoder with a GTK+ interface -SKINS += default${EXTRACT_SUFX} \ - MidnightLove${EXTRACT_SUFX} \ - avifile${EXTRACT_SUFX} \ - BlueHeart${EXTRACT_SUFX} \ - WindowsMediaPlayer6${EXTRACT_SUFX} \ - xanim${EXTRACT_SUFX} \ - neutron${EXTRACT_SUFX} \ - plastic${EXTRACT_SUFX} \ - Cyrus${EXTRACT_SUFX} \ - xine-lcd${EXTRACT_SUFX} \ - phony${EXTRACT_SUFX} \ - mentalic${EXTRACT_SUFX} \ - proton${EXTRACT_SUFX} \ - slim${EXTRACT_SUFX} \ - netscape4${EXTRACT_SUFX} \ - CubicPlayer${EXTRACT_SUFX} \ - AlienMind${EXTRACT_SUFX} \ - CornerMP${EXTRACT_SUFX} +SKINS += default${EXTRACT_SUFX} \ + MidnightLove${EXTRACT_SUFX} \ + avifile${EXTRACT_SUFX} \ + BlueHeart${EXTRACT_SUFX} \ + WindowsMediaPlayer6${EXTRACT_SUFX} \ + xanim${EXTRACT_SUFX} \ + neutron${EXTRACT_SUFX} \ + plastic${EXTRACT_SUFX} \ + Cyrus${EXTRACT_SUFX} \ + xine-lcd${EXTRACT_SUFX} \ + phony${EXTRACT_SUFX} \ + mentalic${EXTRACT_SUFX} \ + proton${EXTRACT_SUFX} \ + slim${EXTRACT_SUFX} \ + netscape4${EXTRACT_SUFX} \ + CubicPlayer${EXTRACT_SUFX} \ + AlienMind${EXTRACT_SUFX} \ + CornerMP${EXTRACT_SUFX} -DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= ${SKINS} +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES+= ${SKINS} CONFIGURE_ARGS+= --enable-gui CONFIGURE_ARGS+= --datadir=${PREFIX}/share/gmplayer @@ -56,9 +56,11 @@ do-install: .include "../../audio/lame/buildlink.mk" .include "../../devel/SDL/buildlink.mk" .include "../../devel/binutils/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../lang/gcc/Makefile.gcc" .include "../../misc/libdvdread/buildlink.mk" .include "../../x11/gtk/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gmplayer/PLIST b/graphics/gmplayer/PLIST index 17adcee045b..0acaa4b1906 100644 --- a/graphics/gmplayer/PLIST +++ b/graphics/gmplayer/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/04/30 15:09:57 veego Exp $ bin/gmplayer man/man1/gmplayer.1 share/gmplayer/DOCS/DVB @@ -20,6 +20,8 @@ share/gmplayer/DOCS/German/encoding.html share/gmplayer/DOCS/German/faq.html share/gmplayer/DOCS/German/formats.html share/gmplayer/DOCS/German/gcc-2.96-3.0.html +share/gmplayer/DOCS/German/mencoder.1 +share/gmplayer/DOCS/German/mplayer.1 share/gmplayer/DOCS/German/sound.html share/gmplayer/DOCS/German/video.html share/gmplayer/DOCS/Hungarian/bugreports.html @@ -34,11 +36,38 @@ share/gmplayer/DOCS/Hungarian/mplayer.1 share/gmplayer/DOCS/Hungarian/skin-hu.html share/gmplayer/DOCS/Hungarian/sound.html share/gmplayer/DOCS/Hungarian/video.html +share/gmplayer/DOCS/Italian/bugreports.html +share/gmplayer/DOCS/Italian/cd-dvd.html +share/gmplayer/DOCS/Italian/codecs.html +share/gmplayer/DOCS/Italian/documentation.html +share/gmplayer/DOCS/Italian/encoding.html +share/gmplayer/DOCS/Italian/faq.html +share/gmplayer/DOCS/Italian/formats.html +share/gmplayer/DOCS/Italian/gcc-2.96-3.0.html +share/gmplayer/DOCS/Italian/skin-it.html +share/gmplayer/DOCS/Italian/sound.html +share/gmplayer/DOCS/Italian/users_against_developers.html +share/gmplayer/DOCS/Italian/video.html share/gmplayer/DOCS/Polish/DVB +share/gmplayer/DOCS/Polish/DXR3 share/gmplayer/DOCS/Polish/bugreports.html +share/gmplayer/DOCS/Polish/cd-dvd.html +share/gmplayer/DOCS/Polish/codecs-in.html share/gmplayer/DOCS/Polish/codecs.html share/gmplayer/DOCS/Polish/documentation.html +share/gmplayer/DOCS/Polish/encoding.html +share/gmplayer/DOCS/Polish/faq.html +share/gmplayer/DOCS/Polish/formats.html share/gmplayer/DOCS/Polish/gcc-2.96-3.0.html +share/gmplayer/DOCS/Polish/mencoder.1 +share/gmplayer/DOCS/Polish/mplayer.1 +share/gmplayer/DOCS/Polish/skin-en.html +share/gmplayer/DOCS/Polish/sound.html +share/gmplayer/DOCS/Polish/users_against_developers.html +share/gmplayer/DOCS/Polish/video.html +share/gmplayer/DOCS/SGML/DO_NOT_USE +share/gmplayer/DOCS/SGML/c +share/gmplayer/DOCS/SGML/docs.sgml share/gmplayer/DOCS/bugreports.html share/gmplayer/DOCS/cd-dvd.html share/gmplayer/DOCS/codecs-in.html @@ -55,14 +84,22 @@ share/gmplayer/DOCS/sound.html share/gmplayer/DOCS/tech/TODO share/gmplayer/DOCS/tech/codec-devel.txt share/gmplayer/DOCS/tech/codecs.conf.txt +share/gmplayer/DOCS/tech/colorspaces.txt share/gmplayer/DOCS/tech/cvs-howto.txt +share/gmplayer/DOCS/tech/dr-methods.txt share/gmplayer/DOCS/tech/formats-hun.txt share/gmplayer/DOCS/tech/formats.txt +share/gmplayer/DOCS/tech/hwac3.txt +share/gmplayer/DOCS/tech/libvo.txt share/gmplayer/DOCS/tech/libvo2.txt share/gmplayer/DOCS/tech/mpsub.sub +share/gmplayer/DOCS/tech/osd.txt share/gmplayer/DOCS/tech/patches.txt +share/gmplayer/DOCS/tech/playtree +share/gmplayer/DOCS/tech/playtree-hun share/gmplayer/DOCS/tech/tech-eng.txt -share/gmplayer/DOCS/tech/tech-hun.txt +share/gmplayer/DOCS/tech/vidix.txt +share/gmplayer/DOCS/tech/vop.txt share/gmplayer/DOCS/users_against_developers.html share/gmplayer/DOCS/video.html share/gmplayer/Skin/AlienMind/README @@ -542,7 +579,9 @@ share/gmplayer/codecs.conf @dirrm share/gmplayer/Skin/AlienMind @dirrm share/gmplayer/Skin @dirrm share/gmplayer/DOCS/tech +@dirrm share/gmplayer/DOCS/SGML @dirrm share/gmplayer/DOCS/Polish +@dirrm share/gmplayer/DOCS/Italian @dirrm share/gmplayer/DOCS/Hungarian @dirrm share/gmplayer/DOCS/German @dirrm share/gmplayer/DOCS/French diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo index aaffaf9118e..f0a00cc2e22 100644 --- a/graphics/gmplayer/distinfo +++ b/graphics/gmplayer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ +$NetBSD: distinfo,v 1.2 2002/04/30 15:09:57 veego Exp $ -SHA1 (gmplayer/MPlayer-0.60.tar.bz2) = 6af7da481fe3688061f5a74ceed694812c1d475a -Size (gmplayer/MPlayer-0.60.tar.bz2) = 1753317 bytes +SHA1 (gmplayer/MPlayer-0.90pre2.tar.bz2) = 51f70a14f43af7cddd17df8c3b2f59207a56ca6d +Size (gmplayer/MPlayer-0.90pre2.tar.bz2) = 2382376 bytes SHA1 (gmplayer/default.tar.bz2) = 40319dd1f8a8f2ff8b85d5efb1d4294d62530535 Size (gmplayer/default.tar.bz2) = 167762 bytes SHA1 (gmplayer/MidnightLove.tar.bz2) = 7eaeb8acfef8a4584485083fd6659631a05fa0f8 @@ -38,9 +38,4 @@ SHA1 (gmplayer/AlienMind.tar.bz2) = 8bd483aa6b52c10ee826c458a2c509c90a57e0f7 Size (gmplayer/AlienMind.tar.bz2) = 129515 bytes SHA1 (gmplayer/CornerMP.tar.bz2) = d46a59c33abcc27ddc24be3124d3f4d23361e836 Size (gmplayer/CornerMP.tar.bz2) = 237492 bytes -SHA1 (patch-aa) = 1e626d0312631e441d126a89314f4e4e6d177e1f -SHA1 (patch-ab) = b57033b07b789917dc2f576e34dacf06e90fc824 -SHA1 (patch-ad) = 2caecb946658925f20874a2aff61afc972354a37 -SHA1 (patch-ae) = 84db805213925f9ebc511de56f723ba29147ba99 -SHA1 (patch-ag) = bfbae41a30a7f0c9440ece02e3f2eadd1fca87a1 -SHA1 (patch-ah) = 506cda70793d84342b035570b428cb7b566b622e +SHA1 (patch-aa) = 514deb9f9e8264ba964a7d5425fa5f3d97b62829 diff --git a/graphics/gmplayer/files/vcd_read_nbsd.c b/graphics/gmplayer/files/vcd_read_nbsd.c deleted file mode 100644 index 9618814a987..00000000000 --- a/graphics/gmplayer/files/vcd_read_nbsd.c +++ /dev/null @@ -1,200 +0,0 @@ -/* $NetBSD: vcd_read_nbsd.c,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ */ - -#include <sys/types.h> -#include <sys/inttypes.h> -#include <sys/cdio.h> -#include <sys/scsiio.h> - -#define HAVE_VCD - -#define CDROM_LEADOUT 0xAA - -static struct ioc_read_toc_entry vcd_entry; -static struct cd_toc_entry vcd_entry_data; -static char vcd_buf[VCD_SECTOR_SIZE]; - -static inline void -vcd_set_msf(unsigned int sect) -{ - unsigned int s = sect; - vcd_entry_data.addr.msf.frame = sect % 75; - sect = sect / 75; - vcd_entry_data.addr.msf.second = sect % 60; - sect = sect / 60; - vcd_entry_data.addr.msf.minute = sect; -} - -static inline unsigned int -vcd_get_msf() -{ - return vcd_entry_data.addr.msf.frame + - (vcd_entry_data.addr.msf.second + - vcd_entry_data.addr.msf.minute * 60) * 75; -} - -int -vcd_seek_to_track(int fd, int track) -{ - vcd_entry.address_format = CD_MSF_FORMAT; - vcd_entry.starting_track = track; - vcd_entry.data_len = sizeof(struct cd_toc_entry); - vcd_entry.data = &vcd_entry_data; - if (ioctl(fd, CDIOREADTOCENTRIES, &vcd_entry)) { - perror("ioctl dif1"); - return -1; - } - return VCD_SECTOR_DATA * vcd_get_msf(); -} - -int -vcd_get_track_end(int fd, int track) -{ - struct ioc_toc_header tochdr; - if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) { - perror("read CDROM toc header: "); - return -1; - } - vcd_entry.address_format = CD_MSF_FORMAT; - vcd_entry.starting_track = track < tochdr.ending_track ? (track + 1) : CDROM_LEADOUT; - vcd_entry.data_len = sizeof(struct cd_toc_entry); - vcd_entry.data = &vcd_entry_data; - if (ioctl(fd, CDIOREADTOCENTRYS, &vcd_entry)) { - perror("ioctl dif2"); - return -1; - } - return VCD_SECTOR_DATA * vcd_get_msf(); -} - -void -vcd_read_toc(int fd) -{ - struct ioc_toc_header tochdr; - int i; - if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) { - perror("read CDROM toc header: "); - return; - } - for (i = tochdr.starting_track; i <= tochdr.ending_track; i++) { - struct ioc_read_toc_entry tocentry; - struct cd_toc_entry tocentry_data; - - tocentry.starting_track = i; - tocentry.address_format = CD_MSF_FORMAT; - tocentry.data_len = sizeof(struct cd_toc_entry); - tocentry.data = &tocentry_data; - - if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) { - perror("read CDROM toc entry: "); - return; - } - printf("track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n", - (int) tocentry.starting_track, - (int) tocentry.data->addr_type, - (int) tocentry.data->control, - (int) tocentry.address_format, - (int) tocentry.data->addr.msf.minute, - (int) tocentry.data->addr.msf.second, - (int) tocentry.data->addr.msf.frame - ); - } -} - -static int -vcd_read(int fd, char *mem) -{ - struct scsireq sc; - int lba = vcd_get_msf(); - int blocks; - int sector_type; - int sync, header_code, user_data, edc_ecc, error_field; - int sub_channel; - int rc; - - blocks = 1; - sector_type = 5; /* mode2/form2 */ - sync = 0; - header_code = 0; - user_data = 1; - edc_ecc = 0; - error_field = 0; - sub_channel = 0; - - memset(&sc, 0, sizeof(sc)); - sc.cmd[0] = 0xBE; - sc.cmd[1] = (sector_type) << 2; - sc.cmd[2] = (lba >> 24) & 0xff; - sc.cmd[3] = (lba >> 16) & 0xff; - sc.cmd[4] = (lba >> 8) & 0xff; - sc.cmd[5] = lba & 0xff; - sc.cmd[6] = (blocks >> 16) & 0xff; - sc.cmd[7] = (blocks >> 8) & 0xff; - sc.cmd[8] = blocks & 0xff; - sc.cmd[9] = (sync << 7) | (header_code << 5) | (user_data << 4) | - (edc_ecc << 3) | (error_field << 1); - sc.cmd[10] = sub_channel; - sc.cmdlen = 12; - sc.databuf = (caddr_t) mem; - sc.datalen = 2328; - sc.senselen = sizeof(sc.sense); - sc.flags = SCCMD_READ; - sc.timeout = 10000; - rc = ioctl(fd, SCIOCCOMMAND, &sc); - if (rc == -1) { - perror("SCIOCCOMMAND"); - return -1; - } - if (sc.retsts || sc.error) { - fprintf(stderr, "scsi command failed: status %d error %d\n", sc.retsts, - sc.error); - return -1; - } - return VCD_SECTOR_DATA; -} - -#ifdef VCD_CACHE - -static int vcd_cache_size = 0; -static char *vcd_cache_data = NULL; -static int *vcd_cache_sectors = NULL; -static int vcd_cache_index = 0; -static int vcd_cache_current = -1; - -void -vcd_cache_init(int s) -{ - vcd_cache_size = s; - vcd_cache_sectors = malloc(s * sizeof(int)); - vcd_cache_data = malloc(s * VCD_SECTOR_SIZE); - memset(vcd_cache_sectors, 255, s * sizeof(int)); -} - -static inline void -vcd_cache_seek(int sect) -{ - vcd_cache_current = sect; -} - -int -vcd_cache_read(int fd, char *mem) -{ - int i; - char *vcd_buf; - for (i = 0; i < vcd_cache_size; i++) - if (vcd_cache_sectors[i] == vcd_cache_current) { - vcd_buf = &vcd_cache_data[i * VCD_SECTOR_SIZE]; - ++vcd_cache_current; - memcpy(mem, &vcd_buf[VCD_SECTOR_OFFS], VCD_SECTOR_DATA); - return VCD_SECTOR_DATA; - } - vcd_buf = &vcd_cache_data[vcd_cache_index * VCD_SECTOR_SIZE]; - vcd_cache_sectors[vcd_cache_index] = vcd_cache_current; - ++vcd_cache_index; - if (vcd_cache_index >= vcd_cache_size) - vcd_cache_index = 0; - vcd_set_msf(vcd_cache_current); - memcpy(vcd_buf, &vcd_entry_data.addr.msf, sizeof(vcd_entry_data.addr.msf)); - ++vcd_cache_current; - memcpy(mem, &vcd_buf[VCD_SECTOR_OFFS], VCD_SECTOR_DATA); - return VCD_SECTOR_DATA; -} -#endif diff --git a/graphics/gmplayer/patches/patch-aa b/graphics/gmplayer/patches/patch-aa index 72c444f32bc..59891e26bbe 100644 --- a/graphics/gmplayer/patches/patch-aa +++ b/graphics/gmplayer/patches/patch-aa @@ -1,21 +1,24 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ +$NetBSD: patch-aa,v 1.2 2002/04/30 15:09:58 veego Exp $ ---- configure.in Sun Nov 25 13:42:15 2001 -+++ configure Sun Nov 25 14:12:54 2001 -@@ -1731,7 +1731,7 @@ - if test "$_ossaudio" = auto ; then - cat > $TMPC << EOF - #include <sys/soundcard.h> --int main(void) { int arg = SNDCTL_DSP_SETFRAGMENT; return 0; } -+int main(void) { int arg = SOUND_VERSION; return 0; } - EOF - _ossaudio=no - cc_check && _ossaudio=yes -@@ -2397,6 +2397,7 @@ - - _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" - bsdos && _ld_arch="$_ld_arch -ldvd" -+netbsd && _ld_arch="$_ld_arch -li386 -lossaudio" - - _def_debug='#undef MP_DEBUG' - test "$_debug" && _def_debug='#define MP_DEBUG 1' +--- configure.orig Sun Apr 28 23:05:09 2002 ++++ configure Mon Apr 29 09:40:55 2002 +@@ -263,8 +263,8 @@ + _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` + ;; + --with-extralibdir=*) +- _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` +-# _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ++# _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ++ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` + ;; + --enable-runtime-cpudetection) + _runtime_cpudetection=yes +@@ -2626,7 +2626,7 @@ + echocheck "DVD support (libmpdvdkit)" + if test "$_dvdkit" = auto ; then + _dvdkit=no +- if linux || freebsd ; then ++ if linux || freebsd | netbsd ; then + test -f "./libmpdvdkit/Makefile" && _dvdkit=yes + fi + fi diff --git a/graphics/gmplayer/patches/patch-ab b/graphics/gmplayer/patches/patch-ab deleted file mode 100644 index 5476c0bf8b4..00000000000 --- a/graphics/gmplayer/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ - ---- configure.orig Tue Dec 25 23:00:07 2001 -+++ configure Tue Dec 25 22:58:10 2001 -@@ -233,6 +233,7 @@ - ;; - --with-extralibdir=*) - _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` -+ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` - ;; - esac - done -@@ -1986,7 +1986,7 @@ - - - echocheck "VCD support" --if linux || bsdos || freebsd || sunos ; then -+if linux || bsdos || freebsd || netbsd || sunos ; then - _inputmodules="vcd $_inputmodules" - _def_vcd='#define HAVE_VCD 1' - echores "ok" diff --git a/graphics/gmplayer/patches/patch-ad b/graphics/gmplayer/patches/patch-ad deleted file mode 100644 index 33406a95bda..00000000000 --- a/graphics/gmplayer/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ - ---- libao2/ao_oss.c.orig Sun Nov 25 14:23:25 2001 -+++ libao2/ao_oss.c Sun Nov 25 14:25:16 2001 -@@ -254,9 +254,11 @@ - static float get_delay(){ - /* Calculate how many bytes/second is sent out */ - if(audio_delay_method==2){ -+#ifdef SNDCTL_DSP_GETODELAY - int r=0; - if(ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &r)!=-1) - return ((float)r)/(float)ao_data.bps; -+#endif - audio_delay_method=1; // fallback if not supported - } - if(audio_delay_method==1){ diff --git a/graphics/gmplayer/patches/patch-ae b/graphics/gmplayer/patches/patch-ae deleted file mode 100644 index 6a8743ed82a..00000000000 --- a/graphics/gmplayer/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ - ---- libmpdemux/stream.c.orig Fri Sep 28 00:36:53 2001 -+++ libmpdemux/stream.c Mon Oct 1 22:56:02 2001 -@@ -19,7 +19,11 @@ - #ifdef __FreeBSD__ - #include "vcd_read_fbsd.h" - #else -+#ifdef __NetBSD__ -+#include "vcd_read_nbsd.h" -+#else - #include "vcd_read.h" -+#endif - #endif - - #endif diff --git a/graphics/gmplayer/patches/patch-ag b/graphics/gmplayer/patches/patch-ag deleted file mode 100644 index 90764b7218c..00000000000 --- a/graphics/gmplayer/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ - ---- libao2/ao_oss.c.orig Wed Dec 26 02:32:52 2001 -+++ libao2/ao_oss.c Tue Dec 25 23:35:56 2001 -@@ -30,7 +30,7 @@ - - LIBAO_EXTERN(oss) - --static char *dsp="/dev/dsp"; -+static char *dsp="/dev/sound"; - static audio_buf_info zz; - static int audio_fd=-1; - diff --git a/graphics/gmplayer/patches/patch-ah b/graphics/gmplayer/patches/patch-ah deleted file mode 100644 index a8875e000bc..00000000000 --- a/graphics/gmplayer/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/04/21 08:07:50 rh Exp $ - ---- libmp1e/common/mmx.c.orig Wed Dec 5 02:56:43 2001 -+++ libmp1e/common/mmx.c Tue Dec 25 23:23:07 2001 -@@ -44,6 +44,8 @@ - * VIA has no similar document available as of Jan 2001. - */ - -+#define cpuid_t xcpuid_t -+ - typedef union { - unsigned char s[16]; - struct { diff --git a/graphics/mplayer/DESCR b/graphics/mplayer/DESCR index 290a89c0b28..7775780b112 100644 --- a/graphics/mplayer/DESCR +++ b/graphics/mplayer/DESCR @@ -1,13 +1,13 @@ -MPlayer is a movie player for LINUX (though it runs on most Unices, -and even on non-x86 architectures). It plays most MPEG, AVI and -ASF files (also some QT/MOV files, with CVID, VP31 video, and raw -audio), supported by many native and win32 DLL codecs. You can -watch VCD, DVD and even DivX movies too. The another big feature +MPlayer is a movie player for LINUX (runs on many other Unices, +and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV, +QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported +by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, +SVCD, DVD, 3ivx, and even DivX movies too. The another big feature of mplayer is the wide range of supported output drivers. It works -with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and -this way all drivers of SDL) and some lowlevel card-specific drivers -(for Matrox/3dfx/SiS) too! Most of them supports software or hardware -scaling, so you can enjoy movies in fullscreen. And what about the -nice big antialiased shaded subtitles (9 supported types!!!) with -european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, -korean fonts, and OSD... +with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you +can use GGI and SDL (and this way all their drivers) and some +lowlevel card-specific drivers (for Matrox, 3Dfx and Radeon) too! +Most of them supports software or hardware scaling, so you can enjoy +movies in fullscreen. And what about the nice big antialiased shaded +subtitles (10 supported types!!!) with european/ISO 8859-1,2 +(hungarian, english, czech, etc), cyrillic, korean fonts, and OSD... diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile index 69884e21185..fcd98caaa00 100644 --- a/graphics/mplayer/Makefile +++ b/graphics/mplayer/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.22 2002/04/30 12:45:29 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2002/04/30 15:10:00 veego Exp $ .include "Makefile.common" -PKGNAME= ${DISTNAME:S/MP/mp/} -PKGREVISION= 2 -MASTER_SITES= http://mp.dev.hu/MPlayer/releases/ - +PKGNAME= mplayer-${MPLAYER_PKG_VERSION} COMMENT= Software only MPEG-1/2/4 video decoder +MASTER_SITES+= http://www2.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp.mplayerhq.hu/MPlayer/releases/ \ + ftp://ftp2.mplayerhq.hu/MPlayer/releases/ + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/DOCS/mplayer.1 ${PREFIX}/man/man1 @@ -18,8 +19,10 @@ do-install: .include "../../audio/lame/buildlink.mk" .include "../../devel/SDL/buildlink.mk" .include "../../devel/binutils/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../lang/gcc/Makefile.gcc" .include "../../misc/libdvdread/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mplayer/Makefile.common b/graphics/mplayer/Makefile.common index f50551d2410..eb5e7d50a6c 100644 --- a/graphics/mplayer/Makefile.common +++ b/graphics/mplayer/Makefile.common @@ -1,8 +1,11 @@ -# $NetBSD: Makefile.common,v 1.4 2002/04/30 13:26:48 zuntum Exp $ +# $NetBSD: Makefile.common,v 1.5 2002/04/30 15:10:01 veego Exp $ -DISTNAME?= MPlayer-0.60 +MPLAYER_DIST_VERSION= 0.90pre2 +MPLAYER_PKG_VERSION= ${MPLAYER_DIST_VERSION:S/pre/rc/} + +DISTNAME= MPlayer-${MPLAYER_DIST_VERSION} CATEGORIES?= graphics -MASTER_SITES= http://mp.dev.hu/MPlayer/releases/ +MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ EXTRACT_SUFX= .tar.bz2 MAINTAINER?= svs@ropnet.ru,zuntum@netbsd.org @@ -11,23 +14,26 @@ HOMEPAGE?= http://www.mplayerhq.hu/ ONLY_FOR_PLATFORM?= NetBSD-*-i386 RESTRICTED?= "unsure of the license" +# see http://www.mplayerhq.hu/DOCS/users_against_developers.html#binary NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} +# no source on the ftp server because of the css source code in it +NO_SRC_ON_FTP= ${RESTRICTED} USE_X11= YES USE_GMAKE= YES HAS_CONFIGURE= YES +USE_PTHREAD= native pth + CONFIGURE_ARGS+= --prefix="${PREFIX}" CONFIGURE_ARGS+= --with-extraincdir="${BUILDLINK_DIR}/include" CONFIGURE_ARGS+= --with-extralibdir="${LOCALBASE}/lib" CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32" -CONFIGURE_ARGS+= --enable-dvdread +#CONFIGURE_ARGS+= --enable-dvdread +CONFIGURE_ARGS+= --disable-mpdvdkit # The configure script attempts to test-execute compiled programs in /tmp, # but that directory may be mounted as noexec; work this around by setting # TMPDIR to ${WRKDIR} CONFIGURE_ENV+= TMPDIR=${WRKDIR} - -post-configure: - ${CP} ${FILESDIR}/vcd_read_nbsd.c ${WRKSRC}/libmpdemux/vcd_read_nbsd.h diff --git a/graphics/mplayer/PLIST b/graphics/mplayer/PLIST index d5ebd39a45c..7a5e3809818 100644 --- a/graphics/mplayer/PLIST +++ b/graphics/mplayer/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/25 16:16:28 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/04/30 15:10:01 veego Exp $ bin/mplayer man/man1/mplayer.1 share/mplayer/DOCS/DVB @@ -20,6 +20,8 @@ share/mplayer/DOCS/German/encoding.html share/mplayer/DOCS/German/faq.html share/mplayer/DOCS/German/formats.html share/mplayer/DOCS/German/gcc-2.96-3.0.html +share/mplayer/DOCS/German/mencoder.1 +share/mplayer/DOCS/German/mplayer.1 share/mplayer/DOCS/German/sound.html share/mplayer/DOCS/German/video.html share/mplayer/DOCS/Hungarian/bugreports.html @@ -34,11 +36,38 @@ share/mplayer/DOCS/Hungarian/mplayer.1 share/mplayer/DOCS/Hungarian/skin-hu.html share/mplayer/DOCS/Hungarian/sound.html share/mplayer/DOCS/Hungarian/video.html +share/mplayer/DOCS/Italian/bugreports.html +share/mplayer/DOCS/Italian/cd-dvd.html +share/mplayer/DOCS/Italian/codecs.html +share/mplayer/DOCS/Italian/documentation.html +share/mplayer/DOCS/Italian/encoding.html +share/mplayer/DOCS/Italian/faq.html +share/mplayer/DOCS/Italian/formats.html +share/mplayer/DOCS/Italian/gcc-2.96-3.0.html +share/mplayer/DOCS/Italian/skin-it.html +share/mplayer/DOCS/Italian/sound.html +share/mplayer/DOCS/Italian/users_against_developers.html +share/mplayer/DOCS/Italian/video.html share/mplayer/DOCS/Polish/DVB +share/mplayer/DOCS/Polish/DXR3 share/mplayer/DOCS/Polish/bugreports.html +share/mplayer/DOCS/Polish/cd-dvd.html +share/mplayer/DOCS/Polish/codecs-in.html share/mplayer/DOCS/Polish/codecs.html share/mplayer/DOCS/Polish/documentation.html +share/mplayer/DOCS/Polish/encoding.html +share/mplayer/DOCS/Polish/faq.html +share/mplayer/DOCS/Polish/formats.html share/mplayer/DOCS/Polish/gcc-2.96-3.0.html +share/mplayer/DOCS/Polish/mencoder.1 +share/mplayer/DOCS/Polish/mplayer.1 +share/mplayer/DOCS/Polish/skin-en.html +share/mplayer/DOCS/Polish/sound.html +share/mplayer/DOCS/Polish/users_against_developers.html +share/mplayer/DOCS/Polish/video.html +share/mplayer/DOCS/SGML/DO_NOT_USE +share/mplayer/DOCS/SGML/c +share/mplayer/DOCS/SGML/docs.sgml share/mplayer/DOCS/bugreports.html share/mplayer/DOCS/cd-dvd.html share/mplayer/DOCS/codecs-in.html @@ -55,19 +84,29 @@ share/mplayer/DOCS/sound.html share/mplayer/DOCS/tech/TODO share/mplayer/DOCS/tech/codec-devel.txt share/mplayer/DOCS/tech/codecs.conf.txt +share/mplayer/DOCS/tech/colorspaces.txt share/mplayer/DOCS/tech/cvs-howto.txt +share/mplayer/DOCS/tech/dr-methods.txt share/mplayer/DOCS/tech/formats-hun.txt share/mplayer/DOCS/tech/formats.txt +share/mplayer/DOCS/tech/hwac3.txt +share/mplayer/DOCS/tech/libvo.txt share/mplayer/DOCS/tech/libvo2.txt share/mplayer/DOCS/tech/mpsub.sub +share/mplayer/DOCS/tech/osd.txt share/mplayer/DOCS/tech/patches.txt +share/mplayer/DOCS/tech/playtree +share/mplayer/DOCS/tech/playtree-hun share/mplayer/DOCS/tech/tech-eng.txt -share/mplayer/DOCS/tech/tech-hun.txt +share/mplayer/DOCS/tech/vidix.txt +share/mplayer/DOCS/tech/vop.txt share/mplayer/DOCS/users_against_developers.html share/mplayer/DOCS/video.html share/mplayer/codecs.conf @dirrm share/mplayer/DOCS/tech +@dirrm share/mplayer/DOCS/SGML @dirrm share/mplayer/DOCS/Polish +@dirrm share/mplayer/DOCS/Italian @dirrm share/mplayer/DOCS/Hungarian @dirrm share/mplayer/DOCS/German @dirrm share/mplayer/DOCS/French diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo index cfdc74cce6b..02c204b2676 100644 --- a/graphics/mplayer/distinfo +++ b/graphics/mplayer/distinfo @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/01/25 16:16:28 skrll Exp $ +$NetBSD: distinfo,v 1.5 2002/04/30 15:10:01 veego Exp $ -SHA1 (MPlayer-0.60.tar.bz2) = 6af7da481fe3688061f5a74ceed694812c1d475a -Size (MPlayer-0.60.tar.bz2) = 1753317 bytes -SHA1 (patch-aa) = 1e626d0312631e441d126a89314f4e4e6d177e1f -SHA1 (patch-ab) = b57033b07b789917dc2f576e34dacf06e90fc824 -SHA1 (patch-ad) = 2caecb946658925f20874a2aff61afc972354a37 -SHA1 (patch-ae) = 84db805213925f9ebc511de56f723ba29147ba99 -SHA1 (patch-ag) = bfbae41a30a7f0c9440ece02e3f2eadd1fca87a1 -SHA1 (patch-ah) = 506cda70793d84342b035570b428cb7b566b622e +SHA1 (MPlayer-0.90pre2.tar.bz2) = 51f70a14f43af7cddd17df8c3b2f59207a56ca6d +Size (MPlayer-0.90pre2.tar.bz2) = 2382376 bytes +SHA1 (patch-aa) = 514deb9f9e8264ba964a7d5425fa5f3d97b62829 diff --git a/graphics/mplayer/files/vcd_read_nbsd.c b/graphics/mplayer/files/vcd_read_nbsd.c deleted file mode 100644 index b8d28ae6851..00000000000 --- a/graphics/mplayer/files/vcd_read_nbsd.c +++ /dev/null @@ -1,200 +0,0 @@ -/* $NetBSD: vcd_read_nbsd.c,v 1.1 2001/12/26 00:58:05 zuntum Exp $ */ - -#include <sys/types.h> -#include <sys/inttypes.h> -#include <sys/cdio.h> -#include <sys/scsiio.h> - -#define HAVE_VCD - -#define CDROM_LEADOUT 0xAA - -static struct ioc_read_toc_entry vcd_entry; -static struct cd_toc_entry vcd_entry_data; -static char vcd_buf[VCD_SECTOR_SIZE]; - -static inline void -vcd_set_msf(unsigned int sect) -{ - unsigned int s = sect; - vcd_entry_data.addr.msf.frame = sect % 75; - sect = sect / 75; - vcd_entry_data.addr.msf.second = sect % 60; - sect = sect / 60; - vcd_entry_data.addr.msf.minute = sect; -} - -static inline unsigned int -vcd_get_msf() -{ - return vcd_entry_data.addr.msf.frame + - (vcd_entry_data.addr.msf.second + - vcd_entry_data.addr.msf.minute * 60) * 75; -} - -int -vcd_seek_to_track(int fd, int track) -{ - vcd_entry.address_format = CD_MSF_FORMAT; - vcd_entry.starting_track = track; - vcd_entry.data_len = sizeof(struct cd_toc_entry); - vcd_entry.data = &vcd_entry_data; - if (ioctl(fd, CDIOREADTOCENTRIES, &vcd_entry)) { - perror("ioctl dif1"); - return -1; - } - return VCD_SECTOR_DATA * vcd_get_msf(); -} - -int -vcd_get_track_end(int fd, int track) -{ - struct ioc_toc_header tochdr; - if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) { - perror("read CDROM toc header: "); - return -1; - } - vcd_entry.address_format = CD_MSF_FORMAT; - vcd_entry.starting_track = track < tochdr.ending_track ? (track + 1) : CDROM_LEADOUT; - vcd_entry.data_len = sizeof(struct cd_toc_entry); - vcd_entry.data = &vcd_entry_data; - if (ioctl(fd, CDIOREADTOCENTRYS, &vcd_entry)) { - perror("ioctl dif2"); - return -1; - } - return VCD_SECTOR_DATA * vcd_get_msf(); -} - -void -vcd_read_toc(int fd) -{ - struct ioc_toc_header tochdr; - int i; - if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) { - perror("read CDROM toc header: "); - return; - } - for (i = tochdr.starting_track; i <= tochdr.ending_track; i++) { - struct ioc_read_toc_entry tocentry; - struct cd_toc_entry tocentry_data; - - tocentry.starting_track = i; - tocentry.address_format = CD_MSF_FORMAT; - tocentry.data_len = sizeof(struct cd_toc_entry); - tocentry.data = &tocentry_data; - - if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) { - perror("read CDROM toc entry: "); - return; - } - printf("track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n", - (int) tocentry.starting_track, - (int) tocentry.data->addr_type, - (int) tocentry.data->control, - (int) tocentry.address_format, - (int) tocentry.data->addr.msf.minute, - (int) tocentry.data->addr.msf.second, - (int) tocentry.data->addr.msf.frame - ); - } -} - -static int -vcd_read(int fd, char *mem) -{ - struct scsireq sc; - int lba = vcd_get_msf(); - int blocks; - int sector_type; - int sync, header_code, user_data, edc_ecc, error_field; - int sub_channel; - int rc; - - blocks = 1; - sector_type = 5; /* mode2/form2 */ - sync = 0; - header_code = 0; - user_data = 1; - edc_ecc = 0; - error_field = 0; - sub_channel = 0; - - memset(&sc, 0, sizeof(sc)); - sc.cmd[0] = 0xBE; - sc.cmd[1] = (sector_type) << 2; - sc.cmd[2] = (lba >> 24) & 0xff; - sc.cmd[3] = (lba >> 16) & 0xff; - sc.cmd[4] = (lba >> 8) & 0xff; - sc.cmd[5] = lba & 0xff; - sc.cmd[6] = (blocks >> 16) & 0xff; - sc.cmd[7] = (blocks >> 8) & 0xff; - sc.cmd[8] = blocks & 0xff; - sc.cmd[9] = (sync << 7) | (header_code << 5) | (user_data << 4) | - (edc_ecc << 3) | (error_field << 1); - sc.cmd[10] = sub_channel; - sc.cmdlen = 12; - sc.databuf = (caddr_t) mem; - sc.datalen = 2328; - sc.senselen = sizeof(sc.sense); - sc.flags = SCCMD_READ; - sc.timeout = 10000; - rc = ioctl(fd, SCIOCCOMMAND, &sc); - if (rc == -1) { - perror("SCIOCCOMMAND"); - return -1; - } - if (sc.retsts || sc.error) { - fprintf(stderr, "scsi command failed: status %d error %d\n", sc.retsts, - sc.error); - return -1; - } - return VCD_SECTOR_DATA; -} - -#ifdef VCD_CACHE - -static int vcd_cache_size = 0; -static char *vcd_cache_data = NULL; -static int *vcd_cache_sectors = NULL; -static int vcd_cache_index = 0; -static int vcd_cache_current = -1; - -void -vcd_cache_init(int s) -{ - vcd_cache_size = s; - vcd_cache_sectors = malloc(s * sizeof(int)); - vcd_cache_data = malloc(s * VCD_SECTOR_SIZE); - memset(vcd_cache_sectors, 255, s * sizeof(int)); -} - -static inline void -vcd_cache_seek(int sect) -{ - vcd_cache_current = sect; -} - -int -vcd_cache_read(int fd, char *mem) -{ - int i; - char *vcd_buf; - for (i = 0; i < vcd_cache_size; i++) - if (vcd_cache_sectors[i] == vcd_cache_current) { - vcd_buf = &vcd_cache_data[i * VCD_SECTOR_SIZE]; - ++vcd_cache_current; - memcpy(mem, &vcd_buf[VCD_SECTOR_OFFS], VCD_SECTOR_DATA); - return VCD_SECTOR_DATA; - } - vcd_buf = &vcd_cache_data[vcd_cache_index * VCD_SECTOR_SIZE]; - vcd_cache_sectors[vcd_cache_index] = vcd_cache_current; - ++vcd_cache_index; - if (vcd_cache_index >= vcd_cache_size) - vcd_cache_index = 0; - vcd_set_msf(vcd_cache_current); - memcpy(vcd_buf, &vcd_entry_data.addr.msf, sizeof(vcd_entry_data.addr.msf)); - ++vcd_cache_current; - memcpy(mem, &vcd_buf[VCD_SECTOR_OFFS], VCD_SECTOR_DATA); - return VCD_SECTOR_DATA; -} -#endif diff --git a/graphics/mplayer/patches/patch-aa b/graphics/mplayer/patches/patch-aa index 9023a37e512..f557e3f7e6d 100644 --- a/graphics/mplayer/patches/patch-aa +++ b/graphics/mplayer/patches/patch-aa @@ -1,21 +1,24 @@ -$NetBSD: patch-aa,v 1.3 2001/12/26 00:58:05 zuntum Exp $ +$NetBSD: patch-aa,v 1.4 2002/04/30 15:10:01 veego Exp $ ---- configure.in Sun Nov 25 13:42:15 2001 -+++ configure Sun Nov 25 14:12:54 2001 -@@ -1731,7 +1731,7 @@ - if test "$_ossaudio" = auto ; then - cat > $TMPC << EOF - #include <sys/soundcard.h> --int main(void) { int arg = SNDCTL_DSP_SETFRAGMENT; return 0; } -+int main(void) { int arg = SOUND_VERSION; return 0; } - EOF - _ossaudio=no - cc_check && _ossaudio=yes -@@ -2397,6 +2397,7 @@ - - _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" - bsdos && _ld_arch="$_ld_arch -ldvd" -+netbsd && _ld_arch="$_ld_arch -li386 -lossaudio" - - _def_debug='#undef MP_DEBUG' - test "$_debug" && _def_debug='#define MP_DEBUG 1' +--- configure.orig Sun Apr 28 23:05:09 2002 ++++ configure Mon Apr 29 09:40:55 2002 +@@ -263,8 +263,8 @@ + _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` + ;; + --with-extralibdir=*) +- _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` +-# _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ++# _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ++ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` + ;; + --enable-runtime-cpudetection) + _runtime_cpudetection=yes +@@ -2626,7 +2626,7 @@ + echocheck "DVD support (libmpdvdkit)" + if test "$_dvdkit" = auto ; then + _dvdkit=no +- if linux || freebsd ; then ++ if linux || freebsd | netbsd ; then + test -f "./libmpdvdkit/Makefile" && _dvdkit=yes + fi + fi diff --git a/graphics/mplayer/patches/patch-ab b/graphics/mplayer/patches/patch-ab deleted file mode 100644 index 842b9dfeb72..00000000000 --- a/graphics/mplayer/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2001/12/26 00:58:05 zuntum Exp $ - ---- configure.orig Tue Dec 25 23:00:07 2001 -+++ configure Tue Dec 25 22:58:10 2001 -@@ -233,6 +233,7 @@ - ;; - --with-extralibdir=*) - _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` -+ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` - ;; - esac - done -@@ -1986,7 +1986,7 @@ - - - echocheck "VCD support" --if linux || bsdos || freebsd || sunos ; then -+if linux || bsdos || freebsd || netbsd || sunos ; then - _inputmodules="vcd $_inputmodules" - _def_vcd='#define HAVE_VCD 1' - echores "ok" diff --git a/graphics/mplayer/patches/patch-ad b/graphics/mplayer/patches/patch-ad deleted file mode 100644 index 82d356d804c..00000000000 --- a/graphics/mplayer/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2001/12/26 00:58:05 zuntum Exp $ - ---- libao2/ao_oss.c.orig Sun Nov 25 14:23:25 2001 -+++ libao2/ao_oss.c Sun Nov 25 14:25:16 2001 -@@ -254,9 +254,11 @@ - static float get_delay(){ - /* Calculate how many bytes/second is sent out */ - if(audio_delay_method==2){ -+#ifdef SNDCTL_DSP_GETODELAY - int r=0; - if(ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &r)!=-1) - return ((float)r)/(float)ao_data.bps; -+#endif - audio_delay_method=1; // fallback if not supported - } - if(audio_delay_method==1){ diff --git a/graphics/mplayer/patches/patch-ae b/graphics/mplayer/patches/patch-ae deleted file mode 100644 index a4e27d6c193..00000000000 --- a/graphics/mplayer/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2001/12/26 00:58:05 zuntum Exp $ - ---- libmpdemux/stream.c.orig Fri Sep 28 00:36:53 2001 -+++ libmpdemux/stream.c Mon Oct 1 22:56:02 2001 -@@ -19,7 +19,11 @@ - #ifdef __FreeBSD__ - #include "vcd_read_fbsd.h" - #else -+#ifdef __NetBSD__ -+#include "vcd_read_nbsd.h" -+#else - #include "vcd_read.h" -+#endif - #endif - - #endif diff --git a/graphics/mplayer/patches/patch-ag b/graphics/mplayer/patches/patch-ag deleted file mode 100644 index 74af17432c9..00000000000 --- a/graphics/mplayer/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2001/12/26 00:58:05 zuntum Exp $ - ---- libao2/ao_oss.c.orig Wed Dec 26 02:32:52 2001 -+++ libao2/ao_oss.c Tue Dec 25 23:35:56 2001 -@@ -30,7 +30,7 @@ - - LIBAO_EXTERN(oss) - --static char *dsp="/dev/dsp"; -+static char *dsp="/dev/sound"; - static audio_buf_info zz; - static int audio_fd=-1; - diff --git a/graphics/mplayer/patches/patch-ah b/graphics/mplayer/patches/patch-ah deleted file mode 100644 index c213ac82603..00000000000 --- a/graphics/mplayer/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2001/12/26 00:58:05 zuntum Exp $ - ---- libmp1e/common/mmx.c.orig Wed Dec 5 02:56:43 2001 -+++ libmp1e/common/mmx.c Tue Dec 25 23:23:07 2001 -@@ -44,6 +44,8 @@ - * VIA has no similar document available as of Jan 2001. - */ - -+#define cpuid_t xcpuid_t -+ - typedef union { - unsigned char s[16]; - struct { |