summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkefren <kefren>2009-08-09 12:56:11 +0000
committerkefren <kefren>2009-08-09 12:56:11 +0000
commit5cf630840e51a9459e3fb9afd00545b71ad6a45e (patch)
tree387f6e87680098fa14eaf7f5095c0f9a4d1f73a2
parent1b9c9ed4793e346759e464976d2a7bb434bae466 (diff)
downloadpkgsrc-5cf630840e51a9459e3fb9afd00545b71ad6a45e.tar.gz
add fix for SA26157. Bump PKGREVISION
-rw-r--r--multimedia/mplayer-share/distinfo3
-rw-r--r--multimedia/mplayer-share/patches/patch-ar14
-rw-r--r--multimedia/mplayer/Makefile4
3 files changed, 18 insertions, 3 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index a18a26c9990..bcd79ba13ff 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2009/03/06 01:33:12 jmcneill Exp $
+$NetBSD: distinfo,v 1.61 2009/08/09 12:56:11 kefren Exp $
SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
@@ -20,6 +20,7 @@ SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73
SHA1 (patch-ao) = ddd85a9bfda237ea923faf0c3677b5e14cff4e0d
SHA1 (patch-ap) = 83777bac06190f71078435721ad2f7055689f64f
SHA1 (patch-aq) = 8d77f3fbe5796707f591e0890b54b9f34f649709
+SHA1 (patch-ar) = c0ecdd35c7c6df29bab728401c02f13391e70a9b
SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e
SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
diff --git a/multimedia/mplayer-share/patches/patch-ar b/multimedia/mplayer-share/patches/patch-ar
new file mode 100644
index 00000000000..1672e883734
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ar
@@ -0,0 +1,14 @@
+--- stream/realrtsp/real.c.orig 2009-08-09 15:48:11.000000000 +0300
++++ stream/realrtsp/real.c 2009-08-09 15:51:10.000000000 +0300
+@@ -376,7 +376,10 @@
+ ts, size, flags1, unknown1, header[4], header[5]);
+ #endif
+ size+=2;
+-
++
++ if (size < 12)
++ return 0;
++
+ ph.object_version=0;
+ ph.length=size;
+ ph.stream_number=(flags1>>1)&0x1f;
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index c427328a978..51f2305a73f 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2009/02/02 19:20:48 drochner Exp $
+# $NetBSD: Makefile,v 1.67 2009/08/09 12:56:11 kefren Exp $
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION= 13
+PKGREVISION= 14
COMMENT= Software-only MPEG-1/2/4 video decoder