From 5077cbc1022f1f560fe01c3ba613815b15dc830e Mon Sep 17 00:00:00 2001 From: dillo Date: Fri, 27 Sep 2002 00:31:00 +0000 Subject: fix and enable AAC support. mplayer now plays Quicktime 6 (.mp4) files --- graphics/mplayer-share/Makefile.common | 3 ++- graphics/mplayer-share/Makefile.depends | 3 ++- graphics/mplayer-share/distinfo | 3 ++- graphics/mplayer-share/patches/patch-ac | 14 ++++++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 graphics/mplayer-share/patches/patch-ac (limited to 'graphics/mplayer-share') diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common index f21ab9e42ed..4a7dcb9686f 100644 --- a/graphics/mplayer-share/Makefile.common +++ b/graphics/mplayer-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2002/08/28 07:00:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2002/09/27 00:31:01 dillo Exp $ MPLAYER_DIST_VERSION= 0.90pre6 @@ -40,6 +40,7 @@ CONFIGURE_ARGS+= --with-extralibdir="${LOCALBASE}/lib" #CONFIGURE_ARGS+= --enable-dvdread CONFIGURE_ARGS+= --disable-mpdvdkit CONFIGURE_ARGS+= --disable-ossaudio +CONFIGURE_ARGS+= --enable-faad # The configure script attempts to test-execute compiled programs in /tmp, # but that directory may be mounted as noexec; work this around by setting diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends index 164085e9563..b009b493d1d 100644 --- a/graphics/mplayer-share/Makefile.depends +++ b/graphics/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.4 2002/08/28 07:00:48 jlam Exp $ +# $NetBSD: Makefile.depends,v 1.5 2002/09/27 00:31:01 dillo Exp $ DEPENDS+= mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share @@ -18,6 +18,7 @@ DEPENDS+= realplayer>=8:../../audio/realplayer USE_X11= # defined .include "../../audio/mad/buildlink2.mk" +.include "../../audio/faad2/buildlink2.mk" .include "../../devel/SDL/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo index b98a3692dcb..afddc281466 100644 --- a/graphics/mplayer-share/distinfo +++ b/graphics/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/07 13:06:45 veego Exp $ +$NetBSD: distinfo,v 1.6 2002/09/27 00:31:01 dillo Exp $ SHA1 (mplayer/MPlayer-0.90pre6.tar.bz2) = 487cea09f024191ec7f632292ede1eb33bc931c4 Size (mplayer/MPlayer-0.90pre6.tar.bz2) = 2599258 bytes @@ -10,3 +10,4 @@ SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec SHA1 (patch-ab) = 413b752bf5a56fcefa5ada7c8bb9d8614e9e5425 +SHA1 (patch-ac) = 62f10613d3992a9e08495b10048a00064ce90f0b diff --git a/graphics/mplayer-share/patches/patch-ac b/graphics/mplayer-share/patches/patch-ac new file mode 100644 index 00000000000..606db3044a9 --- /dev/null +++ b/graphics/mplayer-share/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 2002/09/27 00:31:01 dillo Exp $ + +--- libmpcodecs/ad_faad.c.orig Sun Aug 4 17:33:41 2002 ++++ libmpcodecs/ad_faad.c +@@ -46,7 +46,8 @@ static int preinit(sh_audio_t *sh) + + static int init(sh_audio_t *sh) + { +- unsigned long faac_samplerate, faac_channels; ++ unsigned long faac_samplerate; ++ unsigned char faac_channels; + int faac_init; + faac_hdec = faacDecOpen(); + -- cgit v1.2.3