pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib update to 1.1.16.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/97a7ae52145b
branches: trunk
changeset: 554745:97a7ae52145b
user: drochner <drochner%pkgsrc.org@localhost>
date: Thu Feb 19 12:58:03 2009 +0000
description:
update to 1.1.16.2
changes:
* Build fixes related to ImageMagick 6.4 & later.
* Fix an error in Matroska PTS calculation.
* Some front ends hang due to the hang fixes in 1.1.16. Fix
this by removing a break statement.
* Fix broken size checks in various input plugins
(ref. CVE-2008-5239).
* More malloc checking (ref. CVE-2008-5240).
* Fix race conditions in gapless_switch
(ref. kde bug #180339)
* Fix a possible integer overflow in the 4XM demuxer.
(TKADV2009-004.txt)
pkgsrc notes:
-the 4xm fix upstream is wrong, do it better (patch-ax)
-filter out --no-undefined linker options on NetBSD<5 because this
causes errors if shared modules are not linked against libc
diffstat:
multimedia/xine-lib/Makefile | 4 +++-
multimedia/xine-lib/Makefile.common | 14 ++++++++++----
multimedia/xine-lib/PLIST.common | 4 +++-
multimedia/xine-lib/distinfo | 13 ++++++++-----
multimedia/xine-lib/patches/patch-ax | 21 +++++++++++++++++++++
multimedia/xine-lib/patches/patch-be | 12 ++++++------
multimedia/xine-lib/patches/patch-ga | 15 +++++++++++++++
multimedia/xine-lib/patches/patch-gb | 13 +++++++++++++
8 files changed, 79 insertions(+), 17 deletions(-)
diffs (201 lines):
diff -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile Thu Feb 19 12:50:16 2009 +0000
+++ b/multimedia/xine-lib/Makefile Thu Feb 19 12:58:03 2009 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.67 2009/01/20 18:30:49 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2009/02/19 12:58:03 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 -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common Thu Feb 19 12:50:16 2009 +0000
+++ b/multimedia/xine-lib/Makefile.common Thu Feb 19 12:58:03 2009 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.59 2009/01/20 18:30:49 drochner Exp $
+# $NetBSD: Makefile.common,v 1.60 2009/02/19 12:58:03 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.1
-XINE_PKGNAME= xine-lib-1.1.16.1
+DISTNAME= xine-lib-1.1.16.2
+XINE_PKGNAME= xine-lib-1.1.16.2
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -28,7 +28,7 @@
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= libtool libtool-nofpic
PKGCONFIG_OVERRIDE= misc/libxine.pc.in
-USE_TOOLS+= autoconf gmake msgfmt pkg-config xmkmf
+USE_TOOLS+= autoconf gmake msgfmt pkg-config xmkmf perl
CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32'
CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest
@@ -58,6 +58,12 @@
.endif
.endif # X11_TYPE
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-4].*)
+# --no-undefined causes errors if shlibs are not linked against libc
+BUILDLINK_TRANSFORM+= "rm:-Wl,--no-undefined"
+.endif
+
pre-configure:
cd ${WRKSRC} && autoconf
diff -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/PLIST.common
--- a/multimedia/xine-lib/PLIST.common Thu Feb 19 12:50:16 2009 +0000
+++ b/multimedia/xine-lib/PLIST.common Thu Feb 19 12:58:03 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.27 2008/07/21 00:11:34 dholland Exp $
+@comment $NetBSD: PLIST.common,v 1.28 2009/02/19 12:58:03 drochner Exp $
bin/xine-config
bin/xine-list-1.1
include/xine.h
@@ -34,6 +34,7 @@
include/xine/vo_scale.h
include/xine/xine_buffer.h
include/xine/xine_internal.h
+include/xine/xine_mmx.h
include/xine/xine_plugin.h
include/xine/xineintl.h
include/xine/xineutils.h
@@ -232,6 +233,7 @@
share/doc/xine-lib/hackersguide/post_frame.png
share/locale/cs/LC_MESSAGES/libxine1.mo
share/locale/de/LC_MESSAGES/libxine1.mo
+share/locale/en_US/LC_MESSAGES/libxine1.mo
share/locale/eo/LC_MESSAGES/libxine1.mo
share/locale/es/LC_MESSAGES/libxine1.mo
share/locale/eu/LC_MESSAGES/libxine1.mo
diff -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo Thu Feb 19 12:50:16 2009 +0000
+++ b/multimedia/xine-lib/distinfo Thu Feb 19 12:58:03 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.61 2009/01/20 18:30:49 drochner Exp $
+$NetBSD: distinfo,v 1.62 2009/02/19 12:58:03 drochner Exp $
-SHA1 (xine-lib-1.1.16.1.tar.bz2) = 82709254a0603e3971058aacf8578926b75d4a20
-RMD160 (xine-lib-1.1.16.1.tar.bz2) = 3c76b12fae8cba87e6d3bceafcbf2fb3ef94e164
-Size (xine-lib-1.1.16.1.tar.bz2) = 7382381 bytes
+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 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
@@ -18,7 +18,8 @@
SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
-SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100
+SHA1 (patch-ax) = 683e2139b1075fc626719327de9e7621887c7332
+SHA1 (patch-be) = 966d057b118728ff509fd4e7f8005ab5b00b5633
SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b
SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
@@ -28,3 +29,5 @@
SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2
+SHA1 (patch-ga) = 73b5aa8acbbdf27e0dea29722e6c4e2bfa3cf6fc
+SHA1 (patch-gb) = bf66da95271a1ffade583bf3ec7848f24a658eb0
diff -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/patches/patch-ax
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-ax Thu Feb 19 12:58:03 2009 +0000
@@ -0,0 +1,21 @@
+$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 -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/patches/patch-be
--- a/multimedia/xine-lib/patches/patch-be Thu Feb 19 12:50:16 2009 +0000
+++ b/multimedia/xine-lib/patches/patch-be Thu Feb 19 12:58:03 2009 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-be,v 1.8 2007/11/22 20:20:24 drochner Exp $
+$NetBSD: patch-be,v 1.9 2009/02/19 12:58:03 drochner Exp $
---- src/audio_out/Makefile.in.orig 2007-08-27 20:27:55.000000000 +0200
+--- src/audio_out/Makefile.in.orig 2009-02-10 19:34:49.000000000 +0100
+++ src/audio_out/Makefile.in
-@@ -509,6 +509,7 @@ OBJDUMP = @OBJDUMP@
+@@ -419,6 +419,7 @@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENGL_CFLAGS = @OPENGL_CFLAGS@
OPENGL_LIBS = @OPENGL_LIBS@
+OSS_LIBS = @OSS_LIBS@
+ OTOOL = @OTOOL@
+ OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -699,7 +700,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
+@@ -615,7 +616,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
xineplug_ao_out_file_la_CFLAGS = $(VISIBILITY_FLAG)
xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
diff -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/patches/patch-ga
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-ga Thu Feb 19 12:58:03 2009 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ga,v 1.5 2009/02/19 12:58:03 drochner Exp $
+
+--- Makefile.in.orig 2009-02-17 15:37:58.000000000 +0100
++++ Makefile.in
+@@ -951,8 +951,8 @@ maintainer-clean-generic:
+ maintainer-clean-generic-hook:
+ rm -f config.status
+
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@
++#$(top_srcdir)/configure: $(am__configure_deps)
++# cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff -r 221e12c16682 -r 97a7ae52145b multimedia/xine-lib/patches/patch-gb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-lib/patches/patch-gb Thu Feb 19 12:58:03 2009 +0000
@@ -0,0 +1,13 @@
+$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
Home |
Main Index |
Thread Index |
Old Index