NetBSD Problem Report #20549
Received: (qmail 12995 invoked by uid 605); 2 Mar 2003 11:59:22 -0000
Message-Id: <E18pS7P-0000kA-00@d33-110.ropnet.ru>
Date: Sun, 02 Mar 2003 14:58:59 +0300
From: svs+pr@grep.ru
Sender: gnats-bugs-owner@netbsd.org
To: gnats-bugs@gnats.netbsd.org
Subject: graphics/mplayer: vidix, xanim plugins, VideoCD playback
X-Send-Pr-Version: 3.95
>Number: 20549
>Category: pkg
>Synopsis: graphics/mplayer: vidix drivers, xanim plugins, VideoCD playback
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Mar 02 12:00:00 +0000 2003
>Closed-Date: Mon Oct 20 07:40:18 +0000 2008
>Last-Modified: Wed Dec 17 12:55:01 +0000 2008
>Originator:
>Release: NetBSD 1.6L
>Organization:
>Environment:
>Description:
Three issues:
1) MPlayer contains its own MI drivers for certain
framebuffers. These are compiled but not installed by
default.
2) MPlayer supports loadable codecs developed for XAnim.
The code doesn't depend on XAnim itself.
3) VideoCD playback can fail for certain discs (SCIOCCOMMAND
returns with error=0 but retsts!=0, and higher-level
code fails to play video stream.) This fix was submitted
to mplayer-dev-eng.
>How-To-Repeat:
>Fix:
Index: graphics/gmplayer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gmplayer/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- graphics/gmplayer/Makefile 2003/02/03 05:07:06 1.13
+++ graphics/gmplayer/Makefile 2003/02/24 20:02:29
@@ -56,6 +56,11 @@
.endfor
@${CHMOD} -R a+r ${PREFIX}/share/mplayer/Skin
@${CHMOD} a+rx ${PREFIX}/share/mplayer/Skin/*
+.if ${CONFIGURE_ARGS:M--disable-vidix} == ""
+ ${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/${PKGNAME}/vidix
+ ${INSTALL_PROGRAM} ${WRKSRC}/libdha/libdha.so.0.1 \
+ ${WRKSRC}/vidix/drivers/*.so ${PREFIX}/lib/${PKGNAME}/vidix
+.endif
.include "../../graphics/mplayer-share/Makefile.depends"
Index: graphics/gmplayer/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gmplayer/distinfo,v
retrieving revision 1.29
diff -u -r1.29 distinfo
--- graphics/gmplayer/distinfo 2003/02/22 16:26:18 1.29
+++ graphics/gmplayer/distinfo 2003/02/24 20:02:29
@@ -46,3 +46,7 @@
Size (mplayer/xine-lcd-1.0.tar.bz2) = 168441 bytes
SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
SHA1 (patch-ab) = f2fd9006914a7d1bac364be74ca5d7cb9aab6806
+SHA1 (patch-ac) = 188308ed49f134efe2528e1d20fcb09264bc748b
+SHA1 (patch-ad) = 94779a5212679b6f300fb3eb05f0e475fc9a6621
+SHA1 (patch-ae) = 8ff76a2918bb82c1bbf958c4599b8512d5029c81
+SHA1 (patch-af) = 59a49840704574604601c6d64b8889bcef5f360a
Index: graphics/mplayer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mplayer/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- graphics/mplayer/Makefile 2003/01/20 22:42:39 1.30
+++ graphics/mplayer/Makefile 2003/02/24 20:02:29
@@ -11,6 +11,11 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
+.if ${CONFIGURE_ARGS:M--disable-vidix} == ""
+ ${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/${PKGNAME}/vidix
+ ${INSTALL_PROGRAM} ${WRKSRC}/libdha/libdha.so.0.1 \
+ ${WRKSRC}/vidix/drivers/*.so ${PREFIX}/lib/${PKGNAME}/vidix
+.endif
.include "../../graphics/mplayer-share/Makefile.depends"
Index: graphics/mplayer/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mplayer/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- graphics/mplayer/distinfo 2003/02/22 16:26:18 1.30
+++ graphics/mplayer/distinfo 2003/02/24 20:02:29
@@ -4,3 +4,7 @@
Size (mplayer/MPlayer-0.90rc4.tar.bz2) = 3390207 bytes
SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
SHA1 (patch-ab) = f2fd9006914a7d1bac364be74ca5d7cb9aab6806
+SHA1 (patch-ac) = 188308ed49f134efe2528e1d20fcb09264bc748b
+SHA1 (patch-ad) = 94779a5212679b6f300fb3eb05f0e475fc9a6621
+SHA1 (patch-ae) = 8ff76a2918bb82c1bbf958c4599b8512d5029c81
+SHA1 (patch-af) = 59a49840704574604601c6d64b8889bcef5f360a
Index: graphics/mplayer-share/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mplayer-share/Makefile.common,v
retrieving revision 1.25
diff -u -r1.25 Makefile.common
--- graphics/mplayer-share/Makefile.common 2003/02/22 16:26:17 1.25
+++ graphics/mplayer-share/Makefile.common 2003/02/24 20:02:29
@@ -40,6 +40,7 @@
CONFIGURE_ARGS+= --disable-mpdvdkit
CONFIGURE_ARGS+= --enable-faad
CONFIGURE_ARGS+= --disable-arts
+CONFIGURE_ARGS+= --enable-xanim --with-xanimlibdir="${LOCALBASE}/lib/xanim"
# The configure script attempts to test-execute compiled programs in /tmp,
# but that directory may be mounted as noexec; work this around by setting
@@ -52,6 +53,13 @@
CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32"
.if ${MPLAYER_ENABLE_RUNTIME_CPU_DETECTION} == YES
CONFIGURE_ARGS+= --enable-runtime-cpudetection
+.endif
+.if ${MACHINE_ARCH} != "i386"
+CONFIGURE_ARGS+= --disable-vidix
+.elif exists(${.CURDIR}/PLIST.vidix)
+PLIST_SRC+= PLIST.vidix
+PLIST_SUBST+= PKGNAME=${PKGNAME}
+MAKE_ENV+= PKGNAME=${PKGNAME}
.endif
.if ${MPLAYER_USE_REALMEDIA} == "YES"
CONFIGURE_ARGS+= --with-reallibdir="${LOCALBASE}/lib/RealPlayer8/Codecs"
--- /dev/null Mon Feb 24 23:00:01 2003
+++ graphics/mplayer-share/patches/patch-ac Mon Feb 24 19:06:08 2003
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libmpdemux/vcd_read_nbsd.h.orig Mon Dec 23 03:40:15 2002
++++ libmpdemux/vcd_read_nbsd.h
+@@ -154,7 +154,7 @@ vcd_read(int fd, char *mem)
+ perror("SCIOCCOMMAND");
+ return -1;
+ }
+- if (sc.retsts || sc.error) {
++ if (sc.error) {
+ fprintf(stderr, "scsi command failed: status %d error %d\n", sc.retsts,
+ sc.error);
+ return -1;
--- /dev/null Mon Feb 24 23:00:01 2003
+++ graphics/mplayer-share/patches/patch-ad Mon Feb 24 19:06:21 2003
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libvo/Makefile.orig Sun Feb 23 19:35:09 2003
++++ libvo/Makefile
+@@ -12,7 +12,7 @@ endif
+
+ CFLAGS = $(OPTFLAGS) -I. -I.. $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall
+ ifeq ($(VIDIX),yes)
+-CFLAGS += -DVIDIX_PATH='"$(prefix)/lib/mplayer/vidix/"'
++CFLAGS += -DVIDIX_PATH='"$(prefix)/lib/$(PKGNAME)/vidix/"'
+ endif
+ # -I/usr/X11R6/include/
+
--- /dev/null Mon Feb 24 23:00:01 2003
+++ graphics/mplayer-share/patches/patch-ae Mon Feb 24 21:26:54 2003
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libvo/vosub_vidix.c.orig Sun Dec 15 21:18:41 2002
++++ libvo/vosub_vidix.c
+@@ -709,7 +709,7 @@ int vidix_preinit(const char *drvname,vo
+ printf("vosub_vidix: You have wrong version of VIDIX library\n");
+ return -1;
+ }
+- vidix_handler = vdlOpen(LIBDIR"/mplayer/vidix/",
++ vidix_handler = vdlOpen(VIDIX_PATH,
+ drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
+ TYPE_OUTPUT,
+ verbose);
--- /dev/null Mon Feb 24 23:00:01 2003
+++ graphics/mplayer-share/patches/patch-af Mon Feb 24 19:06:02 2003
@@ -0,0 +1,61 @@
+$NetBSD$
+
+--- vidix/drivers/Makefile.orig Sat Dec 21 16:06:23 2002
++++ vidix/drivers/Makefile
+@@ -2,48 +2,48 @@
+
+ include ../../config.mak
+
+-BINDIR = $(LIBDIR)/mplayer/vidix
++BINDIR = $(LIBDIR)/$(PKGNAME)/vidix
+
+ CYBERBLADE_VID=cyberblade_vid.so
+ CYBERBLADE_SRCS=cyberblade_vid.c
+ CYBERBLADE_OBJS=cyberblade_vid.o
+-CYBERBLADE_LIBS=-L../../libdha -ldha -lm
++CYBERBLADE_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha -lm
+ CYBERBLADE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
+
+ RADEON_VID=radeon_vid.so
+ RADEON_SRCS=radeon_vid.c
+ RADEON_OBJS=radeon_vid.o
+-RADEON_LIBS=-L../../libdha -ldha -lm
++RADEON_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha -lm
+ RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
+
+ RAGE128_VID=rage128_vid.so
+ RAGE128_SRCS=radeon_vid.c
+ RAGE128_OBJS=rage128_vid.o
+-RAGE128_LIBS=-L../../libdha -ldha
++RAGE128_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha
+ RAGE128_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
+
+ PM3_VID=pm3_vid.so
+ PM3_SRCS=pm3_vid.c
+ PM3_OBJS=pm3_vid.o
+-PM3_LIBS=-L../../libdha -ldha
++PM3_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha
+ PM3_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
+
+ MACH64_VID=mach64_vid.so
+ MACH64_SRCS=mach64_vid.c
+ MACH64_OBJS=mach64_vid.o
+-MACH64_LIBS=-L../../libdha -ldha
++MACH64_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha
+ MACH64_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
+
+ MGA_VID=mga_vid.so
+ MGA_SRCS=mga_vid.c
+ MGA_OBJS=mga_vid.o
+-MGA_LIBS=-L../../libdha -ldha -lm
++MGA_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha -lm
+ MGA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
+
+ MGA_CRTC2_VID=mga_crtc2_vid.so
+ MGA_CRTC2_SRCS=mga_vid.c
+ MGA_CRTC2_OBJS=mga_crtc2_vid.o
+-MGA_CRTC2_LIBS=-L../../libdha -ldha -lm
++MGA_CRTC2_LIBS=-L../../libdha -Wl,-rpath,$(BINDIR) -ldha -lm
+ MGA_CRTC2_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DCRTC2
+
+ all: $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID)
--- /dev/null Mon Feb 24 23:20:02 2003
+++ graphics/gmplayer/PLIST.vidix Mon Feb 24 19:06:34 2003
@@ -0,0 +1,11 @@
+@comment $NetBSD$
+lib/${PKGNAME}/vidix/libdha.so.0.1
+lib/${PKGNAME}/vidix/cyberblade_vid.so
+lib/${PKGNAME}/vidix/mach64_vid.so
+lib/${PKGNAME}/vidix/mga_crtc2_vid.so
+lib/${PKGNAME}/vidix/mga_vid.so
+lib/${PKGNAME}/vidix/pm3_vid.so
+lib/${PKGNAME}/vidix/radeon_vid.so
+lib/${PKGNAME}/vidix/rage128_vid.so
+@dirrm lib/${PKGNAME}/vidix
+@dirrm lib/${PKGNAME}
--- /dev/null Mon Feb 24 23:20:02 2003
+++ graphics/mplayer/PLIST.vidix Mon Feb 24 19:06:31 2003
@@ -0,0 +1,11 @@
+@comment $NetBSD$
+lib/${PKGNAME}/vidix/libdha.so.0.1
+lib/${PKGNAME}/vidix/cyberblade_vid.so
+lib/${PKGNAME}/vidix/mach64_vid.so
+lib/${PKGNAME}/vidix/mga_crtc2_vid.so
+lib/${PKGNAME}/vidix/mga_vid.so
+lib/${PKGNAME}/vidix/pm3_vid.so
+lib/${PKGNAME}/vidix/radeon_vid.so
+lib/${PKGNAME}/vidix/rage128_vid.so
+@dirrm lib/${PKGNAME}/vidix
+@dirrm lib/${PKGNAME}
>Release-Note:
>Audit-Trail:
From: Bernd Ernesti <netbsd@lists.veego.de>
To: svs+pr@grep.ru
Cc: gnats-bugs@gnats.netbsd.org
Subject: Re: pkg/20549: graphics/mplayer: vidix, xanim plugins, VideoCD playback
Date: Sun, 2 Mar 2003 14:21:04 +0100
On Sun, Mar 02, 2003 at 02:58:59PM +0300, svs+pr@grep.ru wrote:
[..]
> >Description:
> Three issues:
>
> 1) MPlayer contains its own MI drivers for certain
> framebuffers. These are compiled but not installed by
> default.
Which requires root privileges, because of the way it needs access to the graphics
card.
I didn't even bother to enable it, because it first needs to be fixed to use libpci
and not use the old broken xfree code.
Bernd
From: Sergey Svishchev <svs@ropnet.ru>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/20549
Date: Sun, 19 Oct 2008 16:32:12 +0400
Problems 1 and 2 are obsolete now, but 3rd is still valid -- there's a bug filed in MPlayer
bugzilla (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=751) and here's the patch:
--- stream/vcd_read_fbsd.h.orig 2007-10-07 19:49:26.000000000 +0000
+++ stream/vcd_read_fbsd.h
@@ -37,9 +37,8 @@ typedef struct mp_vcd_priv_st {
vcd_tocentry entry;
#ifdef VCD_NETBSD
struct cd_toc_entry entry_data;
-#else
- cdsector_t buf;
#endif
+ cdsector_t buf;
} mp_vcd_priv_t;
static inline void
@@ -208,8 +207,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
sc.cmd[9] = 1 << 4; // user data only
sc.cmd[10] = 0; // no subchannel
sc.cmdlen = 12;
- sc.databuf = (caddr_t) mem;
- sc.datalen = 2328;
+ sc.databuf = (caddr_t) vcd->buf.data;
+ sc.datalen = VCD_SECTOR_DATA + 4; // MMC-3 spec says there are 4 extra bytes
sc.senselen = sizeof(sc.sense);
sc.flags = SCCMD_READ;
sc.timeout = 10000;
@@ -226,9 +225,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
#else
if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
!= VCD_SECTOR_SIZE) return 0; // EOF?
+#endif
memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
-#endif
vcd_inc_msf(vcd);
return VCD_SECTOR_DATA;
}
--
Sergey Svishchev
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Mon, 20 Oct 2008 07:40:18 +0000
State-Changed-Why:
Patch applied, thanks!
From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/20549 CVS commit: pkgsrc/multimedia
Date: Mon, 20 Oct 2008 07:40:00 +0000 (UTC)
Module Name: pkgsrc
Committed By: wiz
Date: Mon Oct 20 07:40:00 UTC 2008
Modified Files:
pkgsrc/multimedia/gmplayer: Makefile distinfo
pkgsrc/multimedia/mencoder: Makefile
pkgsrc/multimedia/mplayer: Makefile
pkgsrc/multimedia/mplayer-share: distinfo
Added Files:
pkgsrc/multimedia/mplayer-share/patches: patch-an
Log Message:
Add a patch for better VCD support from Sergey Svishchev.
Fixes PR 20549.
To generate a diff of this commit:
cvs rdiff -r1.71 -r1.72 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -r1.57 -r1.58 pkgsrc/multimedia/gmplayer/distinfo
cvs rdiff -r1.39 -r1.40 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -r1.61 -r1.62 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -r1.54 -r1.55 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -r0 -r1.1 pkgsrc/multimedia/mplayer-share/patches/patch-an
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: "Tyler R. Retzlaff" <rtr@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/20549 CVS commit: [pkgsrc-2008Q3] pkgsrc/multimedia
Date: Wed, 17 Dec 2008 12:50:32 +0000 (UTC)
Module Name: pkgsrc
Committed By: rtr
Date: Wed Dec 17 12:50:32 UTC 2008
Modified Files:
pkgsrc/multimedia/gmplayer [pkgsrc-2008Q3]: Makefile distinfo
pkgsrc/multimedia/mencoder [pkgsrc-2008Q3]: Makefile
pkgsrc/multimedia/mplayer [pkgsrc-2008Q3]: Makefile
pkgsrc/multimedia/mplayer-share [pkgsrc-2008Q3]: distinfo
Added Files:
pkgsrc/multimedia/mplayer-share/patches [pkgsrc-2008Q3]: patch-an
patch-ca
Log Message:
pullup ticket #2611 - requested by tron
mplayer, gmplayer, mencoder: security and vcd support patches
revisions pulled up:
pkgsrc/multimedia/gmplayer/Makefile 1.72, 1.73
pkgsrc/multimedia/gmplayer/distinfo 1.58, 1.59
pkgsrc/multimedia/mencoder/Makefile 1.40, 1.41
pkgsrc/multimedia/mplayer-share/distinfo 1.55, 1.56
pkgsrc/multimedia/mplayer-share/patches/patch-an 1.1
pkgsrc/multimedia/mplayer-share/patches/patch-ca 1.1
pkgsrc/multimedia/mplayer/Makefile 1.62, 1.63
Module Name: pkgsrc
Committed By: wiz
Date: Mon Oct 20 07:40:00 UTC 2008
Modified Files:
pkgsrc/multimedia/gmplayer: Makefile distinfo
pkgsrc/multimedia/mencoder: Makefile
pkgsrc/multimedia/mplayer: Makefile
pkgsrc/multimedia/mplayer-share: distinfo
Added Files:
pkgsrc/multimedia/mplayer-share/patches: patch-an
Log Message:
Add a patch for better VCD support from Sergey Svishchev.
Fixes PR 20549.
------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Mon Dec 15 15:37:59 UTC 2008
Modified Files:
pkgsrc/multimedia/gmplayer: Makefile distinfo
pkgsrc/multimedia/mencoder: Makefile
pkgsrc/multimedia/mplayer: Makefile
pkgsrc/multimedia/mplayer-share: distinfo
Added Files:
pkgsrc/multimedia/mplayer-share/patches: patch-ca
Log Message:
Add security patch from MPlayer SVN repository to fix a buffer overflow
in the TwinVQ media file decoder.
To generate a diff of this commit:
cvs rdiff -r1.71 -r1.71.2.1 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -r1.57 -r1.57.4.1 pkgsrc/multimedia/gmplayer/distinfo
cvs rdiff -r1.39 -r1.39.2.1 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -r1.61 -r1.61.2.1 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -r1.54 -r1.54.2.1 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -r0 -r1.1.2.2 pkgsrc/multimedia/mplayer-share/patches/patch-an \
pkgsrc/multimedia/mplayer-share/patches/patch-ca
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.