Sun Feb 7 13:34:34 2016 UTC ()
Update multimedia/{gmplayer,mencoder,mplayer,mplayer-share} to 1.2.1.

pkgsrc changes:
 o Switch all mplayer packages to use multimedia/ffmpeg2 instead of the
   version bundled with MPlayer. This will make maintainership of mplayer
   packages probably a bit easier (and it's particular relevant when dealing
   vulnerability issues). Discussed with wiz@.
 o Adjust CONFIGURE_ARGS and other part of the Makefile* to reflect the switch
   to multimedia/ffmpeg2.

Changes:
  1.2.1:
    Fixes:
    * misc GUI fixes
    * fix build regression in FreeBSD
    * fix many crashes with fuzzed files
    * fix errors for multichannels files and pulseaudio >= 6
    Other:
    * building with system FFmpeg libs is possible without a local copy of
      of private FFmpeg headers
    * docs building does not require FFmpeg anymore
    * FFmpeg updated to 2.8.5


(leot)
diff -r1.130 -r1.131 pkgsrc/multimedia/gmplayer/Makefile
diff -r1.94 -r1.95 pkgsrc/multimedia/gmplayer/distinfo
diff -r1.65 -r1.66 pkgsrc/multimedia/mencoder/Makefile
diff -r1.99 -r1.100 pkgsrc/multimedia/mplayer/Makefile
diff -r1.7 -r1.8 pkgsrc/multimedia/mplayer-share/Makefile.cflags
diff -r1.55 -r1.56 pkgsrc/multimedia/mplayer-share/Makefile.common
diff -r1.19 -r1.20 pkgsrc/multimedia/mplayer-share/Makefile.depends
diff -r1.89 -r1.90 pkgsrc/multimedia/mplayer-share/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mplayer-share/patches/patch-Makefile
diff -r1.33 -r1.34 pkgsrc/multimedia/mplayer-share/patches/patch-aa
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_Makefile
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_configure
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_libvpxenc.c
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_x86_ac3dsp_init.c
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_common.h
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_opencl.c
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86_asm.h
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86_cpu.c
diff -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-gui_wm_ws.c
diff -r1.3 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c
cvs diff -r1.130 -r1.131 pkgsrc/multimedia/gmplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/Makefile 2015/11/23 22:47:59 1.130
+++ pkgsrc/multimedia/gmplayer/Makefile 2016/02/07 13:34:34 1.131
@@ -1,39 +1,34 @@ @@ -1,39 +1,34 @@
1# $NetBSD: Makefile,v 1.130 2015/11/23 22:47:59 leot Exp $ 1# $NetBSD: Makefile,v 1.131 2016/02/07 13:34:34 leot Exp $
2# 2#
3# NOTE: if you are updating both mplayer and gmplayer, you must ensure 3# NOTE: if you are updating both mplayer and gmplayer, you must ensure
4# that *both* distinfo files contain the correct, up-to-date files and 4# that *both* distinfo files contain the correct, up-to-date files and
5# checksums. 5# checksums.
6# 6#
7# NOTE: patches are shared between mplayer and gmplayer! 7# NOTE: patches are shared between mplayer and gmplayer!
8# 8#
9 9
10PKGNAME= gmplayer-${MPLAYER_VERSION} 10PKGNAME= gmplayer-${MPLAYER_VERSION}
11PKGREVISION= 3 
12 11
13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ 12SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
14 http://www2.mplayerhq.hu/MPlayer/skins/ \ 13 http://www2.mplayerhq.hu/MPlayer/skins/ \
15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \ 14 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \
16 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \ 15 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \
17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \ 16 http://ftp5.mplayerhq.hu/MPlayer/skins/ \
18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/ 17 ftp://ftp5.mplayerhq.hu/MPlayer/skins/
19 18
20.include "../../multimedia/mplayer-share/Makefile.common" 19.include "../../multimedia/mplayer-share/Makefile.common"
21SKIN_EXTRACT_SUFX= .tar.bz2 20SKIN_EXTRACT_SUFX= .tar.bz2
22 21
23.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 
24BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm 
25.endif 
26 
27COMMENT= Fast, cross-platform movie player with GTK2+ interface 22COMMENT= Fast, cross-platform movie player with GTK2+ interface
28 23
29SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX} \ 24SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX} \
30 AlienMind-1.2${SKIN_EXTRACT_SUFX} \ 25 AlienMind-1.2${SKIN_EXTRACT_SUFX} \
31 Blue-1.11${SKIN_EXTRACT_SUFX} \ 26 Blue-1.11${SKIN_EXTRACT_SUFX} \
32 BlueHeart-1.5${SKIN_EXTRACT_SUFX} \ 27 BlueHeart-1.5${SKIN_EXTRACT_SUFX} \
33 Blue-small-1.8${SKIN_EXTRACT_SUFX} \ 28 Blue-small-1.8${SKIN_EXTRACT_SUFX} \
34 Canary-1.2${SKIN_EXTRACT_SUFX} \ 29 Canary-1.2${SKIN_EXTRACT_SUFX} \
35 Clearlooks-1.7${SKIN_EXTRACT_SUFX} \ 30 Clearlooks-1.7${SKIN_EXTRACT_SUFX} \
36 CornerMP-1.2${SKIN_EXTRACT_SUFX} \ 31 CornerMP-1.2${SKIN_EXTRACT_SUFX} \
37 CornerMP-aqua-1.4${SKIN_EXTRACT_SUFX} \ 32 CornerMP-aqua-1.4${SKIN_EXTRACT_SUFX} \
38 Corelian-1.2${SKIN_EXTRACT_SUFX} \ 33 Corelian-1.2${SKIN_EXTRACT_SUFX} \
39 CubicPlayer-1.1${SKIN_EXTRACT_SUFX} \ 34 CubicPlayer-1.1${SKIN_EXTRACT_SUFX} \
cvs diff -r1.94 -r1.95 pkgsrc/multimedia/gmplayer/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/distinfo 2015/11/23 22:47:59 1.94
+++ pkgsrc/multimedia/gmplayer/distinfo 2016/02/07 13:34:34 1.95
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.94 2015/11/23 22:47:59 leot Exp $ 1$NetBSD: distinfo,v 1.95 2016/02/07 13:34:34 leot Exp $
2 2
3SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725 3SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725
4RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a 4RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a
5SHA512 (mplayer/Abyss-1.7.tar.bz2) = e60aae7a6a264023ebb49421696bc78ec46b463ce6d7f869cc5561e183a6d5abd3846b71a45656c8ad2a6f35bafd76d15235216dcba3b4936ff7b364b7a66407 5SHA512 (mplayer/Abyss-1.7.tar.bz2) = e60aae7a6a264023ebb49421696bc78ec46b463ce6d7f869cc5561e183a6d5abd3846b71a45656c8ad2a6f35bafd76d15235216dcba3b4936ff7b364b7a66407
6Size (mplayer/Abyss-1.7.tar.bz2) = 292235 bytes 6Size (mplayer/Abyss-1.7.tar.bz2) = 292235 bytes
7SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc 7SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
8RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998 8RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
9SHA512 (mplayer/AlienMind-1.2.tar.bz2) = affae0989be95cdcb72b9d6d36d2c8362599b4cb3441ea15704f935bcb6e1ef2c2f9355ee26b8127177a6968f06b8b0f5b4c9b2919b8aeb257090b47eb7eca52 9SHA512 (mplayer/AlienMind-1.2.tar.bz2) = affae0989be95cdcb72b9d6d36d2c8362599b4cb3441ea15704f935bcb6e1ef2c2f9355ee26b8127177a6968f06b8b0f5b4c9b2919b8aeb257090b47eb7eca52
10Size (mplayer/AlienMind-1.2.tar.bz2) = 131295 bytes 10Size (mplayer/AlienMind-1.2.tar.bz2) = 131295 bytes
11SHA1 (mplayer/Blue-1.11.tar.bz2) = 7e112978e5cf16a023fbbfdb73d06f9709164aff 11SHA1 (mplayer/Blue-1.11.tar.bz2) = 7e112978e5cf16a023fbbfdb73d06f9709164aff
12RMD160 (mplayer/Blue-1.11.tar.bz2) = 41bd7b78ba4538b99cac31a5d777eeaba45c40bd 12RMD160 (mplayer/Blue-1.11.tar.bz2) = 41bd7b78ba4538b99cac31a5d777eeaba45c40bd
13SHA512 (mplayer/Blue-1.11.tar.bz2) = 88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267 13SHA512 (mplayer/Blue-1.11.tar.bz2) = 88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267
14Size (mplayer/Blue-1.11.tar.bz2) = 222529 bytes 14Size (mplayer/Blue-1.11.tar.bz2) = 222529 bytes
@@ -66,30 +66,30 @@ SHA512 (mplayer/Industrial-1.0.tar.bz2)  @@ -66,30 +66,30 @@ SHA512 (mplayer/Industrial-1.0.tar.bz2)
66Size (mplayer/Industrial-1.0.tar.bz2) = 53092 bytes 66Size (mplayer/Industrial-1.0.tar.bz2) = 53092 bytes
67SHA1 (mplayer/JiMPlayer-1.4.tar.bz2) = f3907dcadbef3d6745c919b4d5f9842533d828e4 67SHA1 (mplayer/JiMPlayer-1.4.tar.bz2) = f3907dcadbef3d6745c919b4d5f9842533d828e4
68RMD160 (mplayer/JiMPlayer-1.4.tar.bz2) = 763f8081d0dc84f87d97385d4bba1bb80d8bc79a 68RMD160 (mplayer/JiMPlayer-1.4.tar.bz2) = 763f8081d0dc84f87d97385d4bba1bb80d8bc79a
69SHA512 (mplayer/JiMPlayer-1.4.tar.bz2) = 431339166518fdc8fddf8149b6113fea444582013aa5429afde728413c64506eca35d1bbbea8a3e8d99e1cce158beea35b20df2fff071cfcdff41456c9346427 69SHA512 (mplayer/JiMPlayer-1.4.tar.bz2) = 431339166518fdc8fddf8149b6113fea444582013aa5429afde728413c64506eca35d1bbbea8a3e8d99e1cce158beea35b20df2fff071cfcdff41456c9346427
70Size (mplayer/JiMPlayer-1.4.tar.bz2) = 178517 bytes 70Size (mplayer/JiMPlayer-1.4.tar.bz2) = 178517 bytes
71SHA1 (mplayer/KDE-0.3.tar.bz2) = cfca61f8668ef150fcc8ba3d5ea7e64114358552 71SHA1 (mplayer/KDE-0.3.tar.bz2) = cfca61f8668ef150fcc8ba3d5ea7e64114358552
72RMD160 (mplayer/KDE-0.3.tar.bz2) = 19bbf8815d3dfad69346360199a991f2d7137e21 72RMD160 (mplayer/KDE-0.3.tar.bz2) = 19bbf8815d3dfad69346360199a991f2d7137e21
73SHA512 (mplayer/KDE-0.3.tar.bz2) = 99c328b6013d3012874f602a65e0426382015e06fdde346c5a8709b2e6ca0608d8d25d0e1e2dff975358ad85102fcb85ce53763490d987edede489545c085a95 73SHA512 (mplayer/KDE-0.3.tar.bz2) = 99c328b6013d3012874f602a65e0426382015e06fdde346c5a8709b2e6ca0608d8d25d0e1e2dff975358ad85102fcb85ce53763490d987edede489545c085a95
74Size (mplayer/KDE-0.3.tar.bz2) = 130502 bytes 74Size (mplayer/KDE-0.3.tar.bz2) = 130502 bytes
75SHA1 (mplayer/Linea-1.0.tar.bz2) = e6cbd705e285e117fc97c231b7fe0f9abf1db656 75SHA1 (mplayer/Linea-1.0.tar.bz2) = e6cbd705e285e117fc97c231b7fe0f9abf1db656
76RMD160 (mplayer/Linea-1.0.tar.bz2) = 558647aede2d009519f08191d45bbd1d50ed3ee9 76RMD160 (mplayer/Linea-1.0.tar.bz2) = 558647aede2d009519f08191d45bbd1d50ed3ee9
77SHA512 (mplayer/Linea-1.0.tar.bz2) = a55e11b6ac40e17acf54b290e2763448085e5962da992ec24bc8c3ecd9df40d5ad2965079c930ce30338d64b8a2544dc5ba7f5fcdd84c0ffd14a7e6d1a9ac3d8 77SHA512 (mplayer/Linea-1.0.tar.bz2) = a55e11b6ac40e17acf54b290e2763448085e5962da992ec24bc8c3ecd9df40d5ad2965079c930ce30338d64b8a2544dc5ba7f5fcdd84c0ffd14a7e6d1a9ac3d8
78Size (mplayer/Linea-1.0.tar.bz2) = 46965 bytes 78Size (mplayer/Linea-1.0.tar.bz2) = 46965 bytes
79SHA1 (mplayer/MPlayer-1.2.tar.xz) = 64fad840dfae466ab5ef3be2b6c74058892cd981 79SHA1 (mplayer/MPlayer-1.2.1.tar.xz) = cf988d8c7fe7bcf15a48970f0cf9e46837d78e1b
80RMD160 (mplayer/MPlayer-1.2.tar.xz) = 6d4c83370affbc7a1f79e59af8d78a2346a2b846 80RMD160 (mplayer/MPlayer-1.2.1.tar.xz) = 91e0f9078c22948666139fd122857381aa46eecd
81SHA512 (mplayer/MPlayer-1.2.tar.xz) = ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa 81SHA512 (mplayer/MPlayer-1.2.1.tar.xz) = e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
82Size (mplayer/MPlayer-1.2.tar.xz) = 13019196 bytes 82Size (mplayer/MPlayer-1.2.1.tar.xz) = 13029936 bytes
83SHA1 (mplayer/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f 83SHA1 (mplayer/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f
84RMD160 (mplayer/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c 84RMD160 (mplayer/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c
85SHA512 (mplayer/MidnightLove-1.6.tar.bz2) = 30b5e267d84382c8b9adbf86f21f5f95845ccf017d827241460ab1c050c7ce5f2dfc001209783281ef555190a6ccf62e5a95e009810505a1bb24fb80b2f9f193 85SHA512 (mplayer/MidnightLove-1.6.tar.bz2) = 30b5e267d84382c8b9adbf86f21f5f95845ccf017d827241460ab1c050c7ce5f2dfc001209783281ef555190a6ccf62e5a95e009810505a1bb24fb80b2f9f193
86Size (mplayer/MidnightLove-1.6.tar.bz2) = 539665 bytes 86Size (mplayer/MidnightLove-1.6.tar.bz2) = 539665 bytes
87SHA1 (mplayer/OSX-Brushed-2.3.tar.bz2) = 5e677c6675eb06a07cfd12c7fdce86c9b34ae49e 87SHA1 (mplayer/OSX-Brushed-2.3.tar.bz2) = 5e677c6675eb06a07cfd12c7fdce86c9b34ae49e
88RMD160 (mplayer/OSX-Brushed-2.3.tar.bz2) = 3da0d21b8f86d0909cab8507c452388e508bb2c5 88RMD160 (mplayer/OSX-Brushed-2.3.tar.bz2) = 3da0d21b8f86d0909cab8507c452388e508bb2c5
89SHA512 (mplayer/OSX-Brushed-2.3.tar.bz2) = 4c65d27e169fe036cddbcef72ffa7b4908fd30882d3887c7bc16b65c5d972ac460cdb45e8499ad08a8830581fe095804538133e2d11589f44db1e57d0d0a54a9 89SHA512 (mplayer/OSX-Brushed-2.3.tar.bz2) = 4c65d27e169fe036cddbcef72ffa7b4908fd30882d3887c7bc16b65c5d972ac460cdb45e8499ad08a8830581fe095804538133e2d11589f44db1e57d0d0a54a9
90Size (mplayer/OSX-Brushed-2.3.tar.bz2) = 76233 bytes 90Size (mplayer/OSX-Brushed-2.3.tar.bz2) = 76233 bytes
91SHA1 (mplayer/OSX-Mod-1.1.tar.bz2) = 1dc278b9b7892d88ad1358b6941fd85fbb793683 91SHA1 (mplayer/OSX-Mod-1.1.tar.bz2) = 1dc278b9b7892d88ad1358b6941fd85fbb793683
92RMD160 (mplayer/OSX-Mod-1.1.tar.bz2) = 6b9ecb9d3ddfda67d1cf43da08616dbdd32bb4d2 92RMD160 (mplayer/OSX-Mod-1.1.tar.bz2) = 6b9ecb9d3ddfda67d1cf43da08616dbdd32bb4d2
93SHA512 (mplayer/OSX-Mod-1.1.tar.bz2) = 92c58698d637d293066f1139fcd35531a778e01a2c6ae4b1f7cb9d0b7ad7d33663f2e5ea170fa1f6b11cac0c8c9ca3929ffb1c3fb7a5a2d8da4f200fda609038 93SHA512 (mplayer/OSX-Mod-1.1.tar.bz2) = 92c58698d637d293066f1139fcd35531a778e01a2c6ae4b1f7cb9d0b7ad7d33663f2e5ea170fa1f6b11cac0c8c9ca3929ffb1c3fb7a5a2d8da4f200fda609038
94Size (mplayer/OSX-Mod-1.1.tar.bz2) = 277365 bytes 94Size (mplayer/OSX-Mod-1.1.tar.bz2) = 277365 bytes
95SHA1 (mplayer/OpenDoh-1.1.tar.bz2) = 025ae99f47bed90c57b610c0f184c5cb49c5fa17 95SHA1 (mplayer/OpenDoh-1.1.tar.bz2) = 025ae99f47bed90c57b610c0f184c5cb49c5fa17
@@ -274,35 +274,26 @@ SHA512 (mplayer/webby-1.3.tar.bz2) = 517 @@ -274,35 +274,26 @@ SHA512 (mplayer/webby-1.3.tar.bz2) = 517
274Size (mplayer/webby-1.3.tar.bz2) = 61369 bytes 274Size (mplayer/webby-1.3.tar.bz2) = 61369 bytes
275SHA1 (mplayer/xanim-1.7.tar.bz2) = f215885fbb3d563a024d45e0f940d88315199907 275SHA1 (mplayer/xanim-1.7.tar.bz2) = f215885fbb3d563a024d45e0f940d88315199907
276RMD160 (mplayer/xanim-1.7.tar.bz2) = d3d3ea2577c153177156331e6495988d368dc502 276RMD160 (mplayer/xanim-1.7.tar.bz2) = d3d3ea2577c153177156331e6495988d368dc502
277SHA512 (mplayer/xanim-1.7.tar.bz2) = 2f16633ff1be5e0185c536d8a59adf89302bdd7461587648b6e5c3c071cc9a75e1b83b18425d3555d08411aa1d394ac91b8369bb18233c43888f79a7f349a088 277SHA512 (mplayer/xanim-1.7.tar.bz2) = 2f16633ff1be5e0185c536d8a59adf89302bdd7461587648b6e5c3c071cc9a75e1b83b18425d3555d08411aa1d394ac91b8369bb18233c43888f79a7f349a088
278Size (mplayer/xanim-1.7.tar.bz2) = 94526 bytes 278Size (mplayer/xanim-1.7.tar.bz2) = 94526 bytes
279SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18 279SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
280RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5 280RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
281SHA512 (mplayer/xine-lcd-1.2.tar.bz2) = 1deb579fba43fb74f344d8c1301511467cdd064ff89d8aedcc1addd5d3cb136bdc44a137caf853a18850179ec2580b9c1a02d3e24dc4b8b5121b09bd0333ddfa 281SHA512 (mplayer/xine-lcd-1.2.tar.bz2) = 1deb579fba43fb74f344d8c1301511467cdd064ff89d8aedcc1addd5d3cb136bdc44a137caf853a18850179ec2580b9c1a02d3e24dc4b8b5121b09bd0333ddfa
282Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes 282Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes
283SHA1 (mplayer/xmmplayer-1.5.tar.bz2) = 2d4cb1d30b0519a80c4cd49d042d5d4db5474e7c 283SHA1 (mplayer/xmmplayer-1.5.tar.bz2) = 2d4cb1d30b0519a80c4cd49d042d5d4db5474e7c
284RMD160 (mplayer/xmmplayer-1.5.tar.bz2) = 984ff462de6ea9bc903fda4e59232481bea79845 284RMD160 (mplayer/xmmplayer-1.5.tar.bz2) = 984ff462de6ea9bc903fda4e59232481bea79845
285SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f 285SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f
286Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes 286Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes
287SHA1 (patch-aa) = 81383178c34b89c2e2eb6132e379294ca1f824f3 287SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 288SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c
288SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 289SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
289SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 290SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
290SHA1 (patch-ffmpeg_Makefile) = c42d63935e824bd4006b40575b3e56e1645a32d2 
291SHA1 (patch-ffmpeg_configure) = 43adffa6ff6a781875950a20adeb837b4eafd9b7 
292SHA1 (patch-ffmpeg_libavcodec_libvpxenc.c) = 85fb37d2cf8361faa649b41fc6c36ac261314d39 
293SHA1 (patch-ffmpeg_libavcodec_x86_ac3dsp_init.c) = bbf84edc6b74721e31c0952b461131eac4499026 
294SHA1 (patch-ffmpeg_libavutil_common.h) = 20fe12a85d253caeeca90e09fcecdc929d2d9e34 
295SHA1 (patch-ffmpeg_libavutil_opencl.c) = 5146acb650e699f1e1d05efa4575cec825b7c2eb 
296SHA1 (patch-ffmpeg_libavutil_x86_asm.h) = 4010a5f5a7fd6e22c81f7e56fde5f0a474ad89e2 
297SHA1 (patch-ffmpeg_libavutil_x86_cpu.c) = a298feb778bc1d50e1abf4c0b56b9db97ab13c42 
298SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c 291SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
299SHA1 (patch-gui_wm_ws.c) = cdffd469d7b1fcc63016fa506d53304b24624235 
300SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 292SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
301SHA1 (patch-libmpdemux_demux__gif.c) = 6c7f6d0a89835b64eecead148597bb277be38fd9 
302SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec 293SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
303SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825 294SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
304SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03 295SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
305SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1 296SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
306SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8 297SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8
307SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608 298SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608
308SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1 299SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1
cvs diff -r1.65 -r1.66 pkgsrc/multimedia/mencoder/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mencoder/Makefile 2015/11/21 09:47:23 1.65
+++ pkgsrc/multimedia/mencoder/Makefile 2016/02/07 13:34:34 1.66
@@ -1,27 +1,23 @@ @@ -1,27 +1,23 @@
1# $NetBSD: Makefile,v 1.65 2015/11/21 09:47:23 leot Exp $ 1# $NetBSD: Makefile,v 1.66 2016/02/07 13:34:34 leot Exp $
2 2
3PKGNAME= mencoder-${MPLAYER_VERSION} 3PKGNAME= mencoder-${MPLAYER_VERSION}
4 4
5COMMENT= Simple movie encoder for MPlayer-playable movies 5COMMENT= Simple movie encoder for MPlayer-playable movies
6 6
7USE_TOOLS+= pkg-config 7USE_TOOLS+= pkg-config
8 8
9.include "../../multimedia/mplayer-share/Makefile.common" 9.include "../../multimedia/mplayer-share/Makefile.common"
10 10
11.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 
12BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm 
13.endif 
14 
15# Fix build under Mac OS X, please see here for details: 11# Fix build under Mac OS X, please see here for details:
16# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html 12# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html
17.if ${OPSYS} == "Darwin" 13.if ${OPSYS} == "Darwin"
18LDFLAGS+= -framework Carbon 14LDFLAGS+= -framework Carbon
19.endif 15.endif
20 16
21CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 17CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
22 18
23BUILD_TARGET= mencoder 19BUILD_TARGET= mencoder
24 20
25MANCOMPRESSED_IF_MANZ= YES 21MANCOMPRESSED_IF_MANZ= YES
26INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
27 23
cvs diff -r1.99 -r1.100 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2015/11/21 09:47:23 1.99
+++ pkgsrc/multimedia/mplayer/Makefile 2016/02/07 13:34:34 1.100
@@ -1,27 +1,23 @@ @@ -1,27 +1,23 @@
1# $NetBSD: Makefile,v 1.99 2015/11/21 09:47:23 leot Exp $ 1# $NetBSD: Makefile,v 1.100 2016/02/07 13:34:34 leot Exp $
2 2
3PKGNAME= mplayer-${MPLAYER_VERSION} 3PKGNAME= mplayer-${MPLAYER_VERSION}
4 4
5COMMENT= Fast, cross-platform movie player 5COMMENT= Fast, cross-platform movie player
6 6
7.include "../../multimedia/mplayer-share/Makefile.common" 7.include "../../multimedia/mplayer-share/Makefile.common"
8 8
9USE_TOOLS+= pkg-config 9USE_TOOLS+= pkg-config
10 10
11.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 
12BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm 
13.endif 
14 
15CONFIGURE_ARGS+= --disable-mencoder 11CONFIGURE_ARGS+= --disable-mencoder
16CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 12CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
17CONFIGURE_ARGS+= --enable-xvmc 13CONFIGURE_ARGS+= --enable-xvmc
18CONFIGURE_ARGS+= --with-xvmclib=XvMCW 14CONFIGURE_ARGS+= --with-xvmclib=XvMCW
19 15
20# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not 16# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
21# ${X11_BASE}, so we need to also look for headers in this path. 17# ${X11_BASE}, so we need to also look for headers in this path.
22.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386" 18.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
23CPPFLAGS+= -I/usr/X11R6/include 19CPPFLAGS+= -I/usr/X11R6/include
24BUILDLINK_PASSTHRU_DIRS+= /usr/X11R6/include 20BUILDLINK_PASSTHRU_DIRS+= /usr/X11R6/include
25.endif 21.endif
26 22
27INSTALLATION_DIRS+= bin 23INSTALLATION_DIRS+= bin
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/mplayer-share/Attic/Makefile.cflags (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Attic/Makefile.cflags 2014/12/03 15:08:02 1.7
+++ pkgsrc/multimedia/mplayer-share/Attic/Makefile.cflags 2016/02/07 13:34:33 1.8
@@ -1,34 +1,24 @@ @@ -1,34 +1,24 @@
1# $NetBSD: Makefile.cflags,v 1.7 2014/12/03 15:08:02 bouyer Exp $ 1# $NetBSD: Makefile.cflags,v 1.8 2016/02/07 13:34:33 leot Exp $
2 2
3# This must be included after everything else to truly clear ${CFLAGS} 3# This must be included after everything else to truly clear ${CFLAGS}
4# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the 4# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
5# configure script refuses to add any optimizations at all. 5# configure script refuses to add any optimizations at all.
6 6
7.if !empty(PKG_OPTIONS:Mmplayer-default-cflags) 7.if !empty(PKG_OPTIONS:Mmplayer-default-cflags)
8. if ${MACHINE_ARCH} == "i386" && !empty(PKGSRC_COMPILER:Mgcc) 8. if ${MACHINE_ARCH} == "i386" && !empty(PKGSRC_COMPILER:Mgcc)
9# Schedule for the typical machine fast enough to run mplayer. This 9# Schedule for the typical machine fast enough to run mplayer. This
10# is nearly optimal for K6-2 as well. Anything slower will still run 10# is nearly optimal for K6-2 as well. Anything slower will still run
11# (but would probably benefit greatly from turning off the run-time 11# (but would probably benefit greatly from turning off the run-time
12# cpu detection). 12# cpu detection).
13 13
14. include "../../mk/compiler.mk" 14. include "../../mk/compiler.mk"
15 15
16# alignment flags for builtin ffmpeg 
17# --yasm='' disables asm altogether for gcc < 4.2 
18 
19. if !empty(CC_VERSION:Mgcc-[123]*) || \ 
20 !empty(CC_VERSION:Mgcc-4.[01].*) 
21CONFIGURE_ARGS+= --yasm='' 
22. elif !empty(CC_VERSION:Mgcc-4.*) 
23CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4 
24. endif 
25 
26. if !empty(CC_VERSION:Mgcc-4*) 16. if !empty(CC_VERSION:Mgcc-4*)
27CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro 17CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
28. else 18. else
29CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro 19CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
30. endif 20. endif
31. else 21. else
32CFLAGS+= -O3 -ffast-math -fomit-frame-pointer 22CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
33. endif 23. endif
34.endif 24.endif
cvs diff -r1.55 -r1.56 pkgsrc/multimedia/mplayer-share/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Makefile.common 2015/11/21 09:47:23 1.55
+++ pkgsrc/multimedia/mplayer-share/Makefile.common 2016/02/07 13:34:33 1.56
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.55 2015/11/21 09:47:23 leot Exp $ 1# $NetBSD: Makefile.common,v 1.56 2016/02/07 13:34:33 leot Exp $
2# used by multimedia/gmplayer/Makefile 2# used by multimedia/gmplayer/Makefile
3# used by multimedia/mencoder/Makefile 3# used by multimedia/mencoder/Makefile
4# used by multimedia/mplayer/Makefile 4# used by multimedia/mplayer/Makefile
5 5
6MPLAYER_VERSION= 1.2 6MPLAYER_VERSION= 1.2.1
7 7
8DISTNAME= MPlayer-${MPLAYER_VERSION} 8DISTNAME= MPlayer-${MPLAYER_VERSION}
9 9
10CATEGORIES?= multimedia 10CATEGORIES?= multimedia
11 11
12MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ 12MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
15DIST_SUBDIR= mplayer 15DIST_SUBDIR= mplayer
16 16
17MAINTAINER?= pkgsrc-users@NetBSD.org 17MAINTAINER?= pkgsrc-users@NetBSD.org
18HOMEPAGE?= http://www.mplayerhq.hu/ 18HOMEPAGE?= http://www.mplayerhq.hu/
19 19
@@ -28,48 +28,37 @@ HOMEPAGE?= http://www.mplayerhq.hu/ @@ -28,48 +28,37 @@ HOMEPAGE?= http://www.mplayerhq.hu/
28PATCHDIR= ${.CURDIR}/../../multimedia/mplayer-share/patches 28PATCHDIR= ${.CURDIR}/../../multimedia/mplayer-share/patches
29DISTINFO_FILE= ${.CURDIR}/../../multimedia/mplayer-share/distinfo 29DISTINFO_FILE= ${.CURDIR}/../../multimedia/mplayer-share/distinfo
30 30
31RESTRICTED= Prohibited by USAs DMCA and patent law 31RESTRICTED= Prohibited by USAs DMCA and patent law
32NO_BIN_ON_CDROM= ${RESTRICTED} 32NO_BIN_ON_CDROM= ${RESTRICTED}
33NO_BIN_ON_FTP= ${RESTRICTED} 33NO_BIN_ON_FTP= ${RESTRICTED}
34NO_SRC_ON_FTP= ${RESTRICTED} 34NO_SRC_ON_FTP= ${RESTRICTED}
35 35
36USE_TOOLS+= gmake 36USE_TOOLS+= gmake
37HAS_CONFIGURE= YES 37HAS_CONFIGURE= YES
38 38
39PTHREAD_OPTS+= require 39PTHREAD_OPTS+= require
40 40
41CONFIGURE_ARGS+= --prefix=${PREFIX} \ 41CONFIGURE_ARGS+= --prefix=${PREFIX}
42 #--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \ 42CONFIGURE_ARGS+= --disable-smb
43 --with-extralibdir=${LOCALBASE}/lib \ 43CONFIGURE_ARGS+= --disable-ffmpeg_a
44 --disable-dvdread-internal --disable-smb 
45 44
46# The configure script attempts to test-execute compiled programs in /tmp, 45# The configure script attempts to test-execute compiled programs in /tmp,
47# but that directory may be mounted as noexec; work this around by setting 46# but that directory may be mounted as noexec; work this around by setting
48# TMPDIR to ${WRKDIR} 47# TMPDIR to ${WRKDIR}
49CONFIGURE_ENV+= TMPDIR=${WRKDIR} 48CONFIGURE_ENV+= TMPDIR=${WRKDIR}
50 49
51.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
52 51
53# The configure script misdetects endianness on mipseb 52# The configure script misdetects endianness on mipseb
54.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb" 53.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
55CONFIGURE_ARGS+= --enable-big-endian 54CONFIGURE_ARGS+= --enable-big-endian
56.endif 55.endif
57 56
58.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*) || \ 57.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*) || \
59 !empty(MACHINE_PLATFORM:MNetBSD-*-earm*) 58 !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
60# Avoid crash with system include file: 
61pre-patch: 
62 mv ${WRKSRC}/ffmpeg/libavutil/arm/bswap.h \ 
63 ${WRKSRC}/ffmpeg/libavutil/arm/avbswap.h 
64 
65SUBST_CLASSES+= arm_bswap 
66SUBST_STAGE.arm_bswap= pre-configure 
67SUBST_FILES.arm_bswap= ffmpeg/libavutil/bswap.h 
68SUBST_SED.arm_bswap= -e s,\"arm/bswap.h\",\"arm/avbswap.h\",g 
69SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil 
70 59
71# autodetect code enables these options on NetBSD/arm but it should not 60# autodetect code enables these options on NetBSD/arm but it should not
72CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2 61CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2
73.endif 62.endif
74 63
75.include "../../multimedia/mplayer-share/options.mk" 64.include "../../multimedia/mplayer-share/options.mk"
cvs diff -r1.19 -r1.20 pkgsrc/multimedia/mplayer-share/Attic/Makefile.depends (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Attic/Makefile.depends 2010/09/16 18:56:12 1.19
+++ pkgsrc/multimedia/mplayer-share/Attic/Makefile.depends 2016/02/07 13:34:33 1.20
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1# $NetBSD: Makefile.depends,v 1.19 2010/09/16 18:56:12 wiz Exp $ 1# $NetBSD: Makefile.depends,v 1.20 2016/02/07 13:34:33 leot Exp $
2# 2#
3 3
4DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share 4DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
5 5
6.include "../../converters/libiconv/buildlink3.mk" 6.include "../../converters/libiconv/buildlink3.mk"
7.include "../../fonts/fontconfig/buildlink3.mk" 7.include "../../fonts/fontconfig/buildlink3.mk"
8.include "../../graphics/freetype2/buildlink3.mk" 8.include "../../graphics/freetype2/buildlink3.mk"
 9.include "../../multimedia/ffmpeg2/buildlink3.mk"
9.include "../../x11/libX11/buildlink3.mk" 10.include "../../x11/libX11/buildlink3.mk"
cvs diff -r1.89 -r1.90 pkgsrc/multimedia/mplayer-share/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/distinfo 2015/11/21 09:47:23 1.89
+++ pkgsrc/multimedia/mplayer-share/distinfo 2016/02/07 13:34:33 1.90
@@ -1,28 +1,19 @@ @@ -1,28 +1,19 @@
1$NetBSD: distinfo,v 1.89 2015/11/21 09:47:23 leot Exp $ 1$NetBSD: distinfo,v 1.90 2016/02/07 13:34:33 leot Exp $
2 2
3SHA1 (mplayer/MPlayer-1.2.tar.xz) = 64fad840dfae466ab5ef3be2b6c74058892cd981 3SHA1 (mplayer/MPlayer-1.2.1.tar.xz) = cf988d8c7fe7bcf15a48970f0cf9e46837d78e1b
4RMD160 (mplayer/MPlayer-1.2.tar.xz) = 6d4c83370affbc7a1f79e59af8d78a2346a2b846 4RMD160 (mplayer/MPlayer-1.2.1.tar.xz) = 91e0f9078c22948666139fd122857381aa46eecd
5SHA512 (mplayer/MPlayer-1.2.tar.xz) = ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa 5SHA512 (mplayer/MPlayer-1.2.1.tar.xz) = e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
6Size (mplayer/MPlayer-1.2.tar.xz) = 13019196 bytes 6Size (mplayer/MPlayer-1.2.1.tar.xz) = 13029936 bytes
7SHA1 (patch-aa) = 81383178c34b89c2e2eb6132e379294ca1f824f3 7SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 8SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c
8SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 9SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
9SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 10SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
10SHA1 (patch-ffmpeg_Makefile) = c42d63935e824bd4006b40575b3e56e1645a32d2 
11SHA1 (patch-ffmpeg_configure) = 43adffa6ff6a781875950a20adeb837b4eafd9b7 
12SHA1 (patch-ffmpeg_libavcodec_libvpxenc.c) = 85fb37d2cf8361faa649b41fc6c36ac261314d39 
13SHA1 (patch-ffmpeg_libavcodec_x86_ac3dsp_init.c) = bbf84edc6b74721e31c0952b461131eac4499026 
14SHA1 (patch-ffmpeg_libavutil_common.h) = 20fe12a85d253caeeca90e09fcecdc929d2d9e34 
15SHA1 (patch-ffmpeg_libavutil_opencl.c) = 5146acb650e699f1e1d05efa4575cec825b7c2eb 
16SHA1 (patch-ffmpeg_libavutil_x86_asm.h) = 4010a5f5a7fd6e22c81f7e56fde5f0a474ad89e2 
17SHA1 (patch-ffmpeg_libavutil_x86_cpu.c) = a298feb778bc1d50e1abf4c0b56b9db97ab13c42 
18SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c 11SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
19SHA1 (patch-gui_wm_ws.c) = cdffd469d7b1fcc63016fa506d53304b24624235 
20SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 12SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
21SHA1 (patch-libmpdemux_demux__gif.c) = 6c7f6d0a89835b64eecead148597bb277be38fd9 
22SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec 13SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
23SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825 14SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
24SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03 15SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
25SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1 16SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
26SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8 17SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8
27SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608 18SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608
28SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1 19SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1
File Added: pkgsrc/multimedia/mplayer-share/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2016/02/07 13:34:33 leot Exp $

Do not treat codec-cfg specially. It needs ffmpeg headers altough they were
previously hardcoded via HOSTCFLAGS. Adjust that like other executables.

--- Makefile.orig	2015-06-03 11:58:05.000000000 +0000
+++ Makefile
@@ -752,7 +752,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
 codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
 codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
 codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-	$(HOST_CC) $(HOSTCFLAGS) -o $@ $<
+	$(HOST_CC) $(CC_DEPFLAGS) $(CFLAGS) $(HOSTCFLAGS) -o $@ $<
 
 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
 	./$^ > $@
cvs diff -r1.33 -r1.34 pkgsrc/multimedia/mplayer-share/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/patches/Attic/patch-aa 2015/11/21 09:47:23 1.33
+++ pkgsrc/multimedia/mplayer-share/patches/Attic/patch-aa 2016/02/07 13:34:33 1.34
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: patch-aa,v 1.33 2015/11/21 09:47:23 leot Exp $ 1$NetBSD: patch-aa,v 1.34 2016/02/07 13:34:33 leot Exp $
2 2
3o Handle properly sh3 and evbarm ports on NetBSD. 3o Handle properly sh3 and evbarm ports on NetBSD.
4o Fix CPU family detection on NetBSD with /proc mounted with "-o linux" 4o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
5 (please see also kern/25076). 5 (please see also kern/25076).
 6o Delete not needed -Iffmpeg from the CFLAGS.
6o Fix a bug which broke the detection of a lot of X11 libraries. 7o Fix a bug which broke the detection of a lot of X11 libraries.
7o Add necessary libs for aalib support even if the aa option is turned on with 8o Add necessary libs for aalib support even if the aa option is turned on with
8 --enable-aa. 9 --enable-aa.
9o Add support for dvb capture on NetBSD. 10o Add support for dvb capture on NetBSD.
10 11
11--- configure.orig 2015-10-02 20:29:04.000000000 +0000 12--- configure.orig 2016-01-08 12:39:01.000000000 +0000
12+++ configure 13+++ configure
13@@ -1640,7 +1640,7 @@ else 14@@ -1640,7 +1640,7 @@ else
14 cc_name=$cc_name_tmp 15 cc_name=$cc_name_tmp
15 echocheck "$_cc version" 16 echocheck "$_cc version"
16 cc_vendor=gnu 17 cc_vendor=gnu
17- cc_version=$($_cc -dumpversion 2>&1) 18- cc_version=$($_cc -dumpversion 2>&1)
18+ cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 ) 19+ cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 )
19 case $cc_version in 20 case $cc_version in
20 2.96*) 21 2.96*)
21 cc_fail=yes 22 cc_fail=yes
22@@ -1717,8 +1717,9 @@ if test -z "$_target" ; then 23@@ -1717,8 +1717,9 @@ if test -z "$_target" ; then
23 sun4*|sparc*) host_arch=sparc ;; 24 sun4*|sparc*) host_arch=sparc ;;
24 parisc*|hppa*|9000*) host_arch=hppa ;; 25 parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -74,26 +75,37 @@ o Add support for dvb capture on NetBSD. @@ -74,26 +75,37 @@ o Add support for dvb capture on NetBSD.
74- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" 75- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
75+ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer" 76+ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer"
76 WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Werror=format-security" 77 WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Werror=format-security"
77 WARN_CFLAGS="-Werror-implicit-function-declaration" 78 WARN_CFLAGS="-Werror-implicit-function-declaration"
78 extra_ldflags="$extra_ldflags -ffast-math" 79 extra_ldflags="$extra_ldflags -ffast-math"
79 fi 80 fi
80  81
81 if test "$_profile" != "" || test "$_debug" != ""; then 82 if test "$_profile" != "" || test "$_debug" != ""; then
82- CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile" 83- CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile"
83+ CFLAGS="$CFLAGS $_debug $_profile" 84+ CFLAGS="$CFLAGS $_debug $_profile"
84 WARNFLAGS="-W -Wall $WARNFLAGS" 85 WARNFLAGS="-W -Wall $WARNFLAGS"
85 _install_strip= 86 _install_strip=
86 fi 87 fi
 88@@ -2807,8 +2813,8 @@ else
 89 warn_cflags=yes
 90 fi
 91
 92-CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
 93-HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg -O3"
 94+CFLAGS="-D_ISOC99_SOURCE -I. $CFLAGS"
 95+HOSTCFLAGS="-D_ISOC99_SOURCE -I. -O3"
 96
 97 # On glibc, add some more CPPFLAGS for enabling required functionality.
 98 cpp_condition_check features.h "defined __GLIBC__" &&
87@@ -4591,7 +4597,11 @@ if test "$_x11" = auto && test "$_x11_he 99@@ -4591,7 +4597,11 @@ if test "$_x11" = auto && test "$_x11_he
88 -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \ 100 -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
89 -L/usr/lib ; do 101 -L/usr/lib ; do
90 if netbsd; then 102 if netbsd; then
91- ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" 103- ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
92+ if test -n "$I" ; then 104+ if test -n "$I" ; then
93+ ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" 105+ ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
94+ else 106+ else
95+ ld_tmp="-lXext -lX11 $ld_pthread" 107+ ld_tmp="-lXext -lX11 $ld_pthread"
96+ fi 108+ fi
97 else 109 else
98 ld_tmp="$I -lXext -lX11 $ld_pthread" 110 ld_tmp="$I -lXext -lX11 $ld_pthread"
99 fi 111 fi
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_Makefile
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_configure
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_libavcodec_libvpxenc.c
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_libavcodec_x86_ac3dsp_init.c
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_libavutil_common.h
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_libavutil_opencl.c
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_libavutil_x86_asm.h
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-ffmpeg_libavutil_x86_cpu.c
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-gui_wm_ws.c
File Deleted: pkgsrc/multimedia/mplayer-share/patches/Attic/patch-libmpdemux_demux__gif.c