pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Fix compilation with aalib op...
details: https://anonhg.NetBSD.org/pkgsrc/rev/578730f5ff82
branches: trunk
changeset: 497180:578730f5ff82
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Jul 21 14:24:48 2005 +0000
description:
Fix compilation with aalib option.
diffstat:
multimedia/mplayer-share/distinfo | 4 ++--
multimedia/mplayer-share/options.mk | 5 +----
multimedia/mplayer-share/patches/patch-aa | 13 +++++++++++--
3 files changed, 14 insertions(+), 8 deletions(-)
diffs (69 lines):
diff -r 8dc0e9d843d0 -r 578730f5ff82 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Thu Jul 21 13:25:11 2005 +0000
+++ b/multimedia/mplayer-share/distinfo Thu Jul 21 14:24:48 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2005/05/31 19:15:11 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2005/07/21 14:24:48 wiz Exp $
SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
@@ -12,7 +12,7 @@
SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91
Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = 7e4eaab0042979c44271c361d00e1c05a04c93bc
+SHA1 (patch-aa) = d77cd903d735d7a88336e0aff309f8508cafed94
SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
diff -r 8dc0e9d843d0 -r 578730f5ff82 multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk Thu Jul 21 13:25:11 2005 +0000
+++ b/multimedia/mplayer-share/options.mk Thu Jul 21 14:24:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/07/18 12:07:33 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2005/07/21 14:24:48 wiz Exp $
.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
@@ -79,10 +79,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Maalib)
-CONFIGURE_ARGS+= --enable-aa
. include "../../graphics/aalib-x11/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-aa
.endif
.if !empty(PKG_OPTIONS:Marts)
diff -r 8dc0e9d843d0 -r 578730f5ff82 multimedia/mplayer-share/patches/patch-aa
--- a/multimedia/mplayer-share/patches/patch-aa Thu Jul 21 13:25:11 2005 +0000
+++ b/multimedia/mplayer-share/patches/patch-aa Thu Jul 21 14:24:48 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2005/05/31 19:15:11 jmmv Exp $
+$NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
--- configure.orig 2005-04-13 13:46:35.000000000 +0200
+++ configure
@@ -39,7 +39,7 @@
;;
--with-dxr2incdir=*)
_inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-@@ -2382,7 +2383,7 @@
+@@ -2382,7 +2383,7 @@ echores "$_posix4"
echocheck "lrintf"
cat > $TMPC << EOF
#include <math.h>
@@ -48,3 +48,12 @@
EOF
_lrintf=no
cc_check $_ld_lm && _lrintf=yes
+@@ -3788,7 +3789,7 @@ fi
+ if test "$_aa" = yes ; then
+ _def_aa='#define HAVE_AA 1'
+ if cygwin ; then
+- _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
++ _ld_aa=`${AALIB_CONFIG} --libs | cut -d " " -f 2,5,6`
+ fi
+ _vosrc="$_vosrc vo_aa.c"
+ _vomodules="aa $_vomodules"
Home |
Main Index |
Thread Index |
Old Index