mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-13 07:34:50 +00:00
This update solves two issues which are important for many
users of mplayer: o bktr driver working. Thanks to Arjan van Leeuwen <avleeuwen@piwebs.com> and Simun Mikecin sime@logos.hr (For me it doesn't work at all, but mplayer's tv never did :-) So I rely on the reports of the users who are successful.) o disables support for libdvdnav as it's not compatible with the new version. The mplayer developers are informed and hunt the problem. o introduces a patch to fix -vo md5: patch-libvo-vo_md5.c Thanks to Christopher Nehren <apeiron@comcast.net> PR: ports/63363 Submitted by: maintainer
This commit is contained in:
Kirill Ponomarev
parent
e4010b1e00
commit
b20ae7c490
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=102169
@ -93,7 +93,8 @@
|
||||
# libdvdread). This only affect mplayer if WITH_DVD is used.
|
||||
#
|
||||
# WITH_LIBDVDNAV
|
||||
# default: autodetect
|
||||
# Completely disabled at the moment because of incompatibility issues
|
||||
# with the new libdvdnav. This will probably be fixed in mplayer-1.0.
|
||||
#
|
||||
# WITH_LIBUNGIF
|
||||
# default: autodetect
|
||||
@ -170,7 +171,7 @@
|
||||
|
||||
PORTNAME= mplayer
|
||||
PORTVERSION= 0.92.0
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= multimedia audio ipv6
|
||||
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
|
||||
http://www2.mplayerhq.hu/MPlayer/releases/ \
|
||||
@ -207,7 +208,8 @@ CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
|
||||
--with-x11incdir=${X11BASE}/include \
|
||||
--enable-png \
|
||||
--disable-libfame \
|
||||
--disable-tv-v4l
|
||||
--disable-tv-v4l \
|
||||
--disable-dvdnav
|
||||
|
||||
.if defined(WITH_LANG)
|
||||
CONFIGURE_ARGS+=--language=${WITH_LANG}
|
||||
@ -249,9 +251,9 @@ WITH_LIBDV= yes
|
||||
WITH_DVD= yes
|
||||
.endif
|
||||
|
||||
.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
|
||||
WITH_LIBDVDNAV= yes
|
||||
.endif
|
||||
#.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
|
||||
#WITH_LIBDVDNAV= yes
|
||||
#.endif
|
||||
|
||||
.if exists(${LOCALBASE}/lib/libungif.so.5)
|
||||
WITH_LIBUNGIF= yes
|
||||
@ -369,13 +371,13 @@ LIB_DEPENDS+= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss
|
||||
.else
|
||||
LIB_DEPENDS+= dvdread.3:${PORTSDIR}/multimedia/libdvdread
|
||||
.endif
|
||||
.if defined(WITH_LIBDVDNAV)
|
||||
LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
|
||||
#.if defined(WITH_LIBDVDNAV)
|
||||
#LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
|
||||
|
||||
CONFIGURE_ARGS+= --enable-dvdnav
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-dvdnav
|
||||
.endif
|
||||
#CONFIGURE_ARGS+= --enable-dvdnav
|
||||
#.else
|
||||
#CONFIGURE_ARGS+= --disable-dvdnav
|
||||
#.endif
|
||||
|
||||
CONFIGURE_ARGS+= --enable-css \
|
||||
--with-csslibdir=${LOCALBASE}/lib
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- libmpdemux/tvi_bsdbt848.c.orig Mon Jun 2 00:30:37 2003
|
||||
+++ libmpdemux/tvi_bsdbt848.c Tue Dec 16 00:55:43 2003
|
||||
+++ libmpdemux/tvi_bsdbt848.c Sun Jan 18 21:26:15 2004
|
||||
@@ -39,8 +39,12 @@
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
@ -13,7 +13,22 @@
|
||||
#else
|
||||
#include <machine/ioctl_meteor.h>
|
||||
#include <machine/ioctl_bt848.h>
|
||||
@@ -357,6 +361,12 @@
|
||||
@@ -287,6 +291,7 @@
|
||||
|
||||
case TVI_CONTROL_TUN_SET_NORM:
|
||||
{
|
||||
+ u_short tmp_fps;
|
||||
int req_mode = (int)*(void **)arg;
|
||||
|
||||
priv->iformat = METEOR_FMT_AUTOMODE;
|
||||
@@ -352,11 +357,18 @@
|
||||
return(0);
|
||||
}
|
||||
|
||||
- if(ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0)
|
||||
+ tmp_fps=priv->fps;
|
||||
+ if(ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
|
||||
{
|
||||
perror("fps:ioctl");
|
||||
return(0);
|
||||
}
|
||||
@ -26,3 +41,22 @@
|
||||
|
||||
return(TVI_CONTROL_TRUE);
|
||||
}
|
||||
@@ -453,6 +465,7 @@
|
||||
{
|
||||
int marg;
|
||||
int count;
|
||||
+u_short tmp_fps;
|
||||
|
||||
G_private = priv; /* Oooh, sick */
|
||||
|
||||
@@ -497,8 +510,9 @@
|
||||
perror("SINPUT:ioctl");
|
||||
}
|
||||
|
||||
+tmp_fps=priv->fps;
|
||||
if(priv->videoready == TRUE &&
|
||||
- ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0)
|
||||
+ ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
|
||||
{
|
||||
perror("SFPS:ioctl");
|
||||
}
|
||||
|
||||
11
multimedia/mplayer/files/patch-libvo-vo_md5.c
Normal file
11
multimedia/mplayer/files/patch-libvo-vo_md5.c
Normal file
@ -0,0 +1,11 @@
|
||||
--- libvo/vo_md5.c.orig Mon Nov 11 10:20:26 2002
|
||||
+++ libvo/vo_md5.c Sun Jan 11 02:30:52 2004
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
video_out_pgm.flip_page();
|
||||
|
||||
- snprintf (buf2, 100, "md5sum %s", vo_pgm_filename);
|
||||
+ snprintf (buf2, 100, "md5 %s", vo_pgm_filename);
|
||||
f = popen (buf2, "r");
|
||||
i = fread (buf2, 1, sizeof(buf2), f);
|
||||
pclose (f);
|
||||
@ -13,3 +13,7 @@ Please take a look at docs in
|
||||
If you encounter strange problems, please have a look at
|
||||
http://www.rrr.de/~riggs/mplayer/faq_en.html
|
||||
before throwing stones at me :-)
|
||||
|
||||
CAUTION: Please please please don't use
|
||||
-funroll-loops in your CFLAGS when compiling this port.
|
||||
It WILL NOT WORK for many CPUs.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user