Date: Sun, 23 Aug 2015 16:41:23 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395119 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201508231641.t7NGfNVm004360@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Aug 23 16:41:23 2015 New Revision: 395119 URL: https://svnweb.freebsd.org/changeset/ports/395119 Log: - Update to recent mplayer snapshot (2015-08-22) - Unbundle ffmpeg and use the distfile from multimedia/ffmpeg (currently on version 2.7.2) - Fix edge case assertion in av_free on 9.x/i386 upon stream close with mencoder (no change in behaviour) - Include LICENSE_FILE - Pet portlint Added: head/multimedia/mplayer/Makefile.common - copied, changed from r395112, head/multimedia/mplayer/Makefile.shared head/multimedia/mplayer/files/patch-ffmpeg_Makefile - copied, changed from r395020, head/multimedia/mplayer/files/patch-ffmpeg-Makefile head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavcodec-Makefile head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavfilter-Makefile head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavformat-udp.c head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c (contents, props changed) head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h - copied, changed from r395020, head/multimedia/mplayer/files/patch-libavutil-x86-asm.h head/multimedia/mplayer/files/patch-gui_wm_ws.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-gui_ws_ws.c head/multimedia/mplayer/files/patch-libao2_ao__arts.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libao2-ao_arts.c head/multimedia/mplayer/files/patch-libao2_ao__oss.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libao2-ao_oss.c head/multimedia/mplayer/files/patch-libvo_x11__common.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-libvo-x11_common.c head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c head/multimedia/mplayer/files/patch-stream_tvi__v4l.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-stream-tvi_v4l.c head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c head/multimedia/mplayer/files/patch-vidix_mga__vid.c - copied, changed from r395020, head/multimedia/mplayer/files/patch-vidix-mga_vid.c Deleted: head/multimedia/mplayer/Makefile.shared head/multimedia/mplayer/files/patch-ffmpeg-Makefile head/multimedia/mplayer/files/patch-gui_ws_ws.c head/multimedia/mplayer/files/patch-libao2-ao_arts.c head/multimedia/mplayer/files/patch-libao2-ao_oss.c head/multimedia/mplayer/files/patch-libavcodec-Makefile head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c head/multimedia/mplayer/files/patch-libavfilter-Makefile head/multimedia/mplayer/files/patch-libavformat-udp.c head/multimedia/mplayer/files/patch-libavutil-x86-asm.h head/multimedia/mplayer/files/patch-libvo-x11_common.c head/multimedia/mplayer/files/patch-stream-stream_cdda.c head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c head/multimedia/mplayer/files/patch-stream-tvi_v4l.c head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c head/multimedia/mplayer/files/patch-vidix-mga_vid.c Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/distinfo head/multimedia/mplayer/Makefile head/multimedia/mplayer/distinfo head/multimedia/mplayer/files/patch-Makefile head/multimedia/mplayer/files/patch-configure head/multimedia/mplayer/files/patch-mplayer.c Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mencoder/Makefile Sun Aug 23 16:41:23 2015 (r395119) @@ -3,11 +3,12 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 +CATEGORIES= multimedia audio +MAINTAINER= riggs@FreeBSD.org COMMENT= Convenient video file and movie encoder -.include "${.CURDIR}/../mplayer/Makefile.shared" +.include "${.CURDIR}/../mplayer/Makefile.common" OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \ FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ @@ -79,6 +80,9 @@ pre-everything:: @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" +pre-patch: + ${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg + post-patch: .if ${OSVERSION} >= 900010 @${REINPLACE_CMD} -e \ Modified: head/multimedia/mencoder/distinfo ============================================================================== --- head/multimedia/mencoder/distinfo Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mencoder/distinfo Sun Aug 23 16:41:23 2015 (r395119) @@ -1,2 +1,4 @@ -SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3 -SIZE (mplayer-1.1.20150403.tar.xz) = 11552096 +SHA256 (ffmpeg-2.7.2.tar.bz2) = 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 +SIZE (ffmpeg-2.7.2.tar.bz2) = 8157217 +SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7 +SIZE (mplayer-1.1.20150822.tar.xz) = 5162400 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mplayer/Makefile Sun Aug 23 16:41:23 2015 (r395119) @@ -3,15 +3,16 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 4 +CATEGORIES= multimedia audio +MAINTAINER= riggs@FreeBSD.org COMMENT= High performance media player supporting many formats -.include "${.CURDIR}/Makefile.shared" +.include "${.CURDIR}/Makefile.common" OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ - LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \ + LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \ SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC @@ -121,6 +122,9 @@ pre-everything:: @${ECHO_MSG} "http://www.mplayerhq.hu/" .endif +pre-patch: + ${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg + post-patch: .if ${OSVERSION} >= 900010 @${REINPLACE_CMD} -e \ Copied and modified: head/multimedia/mplayer/Makefile.common (from r395112, head/multimedia/mplayer/Makefile.shared) ============================================================================== --- head/multimedia/mplayer/Makefile.shared Sun Aug 23 16:23:27 2015 (r395112, copy source) +++ head/multimedia/mplayer/Makefile.common Sun Aug 23 16:41:23 2015 (r395119) @@ -4,16 +4,18 @@ # # $FreeBSD$ -MPLAYER_SNAPSHOT_DATE= 2015-04-03 +MPLAYER_SNAPSHOT_DATE= 2015-08-22 MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} -CATEGORIES?= multimedia audio -MASTER_SITES= LOCAL/riggs/mplayer +FFMPEG_VERSION= 2.7.2 +MASTER_SITES= LOCAL/riggs/mplayer:local \ + http://ffmpeg.org/releases/:ffmpeg +DISTFILES+= ffmpeg-${FFMPEG_VERSION}.tar.bz2:ffmpeg \ + ${DISTNAME}.tar.xz:local DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/./g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} -MAINTAINER?= riggs@FreeBSD.org - LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 \ @@ -21,7 +23,7 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graph BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm -USES= compiler:c11 gmake iconv ncurses tar:xz +USES= compiler:c11 gmake iconv ncurses tar:bzip2 tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc="${CC}" \ Modified: head/multimedia/mplayer/distinfo ============================================================================== --- head/multimedia/mplayer/distinfo Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mplayer/distinfo Sun Aug 23 16:41:23 2015 (r395119) @@ -1,2 +1,4 @@ -SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3 -SIZE (mplayer-1.1.20150403.tar.xz) = 11552096 +SHA256 (ffmpeg-2.7.2.tar.bz2) = 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 +SIZE (ffmpeg-2.7.2.tar.bz2) = 8157217 +SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7 +SIZE (mplayer-1.1.20150822.tar.xz) = 5162400 Modified: head/multimedia/mplayer/files/patch-Makefile ============================================================================== --- head/multimedia/mplayer/files/patch-Makefile Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mplayer/files/patch-Makefile Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-03-03 17:45:15.000000000 +0100 -+++ Makefile 2012-03-22 15:26:08.719328325 +0100 -@@ -904,20 +904,17 @@ +--- Makefile.orig 2015-06-03 11:58:05 UTC ++++ Makefile +@@ -855,20 +855,17 @@ $(VIDIX_OBJS): $(VIDIX_PCI_FILES) install: $(INSTALL_TARGETS-yes) install-dirs: Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mplayer/files/patch-configure Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- configure.orig 2014-12-17 22:02:44.000000000 +0100 -+++ configure 2015-03-28 13:56:41.340987552 +0100 -@@ -646,7 +646,7 @@ +--- configure.orig 2015-08-02 17:29:05 UTC ++++ configure +@@ -646,7 +646,7 @@ armthumb=auto _iwmmxt=auto _mtrr=auto _altivec=auto @@ -9,7 +9,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -988,7 +988,7 @@ +@@ -988,7 +988,7 @@ for ac_option do ld_static='' ;; --enable-profile) @@ -18,7 +18,7 @@ ;; --disable-profile) _profile= -@@ -1459,7 +1459,6 @@ +@@ -1459,7 +1459,6 @@ for ac_option do *) echo "Unknown parameter: $ac_option" @@ -26,7 +26,7 @@ ;; esac -@@ -1712,7 +1711,7 @@ +@@ -1712,7 +1711,7 @@ if test -z "$_target" ; then case "$1" in x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ia64) host_arch=ia64 ;; @@ -35,7 +35,7 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; -@@ -1834,7 +1833,11 @@ +@@ -1835,7 +1834,11 @@ echocheck "working compiler" cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." echo "yes" @@ -48,7 +48,7 @@ if test -z "$_target" ; then cat > $TMPC << EOF -@@ -3164,6 +3167,13 @@ +@@ -3170,6 +3173,13 @@ if arm ; then fi echores "$setend" @@ -62,7 +62,7 @@ echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no -@@ -3914,7 +3924,7 @@ +@@ -3920,7 +3930,7 @@ echocheck "pthread" if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -71,7 +71,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3924,7 +3934,7 @@ +@@ -3930,7 +3940,7 @@ int main(void) { pthread_t tid; return p EOF _pthreads=no if ! hpux ; then @@ -80,7 +80,7 @@ # for crosscompilation, we cannot execute the program, be happy if we can link statically cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break done -@@ -4076,7 +4086,7 @@ +@@ -4082,7 +4092,7 @@ EOF # NOTE: -L/usr/lib is a hack to avoid issues due to a # broken libiconv that e.g. macports installs into /opt/local/lib # which might get addded to the search path later by e.g. SDL @@ -89,7 +89,7 @@ cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -5474,15 +5484,6 @@ +@@ -5484,15 +5494,6 @@ EOF break fi done @@ -105,7 +105,7 @@ if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes -@@ -6046,7 +6047,7 @@ +@@ -6056,7 +6057,7 @@ elif darwin ; then elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -114,7 +114,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -6059,7 +6060,7 @@ +@@ -6069,7 +6070,7 @@ else default_cdrom_device="/dev/cdrom" fi @@ -123,18 +123,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6133,8 +6134,8 @@ - cat > $TMPC << EOF - #include <stdio.h> - #include <cdio/version.h> --#include <cdio/cdda.h> --#include <cdio/paranoia.h> -+#include <cdio/paranoia/cdda.h> -+#include <cdio/paranoia/paranoia.h> - int main(void) { - void *test = cdda_verbose_set; - printf("%s\n", CDIO_VERSION); -@@ -6566,7 +6567,7 @@ +@@ -6586,7 +6587,7 @@ echores "$_speex" echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -143,7 +132,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7051,6 +7052,16 @@ +@@ -7071,6 +7072,16 @@ if test "$_librtmp" = yes && test "$netw nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -160,7 +149,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7450,7 +7461,7 @@ +@@ -7471,7 +7482,7 @@ echores "$_mp3lame" echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -169,7 +158,7 @@ fi echores "$_mencoder" -@@ -8329,7 +8340,7 @@ +@@ -8353,7 +8364,7 @@ TIMER = $_timer EXESUF = $_exesuf EXESUFS_ALL = .exe Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_Makefile (from r395020, head/multimedia/mplayer/files/patch-ffmpeg-Makefile) ============================================================================== --- head/multimedia/mplayer/files/patch-ffmpeg-Makefile Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_Makefile Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- ffmpeg/Makefile.orig 2014-07-22 19:20:06.000000000 +0200 -+++ ffmpeg/Makefile 2014-08-11 20:49:48.038911362 +0200 -@@ -91,7 +91,7 @@ +--- ffmpeg/Makefile.orig 2015-06-19 20:44:35 UTC ++++ ffmpeg/Makefile +@@ -92,7 +92,7 @@ define DOSUBDIR $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile (from r395020, head/multimedia/mplayer/files/patch-libavcodec-Makefile) ============================================================================== --- head/multimedia/mplayer/files/patch-libavcodec-Makefile Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile Sun Aug 23 16:41:23 2015 (r395119) @@ -1,11 +1,11 @@ ---- ffmpeg/libavcodec/Makefile.orig 2015-04-02 19:20:07.000000000 +0200 -+++ ffmpeg/libavcodec/Makefile 2015-04-03 13:25:18.741269686 +0200 -@@ -865,7 +865,7 @@ +--- ffmpeg/libavcodec/Makefile.orig 2015-06-19 20:44:36 UTC ++++ ffmpeg/libavcodec/Makefile +@@ -877,7 +877,7 @@ SKIPHEADERS + old_codec_ids.h \ tableprint.h \ tableprint_vlc.h \ - $(ARCH)/vp56_arith.h \ + $(MPLAYER_ARCH)/vp56_arith.h \ + SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h - SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S (from r395020, head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S) ============================================================================== --- head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- ffmpeg/libavcodec/arm/fft_vfp.S.orig 2014-12-09 19:20:07.000000000 +0100 -+++ ffmpeg/libavcodec/arm/fft_vfp.S 2014-12-24 15:48:09.494735677 +0100 -@@ -33,7 +33,7 @@ +--- ffmpeg/libavcodec/arm/fft_vfp.S.orig 2015-06-19 20:44:37 UTC ++++ ffmpeg/libavcodec/arm/fft_vfp.S +@@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1 movrel a2, (fft_tab_vfp - 8) ldr pc, [a2, ip, lsl #2] endfunc Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c (from r395020, head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,5 +1,5 @@ ---- ffmpeg/libavcodec/libgsmdec.c.orig 2014-07-21 19:20:03.000000000 +0200 -+++ ffmpeg/libavcodec/libgsmdec.c 2014-08-15 11:02:55.987422815 +0200 +--- ffmpeg/libavcodec/libgsmdec.c.orig 2015-06-19 20:44:39 UTC ++++ ffmpeg/libavcodec/libgsmdec.c @@ -28,11 +28,7 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c (from r395020, head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,5 +1,5 @@ ---- ffmpeg/libavcodec/libgsmenc.c.orig 2014-08-15 11:02:02.619426519 +0200 -+++ ffmpeg/libavcodec/libgsmenc.c 2014-08-15 11:02:28.587424476 +0200 +--- ffmpeg/libavcodec/libgsmenc.c.orig 2015-06-19 20:44:39 UTC ++++ ffmpeg/libavcodec/libgsmenc.c @@ -28,11 +28,7 @@ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c (from r395020, head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2014-02-12 19:20:06.000000000 +0100 -+++ ffmpeg/libavcodec/mpegaudio_parser.c 2014-04-19 14:39:15.514132783 +0200 -@@ -83,6 +83,7 @@ +--- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2015-06-19 20:44:40 UTC ++++ ffmpeg/libavcodec/mpegaudio_parser.c +@@ -84,6 +84,7 @@ static int mpegaudio_parse(AVCodecParser avctx->sample_rate= sr; avctx->channels = channels; s1->duration = frame_size; Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile (from r395020, head/multimedia/mplayer/files/patch-libavfilter-Makefile) ============================================================================== --- head/multimedia/mplayer/files/patch-libavfilter-Makefile Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile Sun Aug 23 16:41:23 2015 (r395119) @@ -1,10 +1,10 @@ ---- ffmpeg/libavfilter/Makefile.orig 2012-03-21 19:20:05.000000000 +0100 -+++ ffmpeg/libavfilter/Makefile 2012-03-22 16:09:31.826872990 +0100 -@@ -167,6 +167,7 @@ - OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o - OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o +--- ffmpeg/libavfilter/Makefile.orig 2015-06-19 20:44:50 UTC ++++ ffmpeg/libavfilter/Makefile +@@ -26,6 +26,7 @@ OBJS = allfilters.o + transform.o \ + video.o \ +-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile - DIRS = x86 libmpcodecs + OBJS-$(CONFIG_AVCODEC) += avcodec.o Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c (from r395020, head/multimedia/mplayer/files/patch-libavformat-udp.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libavformat-udp.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,5 +1,5 @@ ---- ffmpeg/libavformat/udp.c.orig 2015-03-30 19:20:06.000000000 +0200 -+++ ffmpeg/libavformat/udp.c 2015-04-03 13:29:34.228251670 +0200 +--- ffmpeg/libavformat/udp.c.orig 2015-06-19 20:44:53 UTC ++++ ffmpeg/libavformat/udp.c @@ -71,6 +71,8 @@ #define UDP_MAX_PKT_SIZE 65536 #define UDP_HEADER_SIZE 8 Added: head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c Sun Aug 23 16:41:23 2015 (r395119) @@ -0,0 +1,11 @@ +--- ffmpeg/libavutil/mem.c.orig 2015-08-23 16:08:16 UTC ++++ ffmpeg/libavutil/mem.c +@@ -228,7 +228,7 @@ void av_free(void *ptr) + #if CONFIG_MEMALIGN_HACK + if (ptr) { + int v= ((char *)ptr)[-1]; +- av_assert0(v>0 && v<=ALIGN); ++ av_assert0(v>=0 && v<=ALIGN); + free((char *)ptr - v); + } + #elif HAVE_ALIGNED_MALLOC Copied and modified: head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h (from r395020, head/multimedia/mplayer/files/patch-libavutil-x86-asm.h) ============================================================================== --- head/multimedia/mplayer/files/patch-libavutil-x86-asm.h Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- ffmpeg/libavutil/x86/asm.h.orig 2013-05-25 19:20:04.000000000 +0200 -+++ ffmpeg/libavutil/x86/asm.h 2013-11-11 21:51:57.940269764 +0100 -@@ -70,7 +70,7 @@ +--- ffmpeg/libavutil/x86/asm.h.orig 2015-06-19 20:44:54 UTC ++++ ffmpeg/libavutil/x86/asm.h +@@ -71,7 +71,7 @@ typedef int32_t x86_reg; typedef int x86_reg; #endif Copied and modified: head/multimedia/mplayer/files/patch-gui_wm_ws.c (from r395020, head/multimedia/mplayer/files/patch-gui_ws_ws.c) ============================================================================== --- head/multimedia/mplayer/files/patch-gui_ws_ws.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-gui_wm_ws.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- gui/wm/ws.c.orig 2013-08-03 00:42:05.000000000 +0200 -+++ gui/wm/ws.c 2013-12-16 10:13:26.000000000 +0100 -@@ -1322,6 +1322,7 @@ +--- gui/wm/ws.c.orig 2015-08-01 07:44:07 UTC ++++ 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); Copied and modified: head/multimedia/mplayer/files/patch-libao2_ao__arts.c (from r395020, head/multimedia/mplayer/files/patch-libao2-ao_arts.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libao2-ao_arts.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-libao2_ao__arts.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- libao2/ao_arts.c.orig 2009-03-06 13:43:12.000000000 -0600 -+++ libao2/ao_arts.c 2009-07-23 19:57:44.090958744 -0500 -@@ -116,8 +116,10 @@ +--- libao2/ao_arts.c.orig 2010-02-20 21:02:49 UTC ++++ libao2/ao_arts.c +@@ -116,8 +116,10 @@ static int init(int rate_hz, int channel static void uninit(int immed) { Copied and modified: head/multimedia/mplayer/files/patch-libao2_ao__oss.c (from r395020, head/multimedia/mplayer/files/patch-libao2-ao_oss.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libao2-ao_oss.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-libao2_ao__oss.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- libao2/ao_oss.c.orig 2010-01-11 21:27:52.000000000 +0100 -+++ libao2/ao_oss.c 2011-12-29 01:06:49.227522915 +0100 -@@ -56,6 +56,8 @@ +--- libao2/ao_oss.c.orig 2013-03-17 22:47:17 UTC ++++ libao2/ao_oss.c +@@ -57,6 +57,8 @@ static const ao_info_t info = "" }; @@ -9,7 +9,7 @@ /* Support for >2 output channels added 2001-11-25 - Steve Davies <steve@daviesfam.org> */ LIBAO_EXTERN(oss) -@@ -72,6 +74,11 @@ +@@ -73,6 +75,11 @@ static int format2oss(int format) case AF_FORMAT_S16_BE: return AFMT_S16_BE; #ifdef AFMT_S24_PACKED case AF_FORMAT_S24_LE: return AFMT_S24_PACKED; @@ -21,7 +21,7 @@ #endif #ifdef AFMT_U32_LE case AF_FORMAT_U32_LE: return AFMT_U32_LE; -@@ -115,6 +122,11 @@ +@@ -116,6 +123,11 @@ static int oss2format(int format) case AFMT_S16_BE: return AF_FORMAT_S16_BE; #ifdef AFMT_S24_PACKED case AFMT_S24_PACKED: return AF_FORMAT_S24_LE; @@ -33,7 +33,7 @@ #endif #ifdef AFMT_U32_LE case AFMT_U32_LE: return AF_FORMAT_U32_LE; -@@ -434,9 +446,29 @@ +@@ -435,9 +447,29 @@ static void uninit(int immed){ audio_fd = -1; } @@ -63,7 +63,7 @@ uninit(1); audio_fd=open(dsp, O_WRONLY); if(audio_fd < 0){ -@@ -448,6 +480,7 @@ +@@ -449,6 +481,7 @@ static void reset(void){ fcntl(audio_fd, F_SETFD, FD_CLOEXEC); #endif @@ -71,7 +71,7 @@ oss_format = format2oss(ao_data.format); if(AF_FORMAT_IS_AC3(ao_data.format)) ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); -@@ -459,13 +492,14 @@ +@@ -460,13 +493,14 @@ static void reset(void){ int c = ao_data.channels-1; ioctl (audio_fd, SNDCTL_DSP_STEREO, &c); } Copied and modified: head/multimedia/mplayer/files/patch-libvo_x11__common.c (from r395020, head/multimedia/mplayer/files/patch-libvo-x11_common.c) ============================================================================== --- head/multimedia/mplayer/files/patch-libvo-x11_common.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-libvo_x11__common.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- libvo/x11_common.c.orig 2014-02-08 21:39:02.000000000 +0100 -+++ libvo/x11_common.c 2014-04-19 14:43:53.715749607 +0200 -@@ -430,7 +430,7 @@ +--- libvo/x11_common.c.orig 2015-05-11 20:10:01 UTC ++++ libvo/x11_common.c +@@ -430,7 +430,7 @@ int vo_init(void) } // Required so that XLookupString returns UTF-8 Modified: head/multimedia/mplayer/files/patch-mplayer.c ============================================================================== --- head/multimedia/mplayer/files/patch-mplayer.c Sun Aug 23 16:40:12 2015 (r395118) +++ head/multimedia/mplayer/files/patch-mplayer.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- mplayer.c.orig 2014-04-06 20:46:45.000000000 +0200 -+++ mplayer.c 2014-06-07 14:40:43.756655422 +0200 -@@ -3707,7 +3707,8 @@ +--- mplayer.c.orig 2015-06-10 21:17:35 UTC ++++ mplayer.c +@@ -3711,7 +3711,8 @@ goto_enable_cache: if (use_gui) { if (!gui(GUI_SET_VIDEO, mpctx->sh_video)) goto goto_next_file; Copied and modified: head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c (from r395020, head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c) ============================================================================== --- head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- stream/tvi_bsdbt848.c.orig 2013-03-16 11:15:07.000000000 +0100 -+++ stream/tvi_bsdbt848.c 2013-11-09 13:47:43.804868208 +0100 -@@ -366,11 +366,11 @@ +--- stream/tvi_bsdbt848.c.orig 2013-03-16 10:15:07 UTC ++++ stream/tvi_bsdbt848.c +@@ -366,11 +366,11 @@ static int control(priv_t *priv, int cmd int req_mode = *(int *)arg; u_short tmp_fps; @@ -14,7 +14,7 @@ priv->maxheight = PAL_HEIGHT; priv->maxwidth = PAL_WIDTH; priv->maxfps = PAL_FPS; -@@ -391,7 +391,7 @@ +@@ -391,7 +391,7 @@ static int control(priv_t *priv, int cmd if(req_mode == TV_NORM_NTSC) { @@ -23,7 +23,7 @@ priv->maxheight = NTSC_HEIGHT; priv->maxwidth = NTSC_WIDTH; priv->maxfps = NTSC_FPS; -@@ -415,9 +415,28 @@ +@@ -415,9 +415,28 @@ static int control(priv_t *priv, int cmd } } @@ -35,7 +35,8 @@ + priv->maxwidth = PAL_WIDTH; + priv->maxfps = PAL_FPS; + priv->fps = PAL_FPS; -+ + +- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) + if(priv->fps > priv->maxfps) priv->fps = priv->maxfps; + + if(priv->geom.rows > priv->maxheight) @@ -48,13 +49,12 @@ + priv->geom.columns = priv->maxwidth; + } + } - -- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) ++ + if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) { mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno)); return TVI_CONTROL_FALSE; -@@ -546,8 +565,9 @@ +@@ -546,8 +565,9 @@ G_private = priv; /* Oooh, sick */ /* Video Configuration */ priv->videoready = 1; @@ -65,7 +65,7 @@ priv->maxheight = PAL_HEIGHT; priv->maxwidth = PAL_WIDTH; priv->maxfps = PAL_FPS; -@@ -572,7 +592,7 @@ +@@ -572,7 +592,7 @@ if(priv->btfd < 0) } if(priv->videoready && Copied and modified: head/multimedia/mplayer/files/patch-stream_tvi__v4l.c (from r395020, head/multimedia/mplayer/files/patch-stream-tvi_v4l.c) ============================================================================== --- head/multimedia/mplayer/files/patch-stream-tvi_v4l.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-stream_tvi__v4l.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- stream/tvi_v4l.c 2007-10-07 23:49:26.000000000 +0400 -+++ stream/tvi_v4l.c 2010-01-27 13:42:17.781746063 +0300 -@@ -48,6 +48,14 @@ +--- stream/tvi_v4l.c.orig 2013-03-17 22:47:17 UTC ++++ stream/tvi_v4l.c +@@ -65,6 +65,14 @@ #include "audio_in.h" @@ -14,4 +14,4 @@ + static tvi_handle_t *tvi_init_v4l(tv_param_t* tv_param); - tvi_info_t tvi_info_v4l = { + const tvi_info_t tvi_info_v4l = { Copied and modified: head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c (from r395020, head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c) ============================================================================== --- head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- stream/tvi_v4l2.c.orig 2011-06-26 16:42:35.000000000 +0200 -+++ stream/tvi_v4l2.c 2011-11-26 20:09:03.369654854 +0100 -@@ -52,7 +52,6 @@ +--- stream/tvi_v4l2.c.orig 2014-06-10 16:39:04 UTC ++++ stream/tvi_v4l2.c +@@ -53,7 +53,6 @@ known issues: #ifdef HAVE_SYS_VIDEOIO_H #include <sys/videoio.h> #else @@ -8,9 +8,9 @@ #include <linux/videodev2.h> #endif #include "mp_msg.h" -@@ -62,6 +61,14 @@ - #include "tv.h" - #include "audio_in.h" +@@ -68,6 +67,14 @@ known issues: + #define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x2000 + #endif +#include <libv4l2.h> +#define open v4l2_open Copied and modified: head/multimedia/mplayer/files/patch-vidix_mga__vid.c (from r395020, head/multimedia/mplayer/files/patch-vidix-mga_vid.c) ============================================================================== --- head/multimedia/mplayer/files/patch-vidix-mga_vid.c Sat Aug 22 07:47:46 2015 (r395020, copy source) +++ head/multimedia/mplayer/files/patch-vidix_mga__vid.c Sun Aug 23 16:41:23 2015 (r395119) @@ -1,6 +1,6 @@ ---- vidix/mga_vid.c.orig 2014-05-17 03:38:00.000000000 +0200 -+++ vidix/mga_vid.c 2014-08-11 20:58:07.109876980 +0200 -@@ -1110,13 +1110,10 @@ +--- vidix/mga_vid.c.orig 2014-05-17 01:38:00 UTC ++++ vidix/mga_vid.c +@@ -1110,13 +1110,10 @@ static int mga_probe(int verbose,int for i, lst[i].vendor, lst[i].device); if (lst[i].vendor == VENDOR_MATROX) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508231641.t7NGfNVm004360>