Update "mplayer", "mplayer-share", "mencoder" and "gmplayer" packages

to version 1.0rc2 (as 1.0rc10). Changes since version 1.0rc1 (known as 1.0rc9 in "pkgsrc"): - A lot of new audio and video decoders and other improvements - A large number of bug fixes - Updated documentation - Support for Mac OS X Intel Approved by Thomas Klausner (because it fixes the Darwin-i386 build).
author: tron <tron@pkgsrc.org> 2007-12-21 11:31:11 +0000
committer: tron <tron@pkgsrc.org> 2007-12-21 11:31:11 +0000
commit: 2bb5d9f0da3c82223c3ff88236d35308664e06d0 (patch)
tree: f92d0c6d3c51e10fcb5c180db227e99bc5f37871 /multimedia
parent: 736ef18a712797d23dc53c78a78a57d5de84426b (diff)
download: pkgsrc-2bb5d9f0da3c82223c3ff88236d35308664e06d0.tar.gz
21 files changed, 475 insertions, 359 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index b349d84fcf6..51e3a99f24e 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/09/13 19:16:02 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2007/12/21 11:31:11 tron Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,6 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	4
 
 BROKEN_IN=		pkgsrc-2006Q4
 
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index d2bcb6ec00d..5f47bd94888 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,82 +1,77 @@
-$NetBSD: distinfo,v 1.50 2007/12/18 22:57:43 tron Exp $
+$NetBSD: distinfo,v 1.51 2007/12/21 11:31:11 tron Exp $
 
-SHA1 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
-RMD160 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
-Size (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes
-SHA1 (gmplayer-1.0rc9-20060123/Blue-1.6.tar.bz2) = d894cbd44ffb7bde14a8f9bbdac53525a51e1e08
-RMD160 (gmplayer-1.0rc9-20060123/Blue-1.6.tar.bz2) = 33fcd3812bd12e0369614e0c1c5d4c571784df3e
-Size (gmplayer-1.0rc9-20060123/Blue-1.6.tar.bz2) = 225883 bytes
-SHA1 (gmplayer-1.0rc9-20060123/BlueHeart-1.5.tar.bz2) = 157aca7420e8003ced2f4f1cb38a33c1bfd0db13
-RMD160 (gmplayer-1.0rc9-20060123/BlueHeart-1.5.tar.bz2) = 39e139b5428a695e5eb56e72e0e626cb3a5a2eea
-Size (gmplayer-1.0rc9-20060123/BlueHeart-1.5.tar.bz2) = 281051 bytes
-SHA1 (gmplayer-1.0rc9-20060123/CornerMP-1.2.tar.bz2) = 4de70d5232dd44d9366cb8b876e89db8e48b2d8c
-RMD160 (gmplayer-1.0rc9-20060123/CornerMP-1.2.tar.bz2) = eb563c083111923b4fddd30df074ba08bb78feec
-Size (gmplayer-1.0rc9-20060123/CornerMP-1.2.tar.bz2) = 232731 bytes
-SHA1 (gmplayer-1.0rc9-20060123/CornerMP-aqua-1.4.tar.bz2) = 165d1f30b0c5135a3481d394042a4faea70d3976
-RMD160 (gmplayer-1.0rc9-20060123/CornerMP-aqua-1.4.tar.bz2) = 67d78a19e2362b6c9658f699421fe4228cb8e96a
-Size (gmplayer-1.0rc9-20060123/CornerMP-aqua-1.4.tar.bz2) = 243154 bytes
-SHA1 (gmplayer-1.0rc9-20060123/Cyrus-1.2.tar.bz2) = 20bbb63114e8c0438770c1d1682296f37833968c
-RMD160 (gmplayer-1.0rc9-20060123/Cyrus-1.2.tar.bz2) = c4d4593a358456d98a1d94e14e263a902add6828
-Size (gmplayer-1.0rc9-20060123/Cyrus-1.2.tar.bz2) = 228461 bytes
-SHA1 (gmplayer-1.0rc9-20060123/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
-RMD160 (gmplayer-1.0rc9-20060123/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
-Size (gmplayer-1.0rc9-20060123/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
-SHA1 (gmplayer-1.0rc9-20060123/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f
-RMD160 (gmplayer-1.0rc9-20060123/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c
-Size (gmplayer-1.0rc9-20060123/MidnightLove-1.6.tar.bz2) = 539665 bytes
-SHA1 (gmplayer-1.0rc9-20060123/WMP6-2.2.tar.bz2) = 6cf2062ddf41423edfa35a9a159614ef7996deb3
-RMD160 (gmplayer-1.0rc9-20060123/WMP6-2.2.tar.bz2) = 1cf366456372027d738359f6611b4b95891ade5a
-Size (gmplayer-1.0rc9-20060123/WMP6-2.2.tar.bz2) = 39267 bytes
-SHA1 (gmplayer-1.0rc9-20060123/avifile-1.6.tar.bz2) = 061f3e7a2b92e3e41d43f706c93e5f249c5c989a
-RMD160 (gmplayer-1.0rc9-20060123/avifile-1.6.tar.bz2) = 684f7e9259f4333aca285d2d8356b7c6cbbbfc16
-Size (gmplayer-1.0rc9-20060123/avifile-1.6.tar.bz2) = 42409 bytes
-SHA1 (gmplayer-1.0rc9-20060123/gnome-1.1.tar.bz2) = 0852aaab4336d37bef439a6d11aaab1422df6caa
-RMD160 (gmplayer-1.0rc9-20060123/gnome-1.1.tar.bz2) = 5850b3e5ce508ec40b82032125ee0c83a3ca9f49
-Size (gmplayer-1.0rc9-20060123/gnome-1.1.tar.bz2) = 368649 bytes
-SHA1 (gmplayer-1.0rc9-20060123/hayraphon-1.0.tar.bz2) = c16b379a202e477e68f18003cd868a760daa0605
-RMD160 (gmplayer-1.0rc9-20060123/hayraphon-1.0.tar.bz2) = 2104981d6abdb89436e1f6ccd9ca9260a4cb4394
-Size (gmplayer-1.0rc9-20060123/hayraphon-1.0.tar.bz2) = 77577 bytes
-SHA1 (gmplayer-1.0rc9-20060123/hwswskin-1.1.tar.bz2) = 1637293c9b9b8f8ab1055f838ddd6409d035e3de
-RMD160 (gmplayer-1.0rc9-20060123/hwswskin-1.1.tar.bz2) = ca8d39bfc03dc18c927ff8d6592bd95974a9b354
-Size (gmplayer-1.0rc9-20060123/hwswskin-1.1.tar.bz2) = 20331 bytes
-SHA1 (gmplayer-1.0rc9-20060123/mentalic-1.2.tar.bz2) = 47a0c7f8cebba83b50b381ff923d91904cc5b514
-RMD160 (gmplayer-1.0rc9-20060123/mentalic-1.2.tar.bz2) = d561f0c1c3396c2776175f58f0d69b39623e9fee
-Size (gmplayer-1.0rc9-20060123/mentalic-1.2.tar.bz2) = 166570 bytes
-SHA1 (gmplayer-1.0rc9-20060123/neutron-1.5.tar.bz2) = 757a2aef5a6eb6873024d8cafa5f862377af9239
-RMD160 (gmplayer-1.0rc9-20060123/neutron-1.5.tar.bz2) = 9434c545386357c540a43c5cb37f70a6308b1ed7
-Size (gmplayer-1.0rc9-20060123/neutron-1.5.tar.bz2) = 369303 bytes
-SHA1 (gmplayer-1.0rc9-20060123/phony-1.1.tar.bz2) = 68189ce1ffca26694edf5440769a1d61b84b70bc
-RMD160 (gmplayer-1.0rc9-20060123/phony-1.1.tar.bz2) = 5fd2b0befc46a995579b3722952a73f2c1b062e5
-Size (gmplayer-1.0rc9-20060123/phony-1.1.tar.bz2) = 386399 bytes
-SHA1 (gmplayer-1.0rc9-20060123/plastic-1.2.tar.bz2) = 414560bfdd660a3b44d1f75adda8c36c437ad2d3
-RMD160 (gmplayer-1.0rc9-20060123/plastic-1.2.tar.bz2) = 3e2bed634d2f7a55313e9d6332c57f48f6b0f761
-Size (gmplayer-1.0rc9-20060123/plastic-1.2.tar.bz2) = 454167 bytes
-SHA1 (gmplayer-1.0rc9-20060123/proton-1.2.tar.bz2) = a5178bc09a75464183abc78c380b5b661a3aaf68
-RMD160 (gmplayer-1.0rc9-20060123/proton-1.2.tar.bz2) = 276e93b2c7cf695fdfa5a723fc6074bfa6405172
-Size (gmplayer-1.0rc9-20060123/proton-1.2.tar.bz2) = 322612 bytes
-SHA1 (gmplayer-1.0rc9-20060123/slim-1.2.tar.bz2) = 3913748d9bfb126ec677e84b068c54fb7111196f
-RMD160 (gmplayer-1.0rc9-20060123/slim-1.2.tar.bz2) = 2ec2b2362c4b89ffbe79421b14f3f5f4341996f1
-Size (gmplayer-1.0rc9-20060123/slim-1.2.tar.bz2) = 398873 bytes
-SHA1 (gmplayer-1.0rc9-20060123/xanim-1.6.tar.bz2) = 1b63395d12bfe6eb63c6aa6ea3b870ddbdd26658
-RMD160 (gmplayer-1.0rc9-20060123/xanim-1.6.tar.bz2) = 5c0f34bb4cd722469402cd69de3c4d75e10611f9
-Size (gmplayer-1.0rc9-20060123/xanim-1.6.tar.bz2) = 94564 bytes
-SHA1 (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
-RMD160 (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
-Size (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 172270 bytes
-SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
+SHA1 (gmplayer-1.0rc10-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
+RMD160 (gmplayer-1.0rc10-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
+Size (gmplayer-1.0rc10-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes
+SHA1 (gmplayer-1.0rc10-20060123/Blue-1.6.tar.bz2) = d894cbd44ffb7bde14a8f9bbdac53525a51e1e08
+RMD160 (gmplayer-1.0rc10-20060123/Blue-1.6.tar.bz2) = 33fcd3812bd12e0369614e0c1c5d4c571784df3e
+Size (gmplayer-1.0rc10-20060123/Blue-1.6.tar.bz2) = 225883 bytes
+SHA1 (gmplayer-1.0rc10-20060123/BlueHeart-1.5.tar.bz2) = 157aca7420e8003ced2f4f1cb38a33c1bfd0db13
+RMD160 (gmplayer-1.0rc10-20060123/BlueHeart-1.5.tar.bz2) = 39e139b5428a695e5eb56e72e0e626cb3a5a2eea
+Size (gmplayer-1.0rc10-20060123/BlueHeart-1.5.tar.bz2) = 281051 bytes
+SHA1 (gmplayer-1.0rc10-20060123/CornerMP-1.2.tar.bz2) = 4de70d5232dd44d9366cb8b876e89db8e48b2d8c
+RMD160 (gmplayer-1.0rc10-20060123/CornerMP-1.2.tar.bz2) = eb563c083111923b4fddd30df074ba08bb78feec
+Size (gmplayer-1.0rc10-20060123/CornerMP-1.2.tar.bz2) = 232731 bytes
+SHA1 (gmplayer-1.0rc10-20060123/CornerMP-aqua-1.4.tar.bz2) = 165d1f30b0c5135a3481d394042a4faea70d3976
+RMD160 (gmplayer-1.0rc10-20060123/CornerMP-aqua-1.4.tar.bz2) = 67d78a19e2362b6c9658f699421fe4228cb8e96a
+Size (gmplayer-1.0rc10-20060123/CornerMP-aqua-1.4.tar.bz2) = 243154 bytes
+SHA1 (gmplayer-1.0rc10-20060123/Cyrus-1.2.tar.bz2) = 20bbb63114e8c0438770c1d1682296f37833968c
+RMD160 (gmplayer-1.0rc10-20060123/Cyrus-1.2.tar.bz2) = c4d4593a358456d98a1d94e14e263a902add6828
+Size (gmplayer-1.0rc10-20060123/Cyrus-1.2.tar.bz2) = 228461 bytes
+SHA1 (gmplayer-1.0rc10-20060123/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
+RMD160 (gmplayer-1.0rc10-20060123/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
+Size (gmplayer-1.0rc10-20060123/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
+SHA1 (gmplayer-1.0rc10-20060123/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f
+RMD160 (gmplayer-1.0rc10-20060123/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c
+Size (gmplayer-1.0rc10-20060123/MidnightLove-1.6.tar.bz2) = 539665 bytes
+SHA1 (gmplayer-1.0rc10-20060123/WMP6-2.2.tar.bz2) = 6cf2062ddf41423edfa35a9a159614ef7996deb3
+RMD160 (gmplayer-1.0rc10-20060123/WMP6-2.2.tar.bz2) = 1cf366456372027d738359f6611b4b95891ade5a
+Size (gmplayer-1.0rc10-20060123/WMP6-2.2.tar.bz2) = 39267 bytes
+SHA1 (gmplayer-1.0rc10-20060123/avifile-1.6.tar.bz2) = 061f3e7a2b92e3e41d43f706c93e5f249c5c989a
+RMD160 (gmplayer-1.0rc10-20060123/avifile-1.6.tar.bz2) = 684f7e9259f4333aca285d2d8356b7c6cbbbfc16
+Size (gmplayer-1.0rc10-20060123/avifile-1.6.tar.bz2) = 42409 bytes
+SHA1 (gmplayer-1.0rc10-20060123/gnome-1.1.tar.bz2) = 0852aaab4336d37bef439a6d11aaab1422df6caa
+RMD160 (gmplayer-1.0rc10-20060123/gnome-1.1.tar.bz2) = 5850b3e5ce508ec40b82032125ee0c83a3ca9f49
+Size (gmplayer-1.0rc10-20060123/gnome-1.1.tar.bz2) = 368649 bytes
+SHA1 (gmplayer-1.0rc10-20060123/hayraphon-1.0.tar.bz2) = c16b379a202e477e68f18003cd868a760daa0605
+RMD160 (gmplayer-1.0rc10-20060123/hayraphon-1.0.tar.bz2) = 2104981d6abdb89436e1f6ccd9ca9260a4cb4394
+Size (gmplayer-1.0rc10-20060123/hayraphon-1.0.tar.bz2) = 77577 bytes
+SHA1 (gmplayer-1.0rc10-20060123/hwswskin-1.1.tar.bz2) = 1637293c9b9b8f8ab1055f838ddd6409d035e3de
+RMD160 (gmplayer-1.0rc10-20060123/hwswskin-1.1.tar.bz2) = ca8d39bfc03dc18c927ff8d6592bd95974a9b354
+Size (gmplayer-1.0rc10-20060123/hwswskin-1.1.tar.bz2) = 20331 bytes
+SHA1 (gmplayer-1.0rc10-20060123/mentalic-1.2.tar.bz2) = 47a0c7f8cebba83b50b381ff923d91904cc5b514
+RMD160 (gmplayer-1.0rc10-20060123/mentalic-1.2.tar.bz2) = d561f0c1c3396c2776175f58f0d69b39623e9fee
+Size (gmplayer-1.0rc10-20060123/mentalic-1.2.tar.bz2) = 166570 bytes
+SHA1 (gmplayer-1.0rc10-20060123/neutron-1.5.tar.bz2) = 757a2aef5a6eb6873024d8cafa5f862377af9239
+RMD160 (gmplayer-1.0rc10-20060123/neutron-1.5.tar.bz2) = 9434c545386357c540a43c5cb37f70a6308b1ed7
+Size (gmplayer-1.0rc10-20060123/neutron-1.5.tar.bz2) = 369303 bytes
+SHA1 (gmplayer-1.0rc10-20060123/phony-1.1.tar.bz2) = 68189ce1ffca26694edf5440769a1d61b84b70bc
+RMD160 (gmplayer-1.0rc10-20060123/phony-1.1.tar.bz2) = 5fd2b0befc46a995579b3722952a73f2c1b062e5
+Size (gmplayer-1.0rc10-20060123/phony-1.1.tar.bz2) = 386399 bytes
+SHA1 (gmplayer-1.0rc10-20060123/plastic-1.2.tar.bz2) = 414560bfdd660a3b44d1f75adda8c36c437ad2d3
+RMD160 (gmplayer-1.0rc10-20060123/plastic-1.2.tar.bz2) = 3e2bed634d2f7a55313e9d6332c57f48f6b0f761
+Size (gmplayer-1.0rc10-20060123/plastic-1.2.tar.bz2) = 454167 bytes
+SHA1 (gmplayer-1.0rc10-20060123/proton-1.2.tar.bz2) = a5178bc09a75464183abc78c380b5b661a3aaf68
+RMD160 (gmplayer-1.0rc10-20060123/proton-1.2.tar.bz2) = 276e93b2c7cf695fdfa5a723fc6074bfa6405172
+Size (gmplayer-1.0rc10-20060123/proton-1.2.tar.bz2) = 322612 bytes
+SHA1 (gmplayer-1.0rc10-20060123/slim-1.2.tar.bz2) = 3913748d9bfb126ec677e84b068c54fb7111196f
+RMD160 (gmplayer-1.0rc10-20060123/slim-1.2.tar.bz2) = 2ec2b2362c4b89ffbe79421b14f3f5f4341996f1
+Size (gmplayer-1.0rc10-20060123/slim-1.2.tar.bz2) = 398873 bytes
+SHA1 (gmplayer-1.0rc10-20060123/xanim-1.6.tar.bz2) = 1b63395d12bfe6eb63c6aa6ea3b870ddbdd26658
+RMD160 (gmplayer-1.0rc10-20060123/xanim-1.6.tar.bz2) = 5c0f34bb4cd722469402cd69de3c4d75e10611f9
+Size (gmplayer-1.0rc10-20060123/xanim-1.6.tar.bz2) = 94564 bytes
+SHA1 (gmplayer-1.0rc10-20060123/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
+RMD160 (gmplayer-1.0rc10-20060123/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
+Size (gmplayer-1.0rc10-20060123/xine-lcd-1.2.tar.bz2) = 172270 bytes
+SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
+RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
+Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes
+SHA1 (patch-aa) = 446167de0440017c9d746361771d568a8673751c
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
-SHA1 (patch-ae) = b725fce8f4dfb7b06f6de388265ce317f22824e9
-SHA1 (patch-af) = c450e4deba228328460b2fef236721e01b9ce112
+SHA1 (patch-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9
+SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5
+SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
-SHA1 (patch-ag) = 866fff196714d040af49d049c5c8c640717dc1cf
-SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
-SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
-SHA1 (patch-ak) = f095e2824fd54ec7a8ea7a8a59641743c1b65191
-SHA1 (patch-al) = cd378430de97b2492d524764e2f4f010bab4474c
-SHA1 (patch-ba) = bdb20f4ead6f55c0847534b5b1f06ea865e438e6
-SHA1 (patch-bb) = 554ca2074716ada4f817f55be61e808e1dc5c93e
-SHA1 (patch-bc) = c073f6e5d2d71030346fda82ff3a1f474ad49c0f
-SHA1 (patch-bd) = 955397ff200a9fccc133e0547e5fd8c51bb5c6d7
-SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
+SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 291d91cc819..3537ab6cede 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/12/15 15:54:49 heinz Exp $
+# $NetBSD: Makefile,v 1.36 2007/12/21 11:31:12 tron Exp $
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
 
-PKGREVISION=	5
-
 COMMENT=	Simple movie encoder for MPlayer-playable movies
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 7b2d101b7c8..b24a0141808 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.36 2007/12/15 15:14:26 heinz Exp $
+# $NetBSD: Makefile.common,v 1.37 2007/12/21 11:31:13 tron Exp $
 
-MPLAYER_DIST_VERSION=	1.0rc1
+MPLAYER_DIST_VERSION=	1.0rc2
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc9
+MPLAYER_PKG_VERSION=	1.0rc10
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		multimedia
@@ -41,10 +41,7 @@ PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q} \
 			--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
 			--with-extralibdir="${LOCALBASE}/lib" \
-			--with-x11libdir="${X11BASE}/lib" \
-			--with-extraincdir=${X11BASE}/include \
-			--disable-mpdvdkit \
-			--disable-smb
+			--disable-dvdread-internal --disable-smb
 
 ONLY_FOR_COMPILER=	gcc
 
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index 05b92631f75..b7b91b38e8f 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/10/31 22:33:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/12/21 11:31:14 tron Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/HTML/cs/advaudio.html
 share/mplayer/DOCS/HTML/cs/aspect.html
@@ -47,6 +47,7 @@ share/mplayer/DOCS/HTML/cs/menc-feat-extractsub.html
 share/mplayer/DOCS/HTML/cs/menc-feat-handheld-psp.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-quicktime-7.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
@@ -73,7 +74,6 @@ 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/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
@@ -84,11 +84,11 @@ 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/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/de/aalib.html
 share/mplayer/DOCS/HTML/de/advaudio.html
 share/mplayer/DOCS/HTML/de/aspect.html
 share/mplayer/DOCS/HTML/de/audio-codecs.html
@@ -106,6 +106,7 @@ 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/caca.html
 share/mplayer/DOCS/HTML/de/cd-dvd.html
 share/mplayer/DOCS/HTML/de/codec-importing.html
 share/mplayer/DOCS/HTML/de/codecs.html
@@ -113,12 +114,16 @@ 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/dfbmga.html
+share/mplayer/DOCS/HTML/de/dga.html
+share/mplayer/DOCS/HTML/de/directfb.html
 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/fbdev.html
 share/mplayer/DOCS/HTML/de/features.html
 share/mplayer/DOCS/HTML/de/fonts-osd.html
 share/mplayer/DOCS/HTML/de/gui.html
@@ -136,6 +141,7 @@ share/mplayer/DOCS/HTML/de/menc-feat-extractsub.html
 share/mplayer/DOCS/HTML/de/menc-feat-handheld-psp.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-quicktime-7.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
@@ -146,15 +152,16 @@ 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/mga_vid.html
 share/mplayer/DOCS/HTML/de/mpeg_decoders.html
-share/mplayer/DOCS/HTML/de/mpst.html
 share/mplayer/DOCS/HTML/de/mtrr.html
+share/mplayer/DOCS/HTML/de/opengl.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/radio-input.html
 share/mplayer/DOCS/HTML/de/radio.html
 share/mplayer/DOCS/HTML/de/rtc.html
+share/mplayer/DOCS/HTML/de/sdl.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
@@ -162,22 +169,29 @@ 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/svgalib.html
 share/mplayer/DOCS/HTML/de/sync.html
+share/mplayer/DOCS/HTML/de/tdfx_vid.html
+share/mplayer/DOCS/HTML/de/tdfxfb.html
 share/mplayer/DOCS/HTML/de/troubleshooting.html
 share/mplayer/DOCS/HTML/de/tv-input.html
+share/mplayer/DOCS/HTML/de/tv-teletext.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/vcd.html
-share/mplayer/DOCS/HTML/de/video-cards.html
+share/mplayer/DOCS/HTML/de/vesa.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/vidix.html
 share/mplayer/DOCS/HTML/de/windows.html
+share/mplayer/DOCS/HTML/de/x11.html
+share/mplayer/DOCS/HTML/de/xv.html
+share/mplayer/DOCS/HTML/en/aalib.html
 share/mplayer/DOCS/HTML/en/advaudio.html
 share/mplayer/DOCS/HTML/en/aspect.html
 share/mplayer/DOCS/HTML/en/audio-codecs.html
@@ -195,6 +209,7 @@ 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/caca.html
 share/mplayer/DOCS/HTML/en/cd-dvd.html
 share/mplayer/DOCS/HTML/en/codec-importing.html
 share/mplayer/DOCS/HTML/en/codecs.html
@@ -202,12 +217,16 @@ 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/default.css
+share/mplayer/DOCS/HTML/en/dfbmga.html
+share/mplayer/DOCS/HTML/en/dga.html
+share/mplayer/DOCS/HTML/en/directfb.html
 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/fbdev.html
 share/mplayer/DOCS/HTML/en/features.html
 share/mplayer/DOCS/HTML/en/fonts-osd.html
 share/mplayer/DOCS/HTML/en/gui.html
@@ -225,6 +244,7 @@ share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html
 share/mplayer/DOCS/HTML/en/menc-feat-handheld-psp.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-quicktime-7.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
@@ -235,15 +255,16 @@ 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/mga_vid.html
 share/mplayer/DOCS/HTML/en/mpeg_decoders.html
-share/mplayer/DOCS/HTML/en/mpst.html
 share/mplayer/DOCS/HTML/en/mtrr.html
+share/mplayer/DOCS/HTML/en/opengl.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/radio-input.html
 share/mplayer/DOCS/HTML/en/radio.html
 share/mplayer/DOCS/HTML/en/rtc.html
+share/mplayer/DOCS/HTML/en/sdl.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
@@ -251,22 +272,28 @@ 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/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/svgalib.html
 share/mplayer/DOCS/HTML/en/sync.html
+share/mplayer/DOCS/HTML/en/tdfx_vid.html
+share/mplayer/DOCS/HTML/en/tdfxfb.html
 share/mplayer/DOCS/HTML/en/troubleshooting.html
 share/mplayer/DOCS/HTML/en/tv-input.html
+share/mplayer/DOCS/HTML/en/tv-teletext.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/vcd.html
-share/mplayer/DOCS/HTML/en/video-cards.html
+share/mplayer/DOCS/HTML/en/vesa.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/vidix.html
 share/mplayer/DOCS/HTML/en/windows.html
+share/mplayer/DOCS/HTML/en/x11.html
+share/mplayer/DOCS/HTML/en/xv.html
 share/mplayer/DOCS/HTML/es/amiga.html
 share/mplayer/DOCS/HTML/es/aspect.html
 share/mplayer/DOCS/HTML/es/bsd.html
@@ -402,7 +429,6 @@ 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/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
@@ -413,11 +439,11 @@ 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/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/aalib.html
 share/mplayer/DOCS/HTML/hu/advaudio.html
 share/mplayer/DOCS/HTML/hu/aspect.html
 share/mplayer/DOCS/HTML/hu/audio-codecs.html
@@ -435,6 +461,7 @@ 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/caca.html
 share/mplayer/DOCS/HTML/hu/cd-dvd.html
 share/mplayer/DOCS/HTML/hu/codec-importing.html
 share/mplayer/DOCS/HTML/hu/codecs.html
@@ -442,12 +469,16 @@ 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/default.css
+share/mplayer/DOCS/HTML/hu/dfbmga.html
+share/mplayer/DOCS/HTML/hu/dga.html
+share/mplayer/DOCS/HTML/hu/directfb.html
 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/fbdev.html
 share/mplayer/DOCS/HTML/hu/features.html
 share/mplayer/DOCS/HTML/hu/fonts-osd.html
 share/mplayer/DOCS/HTML/hu/gui.html
@@ -465,6 +496,7 @@ share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html
 share/mplayer/DOCS/HTML/hu/menc-feat-handheld-psp.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-quicktime-7.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
@@ -475,15 +507,16 @@ 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/mga_vid.html
 share/mplayer/DOCS/HTML/hu/mpeg_decoders.html
-share/mplayer/DOCS/HTML/hu/mpst.html
 share/mplayer/DOCS/HTML/hu/mtrr.html
+share/mplayer/DOCS/HTML/hu/opengl.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/radio-input.html
 share/mplayer/DOCS/HTML/hu/radio.html
 share/mplayer/DOCS/HTML/hu/rtc.html
+share/mplayer/DOCS/HTML/hu/sdl.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
@@ -491,22 +524,130 @@ 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/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/svgalib.html
 share/mplayer/DOCS/HTML/hu/sync.html
+share/mplayer/DOCS/HTML/hu/tdfx_vid.html
+share/mplayer/DOCS/HTML/hu/tdfxfb.html
 share/mplayer/DOCS/HTML/hu/troubleshooting.html
 share/mplayer/DOCS/HTML/hu/tv-input.html
+share/mplayer/DOCS/HTML/hu/tv-teletext.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/vcd.html
-share/mplayer/DOCS/HTML/hu/video-cards.html
+share/mplayer/DOCS/HTML/hu/vesa.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/vidix.html
 share/mplayer/DOCS/HTML/hu/windows.html
+share/mplayer/DOCS/HTML/hu/x11.html
+share/mplayer/DOCS/HTML/hu/xv.html
+share/mplayer/DOCS/HTML/it/aalib.html
+share/mplayer/DOCS/HTML/it/advaudio.html
+share/mplayer/DOCS/HTML/it/aspect.html
+share/mplayer/DOCS/HTML/it/audio-codecs.html
+share/mplayer/DOCS/HTML/it/audio-formats.html
+share/mplayer/DOCS/HTML/it/audio.html
+share/mplayer/DOCS/HTML/it/bsd.html
+share/mplayer/DOCS/HTML/it/bugreports.html
+share/mplayer/DOCS/HTML/it/bugreports_advusers.html
+share/mplayer/DOCS/HTML/it/bugreports_fix.html
+share/mplayer/DOCS/HTML/it/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/it/bugreports_report.html
+share/mplayer/DOCS/HTML/it/bugreports_security.html
+share/mplayer/DOCS/HTML/it/bugreports_what.html
+share/mplayer/DOCS/HTML/it/bugreports_where.html
+share/mplayer/DOCS/HTML/it/bugs-audio.html
+share/mplayer/DOCS/HTML/it/bugs-special.html
+share/mplayer/DOCS/HTML/it/bugs.html
+share/mplayer/DOCS/HTML/it/caca.html
+share/mplayer/DOCS/HTML/it/cd-dvd.html
+share/mplayer/DOCS/HTML/it/codec-importing.html
+share/mplayer/DOCS/HTML/it/codecs.html
+share/mplayer/DOCS/HTML/it/commandline.html
+share/mplayer/DOCS/HTML/it/containers.html
+share/mplayer/DOCS/HTML/it/control.html
+share/mplayer/DOCS/HTML/it/default.css
+share/mplayer/DOCS/HTML/it/dfbmga.html
+share/mplayer/DOCS/HTML/it/dga.html
+share/mplayer/DOCS/HTML/it/directfb.html
+share/mplayer/DOCS/HTML/it/drives.html
+share/mplayer/DOCS/HTML/it/dvd.html
+share/mplayer/DOCS/HTML/it/edl.html
+share/mplayer/DOCS/HTML/it/encoding-guide.html
+share/mplayer/DOCS/HTML/it/exotic_platforms.html
+share/mplayer/DOCS/HTML/it/faq.html
+share/mplayer/DOCS/HTML/it/fbdev.html
+share/mplayer/DOCS/HTML/it/features.html
+share/mplayer/DOCS/HTML/it/fonts-osd.html
+share/mplayer/DOCS/HTML/it/gui.html
+share/mplayer/DOCS/HTML/it/history.html
+share/mplayer/DOCS/HTML/it/howtoread.html
+share/mplayer/DOCS/HTML/it/index.html
+share/mplayer/DOCS/HTML/it/install.html
+share/mplayer/DOCS/HTML/it/intro.html
+share/mplayer/DOCS/HTML/it/linux.html
+share/mplayer/DOCS/HTML/it/macos.html
+share/mplayer/DOCS/HTML/it/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/it/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/it/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/it/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/it/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/it/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/it/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/it/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/it/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/it/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/it/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/it/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/it/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/it/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/it/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/it/menc-feat-x264.html
+share/mplayer/DOCS/HTML/it/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/it/mencoder.html
+share/mplayer/DOCS/HTML/it/mga_vid.html
+share/mplayer/DOCS/HTML/it/mpeg_decoders.html
+share/mplayer/DOCS/HTML/it/mtrr.html
+share/mplayer/DOCS/HTML/it/opengl.html
+share/mplayer/DOCS/HTML/it/other.html
+share/mplayer/DOCS/HTML/it/ports.html
+share/mplayer/DOCS/HTML/it/radio-input.html
+share/mplayer/DOCS/HTML/it/radio.html
+share/mplayer/DOCS/HTML/it/rtc.html
+share/mplayer/DOCS/HTML/it/sdl.html
+share/mplayer/DOCS/HTML/it/skin-file.html
+share/mplayer/DOCS/HTML/it/skin-fonts.html
+share/mplayer/DOCS/HTML/it/skin-gui.html
+share/mplayer/DOCS/HTML/it/skin-overview.html
+share/mplayer/DOCS/HTML/it/skin-quality.html
+share/mplayer/DOCS/HTML/it/skin.html
+share/mplayer/DOCS/HTML/it/softreq.html
+share/mplayer/DOCS/HTML/it/streaming.html
+share/mplayer/DOCS/HTML/it/subosd.html
+share/mplayer/DOCS/HTML/it/svgalib.html
+share/mplayer/DOCS/HTML/it/sync.html
+share/mplayer/DOCS/HTML/it/tdfx_vid.html
+share/mplayer/DOCS/HTML/it/tdfxfb.html
+share/mplayer/DOCS/HTML/it/troubleshooting.html
+share/mplayer/DOCS/HTML/it/tv-input.html
+share/mplayer/DOCS/HTML/it/tv.html
+share/mplayer/DOCS/HTML/it/tvout.html
+share/mplayer/DOCS/HTML/it/unix.html
+share/mplayer/DOCS/HTML/it/usage.html
+share/mplayer/DOCS/HTML/it/vcd.html
+share/mplayer/DOCS/HTML/it/vesa.html
+share/mplayer/DOCS/HTML/it/video-codecs.html
+share/mplayer/DOCS/HTML/it/video-formats.html
+share/mplayer/DOCS/HTML/it/video.html
+share/mplayer/DOCS/HTML/it/vidix.html
+share/mplayer/DOCS/HTML/it/windows.html
+share/mplayer/DOCS/HTML/it/x11.html
+share/mplayer/DOCS/HTML/it/xv.html
 share/mplayer/DOCS/HTML/pl/advaudio.html
 share/mplayer/DOCS/HTML/pl/aspect.html
 share/mplayer/DOCS/HTML/pl/audio-codecs.html
@@ -537,13 +678,13 @@ share/mplayer/DOCS/HTML/pl/encoding-guide.html
 share/mplayer/DOCS/HTML/pl/exotic_platforms.html
 share/mplayer/DOCS/HTML/pl/faq.html
 share/mplayer/DOCS/HTML/pl/features.html
+share/mplayer/DOCS/HTML/pl/fonts-osd.html
 share/mplayer/DOCS/HTML/pl/formats.html
 share/mplayer/DOCS/HTML/pl/gui.html
 share/mplayer/DOCS/HTML/pl/history.html
 share/mplayer/DOCS/HTML/pl/howtoread.html
 share/mplayer/DOCS/HTML/pl/index.html
 share/mplayer/DOCS/HTML/pl/install.html
-share/mplayer/DOCS/HTML/pl/installation_codecs.html
 share/mplayer/DOCS/HTML/pl/intro.html
 share/mplayer/DOCS/HTML/pl/linux.html
 share/mplayer/DOCS/HTML/pl/macos.html
@@ -551,6 +692,7 @@ share/mplayer/DOCS/HTML/pl/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/pl/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/pl/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/pl/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/pl/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/pl/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-rescale.html
@@ -578,7 +720,6 @@ share/mplayer/DOCS/HTML/pl/skin-overview.html
 share/mplayer/DOCS/HTML/pl/skin-quality.html
 share/mplayer/DOCS/HTML/pl/skin.html
 share/mplayer/DOCS/HTML/pl/softreq.html
-share/mplayer/DOCS/HTML/pl/sound-cards.html
 share/mplayer/DOCS/HTML/pl/streaming.html
 share/mplayer/DOCS/HTML/pl/subosd.html
 share/mplayer/DOCS/HTML/pl/sync.html
@@ -589,11 +730,11 @@ share/mplayer/DOCS/HTML/pl/tvout.html
 share/mplayer/DOCS/HTML/pl/unix.html
 share/mplayer/DOCS/HTML/pl/usage.html
 share/mplayer/DOCS/HTML/pl/vcd.html
-share/mplayer/DOCS/HTML/pl/video-cards.html
 share/mplayer/DOCS/HTML/pl/video-codecs.html
 share/mplayer/DOCS/HTML/pl/video-formats.html
 share/mplayer/DOCS/HTML/pl/video.html
 share/mplayer/DOCS/HTML/pl/windows.html
+share/mplayer/DOCS/HTML/ru/aalib.html
 share/mplayer/DOCS/HTML/ru/advaudio.html
 share/mplayer/DOCS/HTML/ru/aspect.html
 share/mplayer/DOCS/HTML/ru/audio-codecs.html
@@ -611,6 +752,7 @@ share/mplayer/DOCS/HTML/ru/bugreports_where.html
 share/mplayer/DOCS/HTML/ru/bugs-audio.html
 share/mplayer/DOCS/HTML/ru/bugs-special.html
 share/mplayer/DOCS/HTML/ru/bugs.html
+share/mplayer/DOCS/HTML/ru/caca.html
 share/mplayer/DOCS/HTML/ru/cd-dvd.html
 share/mplayer/DOCS/HTML/ru/codec-importing.html
 share/mplayer/DOCS/HTML/ru/codecs.html
@@ -618,12 +760,16 @@ share/mplayer/DOCS/HTML/ru/commandline.html
 share/mplayer/DOCS/HTML/ru/containers.html
 share/mplayer/DOCS/HTML/ru/control.html
 share/mplayer/DOCS/HTML/ru/default.css
+share/mplayer/DOCS/HTML/ru/dfbmga.html
+share/mplayer/DOCS/HTML/ru/dga.html
+share/mplayer/DOCS/HTML/ru/directfb.html
 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/exotic_platforms.html
 share/mplayer/DOCS/HTML/ru/faq.html
+share/mplayer/DOCS/HTML/ru/fbdev.html
 share/mplayer/DOCS/HTML/ru/features.html
 share/mplayer/DOCS/HTML/ru/fonts-osd.html
 share/mplayer/DOCS/HTML/ru/gui.html
@@ -641,6 +787,7 @@ share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html
 share/mplayer/DOCS/HTML/ru/menc-feat-handheld-psp.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-quicktime-7.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
@@ -651,15 +798,16 @@ 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/mga_vid.html
 share/mplayer/DOCS/HTML/ru/mpeg_decoders.html
-share/mplayer/DOCS/HTML/ru/mpst.html
 share/mplayer/DOCS/HTML/ru/mtrr.html
+share/mplayer/DOCS/HTML/ru/opengl.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/radio-input.html
 share/mplayer/DOCS/HTML/ru/radio.html
 share/mplayer/DOCS/HTML/ru/rtc.html
+share/mplayer/DOCS/HTML/ru/sdl.html
 share/mplayer/DOCS/HTML/ru/skin-file.html
 share/mplayer/DOCS/HTML/ru/skin-fonts.html
 share/mplayer/DOCS/HTML/ru/skin-gui.html
@@ -667,22 +815,131 @@ 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/softreq.html
-share/mplayer/DOCS/HTML/ru/sound-cards.html
 share/mplayer/DOCS/HTML/ru/streaming.html
 share/mplayer/DOCS/HTML/ru/subosd.html
+share/mplayer/DOCS/HTML/ru/svgalib.html
 share/mplayer/DOCS/HTML/ru/sync.html
+share/mplayer/DOCS/HTML/ru/tdfx_vid.html
+share/mplayer/DOCS/HTML/ru/tdfxfb.html
 share/mplayer/DOCS/HTML/ru/troubleshooting.html
 share/mplayer/DOCS/HTML/ru/tv-input.html
+share/mplayer/DOCS/HTML/ru/tv-teletext.html
 share/mplayer/DOCS/HTML/ru/tv.html
 share/mplayer/DOCS/HTML/ru/tvout.html
 share/mplayer/DOCS/HTML/ru/unix.html
 share/mplayer/DOCS/HTML/ru/usage.html
 share/mplayer/DOCS/HTML/ru/vcd.html
-share/mplayer/DOCS/HTML/ru/video-cards.html
+share/mplayer/DOCS/HTML/ru/vesa.html
 share/mplayer/DOCS/HTML/ru/video-codecs.html
 share/mplayer/DOCS/HTML/ru/video-formats.html
 share/mplayer/DOCS/HTML/ru/video.html
+share/mplayer/DOCS/HTML/ru/vidix.html
 share/mplayer/DOCS/HTML/ru/windows.html
+share/mplayer/DOCS/HTML/ru/x11.html
+share/mplayer/DOCS/HTML/ru/xv.html
+share/mplayer/DOCS/HTML/zh_CN/aalib.html
+share/mplayer/DOCS/HTML/zh_CN/advaudio.html
+share/mplayer/DOCS/HTML/zh_CN/aspect.html
+share/mplayer/DOCS/HTML/zh_CN/audio-codecs.html
+share/mplayer/DOCS/HTML/zh_CN/audio-formats.html
+share/mplayer/DOCS/HTML/zh_CN/audio.html
+share/mplayer/DOCS/HTML/zh_CN/bsd.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_advusers.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_fix.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_report.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_security.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_what.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_where.html
+share/mplayer/DOCS/HTML/zh_CN/bugs-audio.html
+share/mplayer/DOCS/HTML/zh_CN/bugs-special.html
+share/mplayer/DOCS/HTML/zh_CN/bugs.html
+share/mplayer/DOCS/HTML/zh_CN/caca.html
+share/mplayer/DOCS/HTML/zh_CN/cd-dvd.html
+share/mplayer/DOCS/HTML/zh_CN/codec-importing.html
+share/mplayer/DOCS/HTML/zh_CN/codecs.html
+share/mplayer/DOCS/HTML/zh_CN/commandline.html
+share/mplayer/DOCS/HTML/zh_CN/containers.html
+share/mplayer/DOCS/HTML/zh_CN/control.html
+share/mplayer/DOCS/HTML/zh_CN/default.css
+share/mplayer/DOCS/HTML/zh_CN/dfbmga.html
+share/mplayer/DOCS/HTML/zh_CN/dga.html
+share/mplayer/DOCS/HTML/zh_CN/directfb.html
+share/mplayer/DOCS/HTML/zh_CN/drives.html
+share/mplayer/DOCS/HTML/zh_CN/dvd.html
+share/mplayer/DOCS/HTML/zh_CN/edl.html
+share/mplayer/DOCS/HTML/zh_CN/encoding-guide.html
+share/mplayer/DOCS/HTML/zh_CN/exotic_platforms.html
+share/mplayer/DOCS/HTML/zh_CN/faq.html
+share/mplayer/DOCS/HTML/zh_CN/fbdev.html
+share/mplayer/DOCS/HTML/zh_CN/features.html
+share/mplayer/DOCS/HTML/zh_CN/fonts-osd.html
+share/mplayer/DOCS/HTML/zh_CN/gui.html
+share/mplayer/DOCS/HTML/zh_CN/history.html
+share/mplayer/DOCS/HTML/zh_CN/howtoread.html
+share/mplayer/DOCS/HTML/zh_CN/index.html
+share/mplayer/DOCS/HTML/zh_CN/install.html
+share/mplayer/DOCS/HTML/zh_CN/intro.html
+share/mplayer/DOCS/HTML/zh_CN/linux.html
+share/mplayer/DOCS/HTML/zh_CN/macos.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-x264.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/zh_CN/mencoder.html
+share/mplayer/DOCS/HTML/zh_CN/mga_vid.html
+share/mplayer/DOCS/HTML/zh_CN/mpeg_decoders.html
+share/mplayer/DOCS/HTML/zh_CN/mtrr.html
+share/mplayer/DOCS/HTML/zh_CN/opengl.html
+share/mplayer/DOCS/HTML/zh_CN/other.html
+share/mplayer/DOCS/HTML/zh_CN/ports.html
+share/mplayer/DOCS/HTML/zh_CN/radio-input.html
+share/mplayer/DOCS/HTML/zh_CN/radio.html
+share/mplayer/DOCS/HTML/zh_CN/rtc.html
+share/mplayer/DOCS/HTML/zh_CN/sdl.html
+share/mplayer/DOCS/HTML/zh_CN/skin-file.html
+share/mplayer/DOCS/HTML/zh_CN/skin-fonts.html
+share/mplayer/DOCS/HTML/zh_CN/skin-gui.html
+share/mplayer/DOCS/HTML/zh_CN/skin-overview.html
+share/mplayer/DOCS/HTML/zh_CN/skin-quality.html
+share/mplayer/DOCS/HTML/zh_CN/skin.html
+share/mplayer/DOCS/HTML/zh_CN/softreq.html
+share/mplayer/DOCS/HTML/zh_CN/streaming.html
+share/mplayer/DOCS/HTML/zh_CN/subosd.html
+share/mplayer/DOCS/HTML/zh_CN/svgalib.html
+share/mplayer/DOCS/HTML/zh_CN/sync.html
+share/mplayer/DOCS/HTML/zh_CN/tdfx_vid.html
+share/mplayer/DOCS/HTML/zh_CN/tdfxfb.html
+share/mplayer/DOCS/HTML/zh_CN/troubleshooting.html
+share/mplayer/DOCS/HTML/zh_CN/tv-input.html
+share/mplayer/DOCS/HTML/zh_CN/tv-teletext.html
+share/mplayer/DOCS/HTML/zh_CN/tv.html
+share/mplayer/DOCS/HTML/zh_CN/tvout.html
+share/mplayer/DOCS/HTML/zh_CN/unix.html
+share/mplayer/DOCS/HTML/zh_CN/usage.html
+share/mplayer/DOCS/HTML/zh_CN/vcd.html
+share/mplayer/DOCS/HTML/zh_CN/vesa.html
+share/mplayer/DOCS/HTML/zh_CN/video-codecs.html
+share/mplayer/DOCS/HTML/zh_CN/video-formats.html
+share/mplayer/DOCS/HTML/zh_CN/video.html
+share/mplayer/DOCS/HTML/zh_CN/vidix.html
+share/mplayer/DOCS/HTML/zh_CN/windows.html
+share/mplayer/DOCS/HTML/zh_CN/x11.html
+share/mplayer/DOCS/HTML/zh_CN/xv.html
 share/mplayer/DOCS/README
 share/mplayer/DOCS/default.css
 share/mplayer/DOCS/man/cs/mplayer.1
@@ -693,7 +950,7 @@ share/mplayer/DOCS/man/fr/mplayer.1
 share/mplayer/DOCS/man/hu/mplayer.1
 share/mplayer/DOCS/man/it/mplayer.1
 share/mplayer/DOCS/man/pl/mplayer.1
-share/mplayer/DOCS/man/sv/mplayer.1
+share/mplayer/DOCS/man/ru/mplayer.1
 share/mplayer/DOCS/man/zh/mplayer.1
 share/mplayer/DOCS/tech/Doxyfile
 share/mplayer/DOCS/tech/MAINTAINERS
@@ -705,6 +962,7 @@ share/mplayer/DOCS/tech/codecs-in.html
 share/mplayer/DOCS/tech/codecs.conf.txt
 share/mplayer/DOCS/tech/colorspaces.txt
 share/mplayer/DOCS/tech/dr-methods.txt
+share/mplayer/DOCS/tech/dvdnav-howto.txt
 share/mplayer/DOCS/tech/encoding-guide.txt
 share/mplayer/DOCS/tech/encoding-tips.txt
 share/mplayer/DOCS/tech/formats.txt
@@ -718,6 +976,7 @@ share/mplayer/DOCS/tech/mirrors/mirror_howto.txt
 share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync
 share/mplayer/DOCS/tech/mpdsf.txt
 share/mplayer/DOCS/tech/mpsub.sub
+share/mplayer/DOCS/tech/new_policy_proposal.txt
 share/mplayer/DOCS/tech/nut.txt
 share/mplayer/DOCS/tech/oggless-xiph-codecs.txt
 share/mplayer/DOCS/tech/osd.txt
@@ -858,6 +1117,22 @@ 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/video.xml
+share/mplayer/DOCS/xml/it/Makefile
+share/mplayer/DOCS/xml/it/audio.xml
+share/mplayer/DOCS/xml/it/bugreports.xml
+share/mplayer/DOCS/xml/it/bugs.xml
+share/mplayer/DOCS/xml/it/cd-dvd.xml
+share/mplayer/DOCS/xml/it/codecs.xml
+share/mplayer/DOCS/xml/it/containers.xml
+share/mplayer/DOCS/xml/it/documentation.xml
+share/mplayer/DOCS/xml/it/faq.xml
+share/mplayer/DOCS/xml/it/history.xml
+share/mplayer/DOCS/xml/it/install.xml
+share/mplayer/DOCS/xml/it/mencoder.xml
+share/mplayer/DOCS/xml/it/radio.xml
+share/mplayer/DOCS/xml/it/tvinput.xml
+share/mplayer/DOCS/xml/it/usage.xml
+share/mplayer/DOCS/xml/it/video.xml
 share/mplayer/DOCS/xml/ldp.dsl
 share/mplayer/DOCS/xml/pl/Makefile
 share/mplayer/DOCS/xml/pl/audio.xml
@@ -889,11 +1164,9 @@ share/mplayer/DOCS/xml/ru/cd-dvd.xml
 share/mplayer/DOCS/xml/ru/codecs.xml
 share/mplayer/DOCS/xml/ru/containers.xml
 share/mplayer/DOCS/xml/ru/documentation.xml
+share/mplayer/DOCS/xml/ru/encoding-guide.xml
 share/mplayer/DOCS/xml/ru/faq.xml
 share/mplayer/DOCS/xml/ru/history.xml
-share/mplayer/DOCS/xml/ru/html-chunk.xsl
-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/mencoder.xml
 share/mplayer/DOCS/xml/ru/ports.xml
@@ -906,23 +1179,21 @@ share/mplayer/DOCS/xml/xsl/ldp-html-chunk.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html.xsl
 share/mplayer/DOCS/xml/xsl/ldp-print.xsl
-share/mplayer/DOCS/zh/bugreports.html
-share/mplayer/DOCS/zh/cd-dvd.html
-share/mplayer/DOCS/zh/codecs.html
-share/mplayer/DOCS/zh/documentation.html
-share/mplayer/DOCS/zh/encoding.html
-share/mplayer/DOCS/zh/faq.html
-share/mplayer/DOCS/zh/formats.html
-share/mplayer/DOCS/zh/skin.html
-share/mplayer/DOCS/zh/sound.html
-share/mplayer/DOCS/zh/users_against_developers.html
-share/mplayer/DOCS/zh/video.html
+share/mplayer/DOCS/xml/zh_CN/Makefile
+share/mplayer/DOCS/xml/zh_CN/audio.xml
+share/mplayer/DOCS/xml/zh_CN/bugreports.xml
+share/mplayer/DOCS/xml/zh_CN/bugs.xml
+share/mplayer/DOCS/xml/zh_CN/cd-dvd.xml
+share/mplayer/DOCS/xml/zh_CN/documentation.xml
+share/mplayer/DOCS/xml/zh_CN/mencoder.xml
+share/mplayer/DOCS/xml/zh_CN/radio.xml
 share/mplayer/codecs.conf
 share/mplayer/input.conf
-@dirrm share/mplayer/DOCS/zh
+@dirrm share/mplayer/DOCS/xml/zh_CN
 @dirrm share/mplayer/DOCS/xml/xsl
 @dirrm share/mplayer/DOCS/xml/ru
 @dirrm share/mplayer/DOCS/xml/pl
+@dirrm share/mplayer/DOCS/xml/it
 @dirrm share/mplayer/DOCS/xml/hu
 @dirrm share/mplayer/DOCS/xml/fr
 @dirrm share/mplayer/DOCS/xml/es
@@ -934,7 +1205,7 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/tech/mirrors
 @dirrm share/mplayer/DOCS/tech
 @dirrm share/mplayer/DOCS/man/zh
-@dirrm share/mplayer/DOCS/man/sv
+@dirrm share/mplayer/DOCS/man/ru
 @dirrm share/mplayer/DOCS/man/pl
 @dirrm share/mplayer/DOCS/man/it
 @dirrm share/mplayer/DOCS/man/hu
@@ -944,8 +1215,10 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/man/de
 @dirrm share/mplayer/DOCS/man/cs
 @dirrm share/mplayer/DOCS/man
+@dirrm share/mplayer/DOCS/HTML/zh_CN
 @dirrm share/mplayer/DOCS/HTML/ru
 @dirrm share/mplayer/DOCS/HTML/pl
+@dirrm share/mplayer/DOCS/HTML/it
 @dirrm share/mplayer/DOCS/HTML/hu
 @dirrm share/mplayer/DOCS/HTML/fr
 @dirrm share/mplayer/DOCS/HTML/es
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index d1f1404d5f7..f846ca580df 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,22 +1,14 @@
-$NetBSD: distinfo,v 1.43 2007/12/18 22:57:43 tron Exp $
+$NetBSD: distinfo,v 1.44 2007/12/21 11:31:14 tron Exp $
 
-SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
-RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
-Size (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
-SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
+SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
+RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
+Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes
+SHA1 (patch-aa) = 446167de0440017c9d746361771d568a8673751c
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
-SHA1 (patch-ae) = b725fce8f4dfb7b06f6de388265ce317f22824e9
-SHA1 (patch-af) = c450e4deba228328460b2fef236721e01b9ce112
-SHA1 (patch-ag) = 866fff196714d040af49d049c5c8c640717dc1cf
+SHA1 (patch-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9
+SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5
+SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
-SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
-SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
-SHA1 (patch-ak) = f095e2824fd54ec7a8ea7a8a59641743c1b65191
-SHA1 (patch-al) = cd378430de97b2492d524764e2f4f010bab4474c
-SHA1 (patch-ba) = bdb20f4ead6f55c0847534b5b1f06ea865e438e6
-SHA1 (patch-bb) = 554ca2074716ada4f817f55be61e808e1dc5c93e
-SHA1 (patch-bc) = c073f6e5d2d71030346fda82ff3a1f474ad49c0f
-SHA1 (patch-bd) = 955397ff200a9fccc133e0547e5fd8c51bb5c6d7
-SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
+SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 6008ff71727..79b9a8b53a9 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2007/09/06 18:31:00 abs Exp $
+# $NetBSD: options.mk,v 1.23 2007/12/21 11:31:14 tron Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -69,6 +69,11 @@ PKG_SUGGESTED_OPTIONS+=	${_o_}
 .endfor
 
 # -------------------------------------------------------------------------
+# Handle extra libraries (part 1)
+# -------------------------------------------------------------------------
+EXTRA_LIBS=
+
+# -------------------------------------------------------------------------
 # Handle chosen options.
 # -------------------------------------------------------------------------
 
@@ -80,6 +85,7 @@ PKG_SUGGESTED_OPTIONS+=	${_o_}
 
 .if !empty(PKG_OPTIONS:Marts)
 CONFIGURE_ARGS+=	--enable-arts
+EXTRA_LIBS+=		-lartsc
 .  include "../../audio/arts/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-arts
@@ -93,10 +99,10 @@ CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
 
 .if !empty(PKG_OPTIONS:Mdts)
-CONFIGURE_ARGS+=	--enable-libdts
+CONFIGURE_ARGS+=	--enable-libdca
 .  include "../../audio/libdca/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-libdts
+CONFIGURE_ARGS+=	--disable-libdca
 .endif
 
 .if !empty(PKG_OPTIONS:Mdv)
@@ -182,7 +188,7 @@ CONFIGURE_ARGS+=	--disable-menu
 EVAL_PREFIX+=		PREFIX.realplayer-codecs=realplayer-codecs
 PREFIX.realplayer-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-real
-CONFIGURE_ARGS+=	--with-reallibdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
+CONFIGURE_ARGS+=	--realcodecsdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
 DEPENDS+=		realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs
 .else
 CONFIGURE_ARGS+=	--disable-real
@@ -197,11 +203,11 @@ CONFIGURE_ARGS+=	--disable-runtime-cpudetection
 .if !empty(PKG_OPTIONS:Mmplayer-win32)
 EVAL_PREFIX+=		PREFIX.win32-codecs=win32-codecs
 PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
-CONFIGURE_ARGS+=	--enable-win32
-CONFIGURE_ARGS+=	--with-win32libdir="${PREFIX.win32-codecs}/lib/win32"
+CONFIGURE_ARGS+=	--enable-win32dll
+CONFIGURE_ARGS+=	--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=		win32-codecs>=011227:../../multimedia/win32-codecs
 .else
-CONFIGURE_ARGS+=	--disable-win32
+CONFIGURE_ARGS+=	--disable-win32dll
 .endif
 
 .if !empty(PKG_OPTIONS:Mnas)
@@ -246,9 +252,17 @@ CONFIGURE_ARGS+=	--disable-libvorbis
 
 .if !empty(PKG_OPTIONS:Mxvid)
 CONFIGURE_ARGS+=	--enable-xvid
+EXTRA_LIBS+=		-lxvidcore
 .  include "../../multimedia/xvidcore/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
+# -------------------------------------------------------------------------
+# Handle extra libraries (part 1)
+# -------------------------------------------------------------------------
+.if ${EXTRA_LIBS} != ""
+CONFIGURE_ARGS+=	--extra-libs=${EXTRA_LIBS:C/^ //:Q}
+.endif
+
 .endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 900de4bd07e..ae360cd4659 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.17 2006/10/31 22:33:28 wiz Exp $
+$NetBSD: patch-aa,v 1.18 2007/12/21 11:31:15 tron Exp $
 
---- configure.orig	2006-10-22 22:32:31.000000000 +0000
-+++ configure
-@@ -515,7 +515,7 @@ for ac_option do
+--- configure.orig	2007-10-07 20:49:33.000000000 +0100
++++ configure	2007-12-19 13:38:13.000000000 +0000
+@@ -718,7 +718,7 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
 -    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
 +    _ld_extra="${_ld_extra} -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'`
      ;;
-   --extra-libs=*)
-     _extra_libs=`echo $ac_option | cut -d '=' -f 2`
-@@ -719,11 +719,11 @@ if test "$_gcc_check" = yes ; then
+ 
+   --with-install=*)
+@@ -1411,11 +1411,11 @@
    esac
    echores "$cc_version"
   else
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.17 2006/10/31 22:33:28 wiz Exp $
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -855,7 +855,7 @@ if x86 || x86_64 ; then
+@@ -1548,7 +1548,7 @@
    # 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`
@@ -34,20 +34,20 @@ $NetBSD: patch-aa,v 1.17 2006/10/31 22:33:28 wiz 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`
  
-@@ -3034,7 +3034,6 @@ fi
- echores "$_pthreads"
+@@ -3098,7 +3098,6 @@
+ echores "$_w32threads"
  
  echocheck "rpath"
 -netbsd &&_rpath=yes
  if test "$_rpath" = yes ; then
    for I in `echo $_ld_extra | sed 's/-L//g'` ; do
      tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
-@@ -4192,7 +4191,7 @@ fi
+@@ -4368,7 +4367,7 @@
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then
--    _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
-+    _ld_aa=`${AALIB_CONFIG} --libs | cut -d " " -f 2,5,6`
+-    _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
++    _libs_mplayer="$_libs_mplayer `${AALIB_CONFIG} --libs | cut -d " " -f 2,5,6`"
    fi
    _vosrc="$_vosrc vo_aa.c"
    _vomodules="aa $_vomodules"
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
index 0416ef39e00..7de611841c2 100644
--- a/multimedia/mplayer-share/patches/patch-ae
+++ b/multimedia/mplayer-share/patches/patch-ae
@@ -1,31 +1,13 @@
-$NetBSD: patch-ae,v 1.7 2007/06/07 13:19:54 tron Exp $
+$NetBSD: patch-ae,v 1.8 2007/12/21 11:31:15 tron Exp $
 
---- stream/stream_cddb.c.orig	2006-10-22 23:32:25.000000000 +0100
-+++ stream/stream_cddb.c	2007-06-07 13:57:35.000000000 +0100
-@@ -435,7 +435,7 @@
+--- libvo/aclib.c.orig	2007-10-07 20:49:28.000000000 +0100
++++ libvo/aclib.c	2007-12-20 21:37:53.000000000 +0000
+@@ -18,7 +18,7 @@
+ //Feel free to fine-tune the above 2, it might be possible to get some speedup with them :)
+ 
+ //#define STATISTICS
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) && !defined(__APPLE__)
+ #define CAN_COMPILE_X86_ASM
+ #endif
  
- 	switch(status) {
- 		case 210:
--			ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id);
-+			ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id);
- 			if( ret!=3 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
-@@ -496,7 +496,7 @@
- 	ptr++;
- 	// We have a list of exact/inexact matches, so which one do we use?
- 	// So let's take the first one.
--	ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title);
-+	ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title);
- 	if( ret!=3 ) {
- 		mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 		return -1;
-@@ -533,7 +533,7 @@
- 	switch(status) {
- 		case 200:
- 			// Found exact match
--			ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
-+			ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
- 			if( ret!=4 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
diff --git a/multimedia/mplayer-share/patches/patch-af b/multimedia/mplayer-share/patches/patch-af
index 6668f773e06..edacb200131 100644
--- a/multimedia/mplayer-share/patches/patch-af
+++ b/multimedia/mplayer-share/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 2007/07/05 05:18:51 wiz Exp $
+$NetBSD: patch-af,v 1.4 2007/12/21 11:31:16 tron Exp $
 
---- libavcodec/h264.c.orig	2006-10-22 22:32:34.000000000 +0000
-+++ libavcodec/h264.c
-@@ -6034,7 +6034,7 @@ static int inline get_cabac_cbf_ctx( H26
+--- libavcodec/h264.c.orig	2007-10-07 20:49:36.000000000 +0100
++++ libavcodec/h264.c	2007-12-19 13:39:30.000000000 +0000
+@@ -5241,7 +5241,7 @@
      return ctx + 4 * cat;
  }
  
--static const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
-+const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
+-static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
++const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
      0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
      2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
      3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
diff --git a/multimedia/mplayer-share/patches/patch-ag b/multimedia/mplayer-share/patches/patch-ag
index cba486bed67..db02fd1600a 100644
--- a/multimedia/mplayer-share/patches/patch-ag
+++ b/multimedia/mplayer-share/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2007/12/18 22:58:53 tron Exp $
+$NetBSD: patch-ag,v 1.4 2007/12/21 11:31:16 tron Exp $
 
---- loader/wine/poppack.h.orig	2006-10-22 23:32:30.000000000 +0100
-+++ loader/wine/poppack.h	2007-12-18 22:56:25.000000000 +0000
-@@ -2,7 +2,7 @@
- #undef __WINE_PSHPACK_H
+--- libvo/osd.c.orig	2007-10-07 20:49:28.000000000 +0100
++++ libvo/osd.c	2007-12-20 21:37:45.000000000 +0000
+@@ -12,7 +12,7 @@
+ #include "cpudetect.h"
+ #include "mangle.h"
+ 
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) && !defined(__APPLE__)
+ #define CAN_COMPILE_X86_ASM
+ #endif
  
- #if defined(__GNUC__) || defined(__SUNPRO_C)
--#pragma pack()
-+// #pragma pack()
- #elif defined(__SUNPRO_CC)
- #warning "Assumes default alignment is 4"
- #pragma pack(4)
diff --git a/multimedia/mplayer-share/patches/patch-ai b/multimedia/mplayer-share/patches/patch-ai
deleted file mode 100644
index 73fcb2f98dd..00000000000
--- a/multimedia/mplayer-share/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2007/01/25 18:31:16 drochner Exp $
-
---- libmpdvdkit2/dvd_reader.c.orig	2007-01-24 22:25:53.000000000 +0100
-+++ libmpdvdkit2/dvd_reader.c
-@@ -549,10 +549,12 @@ static int findDirFile( const char *path
-             sprintf( filename, "%s%s%s", path,
-                      ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
-                      ent->d_name );
-+	    closedir( dir );
-             return 0;
-         }
-     }
- 
-+    closedir( dir );
-     return -1;
- }
- 
diff --git a/multimedia/mplayer-share/patches/patch-aj b/multimedia/mplayer-share/patches/patch-aj
deleted file mode 100644
index 0840cfd521e..00000000000
--- a/multimedia/mplayer-share/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2007/01/25 18:31:16 drochner Exp $
-
---- libmpdvdkit2/dvd_input.c.orig	2007-01-24 22:27:49.000000000 +0100
-+++ libmpdvdkit2/dvd_input.c
-@@ -238,6 +238,7 @@ static int file_read(dvd_input_t dev, vo
-       return (int) (bytes / DVD_VIDEO_LB_LEN);
-     }
-     
-+    buffer += ret;
-     len -= ret;
-   }
- 
diff --git a/multimedia/mplayer-share/patches/patch-ak b/multimedia/mplayer-share/patches/patch-ak
deleted file mode 100644
index 1c4e3108eb6..00000000000
--- a/multimedia/mplayer-share/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2007/03/09 15:14:16 drochner Exp $
-
---- loader/dmo/DMO_VideoDecoder.c.orig	2007-03-09 14:52:13.000000000 +0100
-+++ loader/dmo/DMO_VideoDecoder.c
-@@ -121,6 +121,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open
-      
-         this->iv.m_bh = malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+	this->iv.m_bh->biSize = bihs;
- 
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
diff --git a/multimedia/mplayer-share/patches/patch-al b/multimedia/mplayer-share/patches/patch-al
deleted file mode 100644
index eaf84a00084..00000000000
--- a/multimedia/mplayer-share/patches/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/09/13 19:16:01 drochner Exp $
-
---- libmpdemux/aviheader.c.orig	2007-09-13 20:25:34.000000000 +0200
-+++ libmpdemux/aviheader.c
-@@ -227,16 +227,16 @@ while(1){
- 	  
-       print_avisuperindex_chunk(s,MSGL_V);
-       
--      if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
--        mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
--        s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
--      }
--
-       // Check and fix this useless crap
-       if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
-           mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size: %u\n",s->wLongsPerEntry);
-           s->wLongsPerEntry = sizeof(avisuperindex_entry)/4;
-       }
-+      if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
-+	mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
-+	s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
-+      }
-+
-       s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry));
-       s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk));
- 
diff --git a/multimedia/mplayer-share/patches/patch-ba b/multimedia/mplayer-share/patches/patch-ba
deleted file mode 100644
index d85cc740ae1..00000000000
--- a/multimedia/mplayer-share/patches/patch-ba
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2007/01/09 14:49:33 drochner Exp $
-
---- stream/realrtsp/asmrp.c.orig	2006-10-23 00:32:25.000000000 +0200
-+++ stream/realrtsp/asmrp.c
-@@ -40,6 +40,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include "asmrp.h"
- 
- /*
- #define LOG
-@@ -645,8 +646,10 @@ static int asmrp_eval (asmrp_t *p, int *
- #ifdef LOG
-       printf ("rule #%d is true\n", rule_num);
- #endif
--      matches[num_matches] = rule_num;
--      num_matches++;
-+      if(num_matches < MAX_RULEMATCHES - 1)
-+        matches[num_matches++] = rule_num;
-+      else
-+        printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
-     }
- 
-     rule_num++;
diff --git a/multimedia/mplayer-share/patches/patch-bb b/multimedia/mplayer-share/patches/patch-bb
deleted file mode 100644
index 6a03902e6c6..00000000000
--- a/multimedia/mplayer-share/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.5 2007/01/09 14:49:33 drochner Exp $
-
---- stream/realrtsp/real.c.orig	2006-10-23 00:32:25.000000000 +0200
-+++ stream/realrtsp/real.c
-@@ -271,7 +271,7 @@ static rmff_header_t *real_parse_sdp(cha
-     int j=0;
-     int n;
-     char b[64];
--    int rulematches[16];
-+    int rulematches[MAX_RULEMATCHES];
- 
- #ifdef LOG
-     printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
diff --git a/multimedia/mplayer-share/patches/patch-bc b/multimedia/mplayer-share/patches/patch-bc
deleted file mode 100644
index 330dbdfa0ec..00000000000
--- a/multimedia/mplayer-share/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2007/01/09 14:49:33 drochner Exp $
-
---- stream/realrtsp/asmrp.h.orig	2006-10-23 00:32:25.000000000 +0200
-+++ stream/realrtsp/asmrp.h
-@@ -40,6 +40,8 @@
- #ifndef HAVE_ASMRP_H
- #define HAVE_ASMRP_H
- 
-+#define MAX_RULEMATCHES 16
-+
- int asmrp_match (const char *rules, int bandwidth, int *matches) ;
- 
- #endif
diff --git a/multimedia/mplayer-share/patches/patch-bd b/multimedia/mplayer-share/patches/patch-bd
deleted file mode 100644
index eba61ef20c3..00000000000
--- a/multimedia/mplayer-share/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2007/02/23 19:19:40 drochner Exp $
-
---- stream/udp.c.orig	2007-02-22 14:14:08.000000000 +0100
-+++ stream/udp.c
-@@ -157,8 +157,8 @@ udp_open_socket (URL_t *url)
-     }
-   }
- 
--  tv.tv_sec = 0;
--  tv.tv_usec = (1 * 1000000);	/* 1 second timeout */
-+  tv.tv_sec = 1;
-+  tv.tv_usec = 0;	/* 1 second timeout */
- 
-   FD_ZERO (&set);
-   FD_SET (socket_server_fd, &set);
diff --git a/multimedia/mplayer-share/patches/patch-tc b/multimedia/mplayer-share/patches/patch-tc
index 950ea4f00d8..fa810b2ba63 100644
--- a/multimedia/mplayer-share/patches/patch-tc
+++ b/multimedia/mplayer-share/patches/patch-tc
@@ -1,13 +1,13 @@
-$NetBSD: patch-tc,v 1.1 2006/10/11 18:32:40 rillig Exp $
+$NetBSD: patch-tc,v 1.2 2007/12/21 11:31:25 tron Exp $
 
---- TOOLS/x2mpsub.sh.orig	2006-10-11 20:29:22.000000000 +0200
-+++ TOOLS/x2mpsub.sh	2006-06-11 20:35:46.000000000 +0200
-@@ -6,7 +6,7 @@
- # Gabucino. No warranty. :)
- #
- 
--TMP="x2mpsub-$RANDOM"
-+TMP="x2mpsub-$$-$RANDOM"
- mkdir "$TMP"
- touch "$TMP/$TMP"
+--- TOOLS/qepdvcd.sh.orig	2007-10-07 20:49:32.000000000 +0100
++++ TOOLS/qepdvcd.sh	2007-12-19 21:22:09.000000000 +0000
+@@ -234,7 +234,7 @@
+ 	SUBTITLESTRING="$SUBFILENAME"
+ fi
  
+-if [ $SPLIT == "0" ]; then
++if [ $SPLIT = "0" ]; then
+ 	CICLES=0
+ 	TIMESTRING=""
+ else
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index e7b29b803d6..9f87c5d06f9 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2007/09/13 19:16:01 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2007/12/21 11:31:13 tron Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	9
 
 COMMENT=	Software-only MPEG-1/2/4 video decoder
author	tron <tron@pkgsrc.org>	2007-12-21 11:31:11 +0000
committer	tron <tron@pkgsrc.org>	2007-12-21 11:31:11 +0000
commit	2bb5d9f0da3c82223c3ff88236d35308664e06d0 (patch)
tree	f92d0c6d3c51e10fcb5c180db227e99bc5f37871 /multimedia
parent	736ef18a712797d23dc53c78a78a57d5de84426b (diff)
download	pkgsrc-2bb5d9f0da3c82223c3ff88236d35308664e06d0.tar.gz