OS X fixes:

  * Fixed a compilation issue in the DVDioctl driver.
  * Added a call to ranlib after a built-in module compilation.

diff --git a/ChangeLog b/ChangeLog
index 84e24ddec69848393e1032f4a90d483d1397f0b9..244de0892d15e7e904d8551352ab5c27110951a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
 
 HEAD
 
-  * Nothing yet.
+  * Fixed a compilation issue in the DVDioctl driver.
+  * Added a call to ranlib after a built-in module compilation.
 
 0.2.72
 Mon, 16 Apr 2001 14:33:53 +0200

diff --git a/Makefile b/Makefile
index 001852d2b5ca41e245f2efb7f1cc980d83acdc83..9004a39285edc9b57d02f3425e367044d96b0c18 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,7 @@ show:
 
 
 # ugliest of all, but I have no time to do it -- sam
-snapshot:
+snapshot: Makefile.opts
        rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
        # copy archive in /tmp
        find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
@@ -339,4 +339,5 @@ $(PLUGIN_OBJ): FORCE
 builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
 $(BUILTIN_OBJ): FORCE
        cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
+       ranlib $@
 

diff --git a/extras/MacOSX_dvdioctl/DVDioctl.cpp b/extras/MacOSX_dvdioctl/DVDioctl.cpp
index d90916cda8a91af77a69b0df4bcc7635f2aa794f..9e6cb8844ead3b3f67a9139da9966b5014001ef9 100644 (file)
--- a/extras/MacOSX_dvdioctl/DVDioctl.cpp
+++ b/extras/MacOSX_dvdioctl/DVDioctl.cpp
@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 1998-2000 Apple Computer, Inc. All rights reserved.
  * Copyright (C) 2001 VideoLAN
- * $Id: DVDioctl.cpp,v 1.4 2001/04/06 09:15:47 sam Exp $
+ * $Id: DVDioctl.cpp,v 1.5 2001/04/17 14:39:51 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -485,8 +485,8 @@ static int DVDBlockIoctl( dev_t dev, u_long cmd, caddr_t addr, int flags,
         case IODVD_REPORT_KEY:
 
             log( LOG_INFO, "DVD ioctl: report key from `%s', "
-                 p_drive->getDeviceTypeName(),
                  "buf %d, class %d, lba %d, agid %d, format %d\n",
+                 p_drive->getDeviceTypeName(),
                  (int)p_data->p_buffer, p_data->i_keyclass, p_data->i_lba,
                  p_data->i_agid, p_data->i_keyformat );