[Debburn-changes] r419 - in cdrkit/trunk: . include libschily
mkisofs
Eduard Bloch
blade at alioth.debian.org
Thu Nov 23 09:33:25 CET 2006
Author: blade
Date: 2006-11-23 09:33:24 +0100 (Thu, 23 Nov 2006)
New Revision: 419
Removed:
cdrkit/trunk/scgcheck/
cdrkit/trunk/scgskeleton/
Modified:
cdrkit/trunk/TODO
cdrkit/trunk/include/AddScgBits.cmake
cdrkit/trunk/include/AddSchilyBits.cmake
cdrkit/trunk/include/CMakeLists.txt
cdrkit/trunk/include/glibc_elf.h
cdrkit/trunk/include/xconfig.h.in
cdrkit/trunk/libschily/fconv.c
cdrkit/trunk/mkisofs/boot-mips.c
cdrkit/trunk/mkisofs/mkisofs.c
Log:
Some Solaris related wuergarounds (more checks and adaptions in new stuff), also dropped unused scg-related things
Modified: cdrkit/trunk/TODO
===================================================================
--- cdrkit/trunk/TODO 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/TODO 2006-11-23 08:33:24 UTC (rev 419)
@@ -2,6 +2,8 @@
- find a good name for cdda2wav, follow the wodim procedure
- fix lorinder's bug
- check documentation, debian/* documentation, FAQ, etc.pp.
+ - fix DVD-RW support (DVD+RW works, though, DVD-RW blanking works too)
+ - fix dirsplit -S, looses files
1.1.x
Modified: cdrkit/trunk/include/AddScgBits.cmake
===================================================================
--- cdrkit/trunk/include/AddScgBits.cmake 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/include/AddScgBits.cmake 2006-11-23 08:33:24 UTC (rev 419)
@@ -4,7 +4,7 @@
INCLUDE(CheckIncludeFiles)
CHECK_INCLUDE_FILES("stdio.h;camlib.h" HAVE_CAMLIB_H)
-if(HAVE_CAMLIB_H)
+IF(HAVE_CAMLIB_H)
# quick an dirty, should better become a variable used by libscg only,
# analogous to SCG_SELF_LIBS
@@ -13,5 +13,43 @@
LIST(APPEND EXTRA_LIBS "cam")
LIST(APPEND SCG_SELF_LIBS "cam")
-endif(HAVE_CAMLIB_H)
+ENDIF(HAVE_CAMLIB_H)
+FIND_LIBRARY(HAVE_LIBVOLMGT "volmgt")
+IF(HAVE_LIBVOLMGT)
+ LIST(APPEND EXTRA_LIBS "volmgt")
+ LIST(APPEND SCG_SELF_LIBS "volmgt")
+ENDIF(HAVE_LIBVOLMGT)
+
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ LIST(APPEND EXTRA_LIBS -lrt -lsocket)
+ # reason below, FIXME: add proper checks
+ ## CMakeFiles/cdda2wav.dir/cdda2wav.o(.text+0x19cc): In function
+ ## `switch_to_realtime_priority':
+ ## : undefined reference to `sched_get_priority_min'
+ ## CMakeFiles/cdda2wav.dir/cdda2wav.o(.text+0x19e0): In function
+ ## `switch_to_realtime_priority':
+ ## : undefined reference to `sched_get_priority_max'
+ ## CMakeFiles/cdda2wav.dir/cdda2wav.o(.text+0x1a2c): In function
+ ## `switch_to_realtime_priority':
+ ## : undefined reference to `sched_setscheduler'
+ ## CMakeFiles/cdda2wav.dir/toc.o(.text+0x3fd8): In function
+ ## `request_titles':
+ ## : undefined reference to `socket'
+ ## CMakeFiles/cdda2wav.dir/toc.o(.text+0x403c): In function
+ ## `request_titles':
+ ## : undefined reference to `gethostbyname'
+ ## CMakeFiles/cdda2wav.dir/toc.o(.text+0x405c): In function
+ ## `request_titles':
+ ## : undefined reference to `gethostbyname'
+ ## CMakeFiles/cdda2wav.dir/toc.o(.text+0x418c): In function
+ ## `request_titles':
+ ## : undefined reference to `getservbyname'
+ ## CMakeFiles/cdda2wav.dir/toc.o(.text+0x41d4): In function
+ ## `request_titles':
+ ## : undefined reference to `getservbyname'
+ ## CMakeFiles/cdda2wav.dir/toc.o(.text+0x427c): In function
+ ## `request_titles':
+ ## : undefined reference to `connect'
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+
Modified: cdrkit/trunk/include/AddSchilyBits.cmake
===================================================================
--- cdrkit/trunk/include/AddSchilyBits.cmake 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/include/AddSchilyBits.cmake 2006-11-23 08:33:24 UTC (rev 419)
@@ -1,8 +1,10 @@
IF(NOT CHECKED_SCHILY)
+ SET(CHECKED_SCHILY 1)
+
INCLUDE(CheckCSourceCompiles)
- SET(CHECKED_SCHILY 1)
LIST(APPEND EXTRA_LIBS "schily")
+
SET(TESTSRC "
#include <math.h>
int main() { return isnan(1); }
@@ -11,6 +13,10 @@
SET(CMAKE_REQUIRED_LIBRARIES )
CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_LIBC_ISNAN)
+ #//#define HAVE_ISNAN 1 /* isnan() is present in libc or libm */
+ # assuming that, see xconfig.h.in, until we meet an OS where is no
+ # native isnan(...) function available
+
IF(NOT HAVE_LIBC_ISNAN)
SET(CMAKE_REQUIRED_LIBRARIES m)
LIST(APPEND EXTRA_LIBS m)
Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/include/CMakeLists.txt 2006-11-23 08:33:24 UTC (rev 419)
@@ -52,6 +52,24 @@
SET(HAVE_INET_NTOA false)
ENDIF (WIN32) # workaround for cygwin
+FIND_FILE(HAVE_SYS_DKIO_H "sys/dkio.h")
+FIND_FILE(HAVE_SUN_DKIO_H "sun/dkio.h")
+FIND_FILE(HAVE_NAN_H "nan.h")
+
+FIND_FILE(HAVE_SYS_DKIO_H "sys/dkio.h")
+FIND_FILE(HAVE_SUN_DKIO_H "sun/dkio.h")
+FIND_FILE(HAVE_NAN_H "nan.h")
+
+INCLUDE(CheckCSourceCompiles)
+
+ SET(TESTSRC "
+#include <math.h>
+ int main() { return isinf(1); }
+ ")
+SET(CMAKE_REQUIRED_LIBRARIES )
+ CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_ISINF)
+
+
##INCLUDE(CheckCSourceCompiles)
##SET(TESTSRC "
###include <sys/types.h>
Modified: cdrkit/trunk/include/glibc_elf.h
===================================================================
--- cdrkit/trunk/include/glibc_elf.h 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/include/glibc_elf.h 2006-11-23 08:33:24 UTC (rev 419)
@@ -26,7 +26,7 @@
/* Standard ELF types. */
-#include <stdint.h>
+#include <inttypes.h>
#include <sys/types.h>
/* Type for a 16-bit quantity. */
Modified: cdrkit/trunk/include/xconfig.h.in
===================================================================
--- cdrkit/trunk/include/xconfig.h.in 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/include/xconfig.h.in 2006-11-23 08:33:24 UTC (rev 419)
@@ -79,7 +79,7 @@
#define HAVE_SYS_IPC_H 1 /* to use definitions for shmget() ... from sys/ipc.h */
/* #undef MAJOR_IN_MKDEV */ /* if we should include sys/mkdev.h to get major()/minor()/makedev() */
#define MAJOR_IN_SYSMACROS 1 /* if we should include sys/sysmacros.h to get major()/minor()/makedev() */
-/* #undef HAVE_SYS_DKIO_H */ /* if we may include sys/dkio.h for disk ioctls */
+#cmakedefine HAVE_SYS_DKIO_H
/* #undef HAVE_SYS_DKLABEL_H */ /* if we may include sys/dklabel.h for disk label */
/* #undef HAVE_SUN_DKIO_H */ /* if we may include sun/dkio.h for disk ioctls */
/* #undef HAVE_SUN_DKLABEL_H */ /* if we may include sun/dklabel.h for disk label */
@@ -237,7 +237,9 @@
/* #undef HAVE_ECONVERT */ /* econvert() is present in libc */
/* #undef HAVE_FCONVERT */ /* fconvert() is present in libc */
/* #undef HAVE_GCONVERT */ /* gconvert() is present in libc */
-#define HAVE_ISINF 1 /* isinf() is present in libc */
+
+/* isinf() is present in libc */
+#cmakedefine HAVE_ISINF
#define HAVE_ISNAN 1 /* isnan() is present in libc or libm */
#define HAVE_RAND 1 /* rand() is present in libc */
#define HAVE_DRAND48 1 /* drand48() is present in libc */
Modified: cdrkit/trunk/libschily/fconv.c
===================================================================
--- cdrkit/trunk/libschily/fconv.c 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/libschily/fconv.c 2006-11-23 08:33:24 UTC (rev 419)
@@ -76,6 +76,11 @@
#define FOUND_ISXX
#endif
+#ifdef HAVE_NAN_H
+#include <nan.h>
+#define isinf(x) IsINF(x)
+#endif
+
#if defined(HAVE_IEEEFP_H) && !defined(FOUND_ISXX)
/*
* SVR4
Modified: cdrkit/trunk/mkisofs/boot-mips.c
===================================================================
--- cdrkit/trunk/mkisofs/boot-mips.c 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/mkisofs/boot-mips.c 2006-11-23 08:33:24 UTC (rev 419)
@@ -55,7 +55,10 @@
* and other tables is user defined when the device is formatted.
*/
-#include <stdint.h>
+#include <inttypes.h>
+#ifndef MIN
+#define MIN(a,b) ( (a<b) ? a : b )
+#endif
/*
* device parameters are in the volume header to determine mapping
Modified: cdrkit/trunk/mkisofs/mkisofs.c
===================================================================
--- cdrkit/trunk/mkisofs/mkisofs.c 2006-11-22 09:21:45 UTC (rev 418)
+++ cdrkit/trunk/mkisofs/mkisofs.c 2006-11-23 08:33:24 UTC (rev 419)
@@ -2527,7 +2527,14 @@
if (icharset == NULL && iconv_possible) {
char *charset = nl_langinfo(CODESET);
/* set to detected value but only if it is not pure US-ASCII */
- if(strcmp(charset, "ANSI_X3.4-1968") != 0)
+ if(charset) { /* workaround for SunOS, iconv is case-sensitive */
+ char *t;
+ charset = strdup(charset);
+ for(t=charset;*t!='\0';t++)
+ *t=tolower(*t);
+ }
+
+ if(strcmp(charset, "ansi_x3.4-1968") != 0)
icharset = charset;
if(icharset && verbose > 0)
More information about the Debburn-changes
mailing list