Commit 8fc52975 authored by Sam Hocevar's avatar Sam Hocevar

   OS X fixes:
  * Fixed a compilation issue in the DVDioctl driver.
  * Added a call to ranlib after a built-in module compilation.
parent 28b0b9af
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
HEAD 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 0.2.72
Mon, 16 Apr 2001 14:33:53 +0200 Mon, 16 Apr 2001 14:33:53 +0200
......
...@@ -203,7 +203,7 @@ show: ...@@ -203,7 +203,7 @@ show:
# ugliest of all, but I have no time to do it -- sam # 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* rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
# copy archive in /tmp # copy archive in /tmp
find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \ find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
...@@ -339,4 +339,5 @@ $(PLUGIN_OBJ): FORCE ...@@ -339,4 +339,5 @@ $(PLUGIN_OBJ): FORCE
builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ) builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
$(BUILTIN_OBJ): FORCE $(BUILTIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%) cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
ranlib $@
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2000 Apple Computer, Inc. All rights reserved. * Copyright (C) 1998-2000 Apple Computer, Inc. All rights reserved.
* Copyright (C) 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -485,8 +485,8 @@ static int DVDBlockIoctl( dev_t dev, u_long cmd, caddr_t addr, int flags, ...@@ -485,8 +485,8 @@ static int DVDBlockIoctl( dev_t dev, u_long cmd, caddr_t addr, int flags,
case IODVD_REPORT_KEY: case IODVD_REPORT_KEY:
log( LOG_INFO, "DVD ioctl: report key from `%s', " log( LOG_INFO, "DVD ioctl: report key from `%s', "
p_drive->getDeviceTypeName(),
"buf %d, class %d, lba %d, agid %d, format %d\n", "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, (int)p_data->p_buffer, p_data->i_keyclass, p_data->i_lba,
p_data->i_agid, p_data->i_keyformat ); p_data->i_agid, p_data->i_keyformat );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment