Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6264
Modified Files: audacious2.info Log Message: Let's try fixing building on 10.4 once more, thanks to fixes from David Fang. Index: audacious2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/audacious2.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- audacious2.info 13 Sep 2010 22:47:00 -0000 1.4 +++ audacious2.info 14 Sep 2010 21:46:56 -0000 1.5 @@ -1,6 +1,6 @@ Package: audacious2 Version: 2.2 -Revision: 1 +Revision: 2 Description: Advanced audio player DescDetail: << Audacious is an advanced audio player. It is free, lightweight, based @@ -28,10 +28,54 @@ Source-MD5: ad0f7484692c529acfa91ce784170478 PatchScript: << + #!/bin/sh -ev echo 'LIBS += ${GLIB_LIBS}' >>src/libSAD/Makefile echo 'LIBS += -L../libaudcore -laudcore' >>src/libid3tag/Makefile echo 'LIBS += -L../libaudcore -laudcore' >>src/libaudtag/Makefile echo 'LDFLAGS += -undefined dynamic_lookup' >>src/libaudgui/Makefile + + # fix C linkages of declarations + # I'm guessing all these multiply defined variables are meant + # to be shared global variables... + file=src/libaudtag/tag_module.h && mv $file $file.orig + sed -e '/mowgli_list_t tag_modules;/s|^|extern |' \ + -e '/int number_of_modules;/s|^|extern |' \ + $file.orig > $file + file=src/libaudtag/id3/id3.h && mv $file $file.orig + sed -e '/mowgli_dictionary_t \*frames/s|^|extern |' \ + -e '/mowgli_list_t \*frameIDs/s|^|extern |' \ + $file.orig > $file + file=src/libaudtag/ape/ape.h && mv $file $file.orig + sed -e '/mowgli_dictionary_t \*tagItems/s|^|extern |' \ + -e '/mowgli_list_t \*tagKeys/s|^|extern |' \ + -e '/guint32 headerPosition/s|^|extern |' \ + $file.orig > $file + file=src/libaudtag/aac/aac.h && mv $file $file.orig + sed -e '/Atom \*ilstAtom/s|^|extern |' \ + -e '/guint64 ilstFileOffset/s|^|extern |' \ + -e '/guint32 newilstSize/s|^|extern |' \ + -e '/mowgli_list_t \*dataAtoms/s|^|extern |' \ + -e '/mowgli_dictionary_t \*ilstAtoms/s|^|extern |' \ + $file.orig > $file + + # define global variables + # assuming that pointers and POD types are NULL/0 initialized... + file=src/libaudtag/tag_module.c && cp $file $file.orig + echo "mowgli_list_t tag_modules;" >> $file + echo "int number_of_modules = 0;" >> $file + file=src/libaudtag/id3/id3.c && cp $file $file.orig + echo "mowgli_dictionary_t *frames = NULL;" >> $file + echo "mowgli_list_t *frameIDs = NULL;" >> $file + file=src/libaudtag/ape/ape.c && cp $file $file.orig + echo "mowgli_dictionary_t *tagItems = NULL;" >> $file + echo "mowgli_list_t *tagKeys = NULL;" >> $file + echo "guint32 headerPosition = 0;" >> $file + file=src/libaudtag/aac/aac.c && cp $file $file.orig + echo "Atom *ilstAtom = NULL;" >> $file + echo "guint64 ilstFileOffset = 0;" >> $file + echo "guint32 newilstSize = 0;" >> $file + echo "mowgli_list_t *dataAtoms = NULL;" >> $file + echo "mowgli_dictionary_t *ilstAtoms = NULL;" >> $file << Depends: << ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs