summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2006-06-13 17:25:00 +0000
committerdrochner <drochner@pkgsrc.org>2006-06-13 17:25:00 +0000
commit9ee10a64014c4bec68c7670d28130987f7e8f43c (patch)
tree1019d8c146d2fe4f05346a2b6013cd45b6fc0844 /multimedia
parentae4fdc3e839f1342b3bf447187635ce59a05552f (diff)
downloadpkgsrc-9ee10a64014c4bec68c7670d28130987f7e8f43c.tar.gz
update to 1.0pre8
too many changes to list here, see the ChangeLog most visible: security patches and DragonFly support were intrgrated upstream, new gmplayer look&feel (like it or not...)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gmplayer/Makefile5
-rw-r--r--multimedia/gmplayer/distinfo153
-rw-r--r--multimedia/mencoder/Makefile3
-rw-r--r--multimedia/mplayer-share/Makefile3
-rw-r--r--multimedia/mplayer-share/Makefile.common6
-rw-r--r--multimedia/mplayer-share/PLIST333
-rw-r--r--multimedia/mplayer-share/distinfo33
-rw-r--r--multimedia/mplayer-share/patches/patch-aa39
-rw-r--r--multimedia/mplayer-share/patches/patch-ab13
-rw-r--r--multimedia/mplayer-share/patches/patch-ac8
-rw-r--r--multimedia/mplayer-share/patches/patch-ad24
-rw-r--r--multimedia/mplayer-share/patches/patch-ae50
-rw-r--r--multimedia/mplayer-share/patches/patch-af12
-rw-r--r--multimedia/mplayer-share/patches/patch-ah12
-rw-r--r--multimedia/mplayer-share/patches/patch-ai82
-rw-r--r--multimedia/mplayer-share/patches/patch-aj39
-rw-r--r--multimedia/mplayer-share/patches/patch-da12
-rw-r--r--multimedia/mplayer-share/patches/patch-dc12
-rw-r--r--multimedia/mplayer-share/patches/patch-dd12
-rw-r--r--multimedia/mplayer-share/patches/patch-de21
-rw-r--r--multimedia/mplayer-share/patches/patch-df12
-rw-r--r--multimedia/mplayer-share/patches/patch-dg13
-rw-r--r--multimedia/mplayer-share/patches/patch-dh22
-rw-r--r--multimedia/mplayer-share/patches/patch-di12
-rw-r--r--multimedia/mplayer-share/patches/patch-dj39
-rw-r--r--multimedia/mplayer-share/patches/patch-dk12
-rw-r--r--multimedia/mplayer-share/patches/patch-dm30
-rw-r--r--multimedia/mplayer-share/patches/patch-do13
-rw-r--r--multimedia/mplayer/Makefile3
29 files changed, 375 insertions, 653 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 4f52e2123d6..63aefedc62f 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/04/13 14:05:34 drochner Exp $
+# $NetBSD: Makefile,v 1.45 2006/06/13 17:25:00 drochner Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,6 @@
#
PKGNAME= gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION= 6
SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/Skin/ \
ftp://ftp1.mplayerhq.hu/MPlayer/Skin/ \
@@ -75,7 +74,7 @@ do-install:
.include "../../multimedia/mplayer-share/Makefile.depends"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
.include "../../multimedia/mplayer-share/Makefile.cflags"
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 6770b8b606d..e8f8ab0b0fd 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,86 +1,69 @@
-$NetBSD: distinfo,v 1.34 2006/04/13 14:05:34 drochner Exp $
+$NetBSD: distinfo,v 1.35 2006/06/13 17:25:00 drochner Exp $
-SHA1 (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7try2.tar.bz2) = dcaced128167f15d094c9b63ca8b3dfd8f583e32
-RMD160 (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7try2.tar.bz2) = d1da9b34f4c3de67a3a41f9117f32d2ee88c6e54
-Size (gmplayer-1.0rc7-20060123/MPlayer-1.0pre7try2.tar.bz2) = 6868786 bytes
-SHA1 (gmplayer-1.0rc7-20060123/AlienMind-1.2.tar.bz2) = 0d612f7fc92332783e3a8fd42b9f957a1c6ecaee
-RMD160 (gmplayer-1.0rc7-20060123/AlienMind-1.2.tar.bz2) = 5e7f5fcade401af16c1614dcfc5c6f673fe4cd49
-Size (gmplayer-1.0rc7-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes
-SHA1 (gmplayer-1.0rc7-20060123/Blue-1.4.tar.bz2) = 35a4f687d5f70565d066c9b9cadf5cb60273a0ed
-RMD160 (gmplayer-1.0rc7-20060123/Blue-1.4.tar.bz2) = 83c7d62f8d3e96d59876cc1a2e544005e5d6f159
-Size (gmplayer-1.0rc7-20060123/Blue-1.4.tar.bz2) = 221764 bytes
-SHA1 (gmplayer-1.0rc7-20060123/BlueHeart-1.5.tar.bz2) = c5da3b035492e8e9c44c2540223c2ab9790c5795
-RMD160 (gmplayer-1.0rc7-20060123/BlueHeart-1.5.tar.bz2) = 8edd715fc70d5226b5769c87290c40268ce6ce82
-Size (gmplayer-1.0rc7-20060123/BlueHeart-1.5.tar.bz2) = 281110 bytes
-SHA1 (gmplayer-1.0rc7-20060123/CornerMP-1.2.tar.bz2) = 5687ac894548b69d112dcc74c519d9c752d21ea8
-RMD160 (gmplayer-1.0rc7-20060123/CornerMP-1.2.tar.bz2) = c47f41bdbeba690c18896d51e3d7696b89711a1d
-Size (gmplayer-1.0rc7-20060123/CornerMP-1.2.tar.bz2) = 232726 bytes
-SHA1 (gmplayer-1.0rc7-20060123/CornerMP-aqua-1.4.tar.bz2) = 8217cf467a3d588a0831d79c86bf6c718f74a31c
-RMD160 (gmplayer-1.0rc7-20060123/CornerMP-aqua-1.4.tar.bz2) = 3af6e18f52c585aa5f8399bb01179e6ac96af7cb
-Size (gmplayer-1.0rc7-20060123/CornerMP-aqua-1.4.tar.bz2) = 243275 bytes
-SHA1 (gmplayer-1.0rc7-20060123/Cyrus-1.2.tar.bz2) = 04bea3ecc4f3f14592b06bfea2f66cdbba28eebb
-RMD160 (gmplayer-1.0rc7-20060123/Cyrus-1.2.tar.bz2) = 46090cada81d1304aabbf07d20e358c52c0923b0
-Size (gmplayer-1.0rc7-20060123/Cyrus-1.2.tar.bz2) = 228477 bytes
-SHA1 (gmplayer-1.0rc7-20060123/MidnightLove-1.6.tar.bz2) = cb3e4e5f6ea8ff427acfe133367a0d05702d77fb
-RMD160 (gmplayer-1.0rc7-20060123/MidnightLove-1.6.tar.bz2) = 678848e8971615369eddfcdfc9a404e5b978004f
-Size (gmplayer-1.0rc7-20060123/MidnightLove-1.6.tar.bz2) = 539609 bytes
-SHA1 (gmplayer-1.0rc7-20060123/WMP6-2.2.tar.bz2) = 17118c9074ba568d032aa70c947c9bce31a162a2
-RMD160 (gmplayer-1.0rc7-20060123/WMP6-2.2.tar.bz2) = 8ffcdd4f01a30b9921f3262266dec83cd3f59acd
-Size (gmplayer-1.0rc7-20060123/WMP6-2.2.tar.bz2) = 39316 bytes
-SHA1 (gmplayer-1.0rc7-20060123/avifile-1.6.tar.bz2) = 9c9da5e3332692815f7ca0796a64d0e25dab7bb2
-RMD160 (gmplayer-1.0rc7-20060123/avifile-1.6.tar.bz2) = fc170f5e71c0ebc6750adeeac526997e70980a56
-Size (gmplayer-1.0rc7-20060123/avifile-1.6.tar.bz2) = 42454 bytes
-SHA1 (gmplayer-1.0rc7-20060123/gnome-1.1.tar.bz2) = b91d0d5baf6f7f4d383fa35b748c15c8258a6832
-RMD160 (gmplayer-1.0rc7-20060123/gnome-1.1.tar.bz2) = 33080c3eb5f7a5e307ff824f2ba237462e6d4d55
-Size (gmplayer-1.0rc7-20060123/gnome-1.1.tar.bz2) = 368734 bytes
-SHA1 (gmplayer-1.0rc7-20060123/hayraphon-1.0.tar.bz2) = cd5c8384e9d16b7b390f764c01126cdd6d8c84fb
-RMD160 (gmplayer-1.0rc7-20060123/hayraphon-1.0.tar.bz2) = f8e3428582074e6663add8d1d80112a2b683ef09
-Size (gmplayer-1.0rc7-20060123/hayraphon-1.0.tar.bz2) = 77630 bytes
-SHA1 (gmplayer-1.0rc7-20060123/hwswskin-1.1.tar.bz2) = d738b76163cb955b73c99390c23f64d882f2eeb6
-RMD160 (gmplayer-1.0rc7-20060123/hwswskin-1.1.tar.bz2) = d6080186f372aba95ebb645dd799d9600fa44793
-Size (gmplayer-1.0rc7-20060123/hwswskin-1.1.tar.bz2) = 20384 bytes
-SHA1 (gmplayer-1.0rc7-20060123/mentalic-1.2.tar.bz2) = 2be87ff3f2866d365a7e66514cc0292156c03ed4
-RMD160 (gmplayer-1.0rc7-20060123/mentalic-1.2.tar.bz2) = 3daed2b780978bedfa52cbfb3089ba2773376464
-Size (gmplayer-1.0rc7-20060123/mentalic-1.2.tar.bz2) = 166595 bytes
-SHA1 (gmplayer-1.0rc7-20060123/neutron-1.5.tar.bz2) = b1473d07c6fc22b6c7b8c875d2f064dcdbd21eca
-RMD160 (gmplayer-1.0rc7-20060123/neutron-1.5.tar.bz2) = 11be97a7c2accb1b5e8c1df6f66e038769786c13
-Size (gmplayer-1.0rc7-20060123/neutron-1.5.tar.bz2) = 369333 bytes
-SHA1 (gmplayer-1.0rc7-20060123/phony-1.1.tar.bz2) = 7be9e0fe2c0e7dee0c315fe542edb894b06b11d8
-RMD160 (gmplayer-1.0rc7-20060123/phony-1.1.tar.bz2) = 4e5070fdddddb523eada26113463ac41afd845ad
-Size (gmplayer-1.0rc7-20060123/phony-1.1.tar.bz2) = 386433 bytes
-SHA1 (gmplayer-1.0rc7-20060123/plastic-1.2.tar.bz2) = a80a746d5164017b4bf593ee3e99e61f651ad574
-RMD160 (gmplayer-1.0rc7-20060123/plastic-1.2.tar.bz2) = 04d44afa6aa4b9114a682a945d3f6cc0e46e7b35
-Size (gmplayer-1.0rc7-20060123/plastic-1.2.tar.bz2) = 454107 bytes
-SHA1 (gmplayer-1.0rc7-20060123/proton-1.2.tar.bz2) = 9a1a9932824185d033fbc1043f32e8fb38cd198b
-RMD160 (gmplayer-1.0rc7-20060123/proton-1.2.tar.bz2) = 97d7d57b27b5206d369b45f8f8e294f1b1c1cdcb
-Size (gmplayer-1.0rc7-20060123/proton-1.2.tar.bz2) = 322600 bytes
-SHA1 (gmplayer-1.0rc7-20060123/slim-1.2.tar.bz2) = 23d842ca03ec91c589ee4123adb85137d6809549
-RMD160 (gmplayer-1.0rc7-20060123/slim-1.2.tar.bz2) = 765097ec829b9d43ae1b3a81120e488bd41de631
-Size (gmplayer-1.0rc7-20060123/slim-1.2.tar.bz2) = 398982 bytes
-SHA1 (gmplayer-1.0rc7-20060123/xanim-1.6.tar.bz2) = 23bd27aadc76557ec754823d44c11af0608acc6e
-RMD160 (gmplayer-1.0rc7-20060123/xanim-1.6.tar.bz2) = 636372db426734407235291ad1d7497080c5ff80
-Size (gmplayer-1.0rc7-20060123/xanim-1.6.tar.bz2) = 94555 bytes
-SHA1 (gmplayer-1.0rc7-20060123/xine-lcd-1.2.tar.bz2) = e3f9deade893dc750e9e1b9d824109db9d88c84e
-RMD160 (gmplayer-1.0rc7-20060123/xine-lcd-1.2.tar.bz2) = c4394a2e409d9d24cd9b73eb2f15e39ddd010bf9
-Size (gmplayer-1.0rc7-20060123/xine-lcd-1.2.tar.bz2) = 172363 bytes
-SHA1 (patch-aa) = 708128dde21b8de799aa26d75335da76543e2373
-SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
-SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
-SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
-SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
-SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
-SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c
-SHA1 (patch-ai) = a884b7a23ff8b2c31e6190d2ba9989a8f0057a0c
-SHA1 (patch-aj) = cb1f5451f9614cc39255fc5ce2afef7d68c31298
-SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
-SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
-SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
-SHA1 (patch-de) = 923814d978a3ed2b00494cf7f7fd17acd72aa610
-SHA1 (patch-df) = 0a85d1d8fbbbc1a86436e7364b72619a9a32e2d7
-SHA1 (patch-dg) = 1633dfd61c83796ce148ede22bafbe01f67d2bd4
-SHA1 (patch-dh) = 639638d871af2462945d8c5e454cae291a15e939
-SHA1 (patch-di) = 5b4c7d96537882422fb648181a93ec9ba9e13c7e
-SHA1 (patch-dj) = e72e08dda9f3eb97bf5e63751bf18999f1689434
-SHA1 (patch-dk) = 744911451794b554f9754b4cd77cf24520ed0f8e
-SHA1 (patch-dm) = b57da36cce0b896b51ca1ff2eef3c58ed95e2b68
-SHA1 (patch-do) = dbd4705c81ee4e6fa7cefc93dc187733a739d710
+SHA1 (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
+RMD160 (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
+Size (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 8166628 bytes
+SHA1 (gmplayer-1.0rc8-20060123/AlienMind-1.2.tar.bz2) = 0d612f7fc92332783e3a8fd42b9f957a1c6ecaee
+RMD160 (gmplayer-1.0rc8-20060123/AlienMind-1.2.tar.bz2) = 5e7f5fcade401af16c1614dcfc5c6f673fe4cd49
+Size (gmplayer-1.0rc8-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes
+SHA1 (gmplayer-1.0rc8-20060123/Blue-1.4.tar.bz2) = 35a4f687d5f70565d066c9b9cadf5cb60273a0ed
+RMD160 (gmplayer-1.0rc8-20060123/Blue-1.4.tar.bz2) = 83c7d62f8d3e96d59876cc1a2e544005e5d6f159
+Size (gmplayer-1.0rc8-20060123/Blue-1.4.tar.bz2) = 221764 bytes
+SHA1 (gmplayer-1.0rc8-20060123/BlueHeart-1.5.tar.bz2) = c5da3b035492e8e9c44c2540223c2ab9790c5795
+RMD160 (gmplayer-1.0rc8-20060123/BlueHeart-1.5.tar.bz2) = 8edd715fc70d5226b5769c87290c40268ce6ce82
+Size (gmplayer-1.0rc8-20060123/BlueHeart-1.5.tar.bz2) = 281110 bytes
+SHA1 (gmplayer-1.0rc8-20060123/CornerMP-1.2.tar.bz2) = 5687ac894548b69d112dcc74c519d9c752d21ea8
+RMD160 (gmplayer-1.0rc8-20060123/CornerMP-1.2.tar.bz2) = c47f41bdbeba690c18896d51e3d7696b89711a1d
+Size (gmplayer-1.0rc8-20060123/CornerMP-1.2.tar.bz2) = 232726 bytes
+SHA1 (gmplayer-1.0rc8-20060123/CornerMP-aqua-1.4.tar.bz2) = 8217cf467a3d588a0831d79c86bf6c718f74a31c
+RMD160 (gmplayer-1.0rc8-20060123/CornerMP-aqua-1.4.tar.bz2) = 3af6e18f52c585aa5f8399bb01179e6ac96af7cb
+Size (gmplayer-1.0rc8-20060123/CornerMP-aqua-1.4.tar.bz2) = 243275 bytes
+SHA1 (gmplayer-1.0rc8-20060123/Cyrus-1.2.tar.bz2) = 04bea3ecc4f3f14592b06bfea2f66cdbba28eebb
+RMD160 (gmplayer-1.0rc8-20060123/Cyrus-1.2.tar.bz2) = 46090cada81d1304aabbf07d20e358c52c0923b0
+Size (gmplayer-1.0rc8-20060123/Cyrus-1.2.tar.bz2) = 228477 bytes
+SHA1 (gmplayer-1.0rc8-20060123/MidnightLove-1.6.tar.bz2) = cb3e4e5f6ea8ff427acfe133367a0d05702d77fb
+RMD160 (gmplayer-1.0rc8-20060123/MidnightLove-1.6.tar.bz2) = 678848e8971615369eddfcdfc9a404e5b978004f
+Size (gmplayer-1.0rc8-20060123/MidnightLove-1.6.tar.bz2) = 539609 bytes
+SHA1 (gmplayer-1.0rc8-20060123/WMP6-2.2.tar.bz2) = 17118c9074ba568d032aa70c947c9bce31a162a2
+RMD160 (gmplayer-1.0rc8-20060123/WMP6-2.2.tar.bz2) = 8ffcdd4f01a30b9921f3262266dec83cd3f59acd
+Size (gmplayer-1.0rc8-20060123/WMP6-2.2.tar.bz2) = 39316 bytes
+SHA1 (gmplayer-1.0rc8-20060123/avifile-1.6.tar.bz2) = 9c9da5e3332692815f7ca0796a64d0e25dab7bb2
+RMD160 (gmplayer-1.0rc8-20060123/avifile-1.6.tar.bz2) = fc170f5e71c0ebc6750adeeac526997e70980a56
+Size (gmplayer-1.0rc8-20060123/avifile-1.6.tar.bz2) = 42454 bytes
+SHA1 (gmplayer-1.0rc8-20060123/gnome-1.1.tar.bz2) = b91d0d5baf6f7f4d383fa35b748c15c8258a6832
+RMD160 (gmplayer-1.0rc8-20060123/gnome-1.1.tar.bz2) = 33080c3eb5f7a5e307ff824f2ba237462e6d4d55
+Size (gmplayer-1.0rc8-20060123/gnome-1.1.tar.bz2) = 368734 bytes
+SHA1 (gmplayer-1.0rc8-20060123/hayraphon-1.0.tar.bz2) = cd5c8384e9d16b7b390f764c01126cdd6d8c84fb
+RMD160 (gmplayer-1.0rc8-20060123/hayraphon-1.0.tar.bz2) = f8e3428582074e6663add8d1d80112a2b683ef09
+Size (gmplayer-1.0rc8-20060123/hayraphon-1.0.tar.bz2) = 77630 bytes
+SHA1 (gmplayer-1.0rc8-20060123/hwswskin-1.1.tar.bz2) = d738b76163cb955b73c99390c23f64d882f2eeb6
+RMD160 (gmplayer-1.0rc8-20060123/hwswskin-1.1.tar.bz2) = d6080186f372aba95ebb645dd799d9600fa44793
+Size (gmplayer-1.0rc8-20060123/hwswskin-1.1.tar.bz2) = 20384 bytes
+SHA1 (gmplayer-1.0rc8-20060123/mentalic-1.2.tar.bz2) = 2be87ff3f2866d365a7e66514cc0292156c03ed4
+RMD160 (gmplayer-1.0rc8-20060123/mentalic-1.2.tar.bz2) = 3daed2b780978bedfa52cbfb3089ba2773376464
+Size (gmplayer-1.0rc8-20060123/mentalic-1.2.tar.bz2) = 166595 bytes
+SHA1 (gmplayer-1.0rc8-20060123/neutron-1.5.tar.bz2) = b1473d07c6fc22b6c7b8c875d2f064dcdbd21eca
+RMD160 (gmplayer-1.0rc8-20060123/neutron-1.5.tar.bz2) = 11be97a7c2accb1b5e8c1df6f66e038769786c13
+Size (gmplayer-1.0rc8-20060123/neutron-1.5.tar.bz2) = 369333 bytes
+SHA1 (gmplayer-1.0rc8-20060123/phony-1.1.tar.bz2) = 7be9e0fe2c0e7dee0c315fe542edb894b06b11d8
+RMD160 (gmplayer-1.0rc8-20060123/phony-1.1.tar.bz2) = 4e5070fdddddb523eada26113463ac41afd845ad
+Size (gmplayer-1.0rc8-20060123/phony-1.1.tar.bz2) = 386433 bytes
+SHA1 (gmplayer-1.0rc8-20060123/plastic-1.2.tar.bz2) = a80a746d5164017b4bf593ee3e99e61f651ad574
+RMD160 (gmplayer-1.0rc8-20060123/plastic-1.2.tar.bz2) = 04d44afa6aa4b9114a682a945d3f6cc0e46e7b35
+Size (gmplayer-1.0rc8-20060123/plastic-1.2.tar.bz2) = 454107 bytes
+SHA1 (gmplayer-1.0rc8-20060123/proton-1.2.tar.bz2) = 9a1a9932824185d033fbc1043f32e8fb38cd198b
+RMD160 (gmplayer-1.0rc8-20060123/proton-1.2.tar.bz2) = 97d7d57b27b5206d369b45f8f8e294f1b1c1cdcb
+Size (gmplayer-1.0rc8-20060123/proton-1.2.tar.bz2) = 322600 bytes
+SHA1 (gmplayer-1.0rc8-20060123/slim-1.2.tar.bz2) = 23d842ca03ec91c589ee4123adb85137d6809549
+RMD160 (gmplayer-1.0rc8-20060123/slim-1.2.tar.bz2) = 765097ec829b9d43ae1b3a81120e488bd41de631
+Size (gmplayer-1.0rc8-20060123/slim-1.2.tar.bz2) = 398982 bytes
+SHA1 (gmplayer-1.0rc8-20060123/xanim-1.6.tar.bz2) = 23bd27aadc76557ec754823d44c11af0608acc6e
+RMD160 (gmplayer-1.0rc8-20060123/xanim-1.6.tar.bz2) = 636372db426734407235291ad1d7497080c5ff80
+Size (gmplayer-1.0rc8-20060123/xanim-1.6.tar.bz2) = 94555 bytes
+SHA1 (gmplayer-1.0rc8-20060123/xine-lcd-1.2.tar.bz2) = e3f9deade893dc750e9e1b9d824109db9d88c84e
+RMD160 (gmplayer-1.0rc8-20060123/xine-lcd-1.2.tar.bz2) = c4394a2e409d9d24cd9b73eb2f15e39ddd010bf9
+Size (gmplayer-1.0rc8-20060123/xine-lcd-1.2.tar.bz2) = 172363 bytes
+SHA1 (patch-aa) = 4b80c0d18f0c9ae3f65d572965222db709a2a6b3
+SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
+SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
+SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 1e392e3cba1..d9401fa9f94 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2006/04/13 14:05:34 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2006/06/13 17:25:00 drochner Exp $
PKGNAME= mencoder-${MPLAYER_PKG_VERSION}
-PKGREVISION= 4
COMMENT= Simple movie encoder for MPlayer-playable movies
diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
index 18614f2a883..d3e49176d56 100644
--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/03/17 02:53:00 taca Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/13 17:25:00 drochner Exp $
.include "Makefile.common"
PKGNAME= mplayer-share-${MPLAYER_PKG_VERSION}
-PKGREVISION= 3
COMMENT= Documentation used by mplayer and gmplayer
DEPENDS+= mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 2657f5a3057..fd48f0a0545 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.29 2006/04/13 14:05:34 drochner Exp $
+# $NetBSD: Makefile.common,v 1.30 2006/06/13 17:25:00 drochner Exp $
-MPLAYER_DIST_VERSION= 1.0pre7try2
+MPLAYER_DIST_VERSION= 1.0pre8
# This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION= 1.0rc7
+MPLAYER_PKG_VERSION= 1.0rc8
DISTNAME= MPlayer-${MPLAYER_DIST_VERSION}
CATEGORIES?= multimedia
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index 3038f4f6ac1..6e688a48df7 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,39 +1,44 @@
-@comment $NetBSD: PLIST,v 1.6 2006/02/03 00:39:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/13 17:25:00 drochner Exp $
man/man1/mplayer.1
-share/mplayer/DOCS/HTML/cs/amiga.html
+share/mplayer/DOCS/HTML/cs/advaudio.html
share/mplayer/DOCS/HTML/cs/aspect.html
+share/mplayer/DOCS/HTML/cs/audio-codecs.html
+share/mplayer/DOCS/HTML/cs/audio-formats.html
share/mplayer/DOCS/HTML/cs/audio.html
share/mplayer/DOCS/HTML/cs/bsd.html
share/mplayer/DOCS/HTML/cs/bugreports.html
share/mplayer/DOCS/HTML/cs/bugreports_advusers.html
share/mplayer/DOCS/HTML/cs/bugreports_fix.html
+share/mplayer/DOCS/HTML/cs/bugreports_regression_test.html
share/mplayer/DOCS/HTML/cs/bugreports_report.html
+share/mplayer/DOCS/HTML/cs/bugreports_security.html
share/mplayer/DOCS/HTML/cs/bugreports_what.html
share/mplayer/DOCS/HTML/cs/bugreports_where.html
share/mplayer/DOCS/HTML/cs/bugs-audio.html
share/mplayer/DOCS/HTML/cs/bugs-special.html
share/mplayer/DOCS/HTML/cs/bugs.html
share/mplayer/DOCS/HTML/cs/cd-dvd.html
+share/mplayer/DOCS/HTML/cs/codec-importing.html
share/mplayer/DOCS/HTML/cs/codecs.html
share/mplayer/DOCS/HTML/cs/commandline.html
+share/mplayer/DOCS/HTML/cs/containers.html
share/mplayer/DOCS/HTML/cs/control.html
-share/mplayer/DOCS/HTML/cs/custommatrices.html
share/mplayer/DOCS/HTML/cs/default.css
share/mplayer/DOCS/HTML/cs/drives.html
share/mplayer/DOCS/HTML/cs/dvd.html
share/mplayer/DOCS/HTML/cs/edl.html
+share/mplayer/DOCS/HTML/cs/encoding-guide.html
+share/mplayer/DOCS/HTML/cs/exotic_platforms.html
share/mplayer/DOCS/HTML/cs/faq.html
share/mplayer/DOCS/HTML/cs/features.html
-share/mplayer/DOCS/HTML/cs/formats.html
share/mplayer/DOCS/HTML/cs/gcc-296.html
share/mplayer/DOCS/HTML/cs/gui.html
share/mplayer/DOCS/HTML/cs/history.html
share/mplayer/DOCS/HTML/cs/howtoread.html
-share/mplayer/DOCS/HTML/cs/hp-ux.html
share/mplayer/DOCS/HTML/cs/index.html
share/mplayer/DOCS/HTML/cs/install.html
+share/mplayer/DOCS/HTML/cs/installation_codecs.html
share/mplayer/DOCS/HTML/cs/intro.html
-share/mplayer/DOCS/HTML/cs/irix.html
share/mplayer/DOCS/HTML/cs/joe-barr.html
share/mplayer/DOCS/HTML/cs/linux.html
share/mplayer/DOCS/HTML/cs/macos.html
@@ -45,64 +50,178 @@ share/mplayer/DOCS/HTML/cs/menc-feat-extractsub.html
share/mplayer/DOCS/HTML/cs/menc-feat-mpeg.html
share/mplayer/DOCS/HTML/cs/menc-feat-mpeg4.html
share/mplayer/DOCS/HTML/cs/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/cs/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/cs/menc-feat-selecting-input.html
share/mplayer/DOCS/HTML/cs/menc-feat-streamcopy.html
share/mplayer/DOCS/HTML/cs/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/cs/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/cs/menc-feat-x264.html
+share/mplayer/DOCS/HTML/cs/menc-feat-xvid.html
share/mplayer/DOCS/HTML/cs/mencoder.html
+share/mplayer/DOCS/HTML/cs/mpeg_decoders.html
share/mplayer/DOCS/HTML/cs/mplayer-binary.html
share/mplayer/DOCS/HTML/cs/mpst.html
+share/mplayer/DOCS/HTML/cs/mtrr.html
share/mplayer/DOCS/HTML/cs/nvidia-opinions.html
-share/mplayer/DOCS/HTML/cs/patches.html
+share/mplayer/DOCS/HTML/cs/other.html
+share/mplayer/DOCS/HTML/cs/output-trad.html
share/mplayer/DOCS/HTML/cs/ports.html
-share/mplayer/DOCS/HTML/cs/qnx.html
share/mplayer/DOCS/HTML/cs/rtc.html
share/mplayer/DOCS/HTML/cs/skin-file.html
share/mplayer/DOCS/HTML/cs/skin-fonts.html
share/mplayer/DOCS/HTML/cs/skin-gui.html
share/mplayer/DOCS/HTML/cs/skin-overview.html
+share/mplayer/DOCS/HTML/cs/skin-quality.html
share/mplayer/DOCS/HTML/cs/skin.html
-share/mplayer/DOCS/HTML/cs/solaris.html
+share/mplayer/DOCS/HTML/cs/softreq.html
+share/mplayer/DOCS/HTML/cs/sound-cards.html
share/mplayer/DOCS/HTML/cs/streaming.html
share/mplayer/DOCS/HTML/cs/subosd.html
+share/mplayer/DOCS/HTML/cs/sync.html
+share/mplayer/DOCS/HTML/cs/troubleshooting.html
share/mplayer/DOCS/HTML/cs/tv-input.html
+share/mplayer/DOCS/HTML/cs/tv.html
+share/mplayer/DOCS/HTML/cs/tvout.html
+share/mplayer/DOCS/HTML/cs/unix.html
share/mplayer/DOCS/HTML/cs/usage.html
share/mplayer/DOCS/HTML/cs/users-vs-dev.html
share/mplayer/DOCS/HTML/cs/vcd.html
+share/mplayer/DOCS/HTML/cs/video-cards.html
+share/mplayer/DOCS/HTML/cs/video-codecs.html
+share/mplayer/DOCS/HTML/cs/video-formats.html
share/mplayer/DOCS/HTML/cs/video.html
share/mplayer/DOCS/HTML/cs/windows.html
-share/mplayer/DOCS/HTML/en/amiga.html
+share/mplayer/DOCS/HTML/de/advaudio.html
+share/mplayer/DOCS/HTML/de/aspect.html
+share/mplayer/DOCS/HTML/de/audio-codecs.html
+share/mplayer/DOCS/HTML/de/audio-formats.html
+share/mplayer/DOCS/HTML/de/audio.html
+share/mplayer/DOCS/HTML/de/bsd.html
+share/mplayer/DOCS/HTML/de/bugreports.html
+share/mplayer/DOCS/HTML/de/bugreports_advusers.html
+share/mplayer/DOCS/HTML/de/bugreports_fix.html
+share/mplayer/DOCS/HTML/de/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/de/bugreports_report.html
+share/mplayer/DOCS/HTML/de/bugreports_security.html
+share/mplayer/DOCS/HTML/de/bugreports_what.html
+share/mplayer/DOCS/HTML/de/bugreports_where.html
+share/mplayer/DOCS/HTML/de/bugs-audio.html
+share/mplayer/DOCS/HTML/de/bugs-special.html
+share/mplayer/DOCS/HTML/de/bugs.html
+share/mplayer/DOCS/HTML/de/cd-dvd.html
+share/mplayer/DOCS/HTML/de/codec-importing.html
+share/mplayer/DOCS/HTML/de/codecs.html
+share/mplayer/DOCS/HTML/de/commandline.html
+share/mplayer/DOCS/HTML/de/containers.html
+share/mplayer/DOCS/HTML/de/control.html
+share/mplayer/DOCS/HTML/de/default.css
+share/mplayer/DOCS/HTML/de/drives.html
+share/mplayer/DOCS/HTML/de/dvd.html
+share/mplayer/DOCS/HTML/de/edl.html
+share/mplayer/DOCS/HTML/de/encoding-guide.html
+share/mplayer/DOCS/HTML/de/exotic_platforms.html
+share/mplayer/DOCS/HTML/de/faq.html
+share/mplayer/DOCS/HTML/de/features.html
+share/mplayer/DOCS/HTML/de/gcc-296.html
+share/mplayer/DOCS/HTML/de/gui.html
+share/mplayer/DOCS/HTML/de/history.html
+share/mplayer/DOCS/HTML/de/howtoread.html
+share/mplayer/DOCS/HTML/de/index.html
+share/mplayer/DOCS/HTML/de/install.html
+share/mplayer/DOCS/HTML/de/installation_codecs.html
+share/mplayer/DOCS/HTML/de/intro.html
+share/mplayer/DOCS/HTML/de/joe-barr.html
+share/mplayer/DOCS/HTML/de/linux.html
+share/mplayer/DOCS/HTML/de/macos.html
+share/mplayer/DOCS/HTML/de/mailinglists.html
+share/mplayer/DOCS/HTML/de/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/de/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/de/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/de/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/de/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/de/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/de/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/de/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/de/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/de/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/de/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/de/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/de/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/de/menc-feat-x264.html
+share/mplayer/DOCS/HTML/de/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/de/mencoder.html
+share/mplayer/DOCS/HTML/de/mpeg_decoders.html
+share/mplayer/DOCS/HTML/de/mplayer-binary.html
+share/mplayer/DOCS/HTML/de/mpst.html
+share/mplayer/DOCS/HTML/de/mtrr.html
+share/mplayer/DOCS/HTML/de/nvidia-opinions.html
+share/mplayer/DOCS/HTML/de/other.html
+share/mplayer/DOCS/HTML/de/output-trad.html
+share/mplayer/DOCS/HTML/de/ports.html
+share/mplayer/DOCS/HTML/de/rtc.html
+share/mplayer/DOCS/HTML/de/skin-file.html
+share/mplayer/DOCS/HTML/de/skin-fonts.html
+share/mplayer/DOCS/HTML/de/skin-gui.html
+share/mplayer/DOCS/HTML/de/skin-overview.html
+share/mplayer/DOCS/HTML/de/skin-quality.html
+share/mplayer/DOCS/HTML/de/skin.html
+share/mplayer/DOCS/HTML/de/softreq.html
+share/mplayer/DOCS/HTML/de/sound-cards.html
+share/mplayer/DOCS/HTML/de/streaming.html
+share/mplayer/DOCS/HTML/de/subosd.html
+share/mplayer/DOCS/HTML/de/sync.html
+share/mplayer/DOCS/HTML/de/troubleshooting.html
+share/mplayer/DOCS/HTML/de/tv-input.html
+share/mplayer/DOCS/HTML/de/tv.html
+share/mplayer/DOCS/HTML/de/tvout.html
+share/mplayer/DOCS/HTML/de/unix.html
+share/mplayer/DOCS/HTML/de/usage.html
+share/mplayer/DOCS/HTML/de/users-vs-dev.html
+share/mplayer/DOCS/HTML/de/vcd.html
+share/mplayer/DOCS/HTML/de/video-cards.html
+share/mplayer/DOCS/HTML/de/video-codecs.html
+share/mplayer/DOCS/HTML/de/video-formats.html
+share/mplayer/DOCS/HTML/de/video.html
+share/mplayer/DOCS/HTML/de/windows.html
+share/mplayer/DOCS/HTML/en/advaudio.html
share/mplayer/DOCS/HTML/en/aspect.html
+share/mplayer/DOCS/HTML/en/audio-codecs.html
+share/mplayer/DOCS/HTML/en/audio-formats.html
share/mplayer/DOCS/HTML/en/audio.html
share/mplayer/DOCS/HTML/en/bsd.html
share/mplayer/DOCS/HTML/en/bugreports.html
share/mplayer/DOCS/HTML/en/bugreports_advusers.html
share/mplayer/DOCS/HTML/en/bugreports_fix.html
+share/mplayer/DOCS/HTML/en/bugreports_regression_test.html
share/mplayer/DOCS/HTML/en/bugreports_report.html
+share/mplayer/DOCS/HTML/en/bugreports_security.html
share/mplayer/DOCS/HTML/en/bugreports_what.html
share/mplayer/DOCS/HTML/en/bugreports_where.html
share/mplayer/DOCS/HTML/en/bugs-audio.html
share/mplayer/DOCS/HTML/en/bugs-special.html
share/mplayer/DOCS/HTML/en/bugs.html
share/mplayer/DOCS/HTML/en/cd-dvd.html
+share/mplayer/DOCS/HTML/en/codec-importing.html
share/mplayer/DOCS/HTML/en/codecs.html
share/mplayer/DOCS/HTML/en/commandline.html
+share/mplayer/DOCS/HTML/en/containers.html
share/mplayer/DOCS/HTML/en/control.html
-share/mplayer/DOCS/HTML/en/custommatrices.html
share/mplayer/DOCS/HTML/en/default.css
share/mplayer/DOCS/HTML/en/drives.html
share/mplayer/DOCS/HTML/en/dvd.html
share/mplayer/DOCS/HTML/en/edl.html
+share/mplayer/DOCS/HTML/en/encoding-guide.html
+share/mplayer/DOCS/HTML/en/exotic_platforms.html
share/mplayer/DOCS/HTML/en/faq.html
share/mplayer/DOCS/HTML/en/features.html
-share/mplayer/DOCS/HTML/en/formats.html
share/mplayer/DOCS/HTML/en/gcc-296.html
share/mplayer/DOCS/HTML/en/gui.html
share/mplayer/DOCS/HTML/en/history.html
share/mplayer/DOCS/HTML/en/howtoread.html
-share/mplayer/DOCS/HTML/en/hp-ux.html
share/mplayer/DOCS/HTML/en/index.html
share/mplayer/DOCS/HTML/en/install.html
+share/mplayer/DOCS/HTML/en/installation_codecs.html
share/mplayer/DOCS/HTML/en/intro.html
-share/mplayer/DOCS/HTML/en/irix.html
share/mplayer/DOCS/HTML/en/joe-barr.html
share/mplayer/DOCS/HTML/en/linux.html
share/mplayer/DOCS/HTML/en/macos.html
@@ -114,28 +233,46 @@ share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html
share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html
share/mplayer/DOCS/HTML/en/menc-feat-mpeg4.html
share/mplayer/DOCS/HTML/en/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/en/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/en/menc-feat-selecting-input.html
share/mplayer/DOCS/HTML/en/menc-feat-streamcopy.html
share/mplayer/DOCS/HTML/en/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/en/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/en/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/en/menc-feat-x264.html
+share/mplayer/DOCS/HTML/en/menc-feat-xvid.html
share/mplayer/DOCS/HTML/en/mencoder.html
+share/mplayer/DOCS/HTML/en/mpeg_decoders.html
share/mplayer/DOCS/HTML/en/mplayer-binary.html
share/mplayer/DOCS/HTML/en/mpst.html
+share/mplayer/DOCS/HTML/en/mtrr.html
share/mplayer/DOCS/HTML/en/nvidia-opinions.html
-share/mplayer/DOCS/HTML/en/patches.html
+share/mplayer/DOCS/HTML/en/other.html
+share/mplayer/DOCS/HTML/en/output-trad.html
share/mplayer/DOCS/HTML/en/ports.html
-share/mplayer/DOCS/HTML/en/qnx.html
share/mplayer/DOCS/HTML/en/rtc.html
share/mplayer/DOCS/HTML/en/skin-file.html
share/mplayer/DOCS/HTML/en/skin-fonts.html
share/mplayer/DOCS/HTML/en/skin-gui.html
share/mplayer/DOCS/HTML/en/skin-overview.html
+share/mplayer/DOCS/HTML/en/skin-quality.html
share/mplayer/DOCS/HTML/en/skin.html
-share/mplayer/DOCS/HTML/en/solaris.html
+share/mplayer/DOCS/HTML/en/softreq.html
+share/mplayer/DOCS/HTML/en/sound-cards.html
share/mplayer/DOCS/HTML/en/streaming.html
share/mplayer/DOCS/HTML/en/subosd.html
+share/mplayer/DOCS/HTML/en/sync.html
+share/mplayer/DOCS/HTML/en/troubleshooting.html
share/mplayer/DOCS/HTML/en/tv-input.html
+share/mplayer/DOCS/HTML/en/tv.html
+share/mplayer/DOCS/HTML/en/tvout.html
+share/mplayer/DOCS/HTML/en/unix.html
share/mplayer/DOCS/HTML/en/usage.html
share/mplayer/DOCS/HTML/en/users-vs-dev.html
share/mplayer/DOCS/HTML/en/vcd.html
+share/mplayer/DOCS/HTML/en/video-cards.html
+share/mplayer/DOCS/HTML/en/video-codecs.html
+share/mplayer/DOCS/HTML/en/video-formats.html
share/mplayer/DOCS/HTML/en/video.html
share/mplayer/DOCS/HTML/en/windows.html
share/mplayer/DOCS/HTML/es/amiga.html
@@ -190,7 +327,6 @@ share/mplayer/DOCS/HTML/es/mencoder.html
share/mplayer/DOCS/HTML/es/mplayer-binary.html
share/mplayer/DOCS/HTML/es/mpst.html
share/mplayer/DOCS/HTML/es/nvidia-opinions.html
-share/mplayer/DOCS/HTML/es/patches.html
share/mplayer/DOCS/HTML/es/ports.html
share/mplayer/DOCS/HTML/es/qnx.html
share/mplayer/DOCS/HTML/es/rtc.html
@@ -207,110 +343,136 @@ share/mplayer/DOCS/HTML/es/usage.html
share/mplayer/DOCS/HTML/es/users-vs-dev.html
share/mplayer/DOCS/HTML/es/vcd.html
share/mplayer/DOCS/HTML/es/windows.html
-share/mplayer/DOCS/HTML/fr/amiga.html
+share/mplayer/DOCS/HTML/fr/advaudio.html
share/mplayer/DOCS/HTML/fr/aspect.html
+share/mplayer/DOCS/HTML/fr/audio-codecs.html
+share/mplayer/DOCS/HTML/fr/audio-formats.html
share/mplayer/DOCS/HTML/fr/audio.html
share/mplayer/DOCS/HTML/fr/bsd.html
share/mplayer/DOCS/HTML/fr/bugreports.html
share/mplayer/DOCS/HTML/fr/bugreports_advusers.html
share/mplayer/DOCS/HTML/fr/bugreports_fix.html
+share/mplayer/DOCS/HTML/fr/bugreports_regression_test.html
share/mplayer/DOCS/HTML/fr/bugreports_report.html
+share/mplayer/DOCS/HTML/fr/bugreports_security.html
share/mplayer/DOCS/HTML/fr/bugreports_what.html
share/mplayer/DOCS/HTML/fr/bugreports_where.html
share/mplayer/DOCS/HTML/fr/bugs-audio.html
share/mplayer/DOCS/HTML/fr/bugs-special.html
share/mplayer/DOCS/HTML/fr/bugs.html
share/mplayer/DOCS/HTML/fr/cd-dvd.html
+share/mplayer/DOCS/HTML/fr/codec-importing.html
share/mplayer/DOCS/HTML/fr/codecs.html
share/mplayer/DOCS/HTML/fr/commandline.html
+share/mplayer/DOCS/HTML/fr/containers.html
share/mplayer/DOCS/HTML/fr/control.html
-share/mplayer/DOCS/HTML/fr/custommatrices.html
share/mplayer/DOCS/HTML/fr/default.css
share/mplayer/DOCS/HTML/fr/drives.html
share/mplayer/DOCS/HTML/fr/dvd.html
share/mplayer/DOCS/HTML/fr/edl.html
+share/mplayer/DOCS/HTML/fr/encoding-guide.html
+share/mplayer/DOCS/HTML/fr/exotic_platforms.html
share/mplayer/DOCS/HTML/fr/faq.html
share/mplayer/DOCS/HTML/fr/features.html
-share/mplayer/DOCS/HTML/fr/formats.html
share/mplayer/DOCS/HTML/fr/gcc-296.html
share/mplayer/DOCS/HTML/fr/gui.html
share/mplayer/DOCS/HTML/fr/history.html
share/mplayer/DOCS/HTML/fr/howtoread.html
-share/mplayer/DOCS/HTML/fr/hpux.html
share/mplayer/DOCS/HTML/fr/index.html
share/mplayer/DOCS/HTML/fr/install.html
+share/mplayer/DOCS/HTML/fr/installation_codecs.html
share/mplayer/DOCS/HTML/fr/intro.html
-share/mplayer/DOCS/HTML/fr/irix.html
share/mplayer/DOCS/HTML/fr/joe-barr.html
share/mplayer/DOCS/HTML/fr/linux.html
share/mplayer/DOCS/HTML/fr/macos.html
share/mplayer/DOCS/HTML/fr/mailinglists.html
-share/mplayer/DOCS/HTML/fr/menc-feat-divx4.html
share/mplayer/DOCS/HTML/fr/menc-feat-dvd-mpeg4.html
share/mplayer/DOCS/HTML/fr/menc-feat-enc-images.html
share/mplayer/DOCS/HTML/fr/menc-feat-enc-libavcodec.html
share/mplayer/DOCS/HTML/fr/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/fr/menc-feat-fix-avi.html
share/mplayer/DOCS/HTML/fr/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/fr/menc-feat-mpeg4.html
share/mplayer/DOCS/HTML/fr/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/fr/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/fr/menc-feat-selecting-input.html
share/mplayer/DOCS/HTML/fr/menc-feat-streamcopy.html
share/mplayer/DOCS/HTML/fr/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/fr/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/fr/menc-feat-x264.html
+share/mplayer/DOCS/HTML/fr/menc-feat-xvid.html
share/mplayer/DOCS/HTML/fr/mencoder.html
+share/mplayer/DOCS/HTML/fr/mpeg_decoders.html
share/mplayer/DOCS/HTML/fr/mplayer-binary.html
share/mplayer/DOCS/HTML/fr/mpst.html
+share/mplayer/DOCS/HTML/fr/mtrr.html
share/mplayer/DOCS/HTML/fr/nvidia-opinions.html
-share/mplayer/DOCS/HTML/fr/patches.html
+share/mplayer/DOCS/HTML/fr/other.html
+share/mplayer/DOCS/HTML/fr/output-trad.html
share/mplayer/DOCS/HTML/fr/ports.html
-share/mplayer/DOCS/HTML/fr/qnx.html
share/mplayer/DOCS/HTML/fr/rtc.html
share/mplayer/DOCS/HTML/fr/skin-file.html
share/mplayer/DOCS/HTML/fr/skin-fonts.html
share/mplayer/DOCS/HTML/fr/skin-gui.html
share/mplayer/DOCS/HTML/fr/skin-overview.html
+share/mplayer/DOCS/HTML/fr/skin-quality.html
share/mplayer/DOCS/HTML/fr/skin.html
-share/mplayer/DOCS/HTML/fr/solaris.html
+share/mplayer/DOCS/HTML/fr/softreq.html
+share/mplayer/DOCS/HTML/fr/sound-cards.html
share/mplayer/DOCS/HTML/fr/streaming.html
share/mplayer/DOCS/HTML/fr/subosd.html
+share/mplayer/DOCS/HTML/fr/sync.html
+share/mplayer/DOCS/HTML/fr/troubleshooting.html
share/mplayer/DOCS/HTML/fr/tv-input.html
+share/mplayer/DOCS/HTML/fr/tv.html
+share/mplayer/DOCS/HTML/fr/tvout.html
+share/mplayer/DOCS/HTML/fr/unix.html
share/mplayer/DOCS/HTML/fr/usage.html
share/mplayer/DOCS/HTML/fr/users-vs-dev.html
share/mplayer/DOCS/HTML/fr/vcd.html
+share/mplayer/DOCS/HTML/fr/video-cards.html
+share/mplayer/DOCS/HTML/fr/video-codecs.html
+share/mplayer/DOCS/HTML/fr/video-formats.html
share/mplayer/DOCS/HTML/fr/video.html
share/mplayer/DOCS/HTML/fr/windows.html
-share/mplayer/DOCS/HTML/hu/amiga.html
+share/mplayer/DOCS/HTML/hu/advaudio.html
share/mplayer/DOCS/HTML/hu/aspect.html
+share/mplayer/DOCS/HTML/hu/audio-codecs.html
+share/mplayer/DOCS/HTML/hu/audio-formats.html
share/mplayer/DOCS/HTML/hu/audio.html
share/mplayer/DOCS/HTML/hu/bsd.html
share/mplayer/DOCS/HTML/hu/bugreports.html
share/mplayer/DOCS/HTML/hu/bugreports_advusers.html
share/mplayer/DOCS/HTML/hu/bugreports_fix.html
+share/mplayer/DOCS/HTML/hu/bugreports_regression_test.html
share/mplayer/DOCS/HTML/hu/bugreports_report.html
+share/mplayer/DOCS/HTML/hu/bugreports_security.html
share/mplayer/DOCS/HTML/hu/bugreports_what.html
share/mplayer/DOCS/HTML/hu/bugreports_where.html
share/mplayer/DOCS/HTML/hu/bugs-audio.html
share/mplayer/DOCS/HTML/hu/bugs-special.html
share/mplayer/DOCS/HTML/hu/bugs.html
share/mplayer/DOCS/HTML/hu/cd-dvd.html
+share/mplayer/DOCS/HTML/hu/codec-importing.html
share/mplayer/DOCS/HTML/hu/codecs.html
share/mplayer/DOCS/HTML/hu/commandline.html
+share/mplayer/DOCS/HTML/hu/containers.html
share/mplayer/DOCS/HTML/hu/control.html
-share/mplayer/DOCS/HTML/hu/custommatrices.html
share/mplayer/DOCS/HTML/hu/default.css
share/mplayer/DOCS/HTML/hu/drives.html
share/mplayer/DOCS/HTML/hu/dvd.html
share/mplayer/DOCS/HTML/hu/edl.html
+share/mplayer/DOCS/HTML/hu/encoding-guide.html
+share/mplayer/DOCS/HTML/hu/exotic_platforms.html
share/mplayer/DOCS/HTML/hu/faq.html
share/mplayer/DOCS/HTML/hu/features.html
-share/mplayer/DOCS/HTML/hu/formats.html
share/mplayer/DOCS/HTML/hu/gcc-296.html
share/mplayer/DOCS/HTML/hu/gui.html
share/mplayer/DOCS/HTML/hu/history.html
share/mplayer/DOCS/HTML/hu/howtoread.html
-share/mplayer/DOCS/HTML/hu/hp-ux.html
share/mplayer/DOCS/HTML/hu/index.html
share/mplayer/DOCS/HTML/hu/install.html
+share/mplayer/DOCS/HTML/hu/installation_codecs.html
share/mplayer/DOCS/HTML/hu/intro.html
-share/mplayer/DOCS/HTML/hu/irix.html
share/mplayer/DOCS/HTML/hu/joe-barr.html
share/mplayer/DOCS/HTML/hu/linux.html
share/mplayer/DOCS/HTML/hu/macos.html
@@ -322,28 +484,46 @@ share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html
share/mplayer/DOCS/HTML/hu/menc-feat-mpeg.html
share/mplayer/DOCS/HTML/hu/menc-feat-mpeg4.html
share/mplayer/DOCS/HTML/hu/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/hu/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/hu/menc-feat-selecting-input.html
share/mplayer/DOCS/HTML/hu/menc-feat-streamcopy.html
share/mplayer/DOCS/HTML/hu/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/hu/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/hu/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/hu/menc-feat-x264.html
+share/mplayer/DOCS/HTML/hu/menc-feat-xvid.html
share/mplayer/DOCS/HTML/hu/mencoder.html
+share/mplayer/DOCS/HTML/hu/mpeg_decoders.html
share/mplayer/DOCS/HTML/hu/mplayer-binary.html
share/mplayer/DOCS/HTML/hu/mpst.html
+share/mplayer/DOCS/HTML/hu/mtrr.html
share/mplayer/DOCS/HTML/hu/nvidia-opinions.html
-share/mplayer/DOCS/HTML/hu/patches.html
+share/mplayer/DOCS/HTML/hu/other.html
+share/mplayer/DOCS/HTML/hu/output-trad.html
share/mplayer/DOCS/HTML/hu/ports.html
-share/mplayer/DOCS/HTML/hu/qnx.html
share/mplayer/DOCS/HTML/hu/rtc.html
share/mplayer/DOCS/HTML/hu/skin-file.html
share/mplayer/DOCS/HTML/hu/skin-fonts.html
share/mplayer/DOCS/HTML/hu/skin-gui.html
share/mplayer/DOCS/HTML/hu/skin-overview.html
+share/mplayer/DOCS/HTML/hu/skin-quality.html
share/mplayer/DOCS/HTML/hu/skin.html
-share/mplayer/DOCS/HTML/hu/solaris.html
+share/mplayer/DOCS/HTML/hu/softreq.html
+share/mplayer/DOCS/HTML/hu/sound-cards.html
share/mplayer/DOCS/HTML/hu/streaming.html
share/mplayer/DOCS/HTML/hu/subosd.html
+share/mplayer/DOCS/HTML/hu/sync.html
+share/mplayer/DOCS/HTML/hu/troubleshooting.html
share/mplayer/DOCS/HTML/hu/tv-input.html
+share/mplayer/DOCS/HTML/hu/tv.html
+share/mplayer/DOCS/HTML/hu/tvout.html
+share/mplayer/DOCS/HTML/hu/unix.html
share/mplayer/DOCS/HTML/hu/usage.html
share/mplayer/DOCS/HTML/hu/users-vs-dev.html
share/mplayer/DOCS/HTML/hu/vcd.html
+share/mplayer/DOCS/HTML/hu/video-cards.html
+share/mplayer/DOCS/HTML/hu/video-codecs.html
+share/mplayer/DOCS/HTML/hu/video-formats.html
share/mplayer/DOCS/HTML/hu/video.html
share/mplayer/DOCS/HTML/hu/windows.html
share/mplayer/DOCS/HTML/pl/amiga.html
@@ -398,7 +578,6 @@ share/mplayer/DOCS/HTML/pl/mencoder.html
share/mplayer/DOCS/HTML/pl/mplayer-binary.html
share/mplayer/DOCS/HTML/pl/mpst.html
share/mplayer/DOCS/HTML/pl/nvidia-opinions.html
-share/mplayer/DOCS/HTML/pl/patches.html
share/mplayer/DOCS/HTML/pl/ports.html
share/mplayer/DOCS/HTML/pl/qnx.html
share/mplayer/DOCS/HTML/pl/rtc.html
@@ -433,11 +612,11 @@ share/mplayer/DOCS/HTML/ru/cd-dvd.html
share/mplayer/DOCS/HTML/ru/codecs.html
share/mplayer/DOCS/HTML/ru/commandline.html
share/mplayer/DOCS/HTML/ru/control.html
-share/mplayer/DOCS/HTML/ru/custommatrices.html
share/mplayer/DOCS/HTML/ru/default.css
share/mplayer/DOCS/HTML/ru/drives.html
share/mplayer/DOCS/HTML/ru/dvd.html
share/mplayer/DOCS/HTML/ru/edl.html
+share/mplayer/DOCS/HTML/ru/encoding-guide.html
share/mplayer/DOCS/HTML/ru/faq.html
share/mplayer/DOCS/HTML/ru/features.html
share/mplayer/DOCS/HTML/ru/formats.html
@@ -460,13 +639,22 @@ share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html
share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html
share/mplayer/DOCS/HTML/ru/menc-feat-mpeg4.html
share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/ru/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/ru/menc-feat-selecting-input.html
share/mplayer/DOCS/HTML/ru/menc-feat-streamcopy.html
share/mplayer/DOCS/HTML/ru/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/ru/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/ru/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/ru/menc-feat-x264.html
+share/mplayer/DOCS/HTML/ru/menc-feat-xvid.html
share/mplayer/DOCS/HTML/ru/mencoder.html
+share/mplayer/DOCS/HTML/ru/mpeg_decoders.html
share/mplayer/DOCS/HTML/ru/mplayer-binary.html
share/mplayer/DOCS/HTML/ru/mpst.html
+share/mplayer/DOCS/HTML/ru/mtrr.html
share/mplayer/DOCS/HTML/ru/nvidia-opinions.html
-share/mplayer/DOCS/HTML/ru/patches.html
+share/mplayer/DOCS/HTML/ru/other.html
+share/mplayer/DOCS/HTML/ru/output-trad.html
share/mplayer/DOCS/HTML/ru/ports.html
share/mplayer/DOCS/HTML/ru/qnx.html
share/mplayer/DOCS/HTML/ru/rtc.html
@@ -475,27 +663,21 @@ share/mplayer/DOCS/HTML/ru/skin-file.html
share/mplayer/DOCS/HTML/ru/skin-fonts.html
share/mplayer/DOCS/HTML/ru/skin-gui.html
share/mplayer/DOCS/HTML/ru/skin-overview.html
+share/mplayer/DOCS/HTML/ru/skin-quality.html
share/mplayer/DOCS/HTML/ru/skin.html
share/mplayer/DOCS/HTML/ru/solaris.html
share/mplayer/DOCS/HTML/ru/streaming.html
share/mplayer/DOCS/HTML/ru/subosd.html
+share/mplayer/DOCS/HTML/ru/sync.html
+share/mplayer/DOCS/HTML/ru/troubleshooting.html
share/mplayer/DOCS/HTML/ru/tv-input.html
+share/mplayer/DOCS/HTML/ru/tvout.html
share/mplayer/DOCS/HTML/ru/usage.html
share/mplayer/DOCS/HTML/ru/users-vs-dev.html
share/mplayer/DOCS/HTML/ru/vcd.html
share/mplayer/DOCS/HTML/ru/video.html
share/mplayer/DOCS/HTML/ru/windows.html
share/mplayer/DOCS/README
-share/mplayer/DOCS/de/bugreports.html
-share/mplayer/DOCS/de/cd-dvd.html
-share/mplayer/DOCS/de/codecs.html
-share/mplayer/DOCS/de/documentation.html
-share/mplayer/DOCS/de/encoding.html
-share/mplayer/DOCS/de/faq.html
-share/mplayer/DOCS/de/formats.html
-share/mplayer/DOCS/de/sound.html
-share/mplayer/DOCS/de/users_against_developers.html
-share/mplayer/DOCS/de/video.html
share/mplayer/DOCS/default.css
share/mplayer/DOCS/it/bugreports.html
share/mplayer/DOCS/it/cd-dvd.html
@@ -529,6 +711,7 @@ share/mplayer/DOCS/tech/codecs.conf.txt
share/mplayer/DOCS/tech/colorspaces.txt
share/mplayer/DOCS/tech/cvs-howto.txt
share/mplayer/DOCS/tech/dr-methods.txt
+share/mplayer/DOCS/tech/encoding-guide.txt
share/mplayer/DOCS/tech/encoding-tips.txt
share/mplayer/DOCS/tech/formats.txt
share/mplayer/DOCS/tech/general.txt
@@ -536,16 +719,16 @@ share/mplayer/DOCS/tech/hwac3.txt
share/mplayer/DOCS/tech/libao2.txt
share/mplayer/DOCS/tech/libmpcodecs.txt
share/mplayer/DOCS/tech/libvo.txt
-share/mplayer/DOCS/tech/libvo2.txt
share/mplayer/DOCS/tech/manpage.txt
-share/mplayer/DOCS/tech/mncf.txt
+share/mplayer/DOCS/tech/mirrors/mirror_howto.txt
+share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync
share/mplayer/DOCS/tech/mpcf.txt
+share/mplayer/DOCS/tech/mpdsf.txt
share/mplayer/DOCS/tech/mpsub.sub
share/mplayer/DOCS/tech/osd.txt
share/mplayer/DOCS/tech/patches.txt
share/mplayer/DOCS/tech/playtree
share/mplayer/DOCS/tech/playtree-hun
-share/mplayer/DOCS/tech/porting-status.txt
share/mplayer/DOCS/tech/realcodecs/TODO
share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
share/mplayer/DOCS/tech/realcodecs/streaming.txt
@@ -571,13 +754,37 @@ share/mplayer/DOCS/xml/cs/bugs.xml
share/mplayer/DOCS/xml/cs/cd-dvd.xml
share/mplayer/DOCS/xml/cs/codecs.xml
share/mplayer/DOCS/xml/cs/documentation.xml
+share/mplayer/DOCS/xml/cs/encoding-guide.xml
share/mplayer/DOCS/xml/cs/faq.xml
-share/mplayer/DOCS/xml/cs/features.xml
share/mplayer/DOCS/xml/cs/formats.xml
share/mplayer/DOCS/xml/cs/history.xml
share/mplayer/DOCS/xml/cs/install.xml
+share/mplayer/DOCS/xml/cs/mail-lists.xml
+share/mplayer/DOCS/xml/cs/mencoder.xml
+share/mplayer/DOCS/xml/cs/ports.xml
+share/mplayer/DOCS/xml/cs/skin.xml
share/mplayer/DOCS/xml/cs/tvinput.xml
share/mplayer/DOCS/xml/cs/usage.xml
+share/mplayer/DOCS/xml/cs/users-vs-dev.xml
+share/mplayer/DOCS/xml/cs/video.xml
+share/mplayer/DOCS/xml/de/Makefile
+share/mplayer/DOCS/xml/de/audio.xml
+share/mplayer/DOCS/xml/de/bugreports.xml
+share/mplayer/DOCS/xml/de/bugs.xml
+share/mplayer/DOCS/xml/de/documentation.xml
+share/mplayer/DOCS/xml/de/encoding-guide.xml
+share/mplayer/DOCS/xml/de/faq.xml
+share/mplayer/DOCS/xml/de/formats.xml
+share/mplayer/DOCS/xml/de/history.xml
+share/mplayer/DOCS/xml/de/install.xml
+share/mplayer/DOCS/xml/de/mail-lists.xml
+share/mplayer/DOCS/xml/de/mencoder.xml
+share/mplayer/DOCS/xml/de/ports.xml
+share/mplayer/DOCS/xml/de/skin.xml
+share/mplayer/DOCS/xml/de/tvinput.xml
+share/mplayer/DOCS/xml/de/usage.xml
+share/mplayer/DOCS/xml/de/users-vs-dev.xml
+share/mplayer/DOCS/xml/de/video.xml
share/mplayer/DOCS/xml/default.css
share/mplayer/DOCS/xml/en/Makefile
share/mplayer/DOCS/xml/en/audio.xml
@@ -586,14 +793,13 @@ share/mplayer/DOCS/xml/en/bugs.xml
share/mplayer/DOCS/xml/en/cd-dvd.xml
share/mplayer/DOCS/xml/en/codecs.xml
share/mplayer/DOCS/xml/en/documentation.xml
+share/mplayer/DOCS/xml/en/encoding-guide.xml
share/mplayer/DOCS/xml/en/faq.xml
-share/mplayer/DOCS/xml/en/features.xml
share/mplayer/DOCS/xml/en/formats.xml
share/mplayer/DOCS/xml/en/history.xml
share/mplayer/DOCS/xml/en/install.xml
share/mplayer/DOCS/xml/en/mail-lists.xml
share/mplayer/DOCS/xml/en/mencoder.xml
-share/mplayer/DOCS/xml/en/patches.xml
share/mplayer/DOCS/xml/en/ports.xml
share/mplayer/DOCS/xml/en/skin.xml
share/mplayer/DOCS/xml/en/tvinput.xml
@@ -614,7 +820,6 @@ share/mplayer/DOCS/xml/es/history.xml
share/mplayer/DOCS/xml/es/install.xml
share/mplayer/DOCS/xml/es/mail-lists.xml
share/mplayer/DOCS/xml/es/mencoder.xml
-share/mplayer/DOCS/xml/es/patches.xml
share/mplayer/DOCS/xml/es/ports.xml
share/mplayer/DOCS/xml/es/skin.xml
share/mplayer/DOCS/xml/es/tvinput.xml
@@ -628,14 +833,13 @@ share/mplayer/DOCS/xml/fr/bugs.xml
share/mplayer/DOCS/xml/fr/cd-dvd.xml
share/mplayer/DOCS/xml/fr/codecs.xml
share/mplayer/DOCS/xml/fr/documentation.xml
+share/mplayer/DOCS/xml/fr/encoding-guide.xml
share/mplayer/DOCS/xml/fr/faq.xml
-share/mplayer/DOCS/xml/fr/features.xml
share/mplayer/DOCS/xml/fr/formats.xml
share/mplayer/DOCS/xml/fr/history.xml
share/mplayer/DOCS/xml/fr/install.xml
share/mplayer/DOCS/xml/fr/mail-lists.xml
share/mplayer/DOCS/xml/fr/mencoder.xml
-share/mplayer/DOCS/xml/fr/patches.xml
share/mplayer/DOCS/xml/fr/ports.xml
share/mplayer/DOCS/xml/fr/skin.xml
share/mplayer/DOCS/xml/fr/tvinput.xml
@@ -650,16 +854,18 @@ share/mplayer/DOCS/xml/hu/bugs.xml
share/mplayer/DOCS/xml/hu/cd-dvd.xml
share/mplayer/DOCS/xml/hu/codecs.xml
share/mplayer/DOCS/xml/hu/documentation.xml
+share/mplayer/DOCS/xml/hu/encoding-guide.xml
share/mplayer/DOCS/xml/hu/faq.xml
-share/mplayer/DOCS/xml/hu/features.xml
share/mplayer/DOCS/xml/hu/formats.xml
share/mplayer/DOCS/xml/hu/history.xml
share/mplayer/DOCS/xml/hu/install.xml
share/mplayer/DOCS/xml/hu/mail-lists.xml
-share/mplayer/DOCS/xml/hu/patches.xml
+share/mplayer/DOCS/xml/hu/mencoder.xml
share/mplayer/DOCS/xml/hu/ports.xml
+share/mplayer/DOCS/xml/hu/skin.xml
share/mplayer/DOCS/xml/hu/tvinput.xml
share/mplayer/DOCS/xml/hu/usage.xml
+share/mplayer/DOCS/xml/hu/users-vs-dev.xml
share/mplayer/DOCS/xml/hu/video.xml
share/mplayer/DOCS/xml/ldp.dsl
share/mplayer/DOCS/xml/pl/Makefile
@@ -679,7 +885,6 @@ share/mplayer/DOCS/xml/pl/html-single.xsl
share/mplayer/DOCS/xml/pl/install.xml
share/mplayer/DOCS/xml/pl/mail-lists.xml
share/mplayer/DOCS/xml/pl/mencoder.xml
-share/mplayer/DOCS/xml/pl/patches.xml
share/mplayer/DOCS/xml/pl/ports.xml
share/mplayer/DOCS/xml/pl/skin.xml
share/mplayer/DOCS/xml/pl/tvinput.xml
@@ -700,7 +905,6 @@ share/mplayer/DOCS/xml/ru/html-common.xsl
share/mplayer/DOCS/xml/ru/html-single.xsl
share/mplayer/DOCS/xml/ru/install.xml
share/mplayer/DOCS/xml/ru/mail-lists.xml
-share/mplayer/DOCS/xml/ru/patches.xml
share/mplayer/DOCS/xml/ru/ports.xml
share/mplayer/DOCS/xml/ru/tvinput.xml
share/mplayer/DOCS/xml/ru/usage.xml
@@ -730,9 +934,11 @@ share/mplayer/input.conf
@dirrm share/mplayer/DOCS/xml/fr
@dirrm share/mplayer/DOCS/xml/es
@dirrm share/mplayer/DOCS/xml/en
+@dirrm share/mplayer/DOCS/xml/de
@dirrm share/mplayer/DOCS/xml/cs
@dirrm share/mplayer/DOCS/xml
@dirrm share/mplayer/DOCS/tech/realcodecs
+@dirrm share/mplayer/DOCS/tech/mirrors
@dirrm share/mplayer/DOCS/tech
@dirrm share/mplayer/DOCS/man/zh
@dirrm share/mplayer/DOCS/man/sv
@@ -746,14 +952,13 @@ share/mplayer/input.conf
@dirrm share/mplayer/DOCS/man/cs
@dirrm share/mplayer/DOCS/man
@dirrm share/mplayer/DOCS/it
-@dirrm share/mplayer/DOCS/de
@dirrm share/mplayer/DOCS/HTML/ru
@dirrm share/mplayer/DOCS/HTML/pl
@dirrm share/mplayer/DOCS/HTML/hu
@dirrm share/mplayer/DOCS/HTML/fr
@dirrm share/mplayer/DOCS/HTML/es
@dirrm share/mplayer/DOCS/HTML/en
+@dirrm share/mplayer/DOCS/HTML/de
@dirrm share/mplayer/DOCS/HTML/cs
@dirrm share/mplayer/DOCS/HTML
@dirrm share/mplayer/DOCS
-@comment in mplayer-fonts: @dirrm share/mplayer
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index ef7d4c076e8..5fd8011c3c7 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,26 +1,9 @@
-$NetBSD: distinfo,v 1.27 2006/04/13 14:05:34 drochner Exp $
+$NetBSD: distinfo,v 1.28 2006/06/13 17:25:00 drochner Exp $
-SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7try2.tar.bz2) = dcaced128167f15d094c9b63ca8b3dfd8f583e32
-RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7try2.tar.bz2) = d1da9b34f4c3de67a3a41f9117f32d2ee88c6e54
-Size (mplayer-1.0rc7/MPlayer-1.0pre7try2.tar.bz2) = 6868786 bytes
-SHA1 (patch-aa) = 708128dde21b8de799aa26d75335da76543e2373
-SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
-SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
-SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
-SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
-SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
-SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c
-SHA1 (patch-ai) = a884b7a23ff8b2c31e6190d2ba9989a8f0057a0c
-SHA1 (patch-aj) = cb1f5451f9614cc39255fc5ce2afef7d68c31298
-SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
-SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
-SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
-SHA1 (patch-de) = 923814d978a3ed2b00494cf7f7fd17acd72aa610
-SHA1 (patch-df) = 0a85d1d8fbbbc1a86436e7364b72619a9a32e2d7
-SHA1 (patch-dg) = 1633dfd61c83796ce148ede22bafbe01f67d2bd4
-SHA1 (patch-dh) = 639638d871af2462945d8c5e454cae291a15e939
-SHA1 (patch-di) = 5b4c7d96537882422fb648181a93ec9ba9e13c7e
-SHA1 (patch-dj) = e72e08dda9f3eb97bf5e63751bf18999f1689434
-SHA1 (patch-dk) = 744911451794b554f9754b4cd77cf24520ed0f8e
-SHA1 (patch-dm) = b57da36cce0b896b51ca1ff2eef3c58ed95e2b68
-SHA1 (patch-do) = dbd4705c81ee4e6fa7cefc93dc187733a739d710
+SHA1 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
+RMD160 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
+Size (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8166628 bytes
+SHA1 (patch-aa) = 4b80c0d18f0c9ae3f65d572965222db709a2a6b3
+SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
+SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
+SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index fde56669c95..317f314b224 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2005/12/31 01:09:56 kristerw Exp $
+$NetBSD: patch-aa,v 1.14 2006/06/13 17:25:00 drochner Exp $
---- configure.orig 2005-04-13 13:46:35.000000000 +0200
-+++ configure 2005-12-31 02:02:59.000000000 +0100
-@@ -408,7 +408,7 @@
+--- configure.orig 2006-06-11 20:35:47.000000000 +0200
++++ configure
+@@ -493,7 +493,7 @@ for ac_option do
_inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
;;
--with-extralibdir=*)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.13 2005/12/31 01:09:56 kristerw Exp $
;;
--enable-runtime-cpudetection)
_runtime_cpudetection=yes
-@@ -592,11 +592,11 @@
+@@ -694,11 +694,11 @@ if test "$_skip_cc_check" != yes ; then
esac
echores "$cc_version"
else
@@ -19,14 +19,14 @@ $NetBSD: patch-aa,v 1.13 2005/12/31 01:09:56 kristerw Exp $
+ for _cc in "$_cc" gcc cc ; do
echocheck "$_cc version"
cc_vendor=gnu
- cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
-- cc_version=`( $_cc -dumpversion ) 2>&1`
+ cc_name=`$_cc -v 2>&1 | _tail 1 | cut -d ' ' -f 1`
+- cc_version=`$_cc -dumpversion 2>&1`
+ cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
if test "$?" -gt 0; then
cc_version="not found"
fi
-@@ -743,7 +743,7 @@
-
+@@ -830,7 +830,7 @@ if x86 || x86_64 ; then
+ # gather more CPU information
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
- pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
@@ -34,26 +34,7 @@ $NetBSD: patch-aa,v 1.13 2005/12/31 01:09:56 kristerw Exp $
pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
-@@ -1797,7 +1797,8 @@
- _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
- ;;
- --with-x11libdir=*)
-- _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+# _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+ _ld_x11="${_ld_x11} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
- ;;
- --with-dxr2incdir=*)
- _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-@@ -2382,7 +2383,7 @@
- echocheck "lrintf"
- cat > $TMPC << EOF
- #include <math.h>
--int main(void) { (void) lrintf(0.0); return 0; }
-+int main(void) { long (*foo)(double); foo = lrintf; (void)(*foo)(0.0); return 0; }
- EOF
- _lrintf=no
- cc_check $_ld_lm && _lrintf=yes
-@@ -3788,7 +3789,7 @@
+@@ -4136,7 +4136,7 @@ fi
if test "$_aa" = yes ; then
_def_aa='#define HAVE_AA 1'
if cygwin ; then
diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab
index dec1592039b..4711debb9a5 100644
--- a/multimedia/mplayer-share/patches/patch-ab
+++ b/multimedia/mplayer-share/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/05/31 19:15:11 jmmv Exp $
+$NetBSD: patch-ab,v 1.6 2006/06/13 17:25:00 drochner Exp $
---- loader/win32.c.orig 2005-04-15 22:17:12.000000000 +0200
+--- loader/win32.c.orig 2006-06-11 20:35:46.000000000 +0200
+++ loader/win32.c
@@ -451,8 +451,10 @@ static int my_release(void* memory)
@@ -14,12 +14,3 @@ $NetBSD: patch-ab,v 1.5 2005/05/31 19:15:11 jmmv Exp $
//if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld (%d)\n", header, header->size, alccnt);
#else
-@@ -993,7 +995,7 @@
-
- /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */
- #ifndef MPLAYER
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) || defined(__DragonFly__)
- do_cpuid(1, regs);
- switch ((regs[0] >> 8) & 0xf) { // cpu family
- case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac
index ed64a9ddbae..a3b46cc7eb9 100644
--- a/multimedia/mplayer-share/patches/patch-ac
+++ b/multimedia/mplayer-share/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.4 2005/05/30 12:43:30 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2006/06/13 17:25:00 drochner Exp $
---- libfaad2/common.h.orig 2005-02-19 03:19:21.000000000 +0100
+--- libfaad2/common.h.orig 2006-06-11 20:35:42.000000000 +0200
+++ libfaad2/common.h
-@@ -344,7 +344,7 @@ char *strchr(), *strrchr();
- #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
+@@ -334,7 +334,7 @@ char *strchr(), *strrchr();
+ #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF)
#define HAS_LRINTF
// from http://www.stereopsis.com/FPU.html
- static INLINE int lrintf(float f)
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
deleted file mode 100644
index 51389c92ed6..00000000000
--- a/multimedia/mplayer-share/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/04/18 17:49:41 drochner Exp $
-
---- mp_msg.c.orig 2005-01-20 14:22:52.000000000 +0100
-+++ mp_msg.c
-@@ -34,15 +34,19 @@ void mp_msg_init(){
- #ifdef MP_DEBUG
- fprintf(stdout, "Using GNU internationalization\n");
- fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
-+#if 0
- fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
- #endif
- bindtextdomain("mplayer", PREFIX"/share/locale");
- textdomain("mplayer");
- #ifdef MP_DEBUG
- fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
-+#if 0
- fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL));
- #endif
- #endif
-+#endif
-+#endif
- mp_msg_set_level(MSGL_STATUS);
- }
-
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
deleted file mode 100644
index 6574e155ce6..00000000000
--- a/multimedia/mplayer-share/patches/patch-ae
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/05/31 19:15:11 jmmv Exp $
-
---- cpudetect.c.orig 2005-01-12 22:56:25.000000000 +0100
-+++ cpudetect.c 2005-05-20 20:00:44.000000000 +0200
-@@ -20,7 +20,7 @@
- #include <machine/cpu.h>
- #endif
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-@@ -169,7 +169,7 @@
- #endif
-
- /* FIXME: Does SSE2 need more OS support, too? */
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__DragonFly__)
- if (caps->hasSSE)
- check_os_katmai_support();
- if (!caps->hasSSE)
-@@ -324,7 +324,7 @@
- #ifdef ARCH_X86_64
- gCpuCaps.hasSSE=1;
- gCpuCaps.hasSSE2=1;
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- int has_sse=0, ret;
- size_t len=sizeof(has_sse);
-
-@@ -334,6 +334,10 @@
-
- #elif defined(__NetBSD__) || defined (__OpenBSD__)
- #if __NetBSD_Version__ >= 105250000 || (defined __OpenBSD__)
-+#ifdef __x86_64__
-+ gCpuCaps.hasSSE=1;
-+ gCpuCaps.hasSSE2=1;
-+#else
- int has_sse, has_sse2, ret, mib[2];
- size_t varlen;
-
-@@ -362,6 +366,7 @@ static void check_os_katmai_support( voi
- gCpuCaps.hasSSE2=1;
- mp_msg(MSGT_CPUDETECT,MSGL_V, "yes!\n" );
- }
-+#endif /* x86_64 */
- #else
- gCpuCaps.hasSSE = 0;
- mp_msg(MSGT_CPUDETECT,MSGL_WARN, "No OS support for SSE, disabling to be safe.\n" );
diff --git a/multimedia/mplayer-share/patches/patch-af b/multimedia/mplayer-share/patches/patch-af
deleted file mode 100644
index 86c186d74d3..00000000000
--- a/multimedia/mplayer-share/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/05/30 12:44:09 wiz Exp $
-
---- etc/codecs.conf.orig 2005-04-10 18:44:29.000000000 +0200
-+++ etc/codecs.conf
-@@ -2188,6 +2188,7 @@ audiocodec faad
- fourcc mp4a,MP4A
- fourcc "AAC " ; Used in NSV
- format 0xff
-+ format 0x706d
- driver faad
- dll libfaad2
-
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-ah
index 3addd3ee64d..1797d7a9b01 100644
--- a/multimedia/mplayer-share/patches/patch-ah
+++ b/multimedia/mplayer-share/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2005/10/24 19:46:05 minskim Exp $
+$NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
---- subreader.c.orig 2005-02-04 10:31:03.000000000 -0800
+--- subreader.c.orig 2006-06-11 20:35:47.000000000 +0200
+++ subreader.c
-@@ -73,10 +73,10 @@ static int eol(char p) {
+@@ -74,10 +74,10 @@ static int eol(char p) {
/* Remove leading and trailing space */
static void trail_space(char *s) {
int i = 0;
@@ -15,8 +15,8 @@ $NetBSD: patch-ah,v 1.1 2005/10/24 19:46:05 minskim Exp $
}
static char *stristr(const char *haystack, const char *needle) {
-@@ -627,7 +627,7 @@ subtitle *sub_read_line_pjs(FILE *fd,sub
- if (!fgets (line, LINE_LEN, fd))
+@@ -628,7 +628,7 @@ subtitle *sub_read_line_pjs(stream_t *st
+ if (!stream_read_line (st, line, LINE_LEN))
return NULL;
/* skip spaces */
- for (s=line; *s && isspace(*s); s++);
@@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.1 2005/10/24 19:46:05 minskim Exp $
/* allow empty lines at the end of the file */
if (*s==0)
return NULL;
-@@ -680,7 +680,7 @@ subtitle *sub_read_line_mpsub(FILE *fd,
+@@ -681,7 +681,7 @@ subtitle *sub_read_line_mpsub(stream_t *
else return current;
}
p=line;
diff --git a/multimedia/mplayer-share/patches/patch-ai b/multimedia/mplayer-share/patches/patch-ai
deleted file mode 100644
index 203e8dc9d82..00000000000
--- a/multimedia/mplayer-share/patches/patch-ai
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/10 23:34:42 salo Exp $
-
-Security fix for SA17892, from ffmpeg CVS repository.
-
---- libavcodec/utils.c.orig 2005-04-16 22:41:13.000000000 +0200
-+++ libavcodec/utils.c 2005-12-10 23:59:36.000000000 +0100
-@@ -276,49 +276,50 @@
- buf->last_pic_num= *picture_number;
- }else{
- int h_chroma_shift, v_chroma_shift;
-- int pixel_size;
-+ int pixel_size, size[3];
-+ AVPicture picture;
-
- avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
-
-- switch(s->pix_fmt){
-- case PIX_FMT_RGB555:
-- case PIX_FMT_RGB565:
-- case PIX_FMT_YUV422:
-- case PIX_FMT_UYVY422:
-- pixel_size=2;
-- break;
-- case PIX_FMT_RGB24:
-- case PIX_FMT_BGR24:
-- pixel_size=3;
-- break;
-- case PIX_FMT_RGBA32:
-- pixel_size=4;
-- break;
-- default:
-- pixel_size=1;
-- }
--
- avcodec_align_dimensions(s, &w, &h);
-
- if(!(s->flags&CODEC_FLAG_EMU_EDGE)){
- w+= EDGE_WIDTH*2;
- h+= EDGE_WIDTH*2;
- }
-+ avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
-+ pixel_size= picture.linesize[0]*8 / w;
-+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt);
-+ assert(pixel_size>=1);
-+ //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
-+ if(pixel_size == 3*8)
-+ w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift);
-+ else
-+ w= ALIGN(pixel_size*w, STRIDE_ALIGN<<(h_chroma_shift+3)) / pixel_size;
-+ size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
-+ size[0] = picture.linesize[0] * h;
-+ size[1] -= size[0];
-+ if(picture.data[2])
-+ size[1]= size[2]= size[1]/2;
-+ else
-+ size[2]= 0;
-
- buf->last_pic_num= -256*256*256*64;
-+ memset(buf->base, 0, sizeof(buf->base));
-+ memset(buf->data, 0, sizeof(buf->data));
-
-- for(i=0; i<3; i++){
-+ for(i=0; i<3 && size[i]; i++){
- const int h_shift= i==0 ? 0 : h_chroma_shift;
- const int v_shift= i==0 ? 0 : v_chroma_shift;
-
-- //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
-- buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, STRIDE_ALIGN<<(h_chroma_shift-h_shift));
-+ buf->linesize[i]= picture.linesize[i];
-
-- buf->base[i]= av_malloc((buf->linesize[i]*h>>v_shift)+16); //FIXME 16
-+ buf->base[i]= av_malloc(size[i]+16); //FIXME 16
- if(buf->base[i]==NULL) return -1;
-- memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift);
-+ memset(buf->base[i], 128, size[i]);
-
-- if(s->flags&CODEC_FLAG_EMU_EDGE)
-+ // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ...
-+ if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2])
- buf->data[i] = buf->base[i];
- else
- buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), STRIDE_ALIGN);
diff --git a/multimedia/mplayer-share/patches/patch-aj b/multimedia/mplayer-share/patches/patch-aj
deleted file mode 100644
index 1f27d4ed9be..00000000000
--- a/multimedia/mplayer-share/patches/patch-aj
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/04/13 14:05:34 drochner Exp $
-
---- libmpdemux/demuxer.h.orig 2005-04-03 16:08:26.000000000 +0200
-+++ libmpdemux/demuxer.h
-@@ -155,17 +155,19 @@ inline static demux_packet_t* new_demux_
- dp->flags=0;
- dp->refcount=1;
- dp->master=NULL;
-- dp->buffer=len?(unsigned char*)malloc(len+8):NULL;
-- if(len) memset(dp->buffer+len,0,8);
-+ dp->buffer=NULL;
-+ if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8)))
-+ memset(dp->buffer + len, 0, 8);
-+ else
-+ dp->len = 0;
- return dp;
- }
-
- inline static void resize_demux_packet(demux_packet_t* dp, int len)
- {
-- if(len)
-+ if(len > 0)
- {
- dp->buffer=(unsigned char *)realloc(dp->buffer,len+8);
-- memset(dp->buffer+len,0,8);
- }
- else
- {
-@@ -173,6 +175,10 @@ inline static void resize_demux_packet(d
- dp->buffer=NULL;
- }
- dp->len=len;
-+ if (dp->buffer)
-+ memset(dp->buffer + len, 0, 8);
-+ else
-+ dp->len = 0;
- }
-
- inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){
diff --git a/multimedia/mplayer-share/patches/patch-da b/multimedia/mplayer-share/patches/patch-da
deleted file mode 100644
index cc21ff5452a..00000000000
--- a/multimedia/mplayer-share/patches/patch-da
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-da,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libdha/pci.c.orig 2005-05-20 20:00:58.000000000 +0200
-+++ libdha/pci.c 2005-05-20 20:01:07.000000000 +0200
-@@ -62,7 +62,7 @@
- /* OS depended stuff */
- #if defined (linux)
- #include "sysdep/pci_linux.c"
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- #include "sysdep/pci_freebsd.c"
- #elif defined (__386BSD__)
- #include "sysdep/pci_386bsd.c"
diff --git a/multimedia/mplayer-share/patches/patch-dc b/multimedia/mplayer-share/patches/patch-dc
deleted file mode 100644
index 90b0f5b3948..00000000000
--- a/multimedia/mplayer-share/patches/patch-dc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dc,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpcodecs/ad_realaud.c.orig 2005-05-20 20:01:46.000000000 +0200
-+++ libmpcodecs/ad_realaud.c 2005-05-20 20:01:52.000000000 +0200
-@@ -35,7 +35,7 @@
- free(ize);
- }
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- void *__ctype_b=NULL;
- #endif
-
diff --git a/multimedia/mplayer-share/patches/patch-dd b/multimedia/mplayer-share/patches/patch-dd
deleted file mode 100644
index 53bae34ba19..00000000000
--- a/multimedia/mplayer-share/patches/patch-dd
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dd,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpcodecs/vd_realvid.c.orig 2005-05-20 20:04:14.000000000 +0200
-+++ libmpcodecs/vd_realvid.c 2005-05-20 20:04:24.000000000 +0200
-@@ -79,7 +79,7 @@
- // exit(1);
- }
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- void ___brk_addr(void) {exit(0);}
- char **__environ={NULL};
- #undef stderr
diff --git a/multimedia/mplayer-share/patches/patch-de b/multimedia/mplayer-share/patches/patch-de
deleted file mode 100644
index bb531c365ee..00000000000
--- a/multimedia/mplayer-share/patches/patch-de
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-de,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdemux/cddb.c.orig 2005-05-20 20:04:55.000000000 +0200
-+++ libmpdemux/cddb.c 2005-05-20 20:05:16.000000000 +0200
-@@ -30,7 +30,7 @@
-
- #if defined(__linux__)
- #include <linux/cdrom.h>
--#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <sys/cdio.h>
- #endif
-
-@@ -82,7 +82,7 @@
- return tochdr.cdth_trk1;
- }
-
--#elif defined(__FreeBSD__) || defined(__bsdi__)
-+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
- int
- read_toc(const char *dev) {
- int drive;
diff --git a/multimedia/mplayer-share/patches/patch-df b/multimedia/mplayer-share/patches/patch-df
deleted file mode 100644
index dd2ec49b9df..00000000000
--- a/multimedia/mplayer-share/patches/patch-df
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-df,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdemux/stream_vcd.c.orig 2005-05-20 20:10:45.000000000 +0200
-+++ libmpdemux/stream_vcd.c 2005-05-20 20:10:59.000000000 +0200
-@@ -14,7 +14,7 @@
- #include <sys/ioctl.h>
- #include <errno.h>
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/cdrio.h>
- #include "vcd_read_fbsd.h"
- #elif defined(__NetBSD__) || defined (__OpenBSD__)
diff --git a/multimedia/mplayer-share/patches/patch-dg b/multimedia/mplayer-share/patches/patch-dg
deleted file mode 100644
index 3b89c0f7235..00000000000
--- a/multimedia/mplayer-share/patches/patch-dg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dg,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdemux/tvi_bsdbt848.c.orig 2005-05-20 20:11:15.000000000 +0200
-+++ libmpdemux/tvi_bsdbt848.c 2005-05-20 20:11:56.000000000 +0200
-@@ -43,6 +43,9 @@
- #ifdef __NetBSD__
- #include <dev/ic/bt8xx.h>
- #include <sys/audioio.h>
-+#elif defined(__DragonFly__)
-+#include <dev/video/meteor/ioctl_meteor.h>
-+#include <dev/video/bktr/ioctl_bt848.h>
- #elif __FreeBSD_version >= 502100
- #include <dev/bktr/ioctl_meteor.h>
- #include <dev/bktr/ioctl_bt848.h>
diff --git a/multimedia/mplayer-share/patches/patch-dh b/multimedia/mplayer-share/patches/patch-dh
deleted file mode 100644
index 278af1c22bc..00000000000
--- a/multimedia/mplayer-share/patches/patch-dh
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-dh,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdvdkit2/bswap.h.orig 2005-05-20 20:12:12.000000000 +0200
-+++ libmpdvdkit2/bswap.h 2005-05-20 20:13:32.000000000 +0200
-@@ -88,12 +88,17 @@
- }
- #define B2N_64(x) x = bswap_64(x)
-
-+#elif defined(__DragonFly__)
-+#include <sys/endian.h>
-+#define B2N_16(x) x = be16toh(x)
-+#define B2N_32(x) x = be32toh(x)
-+#define B2N_64(x) x = be64toh(x)
-+
- /* This is a slow but portable implementation, it has multiple evaluation
- * problems so beware.
- * FreeBSD and Solaris don't have <byteswap.h> or any other such
- * functionality!
- */
--
- #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__)
- #define B2N_16(x) \
- x = ((((x) & 0xff00) >> 8) | \
diff --git a/multimedia/mplayer-share/patches/patch-di b/multimedia/mplayer-share/patches/patch-di
deleted file mode 100644
index abb7feae0a5..00000000000
--- a/multimedia/mplayer-share/patches/patch-di
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-di,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdvdkit2/dvd_reader.c.orig 2005-05-20 20:13:48.000000000 +0200
-+++ libmpdvdkit2/dvd_reader.c 2005-05-20 20:13:55.000000000 +0200
-@@ -35,7 +35,7 @@
- #include <limits.h>
- #include <dirent.h>
-
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
- #define SYS_BSD 1
- #endif
-
diff --git a/multimedia/mplayer-share/patches/patch-dj b/multimedia/mplayer-share/patches/patch-dj
deleted file mode 100644
index c5426dd98cb..00000000000
--- a/multimedia/mplayer-share/patches/patch-dj
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-dj,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- loader/ldt_keeper.c.orig 2005-05-20 20:14:38.000000000 +0200
-+++ loader/ldt_keeper.c 2005-05-20 20:16:22.000000000 +0200
-@@ -50,7 +50,7 @@
- }
- #endif
- #else
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <machine/segments.h>
- #include <machine/sysarch.h>
- #endif
-@@ -165,7 +165,7 @@
- #endif
- #endif
-
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
- {
- *buffer++ = ((content->base_addr & 0x0000ffff) << 16) |
-@@ -227,7 +227,7 @@
- }
- #endif /*linux*/
-
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- {
- unsigned long d[2];
-
-@@ -246,7 +246,7 @@
- printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n");
- }
- }
--#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
-+#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ */
-
- #if defined(__svr4__)
- {
diff --git a/multimedia/mplayer-share/patches/patch-dk b/multimedia/mplayer-share/patches/patch-dk
deleted file mode 100644
index e0d4485104e..00000000000
--- a/multimedia/mplayer-share/patches/patch-dk
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dk,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- loader/pe_image.c.orig 2005-05-20 20:16:31.000000000 +0200
-+++ loader/pe_image.c 2005-05-20 20:16:45.000000000 +0200
-@@ -905,7 +905,7 @@
- */
- static void __attribute__((noinline)) extend_stack_for_dll_alloca(void)
- {
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- volatile int* mem=alloca(0x20000);
- *mem=0x1234;
- #endif
diff --git a/multimedia/mplayer-share/patches/patch-dm b/multimedia/mplayer-share/patches/patch-dm
deleted file mode 100644
index 63e2036431f..00000000000
--- a/multimedia/mplayer-share/patches/patch-dm
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-dm,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- osdep/getch2.c.orig 2005-05-20 20:17:34.000000000 +0200
-+++ osdep/getch2.c 2005-05-20 20:17:57.000000000 +0200
-@@ -220,7 +220,7 @@
- struct termios tio_new;
- #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
- tcgetattr(0,&tio_orig);
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
- ioctl(0,TIOCGETA,&tio_orig);
- #else
- ioctl(0,TCGETS,&tio_orig);
-@@ -231,7 +231,7 @@
- tio_new.c_cc[VTIME] = 0;
- #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
- tcsetattr(0,TCSANOW,&tio_new);
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
- ioctl(0,TIOCSETA,&tio_new);
- #else
- ioctl(0,TCSETS,&tio_new);
-@@ -245,7 +245,7 @@
- #ifdef HAVE_TERMIOS
- #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
- tcsetattr(0,TCSANOW,&tio_orig);
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
- ioctl(0,TIOCSETA,&tio_orig);
- #else
- ioctl(0,TCSETS,&tio_orig);
diff --git a/multimedia/mplayer-share/patches/patch-do b/multimedia/mplayer-share/patches/patch-do
deleted file mode 100644
index d738b90403b..00000000000
--- a/multimedia/mplayer-share/patches/patch-do
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-do,v 1.1 2005/05/31 19:15:11 jmmv Exp $
-
---- libdha/sysdep/pci_freebsd.c.orig 2002-05-03 14:56:29.000000000 +0200
-+++ libdha/sysdep/pci_freebsd.c 2005-05-20 21:15:13.000000000 +0200
-@@ -8,7 +8,7 @@
- /* machine/console.h seems to be outdated by recent FreeBSD *
- * however pcvt_ioctl.h seems to exist for very long time */
- /* #include <machine/console.h>*/
--#include <machine/pcvt_ioctl.h>
-+#include <sys/kbio.h>
- #ifndef GCCUSESGAS
- #define GCCUSESGAS
- #endif
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 99c245a7ed6..0ff1929e95c 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/06/12 16:57:06 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/06/13 17:25:00 drochner Exp $
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION= 11
COMMENT= Software-only MPEG-1/2/4 video decoder