Date: Wed, 9 Nov 2005 19:30:19 GMT From: "Thomas E. Zander" <riggs@rrr.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/87853: [fix] multimedia/mplayer: no bsdbt848 driver compiled in Message-ID: <200511091930.jA9JUJ9M010677@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/87853; it has been noted by GNATS. From: "Thomas E. Zander" <riggs@rrr.de> To: Simun Mikecin <numisemis@yahoo.com> Cc: bug-followup@FreeBSD.org, Edwin Groothuis <edwin@FreeBSD.org> Subject: Re: ports/87853: [fix] multimedia/mplayer: no bsdbt848 driver compiled in Date: Wed, 9 Nov 2005 20:29:48 +0100 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Hi again, I've prepared a diff to solve the issue. Besides this, PORTREVISION is bumped to reflect the change and distinfo contains sha256 sum. Would you please confirm that it works on amd64, go for the commit and close the pr?! TIA, Riggs -- - Now the world has gone to bed | Now I lay me down to sleep - -- Darkness won't engulf my head | Try to count electric sheep -- --- I can see by infra-red | Sweet dream wishes you can keep --- ---- How I hate the night | How I hate the night ---- --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="mplayer.diff" diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile --- /usr/ports/multimedia/mplayer/Makefile Fri Sep 30 07:50:24 2005 +++ mplayer/Makefile Wed Nov 9 20:06:33 2005 @@ -270,7 +270,7 @@ PORTNAME= mplayer PORTVERSION= 0.99.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio ipv6 MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ diff -ruN /usr/ports/multimedia/mplayer/distinfo mplayer/distinfo --- /usr/ports/multimedia/mplayer/distinfo Wed Aug 31 13:34:33 2005 +++ mplayer/distinfo Wed Nov 9 20:03:45 2005 @@ -1,2 +1,3 @@ MD5 (MPlayer-1.0pre7try2.tar.bz2) = aaca4fd327176c1afb463f0f047ef6f4 +SHA256 (MPlayer-1.0pre7try2.tar.bz2) = 006da26e16bd1b1a8aec5d59b72b0b2ae7716f4e7634859a3e88b6fbbec4d89a SIZE (MPlayer-1.0pre7try2.tar.bz2) = 6868786 diff -ruN /usr/ports/multimedia/mplayer/files/patch-ad mplayer/files/patch-ad --- /usr/ports/multimedia/mplayer/files/patch-ad Fri Sep 30 07:50:24 2005 +++ mplayer/files/patch-ad Wed Nov 9 19:53:48 2005 @@ -1,5 +1,5 @@ --- configure.orig Wed Apr 13 13:46:35 2005 -+++ configure Tue Sep 27 21:31:54 2005 ++++ configure Wed Nov 9 19:52:06 2005 @@ -29,9 +29,9 @@ echo >> "$TMPLOG" cat "$TMPC" >> "$TMPLOG" @@ -161,7 +161,19 @@ #error We do not support old versions of x264. Get the latest from SVN. #endif int main(void) { x264_encoder_open((void*)0); return 0; } -@@ -6477,7 +6416,7 @@ +@@ -6115,8 +6054,11 @@ + if test "$_tv" = yes ; then + cat > $TMPC <<EOF + #include <sys/types.h> ++#include <sys/param.h> + #if defined(__NetBSD__) + #include <dev/ic/bt8xx.h> ++#elif(__FreeBSD_version >= 502100) ++#include <dev/bktr/ioctl_bt848.h> + #else + #include <machine/ioctl_bt848.h> + #endif +@@ -6477,7 +6419,7 @@ fi _stripbinaries=no elif test -z "$CFLAGS" ; then @@ -170,7 +182,7 @@ # always compile with '-g' if .developer: if test -f ".developer" ; then CFLAGS="-g $CFLAGS" -@@ -6487,6 +6426,9 @@ +@@ -6487,6 +6429,9 @@ _stripbinaries=no fi else @@ -180,7 +192,7 @@ cat <<EOF MPlayer compilation will use the CFLAGS set by you, but: -@@ -6526,7 +6468,7 @@ +@@ -6526,7 +6471,7 @@ CFLAGS="$CFLAGS -D_REENTRANT" elif bsd ; then # FIXME bsd needs this so maybe other OS'es @@ -189,7 +201,7 @@ fi # 64 bit file offsets? if test "$_largefiles" = yes || freebsd ; then -@@ -6640,13 +6582,11 @@ +@@ -6640,13 +6585,11 @@ echocheck "lirc" if test "$_lirc" = auto ; then _lirc=no --YZ5djTAD1cGYuMQK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511091930.jA9JUJ9M010677>