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

fixes for quicktime, matroska and wavpack pulled from xine-lib repo

Browse Source 
by brad@

fixes problem reported by viq on ports@
This commit is contained in:
jakemsr 2008-04-06 10:12:23 +00:00
parent 7b734f39a6
commit 23d0a44995
5 changed files with 54 additions and 5 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.31 2008/03/31 11:28:59 jakemsr Exp $
# $OpenBSD: Makefile,v 1.32 2008/04/06 10:12:23 jakemsr Exp $
COMMENT-main= multimedia decoding library
COMMENT-esd= esound audio output module for xine-lib
@ -7,7 +7,7 @@ COMMENT-jack= jackd audio output module for xine-lib
V= 1.1.11.1
DISTNAME= xine-lib-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
PKGNAME-jack= xine-lib-jack-${V}

12
multimedia/xine-lib/patches/patch-src_combined_demux_wavpack_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_combined_demux_wavpack_c,v 1.1 2008/04/06 10:12:23 jakemsr Exp $
--- src/combined/demux_wavpack.c.orig Tue Apr 1 19:45:19 2008
+++ src/combined/demux_wavpack.c Tue Apr 1 19:46:11 2008
@@ -391,7 +391,7 @@ static const char *get_extensions (demux_class_t *cons
}
static const char *get_mimetypes (demux_class_t *const this_gen) {
- return "audio/x-wavpack";
+ return "audio/x-wavpack: wv,wvp: WavPack audio;";
}
static void class_dispose (demux_class_t *const this_gen) {

13
multimedia/xine-lib/patches/patch-src_demuxers_demux_matroska_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_demuxers_demux_matroska_c,v 1.1 2008/04/06 10:12:23 jakemsr Exp $
--- src/demuxers/demux_matroska.c.orig Tue Apr 1 19:47:42 2008
+++ src/demuxers/demux_matroska.c Tue Apr 1 19:48:55 2008
@@ -2915,7 +2915,8 @@ static const char *get_extensions (demux_class_t *this
static const char *get_mimetypes (demux_class_t *this_gen) {
- return "video/mkv: mkv: matroska;";
+ return "video/mkv: mkv: matroska;"
+ "video/x-matroska: mkv: matroska;";
}

18
multimedia/xine-lib/patches/patch-src_demuxers_demux_qt_c
View File

@ -1,7 +1,19 @@
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.3 2008/03/31 11:28:59 jakemsr Exp $
$OpenBSD: patch-src_demuxers_demux_qt_c,v 1.4 2008/04/06 10:12:23 jakemsr Exp $
--- src/demuxers/demux_qt.c.orig Fri Mar 28 18:50:47 2008
+++ src/demuxers/demux_qt.c Sun Mar 30 23:24:31 2008
@@ -3028,7 +3028,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
+++ src/demuxers/demux_qt.c Tue Apr 1 19:47:19 2008
@@ -896,11 +896,6 @@ static qt_error parse_trak_atom (qt_trak *trak,
current_atom_size = _X_BE_32(&trak_atom[i - 4]);
current_atom = _X_BE_32(&trak_atom[i]);
- if (current_atom_size > trak_atom_size - i) {
- last_error = QT_NOT_A_VALID_FILE;
- goto free_trak;
- }
-
if (current_atom == TKHD_ATOM) {
trak->flags = _X_BE_16(&trak_atom[i + 6]);
} else if (current_atom == ELST_ATOM) {
@@ -3028,7 +3023,7 @@ static demux_plugin_t *open_plugin (demux_class_t *cla
/* special consideration for DRM-protected files */
if (this->qt->last_error == QT_DRM_NOT_SUPPORTED)
_x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE,

12
multimedia/xine-lib/patches/patch-src_demuxers_ebml_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_demuxers_ebml_c,v 1.1 2008/04/06 10:12:23 jakemsr Exp $
--- src/demuxers/ebml.c.orig Fri Apr 4 22:55:14 2008
+++ src/demuxers/ebml.c Fri Apr 4 22:55:38 2008
@@ -327,7 +327,7 @@ char *ebml_alloc_read_ascii (ebml_parser_t *ebml, ebml
if (text)
{
text[elem->len] = '\0';
- if (ebml_read_ascii (ebml, &elem, text))
+ if (ebml_read_ascii (ebml, elem, text))
return text;
free (text);
}