Hi, I offered some time ago to do some build cleanup. Today I did so and here's my slew of patches. Basically, they - touch ogg, vorbis, vorbis-tools and theora - fix a bunch of autotools issues - uniformize the use of them across the four - fix compile/link flags - use pkgconfig if it's available to detect flags - for vorbis-tools, generate and use config.h - add -uninstalled .pc stuff so people can develop apps against an uninstalled tree of xiph (you can use the attached shell script to set up your environment for it) The patches are up at http://thomas.apestaart.org/download/patches/ogg/ http://thomas.apestaart.org/download/patches/vorbis/ http://thomas.apestaart.org/download/patches/vorbis-tools/ http://thomas.apestaart.org/download/patches/theora/ and the comments should be clear and usable as ChangeLog entries (if you had one :)) If there are questions, feel free to ask. Now I'm on to compiling some apps that use my uninstalled dev tree. Thomas Dave/Dina : future TV today ! - http://www.davedina.org/ <-*- thomas (dot) apestaart (dot) org -*-> Excuse me I must have mistaken you for someone who gave a damn <-*- thomas (at) apestaart (dot) org -*-> URGent, best radio on the net - 24/7 ! - http://urgent.fm/ -------------- next part -------------- A non-text attachment was scrubbed... Name: xiph-uninstalled Type: application/x-shellscript Size: 2076 bytes Desc: not available Url : http://westfish.xiph.org/pipermail/theora-dev/attachments/20040610/0cac2bce/xiph-uninstalled.bin
On Thu, Jun 10, 2004 at 05:39:10PM +0200, Thomas Vander Stichele wrote:> http://thomas.apestaart.org/download/patches/vorbis/I looked quickly to see if an issue I fixed happened to be included (it's not; patch below), and I'm a little confused: all of the "AUTOMAKE_OPTIONS = foreign" commands were removed, and there's no ChangeLog entry explaining it. That causes errors like "required file `./NEWS' not found". The attached patch fixes a problem I hit: CFLAGS and LDFLAGS specified by the user ("CFLAGS=-opt ./configure") are being doubled up, which caused my build to fail. -- Glenn Maynard -------------- next part -------------- Index: configure.in ==================================================================--- configure.in (revision 6820) +++ configure.in (working copy) @@ -71,8 +71,6 @@ dnl Set some target options -cflags_save="$CFLAGS" -ldflags_save="$LDFLAGS" if test -z "$GCC"; then case $host in *-*-irix*) @@ -82,15 +80,15 @@ CC=cc fi DEBUG="-g -signed" - CFLAGS="-O2 -w -signed" + CFLAGS=${CFLAGS}" -O2 -w -signed" PROFILE="-p -g3 -O2 -signed" ;; sparc-sun-solaris*) DEBUG="-v -g" - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" + CFLAGS=${CFLAGS} "-xO4 -fast -w -fsimple -native -xcg92" PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; *) DEBUG="-g" - CFLAGS="-O" + CFLAGS=${CFLAGS}" -O" PROFILE="-g -p" ;; esac else @@ -98,7 +96,7 @@ case $host in *86-*-linux*) DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char" + CFLAGS=${CFLAGS}" -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char" # PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static" PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline" @@ -138,33 +136,31 @@ AC_MSG_WARN([********************************************************]) AC_MSG_WARN([ ]) - CFLAGS=${OPT}" -D__NO_MATH_INLINES" + CFLAGS=${CFLAGS}" "${OPT}" -D__NO_MATH_INLINES" PROFILE=${PROFILE}" -D__NO_MATH_INLINES" fi;; powerpc-*-linux*) DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES" - CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT" + CFLAGS=${CFLAGS} "-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT" PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";; *-*-linux*) DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char" + CFLAGS=${CFLAGS} "-O20 -ffast-math -D_REENTRANT -fsigned-char" PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; sparc-sun-*) DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8" - CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8" + CFLAGS=${CFLAGS} "-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8" PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; *-*-darwin*) DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char" - CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" + CFLAGS=${CFLAGS} "-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; *) DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" + CFLAGS=${CFLAGS} "-O20 -D__NO_MATH_INLINES -fsigned-char" PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; esac fi -CFLAGS="$CFLAGS $cflags_save" -LDFLAGS="$LDFLAGS $ldflags_save" dnl -------------------------------------------------- dnl Check for headers
<20040610184034.GF783@zewt.org> Message-ID: <1087271779.19021.5.camel@otto.amantes> Hi, On Thu, 2004-06-10 at 20:40, Glenn Maynard wrote:> On Thu, Jun 10, 2004 at 05:39:10PM +0200, Thomas Vander Stichele wrote: > > http://thomas.apestaart.org/download/patches/vorbis/ > > I looked quickly to see if an issue I fixed happened to be included > (it's not; patch below), and I'm a little confused: all of the > "AUTOMAKE_OPTIONS = foreign" commands were removed, and there's no > ChangeLog entry explaining it. That causes errors like "required file > `./NEWS' not found".They're only removed in all subdirectories, not in the root. Did you test the patch ? If you did, can you give me your autotools versions so I can reproduce ? Though I'm fairly confident that this doesn't happen. There's no ChangeLog entry simply because there are no ChangeLog's anywhere in Xiph modules :) No, I don't know why. Yes, I'd like them to be there. Anyway, all the changes I made are detailed in the README for each of the patches.> The attached patch fixes a problem I hit: CFLAGS and LDFLAGS specified > by the user ("CFLAGS=-opt ./configure") are being doubled up, which > caused my build to fail.Yeah, your patch should be applied too. I didn't go over that part of configure, and I'm sure there is even more that should be fixed. Which I'd be willing to help out on if I get some feedback on the current set of patches. Thomas Dave/Dina : future TV today ! - http://www.davedina.org/ <-*- thomas (dot) apestaart (dot) org -*-> Gotta keep moving on lover you hide from me every time <-*- thomas (at) apestaart (dot) org -*-> URGent, best radio on the net - 24/7 ! - http://urgent.fm/
<20040610184034.GF783@zewt.org> <1087271779.19021.5.camel@otto.amantes> Message-ID: <20040719172601.GC20483@xiph.org> Hi Thomas...> I'd be willing to help out on if I get some feedback on the current set > of patches.Has anyone offered that feedback, or has the build system ended up without a dedicated maintainer (It used to be Jack, Ralph took over some of it a while ago. If no one claims responsibility for this, I'll tackle it as I'm in 'cleanup' mode.) Monty
<20040610184034.GF783@zewt.org> <1087271779.19021.5.camel@otto.amantes> <20040719172601.GC20483@xiph.org> Message-ID: <1090312412.2959.2.camel@otto.amantes> On Mon, 2004-07-19 at 19:26, Monty wrote:> Hi Thomas... > > > I'd be willing to help out on if I get some feedback on the current set > > of patches. > > Has anyone offered that feedback, or has the build system ended up > without a dedicated maintainer (It used to be Jack, Ralph took over > some of it a while ago. If no one claims responsibility for this, > I'll tackle it as I'm in 'cleanup' mode.)The feedback was "go ahead and apply". As before, I'm still offering to be a build maintainer and help you guys out. I've commited my patches to theora first to test the water, then to ogg to make sure they are non-invasive (I haven't gotten feedback so I assume everything's fine), and with your permission will proceed to vorbis and vorbis-tools. FWIW, I'm not the imposing kind of maintainer - I prefer sticking to what you guys want and making you guys happy with the build :) The only thing I would really really like is to have the -uninstalled.pc patches to be allowed (since they don't get in the way) because then I can push development xiph on more people in an easy way that they're used to, without having them have to break their trusted installed setup. One of the pieces I am considering pushing cvs xiph into is GNOME's jhbuild, for example. Thomas Dave/Dina : future TV today ! - http://www.davedina.org/ <-*- thomas (dot) apestaart (dot) org -*-> Whenever we meet you say you've changed Like it's some gift you're not the same <-*- thomas (at) apestaart (dot) org -*-> URGent, best radio on the net - 24/7 ! - http://urgent.fm/