Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.872
diff -u -r1.872 configure
--- configure	21 Jun 2004 19:54:48 -0000	1.872
+++ configure	24 Jun 2004 09:25:55 -0000
@@ -880,8 +880,7 @@
 	proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//'`
 	if [ `sysctl -n hw.vectorunit` -eq 1 ]; then
 	    _altivec=yes
- 	fi
-	if [ `sysctl -n hw.optional.altivec` -eq 1 ]; then
+ 	elif [ "`sysctl -n hw.optional.altivec 2> /dev/null`" = 1 ]; then
 	    _altivec=yes
 	fi
     fi
@@ -898,9 +897,9 @@
 	esac
     fi
     if test "$_altivec" = yes; then
-        echores "$proc altivec"
+        echores "PowerPC $proc altivec"
     else
-        echores "$proc"
+        echores "PowerPC $proc"
     fi
 
     echocheck "GCC & CPU optimization abilities"
@@ -1887,8 +1886,11 @@
 fi
 
 # If IRIX we must use ar instead of ranlib (not present on IRIX systems)
+# If Linux, ranlib may be ignored
 if irix ; then
   _ranlib='ar -r'
+elif linux ; then
+  _ranlib='echo ranlib'
 fi
 
 ######################
@@ -2837,14 +2839,14 @@
   cat > $TMPC <<EOF
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
-#include <CoreAudio/CoreAudio.h>
+
 int main(void) {
     EnterMovies();
     ExitMovies();
     CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
 }
 EOF
-  if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then 
+  if cc_check -framework Carbon -framework QuickTime; then
     _macosx=yes
     _macosx_frameworks="-framework Carbon -framework QuickTime -framework CoreAudio"
     _def_macosx='#define MACOSX 1'
@@ -5798,8 +5800,11 @@
 EOF
 fi
 if darwin ; then
-  # use gnu style cpp on Darwin
-  CFLAGS="$CFLAGS -no-cpp-precomp -DSYS_DARWIN -Wl,-bind_at_load"
+  CFLAGS="$CFLAGS -DSYS_DARWIN"
+  # avoid broken Apple cpp in 3.1 and earlier
+  if test "`$_cc -dumpversion`" = "2.95.2" -o "`$_cc -dumpversion`" = "3.1"; then
+    CFLAGS="$CFLAGS -no-cpp-precomp"
+  fi
   # libavcodec (from ffmpeg) requires CONFIG_DARWIN to enable AltiVec on Darwin/MacOSX
   test "$_altivec" = yes && CFLAGS="$CFLAGS -DCONFIG_DARWIN"
 fi
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.288
diff -u -r1.288 Makefile
--- Makefile	18 Jun 2004 17:08:22 -0000	1.288
+++ Makefile	24 Jun 2004 09:25:55 -0000
@@ -208,7 +208,6 @@
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	./darwinfixlib.sh $(MPLAYER_DEP)
     ifeq ($(TARGET_WIN32),yes)
 	windres -o mplayer-rc.o mplayer.rc
     endif
@@ -223,12 +222,10 @@
 	$(CC) $(CFLAGS) -Wall -shared  -Wl,-rpath,/usr/local/lib -Wl,-Bsymbolic  -o mplayer.exe.so $(OBJS_MPLAYER) mplayer.exe.spec.c libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) -lwine -lm 
 
 mplayer_wine.so:	$(MPLAYER_DEP)
-	./darwinfixlib.sh $(MPLAYER_DEP)
 	$(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) -lm
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
-	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
 	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
 endif
 
Index: Gui/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Gui/Makefile	4 Apr 2003 15:39:51 -0000	1.24
+++ Gui/Makefile	24 Jun 2004 09:25:55 -0000
@@ -27,6 +27,7 @@
 $(LIB):	.depend	$(OBJS)
 	rm -f $(LIB)
 	$(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS)
+	$(RANLIB) $(LIB)
 
 all:	$(LIB)
 
Index: input/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/input/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- input/Makefile	22 Aug 2002 23:29:39 -0000	1.4
+++ input/Makefile	24 Jun 2004 09:25:55 -0000
@@ -16,6 +16,7 @@
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
Index: liba52/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/liba52/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- liba52/Makefile	11 Aug 2003 20:52:50 -0000	1.9
+++ liba52/Makefile	24 Jun 2004 09:25:55 -0000
@@ -17,6 +17,7 @@
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 test:        $(LIBNAME) test.c
 	$(CC) $(CFLAGS)  test.c ../cpudetect.c -o test ./liba52.a -lm
Index: libaf/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- libaf/Makefile	20 Sep 2003 13:42:26 -0000	1.12
+++ libaf/Makefile	24 Jun 2004 09:25:55 -0000
@@ -19,6 +19,7 @@
 
 $(LIBNAME):     $(OBJS) Makefile
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 $(OBJS):af.h control.h dsp.h filter.h window.h af_mp.h
 
Index: libao2/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- libao2/Makefile	23 May 2003 12:37:58 -0000	1.28
+++ libao2/Makefile	24 Jun 2004 09:25:55 -0000
@@ -17,6 +17,7 @@
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
Index: libfaad2/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libfaad2/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libfaad2/Makefile	2 Jun 2004 22:59:02 -0000	1.3
+++ libfaad2/Makefile	24 Jun 2004 09:25:56 -0000
@@ -17,6 +17,7 @@
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:	$(LIBNAME)
 
Index: libmenu/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- libmenu/Makefile	2 Sep 2003 14:00:37 -0000	1.5
+++ libmenu/Makefile	24 Jun 2004 09:25:56 -0000
@@ -20,6 +20,7 @@
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
Index: libmpcodecs/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.131
diff -u -r1.131 Makefile
--- libmpcodecs/Makefile	5 May 2004 19:11:16 -0000	1.131
+++ libmpcodecs/Makefile	24 Jun 2004 09:25:56 -0000
@@ -58,9 +58,11 @@
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 $(LIBNAME2):     $(OBJS2)
 	$(AR) r $(LIBNAME2) $(OBJS2)
+	$(RANLIB) $(LIBNAME2)
 
 clean:
 	rm -f *.o *.a *~
Index: libmpdemux/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- libmpdemux/Makefile	12 Apr 2004 14:19:12 -0000	1.78
+++ libmpdemux/Makefile	24 Jun 2004 09:25:56 -0000
@@ -57,6 +57,7 @@
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 test:	$(LIBNAME) test.c
 	$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o ../m_option.o ../subreader.o $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
Index: libmpdvdkit2/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- libmpdvdkit2/Makefile	18 Jan 2003 01:18:23 -0000	1.2
+++ libmpdvdkit2/Makefile	24 Jun 2004 09:25:56 -0000
@@ -33,6 +33,7 @@
 
 $(LIB).a: $(OBJS)
 	$(AR) rc $(LIB).a $(OBJS)
+	$(RANLIB) $(LIB).a
 
 $(LIB).so: $(OBJS)
 	$(CC) -o $(LIB).so -shared -rdynamic $(OBJS)
Index: libmpeg2/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- libmpeg2/Makefile	11 Aug 2003 20:52:53 -0000	1.11
+++ libmpeg2/Makefile	24 Jun 2004 09:25:56 -0000
@@ -22,6 +22,7 @@
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:	$(LIBNAME)
 
Index: libvo/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- libvo/Makefile	10 Jan 2004 09:48:14 -0000	1.42
+++ libvo/Makefile	24 Jun 2004 09:25:56 -0000
@@ -21,6 +21,7 @@
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 vo_mpegpes.o: vo_mpegpes.c
 	$(CC) -c $(CFLAGS) $(DVB_INC) -o $@ $<
Index: loader/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/loader/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- loader/Makefile	29 Jan 2004 12:01:26 -0000	1.14
+++ loader/Makefile	24 Jun 2004 09:25:56 -0000
@@ -36,6 +36,7 @@
 	./loader_objfix.sh
 endif
 	$(AR) -r libloader.a $(LIB_OBJECTS) stubs.o
+	$(RANLIB) $(LIB_OBJECTS)
 
 dep:
 	echo "dependency not required/supported"
Index: mp3lib/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- mp3lib/Makefile	23 Oct 2003 12:10:44 -0000	1.37
+++ mp3lib/Makefile	24 Jun 2004 09:25:56 -0000
@@ -47,6 +47,8 @@
 
 libMP3.a:	$(OBJS)
 	$(AR) r libMP3.a $(OBJS)
+	$(RANLIB) libMP3.a
+
 test1:	libMP3.a test.c
 	$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. ./libMP3.a ../mp_msg-mencoder.o ../cpudetect.o -lm
 
Index: osdep/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- osdep/Makefile	26 Mar 2004 15:21:44 -0000	1.13
+++ osdep/Makefile	24 Jun 2004 09:25:56 -0000
@@ -41,6 +41,7 @@
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
Index: postproc/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- postproc/Makefile	28 Jul 2003 15:24:38 -0000	1.19
+++ postproc/Makefile	24 Jun 2004 09:25:56 -0000
@@ -20,6 +20,7 @@
 
 $(SWSLIB):     $(SWSOBJS)
 	$(AR) r $(SWSLIB) $(SWSOBJS)
+	$(RANLIB) $(SWSLIB)
 
 clean:
 	rm -f *.o *.a *~ *.so cs_test swscale-example
Index: vidix/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- vidix/Makefile	22 Aug 2002 23:29:45 -0000	1.3
+++ vidix/Makefile	24 Jun 2004 09:25:56 -0000
@@ -21,7 +21,7 @@
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
-
+	$(RANLIB) $(LIBNAME)
 
 clean:
 	rm -f *.o *.a *~