cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CDDB access on 64-bit architectures.

Browse Source 
From Xine-lib source repo

ok jakemsr@
This commit is contained in:
brad 2008-08-31 00:35:08 +00:00
parent 186fa1fd56
commit e2615fc74c
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multimedia/xine-lib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2008/08/21 21:56:49 brad Exp $
# $OpenBSD: Makefile,v 1.39 2008/08/31 00:35:08 brad Exp $
SHARED_ONLY= Yes
@ -9,7 +9,7 @@ COMMENT-jack= jackd audio output module for xine-lib
V= 1.1.15
DISTNAME= xine-lib-${V}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}p1
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
PKGNAME-jack= xine-lib-jack-${V}

31
multimedia/xine-lib/patches/patch-src_input_input_cdda_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_input_cdda_c,v 1.5 2008/08/20 01:54:01 brad Exp $
$OpenBSD: patch-src_input_input_cdda_c,v 1.6 2008/08/31 00:35:08 brad Exp $
--- src/input/input_cdda.c.orig Wed Aug 13 12:33:05 2008
+++ src/input/input_cdda.c Thu Aug 14 18:48:39 2008
+++ src/input/input_cdda.c Wed Aug 27 19:50:47 2008
@@ -72,7 +72,7 @@
#elif defined(WIN32)
#define DEFAULT_CDDA_DEVICE "d:\\"
@ -10,6 +10,15 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.5 2008/08/20 01:54:01 brad Exp $
#endif
#define CDDB_SERVER "freedb.freedb.org"
@@ -136,7 +136,7 @@ typedef struct {
char *disc_category;
int fd;
- unsigned long disc_id;
+ uint32_t disc_id;
int disc_length;
trackinfo_t *track;
@@ -611,7 +611,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
return 0;
}
@ -73,3 +82,21 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.5 2008/08/20 01:54:01 brad Exp $
scsireq_t req;
int nblocks = 1;
@@ -1902,7 +1902,7 @@ static unsigned int _cdda_cddb_sum(int n) {
}
return ret;
}
-static unsigned long _cdda_calc_cddb_id(cdda_input_plugin_t *this) {
+static uint32_t _cdda_calc_cddb_id(cdda_input_plugin_t *this) {
int i, tsum = 0;
if(this == NULL || (this->cddb.num_tracks <= 0))
@@ -1959,7 +1959,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, c
/*
* return cbbd disc id.
*/
-static unsigned long _cdda_get_cddb_id(cdda_input_plugin_t *this) {
+static uint32_t _cdda_get_cddb_id(cdda_input_plugin_t *this) {
if(this == NULL || (this->cddb.num_tracks <= 0))
return 0;