diff options
| author | ahoka <ahoka> | 2009-10-18 22:22:10 +0000 |
|---|---|---|
| committer | ahoka <ahoka> | 2009-10-18 22:22:10 +0000 |
| commit | 959a811b3d582468ea86c957f13e04c6e42cdcd6 (patch) | |
| tree | 3d4a34870674cb9521f62df3e80f84cbffcc6c59 | |
| parent | 9b62339056ddc052fb84c3ee4932c5cc2cbab4d4 (diff) | |
| download | pkgsrc-959a811b3d582468ea86c957f13e04c6e42cdcd6.tar.gz | |
Upgrade to the SVN snapshot as of 2009-10-17.
The builtin libavcodec now uses yasm to assemble hand written
h264 code. The older x264 we currently have in pkgsrc is not supported
by mplayer, so I had to do some hand tweaking to make it work.
It may contain bugs because of this, so report any fallouts with h264.
37 files changed, 266 insertions, 2105 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 2ba74ec860f..1547ee7b9eb 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2009/08/26 19:58:05 sno Exp $ +# $NetBSD: Makefile,v 1.79 2009/10/18 22:22:11 ahoka Exp $ # # NOTE: if you are updating both mplayer and gmplayer, you must ensure @@ -8,8 +8,8 @@ # NOTE: patches are shared between mplayer and gmplayer! # -PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 13 +PKGNAME= gmplayer-${MPLAYER_VERSION} +#PKGREVISION= 0 SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ http://www2.mplayerhq.hu/MPlayer/skins/ \ @@ -17,14 +17,16 @@ SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \ http://ftp5.mplayerhq.hu/MPlayer/skins/ \ ftp://ftp5.mplayerhq.hu/MPlayer/skins/ \ - ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/mplayer/ \ - ${MASTER_SITE_LOCAL:=mplayer/} PKG_DESTDIR_SUPPORT= user-destdir .include "../../multimedia/mplayer-share/Makefile.common" -COMMENT= Software only MPEG-1/2/4 video decoder with a GTK+ interface +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm +.endif + +COMMENT= Fast, cross-platform movie player with GTK2+ interface SKINS += AlienMind-1.2${EXTRACT_SUFX} \ Blue-1.7${EXTRACT_SUFX} \ @@ -56,7 +58,7 @@ SITES.${skin}= ${SKIN_SITES} DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${SKINS} DISTINFO_FILE= ${.CURDIR}/distinfo -DIST_SUBDIR= ${PKGNAME_NOREV}-20060123 +DIST_SUBDIR= mplayer USE_TOOLS+= gtar pkg-config CONFIGURE_ARGS+= --enable-gui --disable-mencoder \ diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index 7d206e625c6..2fba2a1bd73 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -1,92 +1,76 @@ -$NetBSD: distinfo,v 1.64 2009/08/09 19:21:10 wiz Exp $ +$NetBSD: distinfo,v 1.65 2009/10/18 22:22:11 ahoka Exp $ -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.7.tar.bz2) = 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 -RMD160 (gmplayer-1.0rc10-20060123/Blue-1.7.tar.bz2) = 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb -Size (gmplayer-1.0rc10-20060123/Blue-1.7.tar.bz2) = 222567 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.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d -RMD160 (gmplayer-1.0rc10-20060123/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52 -Size (gmplayer-1.0rc10-20060123/MPlayer-1.0rc2.tar.bz2) = 9338201 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 (patch-aa) = ebcbff0b8d0914aaaf89d8388bc9e04229680658 -SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 -SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 -SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5 -SHA1 (patch-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9 -SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5 -SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00 +SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc +RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998 +Size (mplayer/AlienMind-1.2.tar.bz2) = 131295 bytes +SHA1 (mplayer/Blue-1.7.tar.bz2) = 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 +RMD160 (mplayer/Blue-1.7.tar.bz2) = 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb +Size (mplayer/Blue-1.7.tar.bz2) = 222567 bytes +SHA1 (mplayer/BlueHeart-1.5.tar.bz2) = 157aca7420e8003ced2f4f1cb38a33c1bfd0db13 +RMD160 (mplayer/BlueHeart-1.5.tar.bz2) = 39e139b5428a695e5eb56e72e0e626cb3a5a2eea +Size (mplayer/BlueHeart-1.5.tar.bz2) = 281051 bytes +SHA1 (mplayer/CornerMP-1.2.tar.bz2) = 4de70d5232dd44d9366cb8b876e89db8e48b2d8c +RMD160 (mplayer/CornerMP-1.2.tar.bz2) = eb563c083111923b4fddd30df074ba08bb78feec +Size (mplayer/CornerMP-1.2.tar.bz2) = 232731 bytes +SHA1 (mplayer/CornerMP-aqua-1.4.tar.bz2) = 165d1f30b0c5135a3481d394042a4faea70d3976 +RMD160 (mplayer/CornerMP-aqua-1.4.tar.bz2) = 67d78a19e2362b6c9658f699421fe4228cb8e96a +Size (mplayer/CornerMP-aqua-1.4.tar.bz2) = 243154 bytes +SHA1 (mplayer/Cyrus-1.2.tar.bz2) = 20bbb63114e8c0438770c1d1682296f37833968c +RMD160 (mplayer/Cyrus-1.2.tar.bz2) = c4d4593a358456d98a1d94e14e263a902add6828 +Size (mplayer/Cyrus-1.2.tar.bz2) = 228461 bytes +SHA1 (mplayer/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f +RMD160 (mplayer/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c +Size (mplayer/MidnightLove-1.6.tar.bz2) = 539665 bytes +SHA1 (mplayer/WMP6-2.2.tar.bz2) = 6cf2062ddf41423edfa35a9a159614ef7996deb3 +RMD160 (mplayer/WMP6-2.2.tar.bz2) = 1cf366456372027d738359f6611b4b95891ade5a +Size (mplayer/WMP6-2.2.tar.bz2) = 39267 bytes +SHA1 (mplayer/avifile-1.6.tar.bz2) = 061f3e7a2b92e3e41d43f706c93e5f249c5c989a +RMD160 (mplayer/avifile-1.6.tar.bz2) = 684f7e9259f4333aca285d2d8356b7c6cbbbfc16 +Size (mplayer/avifile-1.6.tar.bz2) = 42409 bytes +SHA1 (mplayer/gnome-1.1.tar.bz2) = 0852aaab4336d37bef439a6d11aaab1422df6caa +RMD160 (mplayer/gnome-1.1.tar.bz2) = 5850b3e5ce508ec40b82032125ee0c83a3ca9f49 +Size (mplayer/gnome-1.1.tar.bz2) = 368649 bytes +SHA1 (mplayer/hayraphon-1.0.tar.bz2) = c16b379a202e477e68f18003cd868a760daa0605 +RMD160 (mplayer/hayraphon-1.0.tar.bz2) = 2104981d6abdb89436e1f6ccd9ca9260a4cb4394 +Size (mplayer/hayraphon-1.0.tar.bz2) = 77577 bytes +SHA1 (mplayer/hwswskin-1.1.tar.bz2) = 1637293c9b9b8f8ab1055f838ddd6409d035e3de +RMD160 (mplayer/hwswskin-1.1.tar.bz2) = ca8d39bfc03dc18c927ff8d6592bd95974a9b354 +Size (mplayer/hwswskin-1.1.tar.bz2) = 20331 bytes +SHA1 (mplayer/mentalic-1.2.tar.bz2) = 47a0c7f8cebba83b50b381ff923d91904cc5b514 +RMD160 (mplayer/mentalic-1.2.tar.bz2) = d561f0c1c3396c2776175f58f0d69b39623e9fee +Size (mplayer/mentalic-1.2.tar.bz2) = 166570 bytes +SHA1 (mplayer/mplayer-20091017.tar.bz2) = 8ee97842812b9867f192f521b96bb1b6e1742a23 +RMD160 (mplayer/mplayer-20091017.tar.bz2) = 015d3847b05f4d674d4740e55f117ce6085d5cc3 +Size (mplayer/mplayer-20091017.tar.bz2) = 8525942 bytes +SHA1 (mplayer/neutron-1.5.tar.bz2) = 757a2aef5a6eb6873024d8cafa5f862377af9239 +RMD160 (mplayer/neutron-1.5.tar.bz2) = 9434c545386357c540a43c5cb37f70a6308b1ed7 +Size (mplayer/neutron-1.5.tar.bz2) = 369303 bytes +SHA1 (mplayer/phony-1.1.tar.bz2) = 68189ce1ffca26694edf5440769a1d61b84b70bc +RMD160 (mplayer/phony-1.1.tar.bz2) = 5fd2b0befc46a995579b3722952a73f2c1b062e5 +Size (mplayer/phony-1.1.tar.bz2) = 386399 bytes +SHA1 (mplayer/plastic-1.2.tar.bz2) = 414560bfdd660a3b44d1f75adda8c36c437ad2d3 +RMD160 (mplayer/plastic-1.2.tar.bz2) = 3e2bed634d2f7a55313e9d6332c57f48f6b0f761 +Size (mplayer/plastic-1.2.tar.bz2) = 454167 bytes +SHA1 (mplayer/proton-1.2.tar.bz2) = a5178bc09a75464183abc78c380b5b661a3aaf68 +RMD160 (mplayer/proton-1.2.tar.bz2) = 276e93b2c7cf695fdfa5a723fc6074bfa6405172 +Size (mplayer/proton-1.2.tar.bz2) = 322612 bytes +SHA1 (mplayer/slim-1.2.tar.bz2) = 3913748d9bfb126ec677e84b068c54fb7111196f +RMD160 (mplayer/slim-1.2.tar.bz2) = 2ec2b2362c4b89ffbe79421b14f3f5f4341996f1 +Size (mplayer/slim-1.2.tar.bz2) = 398873 bytes +SHA1 (mplayer/xanim-1.6.tar.bz2) = 1b63395d12bfe6eb63c6aa6ea3b870ddbdd26658 +RMD160 (mplayer/xanim-1.6.tar.bz2) = 5c0f34bb4cd722469402cd69de3c4d75e10611f9 +Size (mplayer/xanim-1.6.tar.bz2) = 94564 bytes +SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18 +RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5 +Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes +SHA1 (patch-aa) = 24007024e4b6bfa212817681e8d07cc079aee13b +SHA1 (patch-ac) = 13ea17bcdde5ebc7e04eeb5eb833dca0cd623ba2 +SHA1 (patch-ad) = 0a43a47538f0f18f8b6aa230367821b8bb51e932 +SHA1 (patch-ae) = 448ae3c17fd96248b7360958c9640f74ed4891a5 +SHA1 (patch-ag) = e3aea6e1144e97d1dc9f240275568108df25ab00 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b -SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988 -SHA1 (patch-aj) = 772d083dfa5eac789abfd5e925eeeba400bbc527 -SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58 -SHA1 (patch-al) = 9538b10cf5b3802381d7aabc798676b3cb9ef00d -SHA1 (patch-am) = bae1e03f7265cb6b07947f052f0774d1c17da88e -SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73 -SHA1 (patch-ao) = ddd85a9bfda237ea923faf0c3677b5e14cff4e0d -SHA1 (patch-ap) = 83777bac06190f71078435721ad2f7055689f64f -SHA1 (patch-aq) = 8d77f3fbe5796707f591e0890b54b9f34f649709 -SHA1 (patch-ar) = 1f1b661b3395453200bc313da4df5af8d9e09009 -SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e -SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057 -SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d -SHA1 (patch-bd) = 9132118a143758b6c9e9dffb713f7dadd29ce3c3 -SHA1 (patch-be) = d9b0573c9ea9767bed7d9b3f29cd07cc31c37519 -SHA1 (patch-ca) = 68603a92b3dd8c7a33e6bc982f8ced1219fa419d -SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038 -SHA1 (patch-va) = db69c373e78048924c536055c68c7de0feabc623 -SHA1 (patch-vb) = 28b1dd82fb61a4fc0be4a4f4599f75823cae5f11 +SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae +SHA1 (patch-ao) = 8588d0215e973045b7f1abd7fbc9813409876b99 +SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a +SHA1 (patch-vb) = d836d96c849de866cb4177b20eb1c6dec4b7a0ba +SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89 diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 7d0a9e71ace..7165b551f65 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2009/08/09 19:24:58 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2009/10/18 22:22:11 ahoka Exp $ -PKGNAME= mencoder-${MPLAYER_PKG_VERSION} -PKGREVISION= 7 +PKGNAME= mencoder-${MPLAYER_VERSION} +#PKGREVISION= 0 COMMENT= Simple movie encoder for MPlayer-playable movies @@ -9,6 +9,10 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../multimedia/mplayer-share/Makefile.common" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm +.endif + CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer BUILD_TARGET= mencoder diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile index dedc7960172..3b42b86e92c 100644 --- a/multimedia/mplayer-share/Makefile +++ b/multimedia/mplayer-share/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.17 2009/08/26 19:58:45 sno Exp $ +# $NetBSD: Makefile,v 1.18 2009/10/18 22:22:10 ahoka Exp $ -PKGREVISION= 2 +#PKGREVISION= 0 PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" -PKGNAME= mplayer-share-${MPLAYER_PKG_VERSION} +PKGNAME= mplayer-share-${MPLAYER_VERSION} 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 d1640004306..23e5cb20ee0 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,24 +1,20 @@ -# $NetBSD: Makefile.common,v 1.41 2009/08/09 19:25:50 wiz Exp $ +# $NetBSD: Makefile.common,v 1.42 2009/10/18 22:22:10 ahoka Exp $ # used by multimedia/gmplayer/Makefile # used by multimedia/mencoder/Makefile # used by multimedia/mplayer/Makefile -MPLAYER_DIST_VERSION= 1.0rc2 +MPLAYER_SNAPSHOT_DATE= 2009-10-17 +MPLAYER_VERSION= 1.0rc${MPLAYER_SNAPSHOT_DATE:S/-//g} -# This variable is used in all packages which depend on this package -MPLAYER_PKG_VERSION= 1.0rc10 - -DISTNAME= MPlayer-${MPLAYER_DIST_VERSION} +DISTNAME= mplayer-${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia -MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ - http://ftp5.mplayerhq.hu/MPlayer/releases/ \ - http://www4.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \ - ftp://ftp5.mplayerhq.hu/MPlayer/releases/ +MASTER_SITES= http://irkmaffia.com/~ahoka/distfiles/ EXTRACT_SUFX= .tar.bz2 -DIST_SUBDIR= mplayer-${MPLAYER_PKG_VERSION} +DIST_SUBDIR= mplayer + +WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} -MAINTAINER?= pkgsrc-users@NetBSD.org +MAINTAINER?= ahoka@NetBSD.org HOMEPAGE?= http://www.mplayerhq.hu/ # @@ -44,7 +40,7 @@ HAS_CONFIGURE= YES PTHREAD_OPTS+= require CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \ - --with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \ + #--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \ --with-extralibdir="${LOCALBASE}/lib" \ --disable-dvdread-internal --disable-smb @@ -55,9 +51,6 @@ ONLY_FOR_COMPILER= gcc # TMPDIR to ${WRKDIR} CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q} -post-extract: - ${CP} ${FILESDIR}/ao_pulse.c ${WRKSRC}/libao2/ao_polyp.c - .include "../../mk/bsd.prefs.mk" # The configure script misdetects endianness on mipseb diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST index 18371c0d8f7..87bd7563d46 100644 --- a/multimedia/mplayer-share/PLIST +++ b/multimedia/mplayer-share/PLIST @@ -1,945 +1,5 @@ -@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:08:09 joerg Exp $ +@comment $NetBSD: PLIST,v 1.11 2009/10/18 22:22:10 ahoka Exp $ man/man1/mplayer.1 -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/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/fonts-osd.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/index.html -share/mplayer/DOCS/HTML/cs/install.html -share/mplayer/DOCS/HTML/cs/intro.html -share/mplayer/DOCS/HTML/cs/linux.html -share/mplayer/DOCS/HTML/cs/macos.html -share/mplayer/DOCS/HTML/cs/menc-feat-dvd-mpeg4.html -share/mplayer/DOCS/HTML/cs/menc-feat-enc-images.html -share/mplayer/DOCS/HTML/cs/menc-feat-enc-libavcodec.html -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 -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-video-for-windows.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/mpst.html -share/mplayer/DOCS/HTML/cs/mtrr.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/radio-input.html -share/mplayer/DOCS/HTML/cs/radio.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/softreq.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/vcd.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 -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/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 -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 -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/intro.html -share/mplayer/DOCS/HTML/de/linux.html -share/mplayer/DOCS/HTML/de/macos.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-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 -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/mga_vid.html -share/mplayer/DOCS/HTML/de/mpeg_decoders.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/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 -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/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/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 -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/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 -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 -share/mplayer/DOCS/HTML/en/history.html -share/mplayer/DOCS/HTML/en/howtoread.html -share/mplayer/DOCS/HTML/en/index.html -share/mplayer/DOCS/HTML/en/install.html -share/mplayer/DOCS/HTML/en/intro.html -share/mplayer/DOCS/HTML/en/linux.html -share/mplayer/DOCS/HTML/en/macos.html -share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html -share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html -share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html -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 -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/mga_vid.html -share/mplayer/DOCS/HTML/en/mpeg_decoders.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/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 -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/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/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 -share/mplayer/DOCS/HTML/es/bugreports.html -share/mplayer/DOCS/HTML/es/bugreports_advusers.html -share/mplayer/DOCS/HTML/es/bugreports_fix.html -share/mplayer/DOCS/HTML/es/bugreports_report.html -share/mplayer/DOCS/HTML/es/bugreports_what.html -share/mplayer/DOCS/HTML/es/bugreports_where.html -share/mplayer/DOCS/HTML/es/bugs-audio.html -share/mplayer/DOCS/HTML/es/bugs-special.html -share/mplayer/DOCS/HTML/es/bugs.html -share/mplayer/DOCS/HTML/es/cd-dvd.html -share/mplayer/DOCS/HTML/es/codecs.html -share/mplayer/DOCS/HTML/es/commandline.html -share/mplayer/DOCS/HTML/es/control.html -share/mplayer/DOCS/HTML/es/custommatrices.html -share/mplayer/DOCS/HTML/es/default.css -share/mplayer/DOCS/HTML/es/devices.html -share/mplayer/DOCS/HTML/es/drives.html -share/mplayer/DOCS/HTML/es/dvd.html -share/mplayer/DOCS/HTML/es/edl.html -share/mplayer/DOCS/HTML/es/faq.html -share/mplayer/DOCS/HTML/es/features.html -share/mplayer/DOCS/HTML/es/formats.html -share/mplayer/DOCS/HTML/es/gui.html -share/mplayer/DOCS/HTML/es/history.html -share/mplayer/DOCS/HTML/es/howtoread.html -share/mplayer/DOCS/HTML/es/hpux.html -share/mplayer/DOCS/HTML/es/index.html -share/mplayer/DOCS/HTML/es/install.html -share/mplayer/DOCS/HTML/es/intro.html -share/mplayer/DOCS/HTML/es/irix.html -share/mplayer/DOCS/HTML/es/linux.html -share/mplayer/DOCS/HTML/es/macos.html -share/mplayer/DOCS/HTML/es/menc-feat-divx4.html -share/mplayer/DOCS/HTML/es/menc-feat-dvd-mpeg4.html -share/mplayer/DOCS/HTML/es/menc-feat-enc-images.html -share/mplayer/DOCS/HTML/es/menc-feat-enc-libavcodec.html -share/mplayer/DOCS/HTML/es/menc-feat-extractsub.html -share/mplayer/DOCS/HTML/es/menc-feat-fix-avi.html -share/mplayer/DOCS/HTML/es/menc-feat-mpeg.html -share/mplayer/DOCS/HTML/es/menc-feat-rescale.html -share/mplayer/DOCS/HTML/es/menc-feat-streamcopy.html -share/mplayer/DOCS/HTML/es/menc-feat-telecine.html -share/mplayer/DOCS/HTML/es/mencoder.html -share/mplayer/DOCS/HTML/es/mpst.html -share/mplayer/DOCS/HTML/es/ports.html -share/mplayer/DOCS/HTML/es/qnx.html -share/mplayer/DOCS/HTML/es/rtc.html -share/mplayer/DOCS/HTML/es/skin-file.html -share/mplayer/DOCS/HTML/es/skin-fonts.html -share/mplayer/DOCS/HTML/es/skin-gui.html -share/mplayer/DOCS/HTML/es/skin-overview.html -share/mplayer/DOCS/HTML/es/skin.html -share/mplayer/DOCS/HTML/es/solaris.html -share/mplayer/DOCS/HTML/es/streaming.html -share/mplayer/DOCS/HTML/es/subosd.html -share/mplayer/DOCS/HTML/es/tv-input.html -share/mplayer/DOCS/HTML/es/usage.html -share/mplayer/DOCS/HTML/es/vcd.html -share/mplayer/DOCS/HTML/es/windows.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/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/fonts-osd.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/index.html -share/mplayer/DOCS/HTML/fr/install.html -share/mplayer/DOCS/HTML/fr/intro.html -share/mplayer/DOCS/HTML/fr/linux.html -share/mplayer/DOCS/HTML/fr/macos.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-handheld-psp.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-video-for-windows.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/mpst.html -share/mplayer/DOCS/HTML/fr/mtrr.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/radio-input.html -share/mplayer/DOCS/HTML/fr/radio.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/softreq.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/vcd.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 -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/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 -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 -share/mplayer/DOCS/HTML/hu/history.html -share/mplayer/DOCS/HTML/hu/howtoread.html -share/mplayer/DOCS/HTML/hu/index.html -share/mplayer/DOCS/HTML/hu/install.html -share/mplayer/DOCS/HTML/hu/intro.html -share/mplayer/DOCS/HTML/hu/linux.html -share/mplayer/DOCS/HTML/hu/macos.html -share/mplayer/DOCS/HTML/hu/menc-feat-dvd-mpeg4.html -share/mplayer/DOCS/HTML/hu/menc-feat-enc-images.html -share/mplayer/DOCS/HTML/hu/menc-feat-enc-libavcodec.html -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 -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/mga_vid.html -share/mplayer/DOCS/HTML/hu/mpeg_decoders.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/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 -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/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/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 -share/mplayer/DOCS/HTML/pl/audio-formats.html -share/mplayer/DOCS/HTML/pl/audio.html -share/mplayer/DOCS/HTML/pl/bsd.html -share/mplayer/DOCS/HTML/pl/bugreports.html -share/mplayer/DOCS/HTML/pl/bugreports_advusers.html -share/mplayer/DOCS/HTML/pl/bugreports_fix.html -share/mplayer/DOCS/HTML/pl/bugreports_regression_test.html -share/mplayer/DOCS/HTML/pl/bugreports_report.html -share/mplayer/DOCS/HTML/pl/bugreports_security.html -share/mplayer/DOCS/HTML/pl/bugreports_what.html -share/mplayer/DOCS/HTML/pl/bugreports_where.html -share/mplayer/DOCS/HTML/pl/bugs-audio.html -share/mplayer/DOCS/HTML/pl/bugs-special.html -share/mplayer/DOCS/HTML/pl/bugs.html -share/mplayer/DOCS/HTML/pl/cd-dvd.html -share/mplayer/DOCS/HTML/pl/codec-importing.html -share/mplayer/DOCS/HTML/pl/codecs.html -share/mplayer/DOCS/HTML/pl/commandline.html -share/mplayer/DOCS/HTML/pl/control.html -share/mplayer/DOCS/HTML/pl/default.css -share/mplayer/DOCS/HTML/pl/drives.html -share/mplayer/DOCS/HTML/pl/dvd.html -share/mplayer/DOCS/HTML/pl/edl.html -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/intro.html -share/mplayer/DOCS/HTML/pl/linux.html -share/mplayer/DOCS/HTML/pl/macos.html -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 -share/mplayer/DOCS/HTML/pl/menc-feat-selecting-codec.html -share/mplayer/DOCS/HTML/pl/menc-feat-selecting-input.html -share/mplayer/DOCS/HTML/pl/menc-feat-streamcopy.html -share/mplayer/DOCS/HTML/pl/menc-feat-telecine.html -share/mplayer/DOCS/HTML/pl/menc-feat-vcd-dvd.html -share/mplayer/DOCS/HTML/pl/menc-feat-x264.html -share/mplayer/DOCS/HTML/pl/menc-feat-xvid.html -share/mplayer/DOCS/HTML/pl/mencoder.html -share/mplayer/DOCS/HTML/pl/mpeg_decoders.html -share/mplayer/DOCS/HTML/pl/mpst.html -share/mplayer/DOCS/HTML/pl/mtrr.html -share/mplayer/DOCS/HTML/pl/other.html -share/mplayer/DOCS/HTML/pl/output-trad.html -share/mplayer/DOCS/HTML/pl/ports.html -share/mplayer/DOCS/HTML/pl/radio-input.html -share/mplayer/DOCS/HTML/pl/radio.html -share/mplayer/DOCS/HTML/pl/rtc.html -share/mplayer/DOCS/HTML/pl/skin-file.html -share/mplayer/DOCS/HTML/pl/skin-fonts.html -share/mplayer/DOCS/HTML/pl/skin-gui.html -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/streaming.html -share/mplayer/DOCS/HTML/pl/subosd.html -share/mplayer/DOCS/HTML/pl/sync.html -share/mplayer/DOCS/HTML/pl/troubleshooting.html -share/mplayer/DOCS/HTML/pl/tv-input.html -share/mplayer/DOCS/HTML/pl/tv.html -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-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 -share/mplayer/DOCS/HTML/ru/audio-formats.html -share/mplayer/DOCS/HTML/ru/audio.html -share/mplayer/DOCS/HTML/ru/bsd.html -share/mplayer/DOCS/HTML/ru/bugreports.html -share/mplayer/DOCS/HTML/ru/bugreports_advusers.html -share/mplayer/DOCS/HTML/ru/bugreports_fix.html -share/mplayer/DOCS/HTML/ru/bugreports_regression_test.html -share/mplayer/DOCS/HTML/ru/bugreports_report.html -share/mplayer/DOCS/HTML/ru/bugreports_security.html -share/mplayer/DOCS/HTML/ru/bugreports_what.html -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 -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 -share/mplayer/DOCS/HTML/ru/history.html -share/mplayer/DOCS/HTML/ru/howtoread.html -share/mplayer/DOCS/HTML/ru/index.html -share/mplayer/DOCS/HTML/ru/install.html -share/mplayer/DOCS/HTML/ru/intro.html -share/mplayer/DOCS/HTML/ru/linux.html -share/mplayer/DOCS/HTML/ru/macos.html -share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html -share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html -share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html -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 -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/mga_vid.html -share/mplayer/DOCS/HTML/ru/mpeg_decoders.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/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 -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/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/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 @@ -951,7 +11,7 @@ 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/ru/mplayer.1 -share/mplayer/DOCS/man/zh/mplayer.1 +share/mplayer/DOCS/man/zh_CN/mplayer.1 share/mplayer/DOCS/tech/Doxyfile share/mplayer/DOCS/tech/MAINTAINERS share/mplayer/DOCS/tech/TODO @@ -972,6 +32,7 @@ share/mplayer/DOCS/tech/libao2.txt share/mplayer/DOCS/tech/libmpcodecs.txt share/mplayer/DOCS/tech/libvo.txt share/mplayer/DOCS/tech/manpage.txt +share/mplayer/DOCS/tech/mingw-crosscompile.txt share/mplayer/DOCS/tech/mirrors/mirror_howto.txt share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync share/mplayer/DOCS/tech/mpdsf.txt @@ -982,7 +43,6 @@ share/mplayer/DOCS/tech/oggless-xiph-codecs.txt 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/realcodecs/TODO share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt share/mplayer/DOCS/tech/realcodecs/streaming.txt @@ -996,6 +56,7 @@ share/mplayer/DOCS/tech/swscaler_filters.txt share/mplayer/DOCS/tech/swscaler_methods.txt share/mplayer/DOCS/tech/translations.txt share/mplayer/DOCS/tech/vidix.txt +share/mplayer/DOCS/tech/win32-codec-howto.txt share/mplayer/DOCS/tech/wishlist share/mplayer/DOCS/xml/Makefile share/mplayer/DOCS/xml/Makefile.inc @@ -1003,16 +64,11 @@ share/mplayer/DOCS/xml/README share/mplayer/DOCS/xml/README.maintainers share/mplayer/DOCS/xml/configure share/mplayer/DOCS/xml/cs/Makefile -share/mplayer/DOCS/xml/cs/audio.xml share/mplayer/DOCS/xml/cs/bugreports.xml -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/containers.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/history.xml share/mplayer/DOCS/xml/cs/install.xml share/mplayer/DOCS/xml/cs/mencoder.xml share/mplayer/DOCS/xml/cs/ports.xml @@ -1022,16 +78,11 @@ share/mplayer/DOCS/xml/cs/tvinput.xml share/mplayer/DOCS/xml/cs/usage.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/cd-dvd.xml -share/mplayer/DOCS/xml/de/codecs.xml -share/mplayer/DOCS/xml/de/containers.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/history.xml share/mplayer/DOCS/xml/de/install.xml share/mplayer/DOCS/xml/de/mencoder.xml share/mplayer/DOCS/xml/de/ports.xml @@ -1042,16 +93,11 @@ share/mplayer/DOCS/xml/de/usage.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 share/mplayer/DOCS/xml/en/bugreports.xml -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/containers.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/history.xml share/mplayer/DOCS/xml/en/install.xml share/mplayer/DOCS/xml/en/mencoder.xml share/mplayer/DOCS/xml/en/ports.xml @@ -1061,16 +107,10 @@ share/mplayer/DOCS/xml/en/tvinput.xml share/mplayer/DOCS/xml/en/usage.xml share/mplayer/DOCS/xml/en/video.xml share/mplayer/DOCS/xml/es/Makefile -share/mplayer/DOCS/xml/es/audio.xml share/mplayer/DOCS/xml/es/bugreports.xml -share/mplayer/DOCS/xml/es/bugs.xml share/mplayer/DOCS/xml/es/cd-dvd.xml -share/mplayer/DOCS/xml/es/codecs.xml share/mplayer/DOCS/xml/es/documentation.xml share/mplayer/DOCS/xml/es/faq.xml -share/mplayer/DOCS/xml/es/features.xml -share/mplayer/DOCS/xml/es/formats.xml -share/mplayer/DOCS/xml/es/history.xml share/mplayer/DOCS/xml/es/install.xml share/mplayer/DOCS/xml/es/mencoder.xml share/mplayer/DOCS/xml/es/ports.xml @@ -1079,16 +119,11 @@ share/mplayer/DOCS/xml/es/tvinput.xml share/mplayer/DOCS/xml/es/usage.xml share/mplayer/DOCS/xml/es/video.xml share/mplayer/DOCS/xml/fr/Makefile -share/mplayer/DOCS/xml/fr/audio.xml share/mplayer/DOCS/xml/fr/bugreports.xml -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/containers.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/history.xml share/mplayer/DOCS/xml/fr/install.xml share/mplayer/DOCS/xml/fr/mencoder.xml share/mplayer/DOCS/xml/fr/ports.xml @@ -1099,16 +134,11 @@ share/mplayer/DOCS/xml/fr/usage.xml share/mplayer/DOCS/xml/fr/video.xml share/mplayer/DOCS/xml/html-common.xsl share/mplayer/DOCS/xml/hu/Makefile -share/mplayer/DOCS/xml/hu/audio.xml share/mplayer/DOCS/xml/hu/bugreports.xml -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/containers.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/history.xml share/mplayer/DOCS/xml/hu/install.xml share/mplayer/DOCS/xml/hu/mencoder.xml share/mplayer/DOCS/xml/hu/ports.xml @@ -1118,15 +148,11 @@ 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/encoding-guide.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 @@ -1135,16 +161,11 @@ 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 share/mplayer/DOCS/xml/pl/bugreports.xml -share/mplayer/DOCS/xml/pl/bugs.xml share/mplayer/DOCS/xml/pl/cd-dvd.xml -share/mplayer/DOCS/xml/pl/codecs.xml -share/mplayer/DOCS/xml/pl/containers.xml share/mplayer/DOCS/xml/pl/documentation.xml share/mplayer/DOCS/xml/pl/encoding-guide.xml share/mplayer/DOCS/xml/pl/faq.xml -share/mplayer/DOCS/xml/pl/history.xml share/mplayer/DOCS/xml/pl/html-chunk.xsl share/mplayer/DOCS/xml/pl/html-common.xsl share/mplayer/DOCS/xml/pl/html-single.xsl @@ -1157,16 +178,11 @@ share/mplayer/DOCS/xml/pl/tvinput.xml share/mplayer/DOCS/xml/pl/usage.xml share/mplayer/DOCS/xml/pl/video.xml share/mplayer/DOCS/xml/ru/Makefile -share/mplayer/DOCS/xml/ru/audio.xml share/mplayer/DOCS/xml/ru/bugreports.xml -share/mplayer/DOCS/xml/ru/bugs.xml 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/install.xml share/mplayer/DOCS/xml/ru/mencoder.xml share/mplayer/DOCS/xml/ru/ports.xml @@ -1180,9 +196,7 @@ 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/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 diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 32c125357fa..b7e63646a30 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,32 +1,16 @@ -$NetBSD: distinfo,v 1.62 2009/08/09 19:20:49 wiz Exp $ +$NetBSD: distinfo,v 1.63 2009/10/18 22:22:10 ahoka Exp $ -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) = ebcbff0b8d0914aaaf89d8388bc9e04229680658 -SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 -SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 -SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5 -SHA1 (patch-ae) = 24ac251b3f8d7a94cf61dbe4c960ac76884649f9 -SHA1 (patch-af) = e8b6f2b914f9b8e9f12d92cb49b91b4381a46ce5 -SHA1 (patch-ag) = b46d902d88e05d6f61a017e8a1be79fad5a1fa00 +SHA1 (mplayer/mplayer-20091017.tar.bz2) = 8ee97842812b9867f192f521b96bb1b6e1742a23 +RMD160 (mplayer/mplayer-20091017.tar.bz2) = 015d3847b05f4d674d4740e55f117ce6085d5cc3 +Size (mplayer/mplayer-20091017.tar.bz2) = 8525942 bytes +SHA1 (patch-aa) = 24007024e4b6bfa212817681e8d07cc079aee13b +SHA1 (patch-ac) = 13ea17bcdde5ebc7e04eeb5eb833dca0cd623ba2 +SHA1 (patch-ad) = 0a43a47538f0f18f8b6aa230367821b8bb51e932 +SHA1 (patch-ae) = 448ae3c17fd96248b7360958c9640f74ed4891a5 +SHA1 (patch-ag) = e3aea6e1144e97d1dc9f240275568108df25ab00 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b -SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988 -SHA1 (patch-aj) = 772d083dfa5eac789abfd5e925eeeba400bbc527 -SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58 -SHA1 (patch-al) = 9538b10cf5b3802381d7aabc798676b3cb9ef00d -SHA1 (patch-am) = bae1e03f7265cb6b07947f052f0774d1c17da88e -SHA1 (patch-an) = a967a47b0d0846fe89f91f9d3faa6055975a5a73 -SHA1 (patch-ao) = ddd85a9bfda237ea923faf0c3677b5e14cff4e0d -SHA1 (patch-ap) = 83777bac06190f71078435721ad2f7055689f64f -SHA1 (patch-aq) = 8d77f3fbe5796707f591e0890b54b9f34f649709 -SHA1 (patch-ar) = 1f1b661b3395453200bc313da4df5af8d9e09009 -SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e -SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057 -SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d -SHA1 (patch-bd) = 9132118a143758b6c9e9dffb713f7dadd29ce3c3 -SHA1 (patch-be) = d9b0573c9ea9767bed7d9b3f29cd07cc31c37519 -SHA1 (patch-ca) = 68603a92b3dd8c7a33e6bc982f8ced1219fa419d -SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038 -SHA1 (patch-va) = db69c373e78048924c536055c68c7de0feabc623 -SHA1 (patch-vb) = 28b1dd82fb61a4fc0be4a4f4599f75823cae5f11 +SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae +SHA1 (patch-ao) = 8588d0215e973045b7f1abd7fbc9813409876b99 +SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a +SHA1 (patch-vb) = d836d96c849de866cb4177b20eb1c6dec4b7a0ba +SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89 diff --git a/multimedia/mplayer-share/files/ao_pulse.c b/multimedia/mplayer-share/files/ao_pulse.c deleted file mode 100644 index 827dab92db6..00000000000 --- a/multimedia/mplayer-share/files/ao_pulse.c +++ /dev/null @@ -1,386 +0,0 @@ -/* - * PulseAudio audio output driver. - * Copyright (C) 2006 Lennart Poettering - * Copyright (C) 2007 Reimar Doeffinger - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <string.h> - -#include <pulse/pulseaudio.h> - -#include "config.h" -#include "libaf/af_format.h" -#include "mp_msg.h" -#include "audio_out.h" -#include "audio_out_internal.h" - -#define PULSE_CLIENT_NAME "MPlayer" - -/** General driver info */ -static ao_info_t info = { - "PulseAudio audio output", - "pulse", - "Lennart Poettering", - "" -}; - -/** PulseAudio playback stream object */ -static struct pa_stream *stream; - -/** PulseAudio connection context */ -static struct pa_context *context; - -/** Main event loop object */ -static struct pa_threaded_mainloop *mainloop; - -/** A temporary variable to store the current volume */ -static pa_cvolume volume; - -LIBAO_EXTERN(pulse) - -#define GENERIC_ERR_MSG(ctx, str) \ - mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] "str": %s\n", \ - pa_strerror(pa_context_errno(ctx))) - -static void context_state_cb(pa_context *c, void *userdata) { - switch (pa_context_get_state(c)) { - case PA_CONTEXT_READY: - case PA_CONTEXT_TERMINATED: - case PA_CONTEXT_FAILED: - pa_threaded_mainloop_signal(mainloop, 0); - break; - } -} - -static void stream_state_cb(pa_stream *s, void *userdata) { - switch (pa_stream_get_state(s)) { - case PA_STREAM_READY: - case PA_STREAM_FAILED: - case PA_STREAM_TERMINATED: - pa_threaded_mainloop_signal(mainloop, 0); - break; - } -} - -static void stream_request_cb(pa_stream *s, size_t length, void *userdata) { - pa_threaded_mainloop_signal(mainloop, 0); -} - -static void stream_latency_update_cb(pa_stream *s, void *userdata) { - pa_threaded_mainloop_signal(mainloop, 0); -} - -static void success_cb(pa_stream *s, int success, void *userdata) { - if (userdata) - *(int *)userdata = success; - pa_threaded_mainloop_signal(mainloop, 0); -} - -/** - * \brief waits for a pulseaudio operation to finish, frees it and - * unlocks the mainloop - * \param op operation to wait for - * \return 1 if operation has finished normally (DONE state), 0 otherwise - */ -static int waitop(pa_operation *op) { - pa_operation_state_t state; - if (!op) return 0; - state = pa_operation_get_state(op); - while (state == PA_OPERATION_RUNNING) { - pa_threaded_mainloop_wait(mainloop); - state = pa_operation_get_state(op); - } - pa_operation_unref(op); - pa_threaded_mainloop_unlock(mainloop); - return state == PA_OPERATION_DONE; -} - -static const struct format_map_s { - int mp_format; - pa_sample_format_t pa_format; -} format_maps[] = { - {AF_FORMAT_S16_LE, PA_SAMPLE_S16LE}, - {AF_FORMAT_S16_BE, PA_SAMPLE_S16BE}, -#ifdef PA_SAMPLE_S32NE - {AF_FORMAT_S32_LE, PA_SAMPLE_S32LE}, - {AF_FORMAT_S32_BE, PA_SAMPLE_S32BE}, -#endif -#ifdef PA_SAMPLE_FLOAT32NE - {AF_FORMAT_FLOAT_LE, PA_SAMPLE_FLOAT32LE}, - {AF_FORMAT_FLOAT_BE, PA_SAMPLE_FLOAT32BE}, -#endif - {AF_FORMAT_U8, PA_SAMPLE_U8}, - {AF_FORMAT_MU_LAW, PA_SAMPLE_ULAW}, - {AF_FORMAT_A_LAW, PA_SAMPLE_ALAW}, - {AF_FORMAT_UNKNOWN, 0} -}; - -static int init(int rate_hz, int channels, int format, int flags) { - struct pa_sample_spec ss; - struct pa_channel_map map; - const struct format_map_s *fmt_map; - char *devarg = NULL; - char *host = NULL; - char *sink = NULL; - - if (ao_subdevice) { - devarg = strdup(ao_subdevice); - sink = strchr(devarg, ':'); - if (sink) *sink++ = 0; - if (devarg[0]) host = devarg; - } - - ss.channels = channels; - ss.rate = rate_hz; - - ao_data.samplerate = rate_hz; - ao_data.channels = channels; - - fmt_map = format_maps; - while (fmt_map->mp_format != format) { - if (fmt_map->mp_format == AF_FORMAT_UNKNOWN) { - mp_msg(MSGT_AO, MSGL_V, "AO: [pulse] Unsupported format, using default\n"); - fmt_map = format_maps; - break; - } - fmt_map++; - } - ao_data.format = fmt_map->mp_format; - ss.format = fmt_map->pa_format; - - if (!pa_sample_spec_valid(&ss)) { - mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Invalid sample spec\n"); - goto fail; - } - - pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA); - ao_data.bps = pa_bytes_per_second(&ss); - - pa_cvolume_reset(&volume, ss.channels); - - if (!(mainloop = pa_threaded_mainloop_new())) { - mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate main loop\n"); - goto fail; - } - - if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), PULSE_CLIENT_NAME))) { - mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate context\n"); - goto fail; - } - - pa_context_set_state_callback(context, context_state_cb, NULL); - - if (pa_context_connect(context, host, 0, NULL) < 0) - goto fail; - - pa_threaded_mainloop_lock(mainloop); - - if (pa_threaded_mainloop_start(mainloop) < 0) - goto unlock_and_fail; - - /* Wait until the context is ready */ - pa_threaded_mainloop_wait(mainloop); - - if (pa_context_get_state(context) != PA_CONTEXT_READY) - goto unlock_and_fail; - - if (!(stream = pa_stream_new(context, "audio stream", &ss, &map))) - goto unlock_and_fail; - - pa_stream_set_state_callback(stream, stream_state_cb, NULL); - pa_stream_set_write_callback(stream, stream_request_cb, NULL); - pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL); - - if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, &volume, NULL) < 0) - goto unlock_and_fail; - - /* Wait until the stream is ready */ - pa_threaded_mainloop_wait(mainloop); - - if (pa_stream_get_state(stream) != PA_STREAM_READY) - goto unlock_and_fail; - - pa_threaded_mainloop_unlock(mainloop); - - free(devarg); - return 1; - -unlock_and_fail: - - if (mainloop) - pa_threaded_mainloop_unlock(mainloop); - -fail: - if (context) - GENERIC_ERR_MSG(context, "Init failed"); - free(devarg); - uninit(1); - return 0; -} - -/** Destroy libao driver */ -static void uninit(int immed) { - if (stream && !immed) { - pa_threaded_mainloop_lock(mainloop); - waitop(pa_stream_drain(stream, success_cb, NULL)); - } - - if (mainloop) - pa_threaded_mainloop_stop(mainloop); - - if (stream) { - pa_stream_disconnect(stream); - pa_stream_unref(stream); - stream = NULL; - } - - if (context) { - pa_context_disconnect(context); - pa_context_unref(context); - context = NULL; - } - - if (mainloop) { - pa_threaded_mainloop_free(mainloop); - mainloop = NULL; - } -} - -/** Play the specified data to the pulseaudio server */ -static int play(void* data, int len, int flags) { - pa_threaded_mainloop_lock(mainloop); - if (pa_stream_write(stream, data, len, NULL, 0, PA_SEEK_RELATIVE) < 0) { - GENERIC_ERR_MSG(context, "pa_stream_write() failed"); - len = -1; - } - pa_threaded_mainloop_unlock(mainloop); - return len; -} - -static void cork(int b) { - int success = 0; - pa_threaded_mainloop_lock(mainloop); - if (!waitop(pa_stream_cork(stream, b, success_cb, &success)) || - !success) - GENERIC_ERR_MSG(context, "pa_stream_cork() failed"); -} - -/** Pause the audio stream by corking it on the server */ -static void audio_pause(void) { - cork(1); -} - -/** Resume the audio stream by uncorking it on the server */ -static void audio_resume(void) { - cork(0); -} - -/** Reset the audio stream, i.e. flush the playback buffer on the server side */ -static void reset(void) { - int success = 0; - pa_threaded_mainloop_lock(mainloop); - if (!waitop(pa_stream_flush(stream, success_cb, &success)) || - !success) - GENERIC_ERR_MSG(context, "pa_stream_flush() failed"); -} - -/** Return number of bytes that may be written to the server without blocking */ -static int get_space(void) { - size_t l; - pa_threaded_mainloop_lock(mainloop); - l = pa_stream_writable_size(stream); - pa_threaded_mainloop_unlock(mainloop); - return l; -} - -/** Return the current latency in seconds */ -static float get_delay(void) { - pa_usec_t latency = (pa_usec_t) -1; - pa_threaded_mainloop_lock(mainloop); - while (pa_stream_get_latency(stream, &latency, NULL) < 0) { - if (pa_context_errno(context) != PA_ERR_NODATA) { - GENERIC_ERR_MSG(context, "pa_stream_get_latency() failed"); - break; - } - /* Wait until latency data is available again */ - pa_threaded_mainloop_wait(mainloop); - } - pa_threaded_mainloop_unlock(mainloop); - return latency == (pa_usec_t) -1 ? 0 : latency / 1000000.0; -} - -/** A callback function that is called when the - * pa_context_get_sink_input_info() operation completes. Saves the - * volume field of the specified structure to the global variable volume. */ -static void info_func(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) { - if (is_last < 0) { - GENERIC_ERR_MSG(context, "Failed to get sink input info"); - return; - } - if (!i) - return; - volume = i->volume; - pa_threaded_mainloop_signal(mainloop, 0); -} - -static int control(int cmd, void *arg) { - switch (cmd) { - case AOCONTROL_GET_VOLUME: { - ao_control_vol_t *vol = arg; - uint32_t devidx = pa_stream_get_index(stream); - pa_threaded_mainloop_lock(mainloop); - if (!waitop(pa_context_get_sink_input_info(context, devidx, info_func, NULL))) { - GENERIC_ERR_MSG(context, "pa_stream_get_sink_input_info() failed"); - return CONTROL_ERROR; - } - - if (volume.channels != 2) - vol->left = vol->right = pa_cvolume_avg(&volume)*100/PA_VOLUME_NORM; - else { - vol->left = volume.values[0]*100/PA_VOLUME_NORM; - vol->right = volume.values[1]*100/PA_VOLUME_NORM; - } - - return CONTROL_OK; - } - - case AOCONTROL_SET_VOLUME: { - const ao_control_vol_t *vol = arg; - pa_operation *o; - - if (volume.channels != 2) - pa_cvolume_set(&volume, volume.channels, (pa_volume_t)vol->left*PA_VOLUME_NORM/100); - else { - volume.values[0] = (pa_volume_t)vol->left*PA_VOLUME_NORM/100; - volume.values[1] = (pa_volume_t)vol->right*PA_VOLUME_NORM/100; - } - - if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) { - GENERIC_ERR_MSG(context, "pa_context_set_sink_input_volume() failed"); - return CONTROL_ERROR; - } - /* We don't wait for completion here */ - pa_operation_unref(o); - return CONTROL_OK; - } - - default: - return CONTROL_UNKNOWN; - } -} diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk index fa55168b081..43acdb81edb 100644 --- a/multimedia/mplayer-share/options.mk +++ b/multimedia/mplayer-share/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.36 2009/05/11 08:24:58 wiz Exp $ +# $NetBSD: options.mk,v 1.37 2009/10/18 22:22:10 ahoka Exp $ .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) @@ -257,11 +257,11 @@ CONFIGURE_ARGS+= --disable-png .endif .if !empty(PKG_OPTIONS:Mpulseaudio) -CONFIGURE_ARGS+= --enable-polyp +CONFIGURE_ARGS+= --enable-pulse . include "../../devel/glib2/buildlink3.mk" . include "../../audio/pulseaudio/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-polyp +CONFIGURE_ARGS+= --disable-pulse .endif .if !empty(PKG_OPTIONS:Msdl) @@ -286,8 +286,7 @@ CONFIGURE_ARGS+= --disable-tv-v4l2 # disable vidix if not in options .if empty(PKG_OPTIONS:Mvidix) -CONFIGURE_ARGS+= --disable-vidix-internal -CONFIGURE_ARGS+= --disable-vidix-external +CONFIGURE_ARGS+= --disable-vidix .endif .if !empty(PKG_OPTIONS:Mvorbis) diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 0a51a35dbfc..a135b1642dc 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.23 2009/03/06 01:33:12 jmcneill Exp $ +$NetBSD: patch-aa,v 1.24 2009/10/18 22:22:10 ahoka Exp $ ---- configure.orig 2007-10-07 15:49:33.000000000 -0400 -+++ configure 2009-03-05 20:17:42.000000000 -0500 -@@ -718,7 +718,7 @@ for ac_option do - _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'` - ;; - - --with-install=*) -@@ -1238,6 +1238,9 @@ if test -z "$_target" ; then +--- configure.orig 2009-10-06 08:43:00.000000000 +0200 ++++ configure +@@ -1388,6 +1388,9 @@ if test -z "$_target" ; then powerpc) # Darwin returns 'powerpc' host_arch=ppc ;; @@ -21,92 +12,65 @@ $NetBSD: patch-aa,v 1.23 2009/03/06 01:33:12 jmcneill Exp $ *) # uname -p on Linux returns 'unknown' for the processor type, # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)' -@@ -1411,11 +1414,11 @@ if test "$_gcc_check" = yes ; then - esac - echores "$cc_version" - else -- for _cc in "$_cc" gcc gcc-3.4 gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do -+ 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_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1` - if test "$?" -gt 0; then - cc_version="not found" - fi -@@ -1548,7 +1551,7 @@ if x86 ; then +@@ -1569,7 +1572,7 @@ else + cc_name=$cc_name_tmp + echocheck "$_cc version" + cc_vendor=gnu +- cc_version=$($_cc -dumpversion 2>&1) ++ cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 ) + case $cc_version in + 2.96*) + cc_fail=yes +@@ -1652,7 +1655,7 @@ if x86 ; 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` -+ pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` - 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` + pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1) + pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1) +- pfamily=$($_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1) ++ pfamily=$($_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1) + pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1) + pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1) -@@ -3098,7 +3101,6 @@ test "$_w32threads" = yes && _def_thread +@@ -3433,7 +3436,6 @@ test "$_w32threads" = yes && def_threads 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&/'`" -@@ -3884,7 +3886,11 @@ EOF - for I in "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \ - -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do + for I in $(echo $extra_ldflags | sed 's/-L//g') ; do + tmp="$tmp $(echo $I | sed 's/.*/ -L& -Wl,-R&/')" +@@ -4205,7 +4207,11 @@ EOF + -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \ + -L/usr/lib ; do if netbsd; then -- _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`" +- _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" + if test -n "$I" ; then -+ _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`" ++ _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" + else + _ld_tmp="-lXext -lX11 $_ld_pthread" + fi else _ld_tmp="$I -lXext -lX11 $_ld_pthread" fi -@@ -4368,7 +4374,7 @@ fi +@@ -4656,7 +4662,7 @@ fi if test "$_aa" = yes ; then - _def_aa='#define HAVE_AA 1' + def_aa='#define CONFIG_AA 1' if cygwin ; then -- _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`" +- 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" -@@ -5100,15 +5106,15 @@ fi - echocheck "Polyp" - if test "$_polyp" = auto ; then - _polyp=no -- if $_pkg_config --exists 'polyplib >= 0.6 polyplib-error >= 0.6 polyplib-mainloop >= 0.6' ; then -+ if $_pkg_config --exists 'libpulse >= 0.9 libpulse-simple >= 0.9 libpulse-mainloop-glib >= 0.9' ; then - - cat > $TMPC << EOF --#include <polyp/polyplib.h> --#include <polyp/mainloop.h> --#include <polyp/polyplib-error.h> -+#include <pulse/pulseaudio.h> -+#include <pulse/mainloop.h> -+#include <pulse/error.h> - int main(void) { return 0; } - EOF --cc_check `$_pkg_config --libs --cflags polyplib polyplib-error polyplib-mainloop` && tmp_run && _polyp=yes -+cc_check `$_pkg_config --libs --cflags libpulse libpulse-simple libpulse-mainloop-glib` && tmp_run && _polyp=yes - - fi - fi -@@ -5118,8 +5124,8 @@ if test "$_polyp" = yes ; then - _def_polyp='#define USE_POLYP 1' - _aosrc="$_aosrc ao_polyp.c" - _aomodules="polyp $_aomodules" -- _libs_mplayer="$_libs_mplayer `$_pkg_config --libs polyplib polyplib-error polyplib-mainloop`" -- _inc_extra="$_inc_extra `$_pkg_config --cflags polyplib polyplib-error polyplib-mainloop`" -+ _libs_mplayer="$_libs_mplayer `$_pkg_config --libs libpulse libpulse-simple libpulse-mainloop-glib`" -+ _inc_extra="$_inc_extra `$_pkg_config --cflags libpulse libpulse-simple libpulse-mainloop-glib`" else - _def_polyp='#undef USE_POLYP' - _noaomodules="polyp $_noaomodules" -@@ -6837,11 +6843,16 @@ echores "$_tv_v4l1" +@@ -7221,9 +7227,6 @@ if test "$_x264" = auto ; then + cat > $TMPC << EOF + #include <inttypes.h> + #include <x264.h> +-#if X264_BUILD < 76 +-#error We do not support old versions of x264. Get the latest from git. +-#endif + int main(void) { x264_encoder_open((void*)0); return 0; } + EOF + _x264=no +@@ -7593,11 +7596,16 @@ echores "$_tv_v4l1" echocheck "Video 4 Linux 2 TV interface" if test "$_tv_v4l2" = auto ; then _tv_v4l2=no diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab deleted file mode 100644 index 4711debb9a5..00000000000 --- a/multimedia/mplayer-share/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2006/06/13 17:25:00 drochner Exp $ - ---- 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) - - if (last_alloc) - pthread_mutex_unlock(&memmut); -- else -+ else { -+ pthread_mutex_unlock(&memmut); - pthread_mutex_destroy(&memmut); -+ } - - //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld (%d)\n", header, header->size, alccnt); - #else diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac index a3b46cc7eb9..8c9015e2b3b 100644 --- a/multimedia/mplayer-share/patches/patch-ac +++ b/multimedia/mplayer-share/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.5 2006/06/13 17:25:00 drochner Exp $ +$NetBSD: patch-ac,v 1.6 2009/10/18 22:22:10 ahoka Exp $ ---- libfaad2/common.h.orig 2006-06-11 20:35:42.000000000 +0200 +--- libfaad2/common.h.orig 2009-07-26 21:53:00.000000000 +0200 +++ libfaad2/common.h -@@ -334,7 +334,7 @@ char *strchr(), *strrchr(); - #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF) +@@ -320,7 +320,7 @@ char *strchr(), *strrchr(); + #elif (defined(__i386__) && defined(__GNUC__)) && !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 index 05aab22e8d7..a61d25de1dc 100644 --- a/multimedia/mplayer-share/patches/patch-ad +++ b/multimedia/mplayer-share/patches/patch-ad @@ -1,11 +1,11 @@ -$NetBSD: patch-ad,v 1.8 2006/11/30 14:03:13 abs Exp $ +$NetBSD: patch-ad,v 1.9 2009/10/18 22:22:10 ahoka Exp $ ---- stream/cdd.h.orig 2006-11-21 10:26:56.000000000 +0000 +--- stream/cdd.h.orig 2009-05-13 04:58:57.000000000 +0200 +++ stream/cdd.h @@ -3,8 +3,8 @@ #include "config.h" - #ifndef HAVE_LIBCDIO + #ifndef CONFIG_LIBCDIO -#include <cdda_interface.h> -#include <cdda_paranoia.h> +#include <cdparanoia/cdda_interface.h> diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae index 7de611841c2..3ab90656716 100644 --- a/multimedia/mplayer-share/patches/patch-ae +++ b/multimedia/mplayer-share/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.8 2007/12/21 11:31:15 tron Exp $ +$NetBSD: patch-ae,v 1.9 2009/10/18 22:22:10 ahoka Exp $ ---- 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 :) +--- libvo/aclib.c.orig 2009-04-08 22:21:21.000000000 +0200 ++++ libvo/aclib.c +@@ -40,7 +40,7 @@ + //#define COMPILE_C + //#endif - //#define STATISTICS --#ifdef ARCH_X86 +-#if ARCH_X86 +#if defined(ARCH_X86) && !defined(__APPLE__) - #define CAN_COMPILE_X86_ASM - #endif + #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT + #define COMPILE_MMX diff --git a/multimedia/mplayer-share/patches/patch-af b/multimedia/mplayer-share/patches/patch-af deleted file mode 100644 index edacb200131..00000000000 --- a/multimedia/mplayer-share/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.4 2007/12/21 11:31:16 tron Exp $ - ---- 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] = { - 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 db02fd1600a..6704762c48e 100644 --- a/multimedia/mplayer-share/patches/patch-ag +++ b/multimedia/mplayer-share/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.4 2007/12/21 11:31:16 tron Exp $ +$NetBSD: patch-ag,v 1.5 2009/10/18 22:22:10 ahoka Exp $ ---- 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" +--- libvo/osd.c.orig 2009-04-08 22:21:21.000000000 +0200 ++++ libvo/osd.c +@@ -41,7 +41,7 @@ static const unsigned long long mask24hl + #define COMPILE_C + #endif --#ifdef ARCH_X86 +-#if ARCH_X86 +#if defined(ARCH_X86) && !defined(__APPLE__) - #define CAN_COMPILE_X86_ASM - #endif + #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT + #define COMPILE_MMX diff --git a/multimedia/mplayer-share/patches/patch-ai b/multimedia/mplayer-share/patches/patch-ai deleted file mode 100644 index d86d83bc220..00000000000 --- a/multimedia/mplayer-share/patches/patch-ai +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ai,v 1.5 2008/01/03 13:34:37 gdt Exp $ - -Fix parallel build failure by expressing dependencies. -Filed upstream as http://bugzilla.mplayerhq.hu/show_bug.cgi?id=967 - ---- vidix/Makefile.orig 2007-10-07 15:49:27.000000000 -0400 -+++ vidix/Makefile -@@ -40,13 +40,13 @@ dep depend:: pci_names.c - - include ../mpcommon.mak - --mga_crtc2_vid.o: mga_vid.c -+mga_crtc2_vid.o: mga_vid.c pci_ids.h - $(CC) -c $(CFLAGS) -DCRTC2 -o $@ $< - --rage128_vid.o: radeon_vid.c -+rage128_vid.o: radeon_vid.c pci_ids.h - $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< - --pci_names.c pci_dev_ids.c: pci.db -+pci_vendors.h pci_ids.h pci_names.c pci_names.h pci_dev_ids.c: pci.db - LC_ALL=C awk -f pci_db2c.awk $< - - clean:: diff --git a/multimedia/mplayer-share/patches/patch-aj b/multimedia/mplayer-share/patches/patch-aj deleted file mode 100644 index 3180cd9db2a..00000000000 --- a/multimedia/mplayer-share/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2008/02/26 18:14:30 tnn Exp $ - ---- stream/tvi_bsdbt848.c.orig 2007-10-07 21:49:26.000000000 +0200 -+++ stream/tvi_bsdbt848.c -@@ -36,6 +36,7 @@ - #include <sys/time.h> - #include <signal.h> - #include <string.h> -+#include <errno.h> - - #include <sys/param.h> - #ifdef USE_SUN_AUDIO diff --git a/multimedia/mplayer-share/patches/patch-ak b/multimedia/mplayer-share/patches/patch-ak deleted file mode 100644 index 73293d9612c..00000000000 --- a/multimedia/mplayer-share/patches/patch-ak +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ak,v 1.5 2008/04/14 06:55:47 joerg Exp $ - -Fix crashes when rendering ASS and no TrueType font has been found. -This crash can be hidden by large stack sizes. It is not known whether -this issue is exploitable. - ---- libass/ass_font.c.orig 2007-10-07 21:49:31.000000000 +0200 -+++ libass/ass_font.c -@@ -294,6 +294,8 @@ FT_Glyph ass_font_get_glyph(void* fontco - mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_GlyphNotFoundReselectingFont, - ch, font->desc.family, font->desc.bold, font->desc.italic); - face_idx = add_face(fontconfig_priv, font, ch); -+ if (face_idx == -1) -+ return 0; - face = font->faces[face_idx]; - index = FT_Get_Char_Index(face, ch); - if (index == 0) { diff --git a/multimedia/mplayer-share/patches/patch-al b/multimedia/mplayer-share/patches/patch-al deleted file mode 100644 index fa13b92065b..00000000000 --- a/multimedia/mplayer-share/patches/patch-al +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-al,v 1.3 2008/05/11 03:46:24 tonnerre Exp $ - ---- stream/realrtsp/sdpplin.c.orig 2007-10-07 21:49:25.000000000 +0200 -+++ stream/realrtsp/sdpplin.c -@@ -330,7 +330,8 @@ sdpplin_t *sdpplin_parse(char *data) { - - if(filter(data,"a=StreamCount:integer;",&buf)) { - desc->stream_count=(unsigned int)atoi(buf); -- desc->stream=malloc(sizeof(sdpplin_stream_t*)*desc->stream_count); -+ desc->stream=calloc(desc->stream_count, sizeof(sdpplin_stream_t*)); -+ if (!desc->stream) desc->stream_count = 0; - handled=1; - data=nl(data); - } diff --git a/multimedia/mplayer-share/patches/patch-am b/multimedia/mplayer-share/patches/patch-am deleted file mode 100644 index bce7631dc07..00000000000 --- a/multimedia/mplayer-share/patches/patch-am +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-am,v 1.1 2008/10/02 12:32:41 tron Exp $ - ---- libmpdemux/demux_real.c.orig 2007-10-07 20:49:33.000000000 +0100 -+++ libmpdemux/demux_real.c 2008-10-02 13:04:25.000000000 +0100 -@@ -958,6 +958,7 @@ - // last fragment! - if(dp_hdr->len!=vpkg_length-vpkg_offset) - mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset); -+ if (vpkg_offset > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len; - stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset); - if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else - dp_hdr->len+=vpkg_offset; -@@ -981,6 +982,7 @@ - // non-last fragment: - if(dp_hdr->len!=vpkg_offset) - mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d offset=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,len,vpkg_length); -+ if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len; - stream_read(demuxer->stream, dp_data+dp_hdr->len, len); - if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else - dp_hdr->len+=len; -@@ -1003,6 +1005,7 @@ - extra[0]=1; extra[1]=0; // offset of the first chunk - if(0x00==(vpkg_header&0xc0)){ - // first fragment: -+ if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len - sizeof(dp_hdr_t); - dp_hdr->len=len; - stream_read(demuxer->stream, dp_data, len); - ds->asf_packet=dp; diff --git a/multimedia/mplayer-share/patches/patch-an b/multimedia/mplayer-share/patches/patch-an index 027895e4ead..3669f83cba2 100644 --- a/multimedia/mplayer-share/patches/patch-an +++ b/multimedia/mplayer-share/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2008/10/20 07:40:00 wiz Exp $ +$NetBSD: patch-an,v 1.2 2009/10/18 22:22:10 ahoka Exp $ ---- stream/vcd_read_fbsd.h.orig 2007-10-07 19:49:26.000000000 +0000 +--- stream/vcd_read_fbsd.h.orig 2008-03-10 20:28:42.000000000 +0100 +++ stream/vcd_read_fbsd.h -@@ -37,9 +37,8 @@ typedef struct mp_vcd_priv_st { +@@ -41,9 +41,8 @@ typedef struct mp_vcd_priv_st { vcd_tocentry entry; #ifdef VCD_NETBSD struct cd_toc_entry entry_data; @@ -10,28 +10,29 @@ $NetBSD: patch-an,v 1.1 2008/10/20 07:40:00 wiz Exp $ - cdsector_t buf; #endif + cdsector_t buf; + struct ioc_toc_header tochdr; } mp_vcd_priv_t; - static inline void -@@ -208,8 +207,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) +@@ -209,8 +208,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) sc.cmd[9] = 1 << 4; // user data only sc.cmd[10] = 0; // no subchannel sc.cmdlen = 12; - sc.databuf = (caddr_t) mem; -- sc.datalen = 2328; +- sc.datalen = VCD_SECTOR_DATA; + sc.databuf = (caddr_t) vcd->buf.data; + sc.datalen = VCD_SECTOR_DATA + 4; // MMC-3 spec says there are 4 extra bytes sc.senselen = sizeof(sc.sense); sc.flags = SCCMD_READ; sc.timeout = 10000; -@@ -226,9 +225,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) +@@ -227,9 +226,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem) #else if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE) != VCD_SECTOR_SIZE) return 0; // EOF? -+#endif - - memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); --#endif +- +- memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); + #endif ++ ++ memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA); vcd_inc_msf(vcd); return VCD_SECTOR_DATA; } diff --git a/multimedia/mplayer-share/patches/patch-ao b/multimedia/mplayer-share/patches/patch-ao index f4221a9d2d0..51006414ff2 100644 --- a/multimedia/mplayer-share/patches/patch-ao +++ b/multimedia/mplayer-share/patches/patch-ao @@ -1,41 +1,41 @@ -$NetBSD: patch-ao,v 1.1 2008/12/18 16:44:27 bjs Exp $ +$NetBSD: patch-ao,v 1.2 2009/10/18 22:22:10 ahoka Exp $ NOTE: When updating this, make sure it harmonizes with multimedia/ffmpeg/patches/patch-oldx264. ---- libavcodec/libx264.c.orig 2007-10-07 15:49:37.000000000 -0400 +--- libavcodec/libx264.c.orig 2009-09-29 20:03:30.000000000 +0200 +++ libavcodec/libx264.c -@@ -162,7 +162,11 @@ X264_init(AVCodecContext *avctx) +@@ -179,7 +179,11 @@ static av_cold int X264_init(AVCodecCont - x4->params.i_bframe = avctx->max_b_frames; - x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; + x4->params.i_bframe = avctx->max_b_frames; + x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; +#if X264_BUILD > 62 -+ x4->params.i_bframe_adaptive = avctx->b_frame_strategy; + x4->params.i_bframe_adaptive = avctx->b_frame_strategy; +#else - x4->params.b_bframe_adaptive = avctx->b_frame_strategy; ++ x4->params.b_bframe_adaptive = avctx->b_frame_strategy; +#endif - x4->params.i_bframe_bias = avctx->bframebias; - x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID); - avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames; -@@ -224,9 +228,10 @@ X264_init(AVCodecContext *avctx) + x4->params.i_bframe_bias = avctx->bframebias; + x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; + avctx->has_b_frames = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; +@@ -244,6 +248,10 @@ static av_cold int X264_init(AVCodecCont + x4->params.analyse.i_me_range = avctx->me_range; + x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; - x4->params.analyse.i_me_range = avctx->me_range; - x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; -- +#if X264_BUILD < 65 - x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0); - x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO); ++ x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0); ++ x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO); +#endif - x4->params.analyse.b_mixed_references = - (avctx->flags2 & CODEC_FLAG2_MIXED_REFS); - x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA); -@@ -251,7 +256,9 @@ X264_init(AVCodecContext *avctx) - x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor); - x4->params.rc.f_pb_factor = avctx->b_quant_factor; + x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS; + x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA; + x4->params.analyse.b_transform_8x8 = avctx->flags2 & CODEC_FLAG2_8X8DCT; +@@ -269,6 +277,10 @@ static av_cold int X264_init(AVCodecCont + x4->params.rc.f_pb_factor = avctx->b_quant_factor; x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; + +#if X264_BUILD < 61 - x4->params.rc.psz_rc_eq = avctx->rc_eq; ++ x4->params.rc.psz_rc_eq = avctx->rc_eq; +#endif ++ + x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR; + x4->params.i_log_level = X264_LOG_DEBUG; - x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR); - x4->params.i_log_level = X264_LOG_DEBUG; diff --git a/multimedia/mplayer-share/patches/patch-ap b/multimedia/mplayer-share/patches/patch-ap deleted file mode 100644 index ba49c896e34..00000000000 --- a/multimedia/mplayer-share/patches/patch-ap +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2009/02/02 19:20:49 drochner Exp $ - ---- libavformat/psxstr.c.orig 2007-10-07 21:49:38.000000000 +0200 -+++ libavformat/psxstr.c -@@ -276,12 +276,23 @@ static int str_read_packet(AVFormatConte - int current_sector = AV_RL16(§or[0x1C]); - int sector_count = AV_RL16(§or[0x1E]); - int frame_size = AV_RL32(§or[0x24]); -- int bytes_to_copy; -+ -+ if(!( frame_size>=0 -+ && current_sector < sector_count -+ && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){ -+ av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", current_sector, sector_count, frame_size); -+ return AVERROR_INVALIDDATA; -+ } -+ - // printf("%d %d %d\n",current_sector,sector_count,frame_size); - /* if this is the first sector of the frame, allocate a pkt */ - pkt = &str->tmp_pkt; -- if (current_sector == 0) { -- if (av_new_packet(pkt, frame_size)) -+ -+ if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){ -+ if(pkt->data) -+ av_log(s, AV_LOG_ERROR, "missmatching sector_count\n"); -+ av_free_packet(pkt); -+ if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE)) - return AVERROR(EIO); - - pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE; -@@ -295,15 +306,15 @@ static int str_read_packet(AVFormatConte - str->pts += (90000 / 15); - } - -- /* load all the constituent chunks in the video packet */ -- bytes_to_copy = frame_size - current_sector*VIDEO_DATA_CHUNK_SIZE; -- if (bytes_to_copy>0) { -- if (bytes_to_copy>VIDEO_DATA_CHUNK_SIZE) bytes_to_copy=VIDEO_DATA_CHUNK_SIZE; -- memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE, -- sector + VIDEO_DATA_HEADER_SIZE, bytes_to_copy); -- } -+ memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE, -+ sector + VIDEO_DATA_HEADER_SIZE, -+ VIDEO_DATA_CHUNK_SIZE); -+ - if (current_sector == sector_count-1) { -+ pkt->size= frame_size; - *ret_pkt = *pkt; -+ pkt->data= NULL; -+ pkt->size= -1; - return 0; - } - diff --git a/multimedia/mplayer-share/patches/patch-aq b/multimedia/mplayer-share/patches/patch-aq deleted file mode 100644 index bd6c6e720fe..00000000000 --- a/multimedia/mplayer-share/patches/patch-aq +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2009/02/02 19:20:49 drochner Exp $ - ---- libavformat/4xm.c.orig 2009-01-29 13:36:59.000000000 +0100 -+++ libavformat/4xm.c -@@ -163,10 +163,13 @@ static int fourxm_read_header(AVFormatCo - return AVERROR_INVALIDDATA; - } - current_track = AV_RL32(&header[i + 8]); -+ if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){ -+ av_log(s, AV_LOG_ERROR, "current_track too large\n"); -+ av_free(header); -+ return AVERROR_INVALIDDATA; -+ } - if (current_track + 1 > fourxm->track_count) { - fourxm->track_count = current_track + 1; -- if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)) -- return -1; - fourxm->tracks = av_realloc(fourxm->tracks, - fourxm->track_count * sizeof(AudioTrack)); - if (!fourxm->tracks) { diff --git a/multimedia/mplayer-share/patches/patch-ar b/multimedia/mplayer-share/patches/patch-ar index d546a6774cb..18d142ec744 100644 --- a/multimedia/mplayer-share/patches/patch-ar +++ b/multimedia/mplayer-share/patches/patch-ar @@ -2,16 +2,14 @@ $NetBSD$ Fix for SA26157. ---- stream/realrtsp/real.c.orig 2009-08-09 15:48:11.000000000 +0300 -+++ stream/realrtsp/real.c 2009-08-09 15:51:10.000000000 +0300 -@@ -376,7 +376,10 @@ - ts, size, flags1, unknown1, header[4], header[5]); +--- stream/realrtsp/real.c.orig 2009-09-02 12:55:36.000000000 +0200 ++++ stream/realrtsp/real.c +@@ -369,6 +369,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_sess #endif size+=2; -- -+ + + if (size < 12) -+ return 0; ++ return 0; + ph.object_version=0; ph.length=size; diff --git a/multimedia/mplayer-share/patches/patch-ba b/multimedia/mplayer-share/patches/patch-ba deleted file mode 100644 index df8d27c606c..00000000000 --- a/multimedia/mplayer-share/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.7 2008/02/05 17:00:36 drochner Exp $ - ---- libmpdemux/demux_audio.c.orig 2007-10-07 21:49:33.000000000 +0200 -+++ libmpdemux/demux_audio.c -@@ -229,6 +229,8 @@ get_flac_metadata (demuxer_t* demuxer) - ptr += 4; - - comment = ptr; -+ if (&comment[length] < comments || &comment[length] >= &comments[blk_len]) -+ return; - c = comment[length]; - comment[length] = 0; - diff --git a/multimedia/mplayer-share/patches/patch-bb b/multimedia/mplayer-share/patches/patch-bb deleted file mode 100644 index 0bc4a91bab1..00000000000 --- a/multimedia/mplayer-share/patches/patch-bb +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-bb,v 1.7 2008/02/05 17:00:36 drochner Exp $ - ---- libmpdemux/demux_mov.c.orig 2007-10-07 21:49:33.000000000 +0200 -+++ libmpdemux/demux_mov.c -@@ -173,11 +173,12 @@ void mov_build_index(mov_track_t* trak,i - i=trak->chunkmap_size; - while(i>0){ - --i; -- for(j=trak->chunkmap[i].first;j<last;j++){ -+ j=FFMAX(trak->chunkmap[i].first, 0); -+ for(;j<last;j++){ - trak->chunks[j].desc=trak->chunkmap[i].sdid; - trak->chunks[j].size=trak->chunkmap[i].spc; - } -- last=trak->chunkmap[i].first; -+ last=FFMIN(trak->chunkmap[i].first, trak->chunks_size); - } - - #if 0 -@@ -235,6 +236,8 @@ void mov_build_index(mov_track_t* trak,i - s=0; - for(j=0;j<trak->durmap_size;j++){ - for(i=0;i<trak->durmap[j].num;i++){ -+ if (s >= trak->samples_size) -+ break; - trak->samples[s].pts=pts; - ++s; - pts+=trak->durmap[j].dur; -@@ -246,6 +249,8 @@ void mov_build_index(mov_track_t* trak,i - for(j=0;j<trak->chunks_size;j++){ - off_t pos=trak->chunks[j].pos; - for(i=0;i<trak->chunks[j].size;i++){ -+ if (s >= trak->samples_size) -+ break; - trak->samples[s].pos=pos; - mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X size=%d\n",s, - trak->samples[s].pts, -@@ -1568,8 +1573,7 @@ static void lschunks(demuxer_t* demuxer, - if( udta_len>udta_size) - udta_len=udta_size; - { -- char dump[udta_len-4]; -- stream_read(demuxer->stream, (char *)&dump, udta_len-4-4); -+ stream_skip(demuxer->stream, udta_len-4-4); - udta_size -= udta_len; - } - } diff --git a/multimedia/mplayer-share/patches/patch-bc b/multimedia/mplayer-share/patches/patch-bc deleted file mode 100644 index 66bf334d3bd..00000000000 --- a/multimedia/mplayer-share/patches/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bc,v 1.5 2008/02/05 17:00:36 drochner Exp $ - ---- stream/url.c.orig 2007-10-07 21:49:26.000000000 +0200 -+++ stream/url.c -@@ -328,6 +328,7 @@ url_escape_string(char *outbuf, const ch - } - } - -+ tmp = NULL; - while(i < len) { - // look for the next char that must be kept - for (j=i;j<len;j++) { diff --git a/multimedia/mplayer-share/patches/patch-bd b/multimedia/mplayer-share/patches/patch-bd deleted file mode 100644 index 3c0f673e1f3..00000000000 --- a/multimedia/mplayer-share/patches/patch-bd +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-bd,v 1.5 2008/02/05 17:00:36 drochner Exp $ - ---- stream/stream_cddb.c.orig 2007-10-07 21:49:26.000000000 +0200 -+++ stream/stream_cddb.c -@@ -53,6 +53,7 @@ - #include "version.h" - #include "stream.h" - #include "network.h" -+#include "libavutil/intreadwrite.h" - - #define DEFAULT_FREEDB_SERVER "freedb.freedb.org" - #define DEFAULT_CACHE_DIR "/.cddb/" -@@ -453,8 +454,9 @@ cddb_parse_matches_list(HTTP_header_t *h - } else { - len = ptr2-ptr+1; - } -+ len = FFMIN(sizeof(album_title) - 1, len); - strncpy(album_title, ptr, len); -- album_title[len-2]='\0'; -+ album_title[len]='\0'; - } - mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title); - return 0; -@@ -490,8 +492,9 @@ cddb_query_parse(HTTP_header_t *http_hdr - } else { - len = ptr2-ptr+1; - } -+ len = FFMIN(sizeof(album_title) - 1, len); - strncpy(album_title, ptr, len); -- album_title[len-2]='\0'; -+ album_title[len]='\0'; - } - mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title); - return cddb_request_titles(cddb_data); diff --git a/multimedia/mplayer-share/patches/patch-be b/multimedia/mplayer-share/patches/patch-be deleted file mode 100644 index ef2b1fd4faa..00000000000 --- a/multimedia/mplayer-share/patches/patch-be +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-be,v 1.3 2008/12/20 00:43:47 jmcneill Exp $ - ---- libao2/audio_out.c.orig 2008-12-19 19:39:23.000000000 -0500 -+++ libao2/audio_out.c 2008-12-19 19:39:37.000000000 -0500 -@@ -26,7 +26,7 @@ extern ao_functions_t audio_out_arts; - extern ao_functions_t audio_out_esd; - #endif - #ifdef USE_POLYP --extern ao_functions_t audio_out_polyp; -+extern ao_functions_t audio_out_pulse; - #endif - #ifdef USE_JACK - extern ao_functions_t audio_out_jack; -@@ -113,7 +113,7 @@ ao_functions_t* audio_out_drivers[] = - &audio_out_esd, - #endif - #ifdef USE_POLYP -- &audio_out_polyp, -+ &audio_out_pulse, - #endif - #ifdef USE_JACK - &audio_out_jack, diff --git a/multimedia/mplayer-share/patches/patch-ca b/multimedia/mplayer-share/patches/patch-ca deleted file mode 100644 index 9822526a14d..00000000000 --- a/multimedia/mplayer-share/patches/patch-ca +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2008/12/15 15:37:58 tron Exp $ - -Security fix for vulnerability reported in TKADV2008-014 taken from: - -http://svn.mplayerhq.hu/mplayer/branches/1.0rc2/libmpdemux/demux_vqf.c?view=patch&r1=24723&r2=28150&pathrev=28150 - ---- libmpdemux/demux_vqf.c.orig 2007-10-07 20:49:33.000000000 +0100 -+++ libmpdemux/demux_vqf.c 2008-12-15 14:29:58.000000000 +0000 -@@ -50,11 +50,14 @@ - unsigned chunk_size; - hi->size=chunk_size=stream_read_dword(s); /* include itself */ - stream_read(s,chunk_id,4); -+ if (chunk_size < 8) return NULL; -+ chunk_size -= 8; - if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('C','O','M','M')) - { -- char buf[chunk_size-8]; -+ char buf[BUFSIZ]; - unsigned i,subchunk_size; -- if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL; -+ if (chunk_size > sizeof(buf) || chunk_size < 20) return NULL; -+ if(stream_read(s,buf,chunk_size)!=chunk_size) return NULL; - i=0; - subchunk_size=be2me_32(*((uint32_t *)&buf[0])); - hi->channelMode=be2me_32(*((uint32_t *)&buf[4])); -@@ -83,13 +86,15 @@ - sh_audio->samplesize = 4; - w->wBitsPerSample = 8*sh_audio->samplesize; - w->cbSize = 0; -+ if (subchunk_size > chunk_size - 4) continue; - i+=subchunk_size+4; -- while(i<chunk_size-8) -+ while(i + 8 < chunk_size) - { - unsigned slen,sid; -- char sdata[chunk_size]; -+ char sdata[BUFSIZ]; - sid=*((uint32_t *)&buf[i]); i+=4; - slen=be2me_32(*((uint32_t *)&buf[i])); i+=4; -+ if (slen > sizeof(sdata) - 1 || slen > chunk_size - i) break; - if(sid==mmioFOURCC('D','S','I','Z')) - { - hi->Dsiz=be2me_32(*((uint32_t *)&buf[i])); -@@ -141,7 +146,7 @@ - if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('D','A','T','A')) - { - demuxer->movi_start=stream_tell(s); -- demuxer->movi_end=demuxer->movi_start+chunk_size-8; -+ demuxer->movi_end=demuxer->movi_start+chunk_size; - mp_msg(MSGT_DEMUX, MSGL_V, "Found data at %"PRIX64" size %"PRIu64"\n",demuxer->movi_start,demuxer->movi_end); - /* Done! play it */ - break; -@@ -149,7 +154,7 @@ - else - { - mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",((char *)&chunk_id)[0],((char *)&chunk_id)[1],((char *)&chunk_id)[2],((char *)&chunk_id)[3],chunk_size); -- stream_skip(s,chunk_size-8); /*unknown chunk type */ -+ stream_skip(s,chunk_size); /*unknown chunk type */ - } - } - diff --git a/multimedia/mplayer-share/patches/patch-tc b/multimedia/mplayer-share/patches/patch-tc deleted file mode 100644 index fa810b2ba63..00000000000 --- a/multimedia/mplayer-share/patches/patch-tc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-tc,v 1.2 2007/12/21 11:31:25 tron Exp $ - ---- 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-share/patches/patch-va b/multimedia/mplayer-share/patches/patch-va deleted file mode 100644 index 07aef06a449..00000000000 --- a/multimedia/mplayer-share/patches/patch-va +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-va,v 1.1 2008/09/09 01:11:53 jmcneill Exp $ - ---- libavformat/v4l2.c.orig 2008-09-08 20:54:25.000000000 -0400 -+++ libavformat/v4l2.c 2008-09-08 20:54:53.000000000 -0400 -@@ -32,8 +32,13 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - #include <sys/time.h> -+#ifdef __linux__ - #include <asm/types.h> - #include <linux/videodev2.h> -+#elif defined(__NetBSD__) || defined(__OpenBSD__) -+#include <sys/types.h> -+#include <sys/videoio.h> -+#endif - #include <time.h> - - static const int desired_video_buffers = 256; diff --git a/multimedia/mplayer-share/patches/patch-vb b/multimedia/mplayer-share/patches/patch-vb index bec453cf887..a05e09a7ade 100644 --- a/multimedia/mplayer-share/patches/patch-vb +++ b/multimedia/mplayer-share/patches/patch-vb @@ -1,8 +1,8 @@ -$NetBSD: patch-vb,v 1.2 2008/09/09 12:13:13 jmcneill Exp $ +$NetBSD: patch-vb,v 1.3 2009/10/18 22:22:10 ahoka Exp $ ---- stream/tvi_v4l2.c.orig 2008-09-09 08:11:50.000000000 -0400 -+++ stream/tvi_v4l2.c 2008-09-09 08:12:21.000000000 -0400 -@@ -38,8 +38,12 @@ +--- stream/tvi_v4l2.c.orig 2009-05-13 04:58:57.000000000 +0200 ++++ stream/tvi_v4l2.c +@@ -49,8 +49,12 @@ known issues: #ifdef HAVE_SYS_SYSINFO_H #include <sys/sysinfo.h> #endif diff --git a/multimedia/mplayer-share/patches/patch-ve_x264 b/multimedia/mplayer-share/patches/patch-ve_x264 new file mode 100644 index 00000000000..d46d92911d9 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ve_x264 @@ -0,0 +1,18 @@ +$NetBSD: patch-ve_x264,v 1.1 2009/10/18 22:22:10 ahoka Exp $ + +--- libmpcodecs/ve_x264.c.orig 2009-09-23 14:26:44.000000000 +0200 ++++ libmpcodecs/ve_x264.c +@@ -198,8 +198,13 @@ static int control(struct vf_instance_s* + h264_module_t *mod=(h264_module_t*)vf->priv; + switch(request){ + case VFCTRL_FLUSH_FRAMES: ++#if X264_BUILD > 70 + while (x264_encoder_delayed_frames(mod->x264) > 0) + encode_frame(vf, NULL); ++#else ++ if(param.i_bframe) ++ while(encode_frame(vf, NULL) > 0); ++#endif + return CONTROL_TRUE; + default: + return CONTROL_UNKNOWN; diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 51f2305a73f..804e90b1a8b 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.67 2009/08/09 12:56:11 kefren Exp $ +# $NetBSD: Makefile,v 1.68 2009/10/18 22:22:11 ahoka Exp $ -PKGNAME= mplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 14 +PKGNAME= mplayer-${MPLAYER_VERSION} +#PKGREVISION= 0 -COMMENT= Software-only MPEG-1/2/4 video decoder +COMMENT= Fast, cross-platform movie player PKG_DESTDIR_SUPPORT= user-destdir @@ -11,6 +11,10 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= pkg-config +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm +.endif + CONFIGURE_ARGS+= --disable-mencoder CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer |