diff options
| author | reinoud <reinoud> | 2008-10-13 17:15:44 +0000 |
|---|---|---|
| committer | reinoud <reinoud> | 2008-10-13 17:15:44 +0000 |
| commit | b12d2521f1364d312297c8b31f6d30e2c9aa5752 (patch) | |
| tree | 5cc1cae0688b571565ac34d69360bec46ec5a969 | |
| parent | 2ce6e8fd1f4bddbf1e6b39bf083318fd54e9041b (diff) | |
| download | pkgsrc-b12d2521f1364d312297c8b31f6d30e2c9aa5752.tar.gz | |
Apply patch to first unlock the CD before trying to eject it. Since SDL
doesn't seem to have lock/unlock primitives, this looks like the right thing
to do.
Fixes audio/tcd's eject function too.
| -rw-r--r-- | devel/SDL/Makefile | 4 | ||||
| -rw-r--r-- | devel/SDL/distinfo | 3 | ||||
| -rw-r--r-- | devel/SDL/patches/patch-ab | 12 | ||||
| -rw-r--r-- | doc/CHANGES-2008 | 3 |
4 files changed, 18 insertions, 4 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 07f49194a1b..a766283943b 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2008/05/06 06:36:44 bjs Exp $ +# $NetBSD: Makefile,v 1.83 2008/10/13 17:15:44 reinoud Exp $ DISTNAME= SDL-1.2.13 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel games MASTER_SITES= http://www.libsdl.org/release/ diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index 7e8ce767d3d..f7bab25eb09 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.50 2008/01/13 15:57:59 wiz Exp $ +$NetBSD: distinfo,v 1.51 2008/10/13 17:15:44 reinoud Exp $ SHA1 (SDL-1.2.13.tar.gz) = 51fcaa3e1d5c01fd813ea08688780f86b19cf539 RMD160 (SDL-1.2.13.tar.gz) = ed8825fc98f4b3759cf9e5cf8357d71c50df9925 Size (SDL-1.2.13.tar.gz) = 3373673 bytes SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f +SHA1 (patch-ab) = 344c6b70ee062c576e20d7ff222a6283ba3cb4cb diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab new file mode 100644 index 00000000000..d680da5288a --- /dev/null +++ b/devel/SDL/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.8 2008/10/13 17:15:44 reinoud Exp $ + +--- src/cdrom/openbsd/SDL_syscdrom.c.orig 2007-12-31 05:47:59.000000000 +0100 ++++ src/cdrom/openbsd/SDL_syscdrom.c +@@ -391,6 +391,7 @@ static int SDL_SYS_CDStop(SDL_CD *cdrom) + /* Eject the CD-ROM */ + static int SDL_SYS_CDEject(SDL_CD *cdrom) + { ++ SDL_SYS_CDioctl(cdrom->id, CDIOCALLOW, 0); + return(SDL_SYS_CDioctl(cdrom->id, CDIOCEJECT, 0)); + } + diff --git a/doc/CHANGES-2008 b/doc/CHANGES-2008 index b0feb3a0c8c..6bfeb486d93 100644 --- a/doc/CHANGES-2008 +++ b/doc/CHANGES-2008 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2008,v 1.2493 2008/10/13 15:24:44 schmonz Exp $ +$NetBSD: CHANGES-2008,v 1.2494 2008/10/13 17:15:44 reinoud Exp $ Changes to the packages collection and infrastructure in 2008: @@ -4240,3 +4240,4 @@ Changes to the packages collection and infrastructure in 2008: Updated devel/p5-Compress-Zlib to 2.015 [obache 2008-10-13] Updated lang/ocamlduce to 3.10.2 [obache 2008-10-13] Updated mail/spamdyke to 4.0.5 [schmonz 2008-10-13] + Updated devel/SDL to SDL-1.2.13nb2 [reinoud 2008-10-13] |