Subject: Re: mplayer does not depend on aalib-x11 but uses it if it is
To: None <tech-pkg@NetBSD.org>
From: Leonard Schmidt <lems@gmx.net>
List: tech-pkg
Date: 07/18/2005 10:32:14
--Yylu36WmvOXNoKYn
Content-Type: multipart/mixed; boundary="Dxnq1zWXvFF0Q93v"
Content-Disposition: inline


--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Jul 18, 2005 at 12:13:06AM +0000, Leonard Schmidt wrote:
> When disabling SDL (-sdl), mplayer does not use aalib-x11.

Could something similar like the attached patch be done, please? I
would like to enable aalib support without having to enable SDL as
well (libcaca support would be nice, too. (pkg/30318)).

Regards,
Leonard

--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mplayer-with-aalib.diff"
Content-Transfer-Encoding: quoted-printable

Index: mk/defaults/options.description
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/mk/defaults/options.description,v
retrieving revision 1.30
diff -u -r1.30 options.description
--- mk/defaults/options.description	14 Jul 2005 14:58:01 -0000	1.30
+++ mk/defaults/options.description	18 Jul 2005 08:15:21 -0000
@@ -1,6 +1,7 @@
 2ch_dict=09
 a52=09
 aac=09
+aalib			Enable aalib support.
 ac3_passthrough=09
 ads=09
 alsa=09
Index: multimedia/mplayer-share/options.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- multimedia/mplayer-share/options.mk	8 Jun 2005 16:18:44 -0000	1.4
+++ multimedia/mplayer-share/options.mk	18 Jul 2005 08:15:21 -0000
@@ -15,7 +15,7 @@
=20
 # Set options based on the specific package being built.
 .if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+=3D	esound mplayer-menu nas sdl
+PKG_SUPPORTED_OPTIONS+=3D aalib esound mplayer-menu nas sdl
=20
 .  if ${OPSYS} !=3D "SunOS"
 PKG_SUPPORTED_OPTIONS+=3D	arts
@@ -45,7 +45,7 @@
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
=20
-.for _o_ in arts cdparanoia dv dvdread esound gif jpeg \
+.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
 	    lame mad mplayer-menu mplayer-real \
 	    mplayer-runtime-cpudetection mplayer-win32 \
 	    nas oss png sdl theora vorbis xvid=20
@@ -78,6 +78,13 @@
=20
 .include "../../mk/bsd.options.mk"
=20
+.if !empty(PKG_OPTIONS:Maalib)
+CONFIGURE_ARGS+=3D	--enable-aa
+.  include "../../graphics/aalib-x11/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=3D	--disable-aa
+.endif
+
 .if !empty(PKG_OPTIONS:Marts)
 CONFIGURE_ARGS+=3D	--enable-arts
 .  include "../../audio/arts/buildlink3.mk"

--Dxnq1zWXvFF0Q93v--

--Yylu36WmvOXNoKYn
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)

iD8DBQFC24UueffumNo0U88RAqTpAJ9h796zU6A8YG6CImOKdmw+C5WeEACfVAnl
C6GitGl37LU+HSocwQz74zw=
=ySdz
-----END PGP SIGNATURE-----

--Yylu36WmvOXNoKYn--