summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/xine-lib/Makefile4
-rw-r--r--multimedia/xine-lib/Makefile.common8
-rw-r--r--multimedia/xine-lib/distinfo14
-rw-r--r--multimedia/xine-lib/patches/patch-ae32
-rw-r--r--multimedia/xine-lib/patches/patch-ax21
-rw-r--r--multimedia/xine-lib/patches/patch-ay26
-rw-r--r--multimedia/xine-lib/patches/patch-az21
-rw-r--r--multimedia/xine-lib/patches/patch-gb13
8 files changed, 47 insertions, 92 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 09da8c41ba0..86ee70c92cf 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.69 2009/04/05 13:15:01 drochner Exp $
+# $NetBSD: Makefile,v 1.70 2009/04/17 16:35:40 drochner Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 1
-
COMMENT= Multimedia player library
BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 39f490e85e9..67813497214 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.60 2009/02/19 12:58:03 drochner Exp $
+# $NetBSD: Makefile.common,v 1.61 2009/04/17 16:35:40 drochner Exp $
#
# used by audio/xine-arts/Makefile
# used by audio/xine-esound/Makefile
# used by audio/xine-pulse/Makefile
-DISTNAME= xine-lib-1.1.16.2
-XINE_PKGNAME= xine-lib-1.1.16.2
+DISTNAME= xine-lib-1.1.16.3
+XINE_PKGNAME= xine-lib-1.1.16.3
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -16,7 +16,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xinehq.de/
XINE_LIB_VER= 1.1.16
-XINE_MOD_DIR_VER= 1.25
+XINE_MOD_DIR_VER= 1.26
PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q}
PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 1ab21194912..016a37e7fdf 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.63 2009/04/05 13:15:01 drochner Exp $
+$NetBSD: distinfo,v 1.64 2009/04/17 16:35:40 drochner Exp $
-SHA1 (xine-lib-1.1.16.2.tar.bz2) = faa3d9207d911a535161a3cd5660aa9e6b904c28
-RMD160 (xine-lib-1.1.16.2.tar.bz2) = 80da6bf2127bc349dbbc9da0f5529869110678b4
-Size (xine-lib-1.1.16.2.tar.bz2) = 7407399 bytes
+SHA1 (xine-lib-1.1.16.3.tar.bz2) = 64c57c5f55ff37023cc4c3d93d4df3c06950d235
+RMD160 (xine-lib-1.1.16.3.tar.bz2) = 279304a4e998472b2b5e79887e54c47765044ec6
+Size (xine-lib-1.1.16.3.tar.bz2) = 7468182 bytes
SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
-SHA1 (patch-ae) = 417d730034cc4dbf3103e07afb8432822084c64b
+SHA1 (patch-ae) = d92ea30b4f48e6181c28b69d1270a7d7348109f9
SHA1 (patch-ag) = 066cc1f94d4d0ae6a24c4b6104ba05950db11972
SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f
SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
@@ -18,8 +18,7 @@ SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100
SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
-SHA1 (patch-ax) = 683e2139b1075fc626719327de9e7621887c7332
-SHA1 (patch-ay) = 7bf4d476b7ca26566826355b626e95223c3c5567
+SHA1 (patch-az) = 11ecf590838afb46cb28523ec7175909ab4ba136
SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633
SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b
SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
@@ -31,4 +30,3 @@ SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2
SHA1 (patch-ga) = 73b5aa8acbbdf27e0dea29722e6c4e2bfa3cf6fc
-SHA1 (patch-gb) = bf66da95271a1ffade583bf3ec7848f24a658eb0
diff --git a/multimedia/xine-lib/patches/patch-ae b/multimedia/xine-lib/patches/patch-ae
index e9d903d4c70..a1fe677e9ab 100644
--- a/multimedia/xine-lib/patches/patch-ae
+++ b/multimedia/xine-lib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
+$NetBSD: patch-ae,v 1.6 2009/04/17 16:35:40 drochner Exp $
---- src/input/input_vcd.c.orig 2008-01-01 14:30:08.000000000 +0100
+--- src/input/input_vcd.c.orig 2009-02-17 03:55:21.000000000 +0100
+++ src/input/input_vcd.c
@@ -29,6 +29,7 @@
#include <errno.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
#if defined (__linux__) || defined(__sun)
struct cdrom_tochdr tochdr;
struct cdrom_tocentry tocent[100];
--#elif defined (__FreeBSD_kernel__)
+-#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#elif (defined(BSD) && BSD >= 199306)
struct ioc_toc_header tochdr;
struct cd_toc_entry *tocent;
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
int cur_track;
--#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__)
+-#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306)
uint8_t cur_min, cur_sec, cur_frame;
#endif
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
return 0;
}
--#elif defined (__FreeBSD_kernel__)
+-#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#elif (defined(BSD) && BSD >= 199306)
static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
return VCDSECTORSIZE;
}
--#elif defined (__FreeBSD_kernel__)
+-#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#elif (defined(BSD) && BSD >= 199306)
static off_t vcd_plugin_read (input_plugin_t *this_gen,
char *buf, off_t nlen) {
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
return buf;
}
--#elif defined (__FreeBSD_kernel__)
+-#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#elif (defined(BSD) && BSD >= 199306)
static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen,
fifo_buffer_t *fifo, off_t nlen) {
@@ -59,7 +59,7 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
return offset ; /* FIXME */
}
--#elif defined (__FreeBSD_kernel__)
+-#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#elif (defined(BSD) && BSD >= 199306)
static off_t vcd_plugin_seek (input_plugin_t *this_gen,
off_t offset, int origin) {
@@ -68,19 +68,17 @@ $NetBSD: patch-ae,v 1.5 2008/01/11 16:05:27 drochner Exp $
return (off_t) 0;
}
--#elif defined (__FreeBSD_kernel__)
+-#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
+#elif (defined(BSD) && BSD >= 199306)
static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
off_t len ;
-@@ -859,6 +860,10 @@ static int vcd_plugin_open (input_plugin
+@@ -859,7 +860,7 @@ static int vcd_plugin_open (input_plugin
this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute;
this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second;
this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame;
-+#elif defined(__NetBSD__)
-+ this->cur_min = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.minute;
-+ this->cur_sec = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.second;
-+ this->cur_frame = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.frame;
- #elif defined (__FreeBSD_kernel__)
- {
- int bsize = 2352;
+-#elif defined (__OpenBSD__)
++#elif defined (__OpenBSD__) || defined(__NetBSD__)
+ this->cur_min = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.minute;
+ this->cur_sec = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.second;
+ this->cur_frame = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.frame;
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
deleted file mode 100644
index 49b5a6f5d45..00000000000
--- a/multimedia/xine-lib/patches/patch-ax
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ax,v 1.9 2009/02/19 12:58:03 drochner Exp $
-
---- src/demuxers/demux_4xm.c.orig 2009-02-10 18:32:23.000000000 +0100
-+++ src/demuxers/demux_4xm.c
-@@ -190,12 +190,12 @@ static int open_fourxm_file(demux_fourxm
- return 0;
- }
- const uint32_t current_track = _X_LE_32(&header[i + 8]);
-+ if (current_track >= UINT_MAX / sizeof(audio_track_t) - 1) {
-+ free(header);
-+ return 0;
-+ }
- if (current_track + 1 > fourxm->track_count) {
- fourxm->track_count = current_track + 1;
-- if (fourxm->track_count >= UINT_MAX / sizeof(audio_track_t)) {
-- free(header);
-- return 0;
-- }
- fourxm->tracks = realloc(fourxm->tracks,
- fourxm->track_count * sizeof(audio_track_t));
- if (!fourxm->tracks) {
diff --git a/multimedia/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay
deleted file mode 100644
index 9630bd4f2f8..00000000000
--- a/multimedia/xine-lib/patches/patch-ay
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ay,v 1.7 2009/04/05 13:15:01 drochner Exp $
-
---- src/demuxers/demux_qt.c.orig 2009-04-05 11:28:05.000000000 +0200
-+++ src/demuxers/demux_qt.c
-@@ -1535,7 +1535,8 @@ static qt_error parse_trak_atom (qt_trak
- } else if (current_atom == STTS_ATOM) {
-
- /* there should only be one of these atoms */
-- if (trak->time_to_sample_table) {
-+ if (trak->time_to_sample_table
-+ || current_atom_size < 12 || current_atom_size >= UINT_MAX) {
- last_error = QT_HEADER_TROUBLE;
- goto free_trak;
- }
-@@ -1545,6 +1546,11 @@ static qt_error parse_trak_atom (qt_trak
- debug_atom_load(" qt stts atom (time-to-sample atom): %d entries\n",
- trak->time_to_sample_count);
-
-+ if (trak->time_to_sample_count > (current_atom_size - 12) / 8) {
-+ last_error = QT_HEADER_TROUBLE;
-+ goto free_trak;
-+ }
-+
- trak->time_to_sample_table = (time_to_sample_table_t *)calloc(
- trak->time_to_sample_count+1, sizeof(time_to_sample_table_t));
- if (!trak->time_to_sample_table) {
diff --git a/multimedia/xine-lib/patches/patch-az b/multimedia/xine-lib/patches/patch-az
new file mode 100644
index 00000000000..eaa500a3ced
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-az
@@ -0,0 +1,21 @@
+$NetBSD: patch-az,v 1.6 2009/04/17 16:35:40 drochner Exp $
+
+--- src/demuxers/demux_mod.c.orig 2009-04-05 15:19:38.000000000 +0200
++++ src/demuxers/demux_mod.c
+@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
+ "audio/x-s3m: s3m: ScreamTracker 3 Module;"
+ "audio/s3m: s3m: ScreamTracker 3 Module;"
+ "application/playerpro: 669: 669 Tracker Module;"
+- "application/adrift; amf: ADRIFT Module File;"
+- "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
+- "audio/x-amf; amf: ADRIFT Module File;"
+- "audio/x-xm; xm: FastTracker II Audio;"
+- "audio/xm; xm: FastTracker II Audio;";
++ "application/adrift: amf: ADRIFT Module File;"
++ "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
++ "audio/x-amf: amf: ADRIFT Module File;"
++ "audio/x-xm: xm: FastTracker II Audio;"
++ "audio/xm: xm: FastTracker II Audio;";
+ }
+
+ static void class_dispose (demux_class_t *this_gen) {
diff --git a/multimedia/xine-lib/patches/patch-gb b/multimedia/xine-lib/patches/patch-gb
deleted file mode 100644
index facad8be3de..00000000000
--- a/multimedia/xine-lib/patches/patch-gb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gb,v 1.5 2009/02/19 12:58:03 drochner Exp $
-
---- src/combined/ffmpeg/Makefile.in.orig 2009-02-17 16:27:30.000000000 +0100
-+++ src/combined/ffmpeg/Makefile.in
-@@ -890,7 +890,7 @@ avcodec_video.list: AV_CODECS:=/CODEC_ID
- avcodec_audio.list avcodec_video.list:
- echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
- sed -e $(AV_CODECS)'! d; s/^\s*//; s/[=,].*//; /^$$/ d' |\
-- head -n -1 >$@
-+ sed '$$d' >$@
-
- # Generate the mappings. These are #included where needed.
- ff_%_list.h: $(srcdir)/mkcodeclist.pl avcodec_%.list $(srcdir)/xine_%.list
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 21:59:59 +0000