claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Apply kfreebsd patch from Debian.

Browse Source
This commit is contained in:
rocky
2007-12-15 22:36:35 +00:00
parent 9de6b551d4
commit ddf569dbea
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 79)
define(CDIO_VERSION_STR, 0.$1) define(CDIO_VERSION_STR, 0.$1)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.216 2007/11/16 13:52:55 flameeyes Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.217 2007/12/15 22:36:35 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
@@ -449,7 +449,7 @@ int has_timeout=sizeof(test.timeout);],
LIBS="$LIBS -lwinmm -mwindows" LIBS="$LIBS -lwinmm -mwindows"
cd_drivers="${cd_drivers}, MinGW " cd_drivers="${cd_drivers}, MinGW "
;; ;;
freebsd4.*|freebsd5.*|freebsd6*|freebsd7*|dragonfly*) freebsd4.*|freebsd5.*|freebsd6*|freebsd7*|dragonfly*|kfreebsd*)
AC_DEFINE([HAVE_FREEBSD_CDROM], [1], AC_DEFINE([HAVE_FREEBSD_CDROM], [1],
[Define 1 if you have FreeBSD CD-ROM support]) [Define 1 if you have FreeBSD CD-ROM support])
LIBS="$LIBS -lcam" LIBS="$LIBS -lcam"
@@ -694,7 +694,7 @@ cat > include/cdio/cdio_config.h << EOF
version of config.h version of config.h
*/ */
EOF EOF
head -n 230 config.h >> include/cdio/cdio_config.h head -n 233 config.h >> include/cdio/cdio_config.h
]],[[]]) ]],[[]])
AC_OUTPUT AC_OUTPUT

11
doc/how-to-make-a-release.txt
View File

@@ -5,6 +5,8 @@
- "make distcheck" should work. - "make distcheck" should work.
- Look for/fix/apply patches and outstanding bugs on Savannah.
- Go over Changelog and add NEWS. Update date of release. - Go over Changelog and add NEWS. Update date of release.
- Remove "cvs" from configure.ac's release name. E.g. - Remove "cvs" from configure.ac's release name. E.g.
@@ -25,15 +27,18 @@
- Tag release in CVS: - Tag release in CVS:
cvs log -h configure.ac cvs log -h configure.ac
cvs tag release_*0_79* . cvs tag release_*0_80* .
- "make distcheck" one more time - "make distcheck" one more time
- Get onto ftp.gnu.org. I use my perl program - Get onto ftp.gnu.org. I use my perl program
gnu-ftp-upload libcdio 0.*79* gnu-ftp-upload libcdio 0.*80*
Also gnupload from the automake distribution.
- Update/Announce on Freshmeat: - Update/Announce on Freshmeat:
http://freshmeat.net/projects/libcdio/ "add release" generally http://freshmeat.net/add-release/36670/
(http://freshmeat.net/projects/libcdio/ "add release")
The NEWS file is your friend. The NEWS file is your friend.

4
lib/driver/FreeBSD/freebsd.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: freebsd.h,v 1.6 2006/03/18 01:56:19 rocky Exp $ $Id: freebsd.h,v 1.7 2007/12/15 22:36:35 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -78,7 +78,7 @@ struct ioc_read_audio
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/param.h> /* for __FreeBSD_version */ #include <sys/param.h> /* for __FreeBSD_version */
#if __FreeBSD_version < 500000 #if (__FreeBSD_version < 500000) && (__FreeBSD_kernel_version < 500000)
#define DEVICE_POSTFIX "c" #define DEVICE_POSTFIX "c"
#else #else
#define DEVICE_POSTFIX "" #define DEVICE_POSTFIX ""