kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update multimedia/{gmplayer,mencoder,mplayer,mplayer-share} to 1.2.1.

Browse source 
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
This commit is contained in:
leot 2016-02-07 13:34:33 +00:00
parent a40d07d917
commit 343c2bf2ae
20 changed files with 55 additions and 394 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
multimedia/gmplayer/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.130 2015/11/23 22:47:59 leot Exp $
# $NetBSD: Makefile,v 1.131 2016/02/07 13:34:34 leot Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
# that *both* distinfo files contain the correct, up-to-date files and
@ -8,7 +8,6 @@
#
PKGNAME= gmplayer-${MPLAYER_VERSION}
PKGREVISION= 3
SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
http://www2.mplayerhq.hu/MPlayer/skins/ \
@ -20,10 +19,6 @@ SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
.include "../../multimedia/mplayer-share/Makefile.common"
SKIN_EXTRACT_SUFX= .tar.bz2
.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+= Abyss-1.7${SKIN_EXTRACT_SUFX} \

23
multimedia/gmplayer/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.94 2015/11/23 22:47:59 leot Exp $
$NetBSD: distinfo,v 1.95 2016/02/07 13:34:34 leot Exp $
SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725
RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a
@ -76,10 +76,10 @@ SHA1 (mplayer/Linea-1.0.tar.bz2) = e6cbd705e285e117fc97c231b7fe0f9abf1db656
RMD160 (mplayer/Linea-1.0.tar.bz2) = 558647aede2d009519f08191d45bbd1d50ed3ee9
SHA512 (mplayer/Linea-1.0.tar.bz2) = a55e11b6ac40e17acf54b290e2763448085e5962da992ec24bc8c3ecd9df40d5ad2965079c930ce30338d64b8a2544dc5ba7f5fcdd84c0ffd14a7e6d1a9ac3d8
Size (mplayer/Linea-1.0.tar.bz2) = 46965 bytes
SHA1 (mplayer/MPlayer-1.2.tar.xz) = 64fad840dfae466ab5ef3be2b6c74058892cd981
RMD160 (mplayer/MPlayer-1.2.tar.xz) = 6d4c83370affbc7a1f79e59af8d78a2346a2b846
SHA512 (mplayer/MPlayer-1.2.tar.xz) = ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa
Size (mplayer/MPlayer-1.2.tar.xz) = 13019196 bytes
SHA1 (mplayer/MPlayer-1.2.1.tar.xz) = cf988d8c7fe7bcf15a48970f0cf9e46837d78e1b
RMD160 (mplayer/MPlayer-1.2.1.tar.xz) = 91e0f9078c22948666139fd122857381aa46eecd
SHA512 (mplayer/MPlayer-1.2.1.tar.xz) = e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
Size (mplayer/MPlayer-1.2.1.tar.xz) = 13029936 bytes
SHA1 (mplayer/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f
RMD160 (mplayer/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c
SHA512 (mplayer/MidnightLove-1.6.tar.bz2) = 30b5e267d84382c8b9adbf86f21f5f95845ccf017d827241460ab1c050c7ce5f2dfc001209783281ef555190a6ccf62e5a95e009810505a1bb24fb80b2f9f193
@ -284,21 +284,12 @@ SHA1 (mplayer/xmmplayer-1.5.tar.bz2) = 2d4cb1d30b0519a80c4cd49d042d5d4db5474e7c
RMD160 (mplayer/xmmplayer-1.5.tar.bz2) = 984ff462de6ea9bc903fda4e59232481bea79845
SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f
Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes
SHA1 (patch-aa) = 81383178c34b89c2e2eb6132e379294ca1f824f3
SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c
SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
SHA1 (patch-ffmpeg_Makefile) = c42d63935e824bd4006b40575b3e56e1645a32d2
SHA1 (patch-ffmpeg_configure) = 43adffa6ff6a781875950a20adeb837b4eafd9b7
SHA1 (patch-ffmpeg_libavcodec_libvpxenc.c) = 85fb37d2cf8361faa649b41fc6c36ac261314d39
SHA1 (patch-ffmpeg_libavcodec_x86_ac3dsp_init.c) = bbf84edc6b74721e31c0952b461131eac4499026
SHA1 (patch-ffmpeg_libavutil_common.h) = 20fe12a85d253caeeca90e09fcecdc929d2d9e34
SHA1 (patch-ffmpeg_libavutil_opencl.c) = 5146acb650e699f1e1d05efa4575cec825b7c2eb
SHA1 (patch-ffmpeg_libavutil_x86_asm.h) = 4010a5f5a7fd6e22c81f7e56fde5f0a474ad89e2
SHA1 (patch-ffmpeg_libavutil_x86_cpu.c) = a298feb778bc1d50e1abf4c0b56b9db97ab13c42
SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
SHA1 (patch-gui_wm_ws.c) = cdffd469d7b1fcc63016fa506d53304b24624235
SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
SHA1 (patch-libmpdemux_demux__gif.c) = 6c7f6d0a89835b64eecead148597bb277be38fd9
SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03

6
multimedia/mencoder/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.65 2015/11/21 09:47:23 leot Exp $
# $NetBSD: Makefile,v 1.66 2016/02/07 13:34:34 leot Exp $
PKGNAME= mencoder-${MPLAYER_VERSION}
@ -8,10 +8,6 @@ USE_TOOLS+= pkg-config
.include "../../multimedia/mplayer-share/Makefile.common"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
.endif
# Fix build under Mac OS X, please see here for details:
# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html
.if ${OPSYS} == "Darwin"

12
multimedia/mplayer-share/Makefile.cflags
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cflags,v 1.7 2014/12/03 15:08:02 bouyer Exp $
# $NetBSD: Makefile.cflags,v 1.8 2016/02/07 13:34:33 leot Exp $
# This must be included after everything else to truly clear ${CFLAGS}
# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
@ -13,16 +13,6 @@
. include "../../mk/compiler.mk"
# alignment flags for builtin ffmpeg
# --yasm='' disables asm altogether for gcc < 4.2
. if !empty(CC_VERSION:Mgcc-[123]*) || \
!empty(CC_VERSION:Mgcc-4.[01].*)
CONFIGURE_ARGS+= --yasm=''
. elif !empty(CC_VERSION:Mgcc-4.*)
CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
. endif
. if !empty(CC_VERSION:Mgcc-4*)
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
. else

21
multimedia/mplayer-share/Makefile.common
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.55 2015/11/21 09:47:23 leot Exp $
# $NetBSD: Makefile.common,v 1.56 2016/02/07 13:34:33 leot Exp $
# used by multimedia/gmplayer/Makefile
# used by multimedia/mencoder/Makefile
# used by multimedia/mplayer/Makefile
MPLAYER_VERSION= 1.2
MPLAYER_VERSION= 1.2.1
DISTNAME= MPlayer-${MPLAYER_VERSION}
@ -38,10 +38,9 @@ HAS_CONFIGURE= YES
PTHREAD_OPTS+= require
CONFIGURE_ARGS+= --prefix=${PREFIX} \
#--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
--with-extralibdir=${LOCALBASE}/lib \
--disable-dvdread-internal --disable-smb
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --disable-smb
CONFIGURE_ARGS+= --disable-ffmpeg_a
# The configure script attempts to test-execute compiled programs in /tmp,
# but that directory may be mounted as noexec; work this around by setting
@ -57,16 +56,6 @@ CONFIGURE_ARGS+= --enable-big-endian
.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*) || \
!empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
# Avoid crash with system include file:
pre-patch:
mv ${WRKSRC}/ffmpeg/libavutil/arm/bswap.h \
${WRKSRC}/ffmpeg/libavutil/arm/avbswap.h
SUBST_CLASSES+= arm_bswap
SUBST_STAGE.arm_bswap= pre-configure
SUBST_FILES.arm_bswap= ffmpeg/libavutil/bswap.h
SUBST_SED.arm_bswap= -e s,\"arm/bswap.h\",\"arm/avbswap.h\",g
SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil
# autodetect code enables these options on NetBSD/arm but it should not
CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2

3
multimedia/mplayer-share/Makefile.depends
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.depends,v 1.19 2010/09/16 18:56:12 wiz Exp $
# $NetBSD: Makefile.depends,v 1.20 2016/02/07 13:34:33 leot Exp $
#
DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
@ -6,4 +6,5 @@ DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
.include "../../converters/libiconv/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../multimedia/ffmpeg2/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"

23
multimedia/mplayer-share/distinfo
View file

@ -1,24 +1,15 @@
$NetBSD: distinfo,v 1.89 2015/11/21 09:47:23 leot Exp $
$NetBSD: distinfo,v 1.90 2016/02/07 13:34:33 leot Exp $
SHA1 (mplayer/MPlayer-1.2.tar.xz) = 64fad840dfae466ab5ef3be2b6c74058892cd981
RMD160 (mplayer/MPlayer-1.2.tar.xz) = 6d4c83370affbc7a1f79e59af8d78a2346a2b846
SHA512 (mplayer/MPlayer-1.2.tar.xz) = ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa
Size (mplayer/MPlayer-1.2.tar.xz) = 13019196 bytes
SHA1 (patch-aa) = 81383178c34b89c2e2eb6132e379294ca1f824f3
SHA1 (mplayer/MPlayer-1.2.1.tar.xz) = cf988d8c7fe7bcf15a48970f0cf9e46837d78e1b
RMD160 (mplayer/MPlayer-1.2.1.tar.xz) = 91e0f9078c22948666139fd122857381aa46eecd
SHA512 (mplayer/MPlayer-1.2.1.tar.xz) = e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
Size (mplayer/MPlayer-1.2.1.tar.xz) = 13029936 bytes
SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c
SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
SHA1 (patch-ffmpeg_Makefile) = c42d63935e824bd4006b40575b3e56e1645a32d2
SHA1 (patch-ffmpeg_configure) = 43adffa6ff6a781875950a20adeb837b4eafd9b7
SHA1 (patch-ffmpeg_libavcodec_libvpxenc.c) = 85fb37d2cf8361faa649b41fc6c36ac261314d39
SHA1 (patch-ffmpeg_libavcodec_x86_ac3dsp_init.c) = bbf84edc6b74721e31c0952b461131eac4499026
SHA1 (patch-ffmpeg_libavutil_common.h) = 20fe12a85d253caeeca90e09fcecdc929d2d9e34
SHA1 (patch-ffmpeg_libavutil_opencl.c) = 5146acb650e699f1e1d05efa4575cec825b7c2eb
SHA1 (patch-ffmpeg_libavutil_x86_asm.h) = 4010a5f5a7fd6e22c81f7e56fde5f0a474ad89e2
SHA1 (patch-ffmpeg_libavutil_x86_cpu.c) = a298feb778bc1d50e1abf4c0b56b9db97ab13c42
SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
SHA1 (patch-gui_wm_ws.c) = cdffd469d7b1fcc63016fa506d53304b24624235
SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
SHA1 (patch-libmpdemux_demux__gif.c) = 6c7f6d0a89835b64eecead148597bb277be38fd9
SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03

16
multimedia/mplayer-share/patches/patch-Makefile Normal file
View file

@ -0,0 +1,16 @@
$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
./$^ > $@

16
multimedia/mplayer-share/patches/patch-aa
View file

@ -1,14 +1,15 @@
$NetBSD: patch-aa,v 1.33 2015/11/21 09:47:23 leot Exp $
$NetBSD: patch-aa,v 1.34 2016/02/07 13:34:33 leot Exp $
o Handle properly sh3 and evbarm ports on NetBSD.
o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
(please see also kern/25076).
o Delete not needed -Iffmpeg from the CFLAGS.
o Fix a bug which broke the detection of a lot of X11 libraries.
o Add necessary libs for aalib support even if the aa option is turned on with
--enable-aa.
o Add support for dvb capture on NetBSD.
--- configure.orig 2015-10-02 20:29:04.000000000 +0000
--- configure.orig 2016-01-08 12:39:01.000000000 +0000
+++ configure
@@ -1640,7 +1640,7 @@ else
cc_name=$cc_name_tmp
@ -84,6 +85,17 @@ o Add support for dvb capture on NetBSD.
WARNFLAGS="-W -Wall $WARNFLAGS"
_install_strip=
fi
@@ -2807,8 +2813,8 @@ else
warn_cflags=yes
fi
-CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
-HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg -O3"
+CFLAGS="-D_ISOC99_SOURCE -I. $CFLAGS"
+HOSTCFLAGS="-D_ISOC99_SOURCE -I. -O3"
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
@@ -4591,7 +4597,11 @@ if test "$_x11" = auto && test "$_x11_he
-L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
-L/usr/lib ; do

15
multimedia/mplayer-share/patches/patch-ffmpeg_Makefile
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ffmpeg_Makefile,v 1.1 2015/11/21 09:47:23 leot Exp $
--- ffmpeg/Makefile.orig 2012-09-28 01:37:35.000000000 +0000
+++ ffmpeg/Makefile
@@ -139,8 +139,8 @@ install-progs: install-progs-yes $(PROGS
install-data: $(DATA_FILES) $(EXAMPLES_FILES)
$(Q)mkdir -p "$(DATADIR)/examples"
- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
- $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
+ $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
+ $(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data

58
multimedia/mplayer-share/patches/patch-ffmpeg_configure
View file

@ -1,58 +0,0 @@
$NetBSD: patch-ffmpeg_configure,v 1.1 2015/11/21 09:47:23 leot Exp $
--- ffmpeg/configure.orig 2015-06-19 20:47:55.000000000 +0000
+++ ffmpeg/configure
@@ -4197,6 +4197,11 @@ case $target_os in
;;
netbsd)
disable symver
+ # NetBSD/macppc *really* needs PIC enabled. ffmpeg has repeatedly
+ # broken time and time again because PIC support has been removed
+ # from architectures that need it. So, if you touch this, please
+ # be careful and make sure that your changes work.
+ test "${subarch}" != "x86_32" && enable pic
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
enabled gcc || check_ldflags -Wl,-zmuldefs
@@ -4602,10 +4607,13 @@ check_cc <<EOF && enable attribute_may_a
union { int x; } __attribute__((may_alias)) x;
EOF
-check_cc <<EOF || die "endian test failed"
-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
+check_exec <<EOF || enable bigendian
+int main()
+{
+ long one = 1;
+ return !(*((char *)(&one)));
+}
EOF
-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
if ! enabled ppc64 || enabled bigendian; then
disable vsx
@@ -5426,6 +5434,7 @@ enabled xmm_clobber_test &&
-Wl,--wrap,sws_scale ||
disable xmm_clobber_test
+if false; then
echo "X{};" > $TMPV
if test_ldflags -Wl,--version-script,$TMPV; then
append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
@@ -5438,6 +5447,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
void ff_foo(void) {}
EOF
fi
+fi
if [ -z "$optflags" ]; then
if enabled small; then
@@ -6041,7 +6051,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
-Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
+Libs: -L\${libdir} -Wl,-R\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF

28
multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_libvpxenc.c
View file

@ -1,28 +0,0 @@
$NetBSD: patch-ffmpeg_libavcodec_libvpxenc.c,v 1.1 2015/11/21 09:47:23 leot Exp $
Fix build with libvpx version 1.5.0 and newer. Fix taken from here:
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab#patch1
--- ffmpeg/libavcodec/libvpxenc.c.orig 2015-09-09 02:17:45.000000000 +0100
+++ ffmpeg/libavcodec/libvpxenc.c 2015-11-20 18:25:02.000000000 +0000
@@ -104,19 +104,11 @@
/** String mappings for enum vp8e_enc_control_id */
static const char *const ctlidstr[] = {
- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",

78
multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_x86_ac3dsp_init.c
View file

@ -1,78 +0,0 @@
$NetBSD: patch-ffmpeg_libavcodec_x86_ac3dsp_init.c,v 1.1 2015/11/21 09:47:23 leot Exp $
Fix from PR pkg/48680
--- ffmpeg/libavcodec/x86/ac3dsp_init.c.orig 2014-06-02 23:18:54.000000000 +0200
+++ ffmpeg/libavcodec/x86/ac3dsp_init.c 2014-06-14 21:27:55.000000000 +0200
@@ -84,11 +84,11 @@
"shufps $0, %%xmm6, %%xmm6 \n" \
"shufps $0, %%xmm7, %%xmm7 \n" \
"1: \n" \
- "movaps (%0, %2), %%xmm0 \n" \
- "movaps (%0, %3), %%xmm1 \n" \
- "movaps (%0, %4), %%xmm2 \n" \
- "movaps (%0, %5), %%xmm3 \n" \
- "movaps (%0, %6), %%xmm4 \n" \
+ "movups (%0, %2), %%xmm0 \n" \
+ "movups (%0, %3), %%xmm1 \n" \
+ "movups (%0, %4), %%xmm2 \n" \
+ "movups (%0, %5), %%xmm3 \n" \
+ "movups (%0, %6), %%xmm4 \n" \
"mulps %%xmm5, %%xmm0 \n" \
"mulps %%xmm6, %%xmm1 \n" \
"mulps %%xmm5, %%xmm2 \n" \
@@ -99,8 +99,8 @@
"addps %%xmm3, %%xmm0 \n" \
"addps %%xmm4, %%xmm2 \n" \
mono("addps %%xmm2, %%xmm0 \n") \
- "movaps %%xmm0, (%0, %2) \n" \
- stereo("movaps %%xmm2, (%0, %3) \n") \
+ "movups %%xmm0, (%0, %2) \n" \
+ stereo("movups %%xmm2, (%0, %3) \n") \
"add $16, %0 \n" \
"jl 1b \n" \
: "+&r"(i) \
@@ -120,24 +120,26 @@
"mov %5, %2 \n" \
"1: \n" \
"mov -%c7(%6, %2, %c8), %3 \n" \
- "movaps (%3, %0), %%xmm0 \n" \
+ "movups (%3, %0), %%xmm0 \n" \
stereo("movaps %%xmm0, %%xmm1 \n") \
"mulps %%xmm4, %%xmm0 \n" \
stereo("mulps %%xmm5, %%xmm1 \n") \
"2: \n" \
"mov (%6, %2, %c8), %1 \n" \
- "movaps (%1, %0), %%xmm2 \n" \
+ "movups (%1, %0), %%xmm2 \n" \
stereo("movaps %%xmm2, %%xmm3 \n") \
- "mulps (%4, %2, 8), %%xmm2 \n" \
- stereo("mulps 16(%4, %2, 8), %%xmm3 \n") \
+ "movups (%4, %2, 8), %%xmm4 \n" \
+ "mulps %%xmm4, %%xmm2 \n" \
+ stereo("movups 16(%4, %2, 8), %%xmm4 \n") \
+ stereo("mulps %%xmm4, %%xmm3 \n") \
"addps %%xmm2, %%xmm0 \n" \
stereo("addps %%xmm3, %%xmm1 \n") \
"add $4, %2 \n" \
"jl 2b \n" \
"mov %5, %2 \n" \
stereo("mov (%6, %2, %c8), %1 \n") \
- "movaps %%xmm0, (%3, %0) \n" \
- stereo("movaps %%xmm1, (%1, %0) \n") \
+ "movups %%xmm0, (%3, %0) \n" \
+ stereo("movups %%xmm1, (%1, %0) \n") \
"add $16, %0 \n" \
"jl 1b \n" \
: "+&r"(i), "=&r"(j), "=&r"(k), "=&r"(m) \
@@ -180,8 +182,8 @@
"movss 4(%2, %0), %%xmm5 \n"
"shufps $0, %%xmm4, %%xmm4 \n"
"shufps $0, %%xmm5, %%xmm5 \n"
- "movaps %%xmm4, (%1, %0, 4) \n"
- "movaps %%xmm5, 16(%1, %0, 4) \n"
+ "movups %%xmm4, (%1, %0, 4) \n"
+ "movups %%xmm5, 16(%1, %0, 4) \n"
"jg 1b \n"
: "+&r"(j)
: "r"(matrix_simd), "r"(matrix)

27
multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_common.h
View file

@ -1,27 +0,0 @@
$NetBSD: patch-ffmpeg_libavutil_common.h,v 1.1 2015/11/21 09:47:23 leot Exp $
--- ffmpeg/libavutil/common.h.orig 2013-01-06 21:53:29.000000000 +0000
+++ ffmpeg/libavutil/common.h
@@ -39,6 +39,22 @@
#include "version.h"
#include "libavutil/avconfig.h"
+#if defined(__cplusplus)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__)
+#undef _STDINT_H_
+#undef _SYS_STDINT_H_
+#undef _STDINT_H
+#undef _GCC_WRAP_STDINT_H
+#ifndef __STDC_CONSTANT_MACROS
+#define __STDC_CONSTANT_MACROS
+#endif
+#include <stdint.h>
+#endif /* FreeBSD | OpenBSD | linux */
+#if defined(__DragonFly__) || defined(__NetBSD__)
+#include <machine/int_const.h>
+#endif /* DragonFly | NetBSD */
+#endif /* __cplusplus */
+
#if AV_HAVE_BIGENDIAN
# define AV_NE(be, le) (be)
#else

15
multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_opencl.c
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ffmpeg_libavutil_opencl.c,v 1.1 2015/11/21 09:47:23 leot Exp $
Fix undeclared identifier error.
--- ffmpeg/libavutil/opencl.c.orig 2015-03-16 19:26:04.000000000 +0000
+++ ffmpeg/libavutil/opencl.c
@@ -423,7 +423,7 @@ cl_program av_opencl_compile(const char
cl_program program = NULL;
LOCK_OPENCL;
- for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
+ for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
// identify a program using a unique name within the kernel source
ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {

18
multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86_asm.h
View file

@ -1,18 +0,0 @@
$NetBSD: patch-ffmpeg_libavutil_x86_asm.h,v 1.1 2015/11/21 09:47:23 leot Exp $
avoid SunOS regset.h definition for REG_SP
--- ffmpeg/libavutil/x86/asm.h.orig 2014-08-17 13:33:17.000000000 +0000
+++ ffmpeg/libavutil/x86/asm.h
@@ -27,6 +27,11 @@
typedef struct xmm_reg { uint64_t a, b; } xmm_reg;
typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg;
+/* avoid SunOS regset.h definition for REG_SP */
+#if defined (__sun) && defined (REG_SP)
+#undef REG_SP
+#endif
+
#if ARCH_X86_64
# define OPSIZE "q"
# define REG_a "rax"

20
multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_x86_cpu.c
View file

@ -1,20 +0,0 @@
$NetBSD: patch-ffmpeg_libavutil_x86_cpu.c,v 1.1 2015/11/21 09:47:23 leot Exp $
--- ffmpeg/libavutil/x86/cpu.c.orig 2014-03-23 22:07:55.000000000 +0000
+++ ffmpeg/libavutil/x86/cpu.c
@@ -116,6 +116,7 @@ int ff_get_cpu_flags_x86(void)
#if HAVE_SSE
if (std_caps & (1 << 25))
rval |= AV_CPU_FLAG_SSE;
+#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
if (std_caps & (1 << 26))
rval |= AV_CPU_FLAG_SSE2;
if (ecx & 1)
@@ -138,6 +139,7 @@ int ff_get_cpu_flags_x86(void)
}
}
#endif /* HAVE_AVX */
+#endif /* gcc >= 4.2 */
#endif /* HAVE_SSE */
}
if (max_std_level >= 7) {

23
multimedia/mplayer-share/patches/patch-gui_wm_ws.c
View file

@ -1,23 +0,0 @@
$NetBSD: patch-gui_wm_ws.c,v 1.1 2015/11/21 09:47:23 leot Exp $
Correctly display the GUI avoiding the following errors:
[ws] An X11 error has occurred!
[ws] Error code: 145 - BadShmSeg (invalid shared segment parameter)
[ws] Request code: 139 (minor code: 3)
[ws] MPlayer module: vo_check_events
Imported also upstream:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2015-November/073183.html
--- gui/wm/ws.c.orig 2015-08-01 07:44:07.000000000 +0000
+++ gui/wm/ws.c
@@ -1322,6 +1322,7 @@ void wsImageCreate(wsWindow *win, int w,
win->xImage->data = win->Shminfo.shmaddr;
win->Shminfo.readOnly = False;
XShmAttach(wsDisplay, &win->Shminfo);
+ XSync(wsDisplay, False);
shmctl(win->Shminfo.shmid, IPC_RMID, 0);
} else
#endif

34
multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c
View file

@ -1,34 +0,0 @@
$NetBSD: patch-libmpdemux_demux__gif.c,v 1.3 2015/11/21 09:47:23 leot Exp $
* Fix build with giflib 5.1.
--- libmpdemux/demux_gif.c.orig 2014-10-05 02:39:08.000000000 +0000
+++ libmpdemux/demux_gif.c
@@ -44,6 +44,18 @@ typedef struct {
} gif_priv_t;
#define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
+
+/* from util/qprintf.c of giflib 5.0.4 */
+void
+PrintGifError(int ErrorCode)
+{
+ char *Err = GifErrorString(ErrorCode);
+
+ if (Err != NULL)
+ fprintf(stderr, "GIF-LIB error: %s.\n", Err);
+ else
+ fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode);
+}
#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
#define DGifOpen(a, b) DGifOpen(a, b, NULL)
@@ -70,7 +82,7 @@ static void print_gif_error(GifFileType
#else
static void print_gif_error(GifFileType *gif)
{
- PrintGifError();
+ PrintGifError(gif->Error);
}
#endif

6
multimedia/mplayer/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.99 2015/11/21 09:47:23 leot Exp $
# $NetBSD: Makefile,v 1.100 2016/02/07 13:34:34 leot Exp $
PKGNAME= mplayer-${MPLAYER_VERSION}
@ -8,10 +8,6 @@ COMMENT= Fast, cross-platform movie player
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
CONFIGURE_ARGS+= --enable-xvmc