On Sat, Jan 31, 2009 at 02:57:08PM +0100, Tobias Ulmer wrote:
> On Sat, Jan 31, 2009 at 11:17:33AM +0000, Jacob Meuser wrote:
> > On Sat, Jan 31, 2009 at 02:10:53AM +0100, Tobias Ulmer wrote:
> > > bah wrong patch, here's the correct version:
> > >
> >
> > this apparently breaks audio/audacious-plugins
> >
>
> Because they ship their own mp4ff_int_types.h, which is modified
> to include the top-level config.h, causing breakage if it's not there.
> Compiling against modified headers, then linking against an external
> lib is wrong, but i'm sure you know that ;-)
proposing a patch that breaks the one and only dependency, for whatever
reason, isn't exactly "right" either.
> >
> > > Index: Makefile
> > > ===================================================================
> > > RCS file: /nfs/obsd0/cvs/ports/audio/faad/Makefile,v
> > > retrieving revision 1.38
> > > diff -u -p Makefile
> > > --- Makefile 15 Sep 2008 21:58:19 -0000 1.38
> > > +++ Makefile 31 Jan 2009 00:23:41 -0000
> > > @@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC decoder
> > > COMMENT-xmms= XMMS input plugin for AAC files
> > > V= 2.6.1
> > > DISTNAME= faad2-${V}
> > > -PKGNAME-main= faad-${V}
> > > +PKGNAME-main= faad-${V}p0
> > > PKGNAME-xmms= faad-xmms-${V}
> > > CATEGORIES= audio
> > > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
> > > Index: patches/patch-common_mp4ff_Makefile_am
> > > ===================================================================
> > > RCS file:
> > > /nfs/obsd0/cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
> > > retrieving revision 1.1
> > > diff -u -p patches/patch-common_mp4ff_Makefile_am
> > > --- patches/patch-common_mp4ff_Makefile_am 15 Sep 2008 21:58:19
> > > -0000 1.1
> > > +++ patches/patch-common_mp4ff_Makefile_am 31 Jan 2009 01:06:41
> > > -0000
> > > @@ -1,9 +1,14 @@
> > > $OpenBSD: patch-common_mp4ff_Makefile_am,v 1.1 2008/09/15 21:58:19
> > > jakemsr Exp $
> > > ---- common/mp4ff/Makefile.am.orig Fri Jul 11 14:17:17 2008
> > > -+++ common/mp4ff/Makefile.am Fri Jul 11 14:17:37 2008
> > > +--- common/mp4ff/Makefile.am.orig Sun May 7 20:09:00 2006
> > > ++++ common/mp4ff/Makefile.am Sat Jan 31 02:00:12 2009
> > > @@ -1,4 +1,4 @@
> > > -noinst_LTLIBRARIES = libmp4ff.la
> > > +lib_LTLIBRARIES = libmp4ff.la
> > >
> > > libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
> > >
> > > +@@ -6,3 +6,4 @@ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4s
> > > + mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
> > > + drms.h drms.c drmstables.h
> > > +
> > > ++include_HEADERS=mp4ff.h mp4ff_int_types.h
> > > Index: pkg/PLIST-main
> > > ===================================================================
> > > RCS file: /nfs/obsd0/cvs/ports/audio/faad/pkg/PLIST-main,v
> > > retrieving revision 1.2
> > > diff -u -p pkg/PLIST-main
> > > --- pkg/PLIST-main 15 Sep 2008 21:58:19 -0000 1.2
> > > +++ pkg/PLIST-main 31 Jan 2009 01:06:41 -0000
> > > @@ -6,6 +6,8 @@
> > > @bin bin/faad
> > > include/faad.h
> > > include/faadconfig.h
> > > +include/mp4ff.h
> > > +include/mp4ff_int_types.h
> > > include/neaacdec.h
> > > lib/libfaad.a
> > > lib/libfaad.la
> > >
> >
> > --
> > jake...@sdf.lonestar.org
> > SDF Public Access UNIX System - http://sdf.lonestar.org
> >
> >
>
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
