/usr/ports/audio/faad

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

/usr/ports/audio/faad

Markus Schatzl-3
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

FLAVOR="no_xmms" undocumented

Helps when faad is a dependency but you don't want to have X on
the machine (e.g. mpd).

All the best,
/Markus

- --------------------------------------------------------------------

FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder,
completely written from scratch.

Available flavors:
        no_xmms - don't build xmms plugin

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDc37hV/arRO6fNWsRA1UFAJ0RYhu6+/2ev7VfpWitLUEwBOKdRwCffO6Y
oDCjuIntKLzBQMO+OkBSKqY=
=vUmW
-----END PGP SIGNATURE-----

Reply | Threaded
Open this post in threaded view
|

Re: /usr/ports/audio/faad

Aleksander Piotrowski
M. Schatzl <[hidden email]> wrote:

> FLAVOR="no_xmms" undocumented
>
> Helps when faad is a dependency but you don't want to have X on
> the machine (e.g. mpd).

What about following diff?  OK?

- Add flavor description to pkg/DESCR
  From "M. Schatzl" <[hidden email]>
- Regen PLISTs
- Mark -xmms subpackages as SHARED_ONLY
- Bump PKGNAMEs

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/faad/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile 16 Sep 2005 09:51:26 -0000 1.18
+++ Makefile 10 Nov 2005 21:33:38 -0000
@@ -3,8 +3,8 @@
 COMMENT= "MPEG2 and MPEG-4 AAC decoder"
 COMMENT-xmms= "XMMS input plugin for AAC files"
 DISTNAME= faad2-2.0
-PKGNAME= faad-2.0p2
-PKGNAME-xmms= faad-xmms-2.0p1
+PKGNAME= faad-2.0p3
+PKGNAME-xmms= faad-xmms-2.0p2
 CATEGORIES=     audio
 MASTER_SITES= http://users.codefusionis.com/~jolan/
 
@@ -45,6 +45,7 @@
  faad.0,mp4v2.0::audio/faad
 RUN_DEPENDS= ::audio/xmms
 WANTLIB+= X11 Xext Xi pthread iconv intl glib gmodule gtk gdk
+SHARED_ONLY= Yes
 . else
 WANTLIB+= c
 . endif
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/audio/faad/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- pkg/DESCR 28 Apr 2004 01:30:00 -0000 1.3
+++ pkg/DESCR 10 Nov 2005 21:33:38 -0000
@@ -1,2 +1,5 @@
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder,
 completely written from scratch.
+
+Available flavors:                                                                                                                              
+        no_xmms - don't build XMMS plugin
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/faad/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 16 Sep 2005 09:51:26 -0000 1.6
+++ pkg/PLIST 10 Nov 2005 21:33:38 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.6 2005/09/16 09:51:26 espie Exp $
-@pkgpath audio/faad,no_xmms
 @conflict playfair-*
+@pkgpath audio/faad,no_xmms
 bin/faad
 include/faad.h
 include/faadconfig.h
Index: pkg/PLIST-xmms
===================================================================
RCS file: /cvs/ports/audio/faad/pkg/PLIST-xmms,v
retrieving revision 1.1
diff -u -r1.1 PLIST-xmms
--- pkg/PLIST-xmms 9 Dec 2004 04:57:56 -0000 1.1
+++ pkg/PLIST-xmms 10 Nov 2005 21:33:38 -0000
@@ -1,2 +1,6 @@
 @comment $OpenBSD: PLIST-xmms,v 1.1 2004/12/09 04:57:56 jcs Exp $
 %%SHARED%%
+@comment lib/xmms/
+@comment lib/xmms/Input/
+@comment lib/xmms/Input/libmp4.a
+@comment lib/xmms/Input/libmp4.la

Reply | Threaded
Open this post in threaded view
|

Re: /usr/ports/audio/faad

Jolan Luff
On Thu, Nov 10, 2005 at 10:38:02PM +0100, Aleksander Piotrowski wrote:

> M. Schatzl <[hidden email]> wrote:
>
> > FLAVOR="no_xmms" undocumented
> >
> > Helps when faad is a dependency but you don't want to have X on
> > the machine (e.g. mpd).
>
> What about following diff?  OK?
>
> - Add flavor description to pkg/DESCR
>   From "M. Schatzl" <[hidden email]>

No, it's a PSEUDO_FLAVOR.  We don't document those in DESCR.  They
control the build, not the contents of a package.  People who whine
about this stuff shouldn't be using ports.

> - Regen PLISTs
> - Mark -xmms subpackages as SHARED_ONLY
> - Bump PKGNAMEs

I'd rather split the xmms plugin into audio/xmms-faad.

And while we're on the subject, there should be an audio/mpeg4ip port
for the mpeg4 libraries rather than using the stuff that's bundled with
faad.

This is (mostly) my fault so I'll try to deal with it soon.

Reply | Threaded
Open this post in threaded view
|

Re: /usr/ports/audio/faad

Markus Schatzl-3
In reply to this post by Aleksander Piotrowski
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

Aleksander Piotrowski wrote:
> What about following diff?  OK?

Sorry for not coming up with the diff by myself. Time to have a closer
look at generating ports.

It applies correctly and builds both packages. But I think you verified
that before. Thanks.

All the best,
/Markus


> - Add flavor description to pkg/DESCR
>   From "M. Schatzl" <[hidden email]>
> - Regen PLISTs
> - Mark -xmms subpackages as SHARED_ONLY
> - Bump PKGNAMEs
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/faad/Makefile,v
> retrieving revision 1.18
> diff -u -r1.18 Makefile
> --- Makefile 16 Sep 2005 09:51:26 -0000 1.18
> +++ Makefile 10 Nov 2005 21:33:38 -0000
> @@ -3,8 +3,8 @@
>  COMMENT= "MPEG2 and MPEG-4 AAC decoder"
>  COMMENT-xmms= "XMMS input plugin for AAC files"
>  DISTNAME= faad2-2.0
> -PKGNAME= faad-2.0p2
> -PKGNAME-xmms= faad-xmms-2.0p1
> +PKGNAME= faad-2.0p3
> +PKGNAME-xmms= faad-xmms-2.0p2
>  CATEGORIES=     audio
>  MASTER_SITES= http://users.codefusionis.com/~jolan/
>  
> @@ -45,6 +45,7 @@
>   faad.0,mp4v2.0::audio/faad
>  RUN_DEPENDS= ::audio/xmms
>  WANTLIB+= X11 Xext Xi pthread iconv intl glib gmodule gtk gdk
> +SHARED_ONLY= Yes
>  . else
>  WANTLIB+= c
>  . endif
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/audio/faad/pkg/DESCR,v
> retrieving revision 1.3
> diff -u -r1.3 DESCR
> --- pkg/DESCR 28 Apr 2004 01:30:00 -0000 1.3
> +++ pkg/DESCR 10 Nov 2005 21:33:38 -0000
> @@ -1,2 +1,5 @@
>  FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder,
>  completely written from scratch.
> +
> +Available flavors:                                                                                                                              
> +        no_xmms - don't build XMMS plugin
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/audio/faad/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -r1.6 PLIST
> --- pkg/PLIST 16 Sep 2005 09:51:26 -0000 1.6
> +++ pkg/PLIST 10 Nov 2005 21:33:38 -0000
> @@ -1,6 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.6 2005/09/16 09:51:26 espie Exp $
> -@pkgpath audio/faad,no_xmms
>  @conflict playfair-*
> +@pkgpath audio/faad,no_xmms
>  bin/faad
>  include/faad.h
>  include/faadconfig.h
> Index: pkg/PLIST-xmms
> ===================================================================
> RCS file: /cvs/ports/audio/faad/pkg/PLIST-xmms,v
> retrieving revision 1.1
> diff -u -r1.1 PLIST-xmms
> --- pkg/PLIST-xmms 9 Dec 2004 04:57:56 -0000 1.1
> +++ pkg/PLIST-xmms 10 Nov 2005 21:33:38 -0000
> @@ -1,2 +1,6 @@
>  @comment $OpenBSD: PLIST-xmms,v 1.1 2004/12/09 04:57:56 jcs Exp $
>  %%SHARED%%
> +@comment lib/xmms/
> +@comment lib/xmms/Input/
> +@comment lib/xmms/Input/libmp4.a
> +@comment lib/xmms/Input/libmp4.la
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDc/ZFV/arRO6fNWsRA90bAJ0UOVy6juSjtjbhjMR4hnQMbUUbgQCfSU+r
KZOPSeulSJpFPhvKEQOusrE=
=54R7
-----END PGP SIGNATURE-----