diff options
| author | salo <salo@pkgsrc.org> | 2004-04-07 12:57:58 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2004-04-07 12:57:58 +0000 |
| commit | 2136a8b18274603ae87c37a4f703552f8e7eed37 (patch) | |
| tree | 71b84ca7188ad631810e23240fe5be0f7e536797 /multimedia/mplayer-share | |
| parent | 7f700e6c3541154276cbbe0edb3c71444e2239cb (diff) | |
| download | pkgsrc-2136a8b18274603ae87c37a4f703552f8e7eed37.tar.gz | |
PKGREVISION++
Add Matroska support.
Diffstat (limited to 'multimedia/mplayer-share')
| -rw-r--r-- | multimedia/mplayer-share/Makefile.depends | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 18 |
3 files changed, 20 insertions, 5 deletions
diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends index ff95f7557c3..583b6c7f321 100644 --- a/multimedia/mplayer-share/Makefile.depends +++ b/multimedia/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.5 2004/02/20 17:32:33 jmmv Exp $ +# $NetBSD: Makefile.depends,v 1.6 2004/04/07 12:57:58 salo Exp $ # DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share @@ -36,6 +36,7 @@ USE_X11= YES .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" +.include "../../multimedia/libmatroska/buildlink3.mk" .include "../../multimedia/xvidcore/buildlink3.mk" .if defined(USE_OSS) diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index d80134b9bb0..c60d1d83179 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2004/04/06 18:33:10 salo Exp $ +$NetBSD: distinfo,v 1.3 2004/04/07 12:57:58 salo Exp $ SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes @@ -8,7 +8,7 @@ SHA1 (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f9 Size (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 222208 bytes SHA1 (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 Size (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = 249705 bytes -SHA1 (patch-aa) = 3ab26e41524bee01fba4002f0f827eb5b1b390d7 +SHA1 (patch-aa) = 5c1fef6453f2fde1bb2bc13fc0501935208a459c SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index c49e8271e80..53f4efb4ccb 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2004/04/06 18:33:10 salo Exp $ +$NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $ --- configure.orig 2003-12-08 22:33:31.000000000 +0100 -+++ configure 2004-04-06 20:22:24.000000000 +0200 ++++ configure 2004-04-06 22:46:56.000000000 +0200 @@ -367,8 +367,8 @@ _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; @@ -49,3 +49,17 @@ $NetBSD: patch-aa,v 1.2 2004/04/06 18:33:10 salo Exp $ _def_arch='#define ARCH_X86_64 1' _target_arch='TARGET_ARCH_X86_64 = yes' iproc='x86_64' +@@ -4491,11 +4491,11 @@ + + int main(void) { return 0; } + EOF +- cc_check -lmatroska -lebml -lstdc++ && _matroska=yes ++ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska=yes + if test "$_matroska" = no ; then + _saved_inc_extra=$_inc_extra + _inc_extra="$_inc_extra -I/usr/local/include" +- cc_check -lmatroska -lebml -lstdc++ && _matroska=yes ++ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska=yes + if test "$_matroska" = no ; then + _inc_extra=$_saved_inc_extra + fi |