diff options
author | wiz <wiz@pkgsrc.org> | 2007-02-01 07:33:33 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2007-02-01 07:33:33 +0000 |
commit | 423439eea7e9793f04dfc7974276c51c6c79d275 (patch) | |
tree | 71d4d0a838f30165ed195181e721c06188899879 | |
parent | 5c8bdf0d9334bcbdcc7bd1c469d98c7f98417d6a (diff) | |
download | pkgsrc-423439eea7e9793f04dfc7974276c51c6c79d275.tar.gz |
Really include CD_BLOCK_OFFSET changes from Sergey Svishchev,
sent in PR 34107.
Bump PKGREVISION.
-rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-an | 28 |
3 files changed, 22 insertions, 14 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index d8999b4dc0b..7d5ae31f514 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2007/01/29 10:32:50 joerg Exp $ +# $NetBSD: Makefile,v 1.48 2007/02/01 07:33:33 wiz Exp $ .include "Makefile.common" -PKGREVISION= 4 +PKGREVISION= 5 COMMENT= Multimedia player library diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index fa070ae66a7..5e5ec509245 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2007/01/10 17:18:37 drochner Exp $ +$NetBSD: distinfo,v 1.43 2007/02/01 07:33:33 wiz Exp $ SHA1 (xine-lib-1.1.3.tar.gz) = c0886910ddb1afa1a72572decf12c0251bba40bf RMD160 (xine-lib-1.1.3.tar.gz) = 8e28638385ea48e7d4d4d702573ca92c4eca77c8 @@ -14,7 +14,7 @@ SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e -SHA1 (patch-an) = ba1ba429c13d3695cca5df4f00dd380aa98f03fa +SHA1 (patch-an) = 14de05f8fcd857403078234190f2799ec0115b98 SHA1 (patch-ao) = eabc0d33210aeb1c8469e761471e5bb8336c89b7 SHA1 (patch-ap) = c84a3ca97a4615a1b389f49847c0eefe0ee0478f SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 diff --git a/multimedia/xine-lib/patches/patch-an b/multimedia/xine-lib/patches/patch-an index 23c46aa8d59..411bf51a279 100644 --- a/multimedia/xine-lib/patches/patch-an +++ b/multimedia/xine-lib/patches/patch-an @@ -1,8 +1,16 @@ -$NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ +$NetBSD: patch-an,v 1.8 2007/02/01 07:33:34 wiz Exp $ ---- src/input/input_cdda.c.orig 2005-10-08 15:57:42.000000000 +0200 +--- src/input/input_cdda.c.orig 2006-08-11 21:40:02.000000000 +0000 +++ src/input/input_cdda.c -@@ -613,14 +613,20 @@ static int read_cdrom_frames(cdda_input_ +@@ -86,6 +86,7 @@ + #define CD_FRAMES_PER_SECOND 75 + #define CD_RAW_FRAME_SIZE 2352 + #define CD_LEADOUT_TRACK 0xAA ++#define CD_BLOCK_OFFSET 150 + + typedef struct _cdrom_toc_entry { + int track_mode; +@@ -613,14 +614,20 @@ static int read_cdrom_frames(cdda_input_ return 0; } @@ -24,7 +32,7 @@ $NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ int i; /* fetch the table of contents */ -@@ -646,13 +652,26 @@ static int read_cdrom_toc(int fd, cdrom_ +@@ -646,13 +653,26 @@ static int read_cdrom_toc(int fd, cdrom_ memset(&tocentry, 0, sizeof(tocentry)); @@ -51,7 +59,7 @@ $NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ toc->toc_entries[i-1].track_mode = (tocentry.entry.control & 0x04) ? 1 : 0; toc->toc_entries[i-1].first_frame_minute = tocentry.entry.addr.msf.minute; toc->toc_entries[i-1].first_frame_second = tocentry.entry.addr.msf.second; -@@ -661,18 +680,41 @@ static int read_cdrom_toc(int fd, cdrom_ +@@ -661,18 +681,41 @@ static int read_cdrom_toc(int fd, cdrom_ (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) + tocentry.entry.addr.msf.frame; @@ -63,7 +71,7 @@ $NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ + toc->toc_entries[i-1].first_frame = + (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + + (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) + -+ tocentry.data->addr.msf.frame; ++ tocentry.data->addr.msf.frame - CD_BLOCK_OFFSET; +#endif } @@ -93,7 +101,7 @@ $NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ toc->leadout_track.track_mode = (tocentry.entry.control & 0x04) ? 1 : 0; toc->leadout_track.first_frame_minute = tocentry.entry.addr.msf.minute; toc->leadout_track.first_frame_second = tocentry.entry.addr.msf.second; -@@ -681,6 +723,16 @@ static int read_cdrom_toc(int fd, cdrom_ +@@ -681,6 +724,16 @@ static int read_cdrom_toc(int fd, cdrom_ (tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + (tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) + tocentry.entry.addr.msf.frame; @@ -105,12 +113,12 @@ $NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ + toc->leadout_track.first_frame = + (tocentry.data->addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) + + (tocentry.data->addr.msf.second * CD_FRAMES_PER_SECOND) + -+ tocentry.data->addr.msf.frame; ++ tocentry.data->addr.msf.frame - CD_BLOCK_OFFSET; +#endif return 0; } -@@ -689,12 +741,12 @@ static int read_cdrom_frames(cdda_input_ +@@ -689,12 +742,12 @@ static int read_cdrom_frames(cdda_input_ unsigned char *data) { int fd = this_gen->fd; @@ -126,7 +134,7 @@ $NetBSD: patch-an,v 1.7 2006/08/06 10:36:50 wiz Exp $ cdda.address_format = CD_MSF_FORMAT; cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND; cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE; -@@ -712,6 +764,33 @@ static int read_cdrom_frames(cdda_input_ +@@ -712,6 +765,33 @@ static int read_cdrom_frames(cdda_input_ perror("CDIOCREADAUDIO"); return -1; } |