Date: Fri, 29 Aug 2014 09:55:41 +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: r366488 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201408290955.s7T9tfeg053549@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Fri Aug 29 09:55:41 2014 New Revision: 366488 URL: http://svnweb.freebsd.org/changeset/ports/366488 QAT: https://qat.redports.org/buildarchive/r366488/ Log: - Update to new upstream snapshot 2014-08-24 - GUI OPTION is no longer default - Workaround an issue in CURRENT which prevented building a binary that supports profiling - Retire no longer needed CONFIGURE_ARGS and patch for CVE-2014-4610 Added: head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c (contents, props changed) head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c (contents, props changed) Deleted: head/multimedia/mplayer/files/patch-CVE-2014-4610 head/multimedia/mplayer/files/patch-libavcodec-libgsm.c Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/distinfo head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.options head/multimedia/mplayer/Makefile.shared head/multimedia/mplayer/distinfo head/multimedia/mplayer/files/patch-configure head/multimedia/mplayer/files/patch-ffmpeg-Makefile head/multimedia/mplayer/files/patch-vidix-mga_vid.c Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mencoder/Makefile Fri Aug 29 09:55:41 2014 (r366488) @@ -3,7 +3,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 COMMENT= Convenient video file and movie encoder Modified: head/multimedia/mencoder/distinfo ============================================================================== --- head/multimedia/mencoder/distinfo Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mencoder/distinfo Fri Aug 29 09:55:41 2014 (r366488) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20140418.tar.xz) = 8ac4bc58897e4f7d007040eae569cb2bf19f544fe772bb51127d801154350a7e -SIZE (mplayer-1.1.20140418.tar.xz) = 11105012 +SHA256 (mplayer-1.1.20140824.tar.xz) = ea11e84bb3ea21904fccc2b661aee997e87d16c2d56659c1a439328c2d1d0745 +SIZE (mplayer-1.1.20140824.tar.xz) = 11397312 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/Makefile Fri Aug 29 09:55:41 2014 (r366488) @@ -3,7 +3,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 6 COMMENT= High performance media player supporting many formats @@ -20,7 +19,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLUR OPTIONS_RADIO= RGCD OPTIONS_RADIO_RGCD= CDIO CDPARANOIA -OPTIONS_DEFAULT=FRIBIDI GUI IPV6 OCFLAGS OPENGL RTCPU SKINS \ +OPTIONS_DEFAULT=FRIBIDI IPV6 OCFLAGS OPENGL RTCPU SKINS \ WIN32 X11 X11DGA X11VM XINERAMA XVIDEO BLURAY_DESC?= BluRay support Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/Makefile.options Fri Aug 29 09:55:41 2014 (r366488) @@ -159,7 +159,12 @@ CFLAGS+= -O -fomit-frame-pointer .if ${PORT_OPTIONS:MPROFILE} CONFIGURE_ARGS+= --enable-profile LDFLAGS+= -pg +.if ${OSVERSION} >= 1100000 +#Workaround a temporary bug in 11-CURRENT where +#using -pie does not work with -pthread +CONFIGURE_ARGS+= --disable-relocatable .endif +.endif #PROFILE # Edge case: binary codecs on i386, mostly superseded by internal ffmpeg # ====================================================================== Modified: head/multimedia/mplayer/Makefile.shared ============================================================================== --- head/multimedia/mplayer/Makefile.shared Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/Makefile.shared Fri Aug 29 09:55:41 2014 (r366488) @@ -4,7 +4,7 @@ # # $FreeBSD$ -MPLAYER_SNAPSHOT_DATE= 2014-04-18 +MPLAYER_SNAPSHOT_DATE= 2014-08-24 MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -46,7 +46,6 @@ CONFIGURE_ARGS= --cc="${CC}" \ --disable-live \ --disable-joystick \ --disable-mad \ - --disable-mp3lib \ --disable-libmpeg2 \ --disable-nemesi \ --disable-speex \ Modified: head/multimedia/mplayer/distinfo ============================================================================== --- head/multimedia/mplayer/distinfo Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/distinfo Fri Aug 29 09:55:41 2014 (r366488) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20140418.tar.xz) = 8ac4bc58897e4f7d007040eae569cb2bf19f544fe772bb51127d801154350a7e -SIZE (mplayer-1.1.20140418.tar.xz) = 11105012 +SHA256 (mplayer-1.1.20140824.tar.xz) = ea11e84bb3ea21904fccc2b661aee997e87d16c2d56659c1a439328c2d1d0745 +SIZE (mplayer-1.1.20140824.tar.xz) = 11397312 Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/files/patch-configure Fri Aug 29 09:55:41 2014 (r366488) @@ -1,6 +1,6 @@ ---- configure.orig 2014-04-15 15:12:18.000000000 +0200 -+++ configure 2014-04-21 18:34:48.440563168 +0200 -@@ -645,7 +645,7 @@ +--- configure.orig 2014-08-05 13:12:59.000000000 +0200 ++++ configure 2014-08-15 17:48:16.698117164 +0200 +@@ -649,7 +649,7 @@ _iwmmxt=auto _mtrr=auto _altivec=auto @@ -9,7 +9,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -995,7 +995,7 @@ +@@ -999,7 +999,7 @@ ld_static='' ;; --enable-profile) @@ -18,7 +18,7 @@ ;; --disable-profile) _profile= -@@ -1466,7 +1466,6 @@ +@@ -1474,7 +1474,6 @@ *) echo "Unknown parameter: $ac_option" @@ -26,7 +26,7 @@ ;; esac -@@ -1719,7 +1718,7 @@ +@@ -1727,7 +1726,7 @@ 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,20 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; -@@ -3868,7 +3867,7 @@ +@@ -1843,7 +1842,11 @@ + cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." + echo "yes" + +-cflag_check "-lm" && libm="-lm" ++if test -z "$_profile" ; then ++ cflag_check "-lm" && libm="-lm" ++else ++ cflag_check "-lm_p" && libm="-lm_p" ++fi + + if test -z "$_target" ; then + cat > $TMPC << EOF +@@ -3882,7 +3885,7 @@ if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -44,7 +57,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3878,7 +3877,7 @@ +@@ -3892,7 +3895,7 @@ EOF _pthreads=no if ! hpux ; then @@ -53,7 +66,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 -@@ -4030,7 +4029,7 @@ +@@ -4044,7 +4047,7 @@ # 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 @@ -62,7 +75,7 @@ cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -5974,7 +5973,7 @@ +@@ -5996,7 +5999,7 @@ elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -71,7 +84,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -5987,7 +5986,7 @@ +@@ -6009,7 +6012,7 @@ default_cdrom_device="/dev/cdrom" fi @@ -80,7 +93,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6586,7 +6585,7 @@ +@@ -6608,7 +6611,7 @@ echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -89,7 +102,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7071,6 +7070,16 @@ +@@ -7093,6 +7096,16 @@ nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -106,7 +119,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7470,7 +7479,7 @@ +@@ -7492,7 +7505,7 @@ echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -115,7 +128,7 @@ fi echores "$_mencoder" -@@ -8399,7 +8408,7 @@ +@@ -8421,7 +8434,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe Modified: head/multimedia/mplayer/files/patch-ffmpeg-Makefile ============================================================================== --- head/multimedia/mplayer/files/patch-ffmpeg-Makefile Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/files/patch-ffmpeg-Makefile Fri Aug 29 09:55:41 2014 (r366488) @@ -1,11 +1,11 @@ ---- ffmpeg/Makefile.orig 2012-06-29 19:20:03.000000000 +0200 -+++ ffmpeg/Makefile 2012-07-21 18:47:01.068697043 +0200 -@@ -82,7 +82,7 @@ +--- 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 @@ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile --include $(SRC_PATH)/$(1)/$(ARCH)/Makefile +-include $(SRC_PATH)/$(1)/$(MPLAYER_ARCH)/Makefile + -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile include $(SRC_PATH)/library.mak endef - Added: head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c Fri Aug 29 09:55:41 2014 (r366488) @@ -0,0 +1,14 @@ +--- 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 +@@ -28,11 +28,7 @@ + // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html + + #include "config.h" +-#if HAVE_GSM_H + #include <gsm.h> +-#else +-#include <gsm/gsm.h> +-#endif + + #include "libavutil/channel_layout.h" + #include "libavutil/common.h" Added: head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c Fri Aug 29 09:55:41 2014 (r366488) @@ -0,0 +1,14 @@ +--- 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 +@@ -28,11 +28,7 @@ + // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html + + #include "config.h" +-#if HAVE_GSM_H + #include <gsm.h> +-#else +-#include <gsm/gsm.h> +-#endif + + #include "libavutil/common.h" + Modified: head/multimedia/mplayer/files/patch-vidix-mga_vid.c ============================================================================== --- head/multimedia/mplayer/files/patch-vidix-mga_vid.c Fri Aug 29 09:54:24 2014 (r366487) +++ head/multimedia/mplayer/files/patch-vidix-mga_vid.c Fri Aug 29 09:55:41 2014 (r366488) @@ -1,5 +1,5 @@ ---- vidix/mga_vid.c.orig 2009-05-12 21:58:57.000000000 -0500 -+++ vidix/mga_vid.c 2009-07-23 20:41:50.683011307 -0500 +--- 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 @@ i, lst[i].vendor, lst[i].device); if (lst[i].vendor == VENDOR_MATROX) @@ -7,9 +7,9 @@ -#if 0 if ((lst[i].command & PCI_COMMAND_IO) == 0) { -- printf("[mga] Device is disabled, ignoring\n"); +- mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device is disabled, ignoring\n"); - continue; -+ printf("[mga] Device is disabled, trying anyways.\n"); ++ mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device seems disabled, trying anyway\n"); } -#endif switch(lst[i].device)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408290955.s7T9tfeg053549>