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.

2 files changed, 83 insertions, 97 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