[vorbis-dev] vorbize and os_type patches + general build issues

[Greg Olszewski]

Howdy..

I've got a couple little patches here.

1. vorbis-tools needs getopt. Since it's already sitting in the
source tree for cmdline I set up cmdline to make a getopt.a that gets
used for both. Also, since mp3tovorbis is a shell script, it needs to
be installed 755 not 711 (unless I'm missing something). 

2. I've found that both tru64 and irix 5.3 won't give int64_t without
inttypes.h, since I haven't had a chance to check that the irix encoder
actually works I've only included the patch for the first.

Also, I think I've gotten the winamp plugin building correctly, but I
don't have a windows machine to try it on. If someone who does could
grab it from ftp://ftp.nwonknu.org/pub/in_ogg.dll, and let me know if
it works, I would appreciate it.

thanks.

have fun,

greg

--
this signature intentionally left blank





Index: cmdline/Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/cmdline/Makefile.in,v
retrieving revision 1.5
diff -r1.5 Makefile.in
28c28
< LIBS=@LIBS@ @pthread_lib@

---
> LIBS=@LIBS@ @pthread_lib@ getopt.a
30c30,31
< OFILES = 	getopt.o getopt1.o main.o
---
> OFILES = main.o
> GETOPT_OBJECTS = getopt.o getopt1.o
43,44c44,45
< target:	$(OFILES) ../lib/libvorbis.a
< 	$(LD) $(CFLAGS) $(OFILES) $(LDFLAGS) ../lib/libvorbis.a -o vorbis $(LIBS)
---
> target:	$(OFILES)  getopt.a ../lib/libvorbis.a
> 	$(LD) $(CFLAGS) $(OFILES) $(LDFLAGS) ../lib/libvorbis.a getopt.a -o vorbis $(LIBS)
48a50,54
> getopt.a: $(GETOPT_OBJECTS)
> 	-rm -f getopt.a
> 	$(AR) cru getopt.a $(GETOPT_OBJECTS)
> 	$(RANLIB) getopt.a
> 
53a60,61
> 
> 
Index: vorbis-tools/Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vorbis-tools/Makefile.in,v
retrieving revision 1.7
diff -r1.7 Makefile.in
24c24,25
< LIBS=@LIBS@ ../lib/vorbisfile.a ../lib/libvorbis.a
---
> VORBISLIBS= ../lib/vorbisfile.a ../lib/libvorbis.a ../cmdline/getopt.a
> LIBS=@LIBS@ $(VORBISLIBS)
42c43
< vorbize: vorbize.o
---
> vorbize: vorbize.o $(VORBISLIBS)
45a47,48
> ../cmdline/getopt.a:
> 	cd ../cmdline && make getopt.a
58c61
< 	$(INSTALL) -b -m 711 mp3tovorbis @prefix@/bin/
---
> 	$(INSTALL) -b -m 755 mp3tovorbis @prefix@/bin/





Index: include/vorbis/os_types.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/include/vorbis/os_types.h,v
retrieving revision 1.5
diff -r1.5 os_types.h
26c26
< #ifdef __BEOS__

---
> #if defined (__BEOS__) || (defined(__unix__) && defined(__digital__))

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/