Index: head/multimedia/avidemux/Makefile.common =================================================================== --- head/multimedia/avidemux/Makefile.common (revision 428895) +++ head/multimedia/avidemux/Makefile.common (revision 428896) @@ -1,288 +1,289 @@ # $FreeBSD$ PORTREVISION?= 2 AVIDEMUX_VERSION= 2.6.11 MASTER_SITES= \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} BUILD_DEPENDS+= yasm:devel/yasm \ bash:shells/bash LIB_DEPENDS+= libmad.so:audio/libmad \ libdca.so:multimedia/libdca \ libpng.so:graphics/png LICENSE= GPLv2 USE_GNOME= libxml2 USE_QT4= # empty OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options USES= cmake:outsource pkgconfig iconv gmake compiler:features sqlite USES+= dos2unix execinfo DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none CMAKE_ARGS+= -DQT5:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes +NOPRECIOUSMAKEVARS= yes # ARCH BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \ PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU OPTIONS_DEFAULT= QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ SDL FAAD VDPAU VORBIS OPTIONS_SUB= yes CLI_DESC= Build CLI tool FRIBIDI_CMAKE_OFF= -DFRIDIBI:BOOL=OFF FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi OPUS_CMAKE_OFF= -DOPUS:BOOL=OFF OPUS_LIB_DEPENDS= libopus.so:audio/opus TWOLAME_CMAKE_OFF= -DTWOLAME:BOOL=OFF TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame .if !defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= LAME FAAC AMR X264 .endif .include .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" . if ${PORT_OPTIONS:MQT4} PLIST_SUB+= QT_NLS="" . else PLIST_SUB+= QT_NLS="@comment " . endif .else CMAKE_ARGS+= -DNO_NLS:BOOL=ON PLIST_SUB+= NLS="@comment " QT_NLS="@comment " .endif # for libexecinfo: (so that __builtin_frame_address() finds the top # of the stack) .if ${ARCH} == "amd64" CFLAGS+= -fno-omit-frame-pointer #MAKE_ENV+= ARCH=x86_64 #CONFIGURE_ENV+= ARCH=x86_64 .endif .if !exists(/usr/lib/libexecinfo.so) CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=${LOCALBASE}/include CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=${LOCALBASE}/lib/libexecinfo.so .else CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=/usr/include CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo .endif # We haven't ALSA(Never) & Aften(Yet) on FreeBSD CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF .if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MQT4) CMAKE_ARGS+= -DX11:BOOL=OFF .else USE_GNOME+= libxslt .endif .if ${PORT_OPTIONS:MGTK3} USE_GNOME+= gnomeprefix gtk30 PLIST_SUB+= GTK="" .else CMAKE_ARGS+= -DGTK:BOOL=OFF PLIST_SUB+= GTK="@comment " .endif .if ${PORT_OPTIONS:MQT4} CMAKE_ARGS+= -DLRELEASE_EXECUTABLE=${LOCALBASE}/bin/lrelease-qt4 USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build gui PLIST_SUB+= QT4="" .else CMAKE_ARGS+= -DQT4:BOOL=OFF PLIST_SUB+= QT4="@comment " .endif .if ${PORT_OPTIONS:MCLI} PLIST_SUB+= CLI="" .else PLIST_SUB+= CLI="@comment " .endif .if ${PORT_OPTIONS:MOSS} CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=ON .else CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=OFF .endif .if ${PORT_OPTIONS:MESOUND} USE_GNOME+= esound PLIST_SUB+= ESD="" .else CMAKE_ARGS+= -DESD:BOOL=OFF PLIST_SUB+= ESD="@comment " .endif .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= libjack.so:audio/jack PLIST_SUB+= JACK="" .else CMAKE_ARGS+= -DJACK:BOOL=OFF PLIST_SUB+= JACK="@comment " .endif .if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= libpulse.so:audio/pulseaudio PLIST_SUB+= PULSE="" .else CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF PLIST_SUB+= PULSE="@comment " .endif .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= libfreetype.so:print/freetype2 PLIST_SUB+= FREETYPE="" .else CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF PLIST_SUB+= FREETYPE="@comment " .endif .if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig .else CMAKE_ARGS+= -DFONTCONFIG:BOOL=OFF .endif .if ${PORT_OPTIONS:MXVIDEO} #LIB_DEPENDS+= Xv:x11/libXv USE_XORG+= xv .else CMAKE_ARGS+= -DXVIDEO:BOOL=OFF .endif .if ${PORT_OPTIONS:MFAAC} LIB_DEPENDS+= libfaac.so:audio/faac PLIST_SUB+= FAAC="" .else CMAKE_ARGS+= -DFAAC:BOOL=OFF PLIST_SUB+= FAAC="@comment " .endif .if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= libmp3lame.so:audio/lame PLIST_SUB+= LAME="" .else CMAKE_ARGS+= -DLAME:BOOL=OFF PLIST_SUB+= LAME="@comment " .endif .if ${PORT_OPTIONS:MFAAD} LIB_DEPENDS+= libfaad.so:audio/faad PLIST_SUB+= FAAD="" .else CMAKE_ARGS+= -DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF PLIST_SUB+= FAAD="@comment " .endif .if ${PORT_OPTIONS:MX264} LIB_DEPENDS+= libx264.so:multimedia/libx264 PLIST_SUB+= X264="" .else CMAKE_ARGS+= -DX264:BOOL=OFF PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MX265} LIB_DEPENDS+= libx265.so:multimedia/x265 PLIST_SUB+= X265="" .else CMAKE_ARGS+= -DX265:BOOL=OFF PLIST_SUB+= X265="@comment " .endif .if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= libvpx.so:multimedia/libvpx PLIST_SUB+= VPX="" .else CMAKE_ARGS+= -DVPXDEC:BOOL=OFF PLIST_SUB+= VPX="@comment " .endif .if ${PORT_OPTIONS:MXVID} LIB_DEPENDS+= libxvidcore.so:multimedia/xvid PLIST_SUB+= XVID="" .else CMAKE_ARGS+= -DXVID:BOOL=OFF PLIST_SUB+= XVID="@comment " .endif .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl PLIST_SUB+= SDL="" .else CMAKE_ARGS+= -DSDL:BOOL=OFF PLIST_SUB+= SDL="@comment " .endif .if ${PORT_OPTIONS:MVAAPI} LIB_DEPENDS+= libva.so:multimedia/libva PLIST_SUB+= VAAPI="" .else CMAKE_ARGS+= -DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF PLIST_SUB+= VAAPI="@comment " .endif .if ${PORT_OPTIONS:MVDPAU} LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau PLIST_SUB+= VDPAU="" .else CMAKE_ARGS+= -DVDPAU:BOOL=OFF PLIST_SUB+= VDPAU="@comment " .endif .if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbis.so:audio/libvorbis PLIST_SUB+= VORBIS="" .else CMAKE_ARGS+= -DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF PLIST_SUB+= VORBIS="@comment " .endif .if ${PORT_OPTIONS:MAMR} LIB_DEPENDS+= libopencore-amrnb.so:audio/opencore-amr PLIST_SUB+= AMRNB="" PLIST_SUB+= AMRWB="" .else CMAKE_ARGS+= -DOPENCORE_AMRNB:BOOL=OFF PLIST_SUB+= AMRNB="@comment " CMAKE_ARGS+= -DOPENCORE_AMRWB:BOOL=OFF PLIST_SUB+= AMRWB="@comment " .endif .include # is this kosher? the result seems to run tho... (see ports/185997) .if $(COMPILER_FEATURES:Mlibc++) LDFLAGS+= -lc++ .endif #.if ${COMPILER_TYPE} == clang USE_GCC= yes #.endif .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif post-patch: @${MKDIR} ${CONFIGURE_WRKSRC}/config @${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config @${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt post-configure-common: @${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||g' Index: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch =================================================================== --- head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch (revision 428895) +++ head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch (nonexistent) @@ -1,14 +0,0 @@ ---- avidemux_core/ffmpeg_package/patches/Makefile.patch.orig 2015-06-01 05:59:45 UTC -+++ avidemux_core/ffmpeg_package/patches/Makefile.patch -@@ -0,0 +1,11 @@ -+--- Makefile.orig 2015-03-16 20:25:47.000000000 +0100 -++++ Makefile -+@@ -92,7 +92,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)/$(FFMPEG_ARCH)/Makefile -+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile -+ include $(SRC_PATH)/library.mak -+ endef Property changes on: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch =================================================================== --- head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch (revision 428895) +++ head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch (nonexistent) @@ -1,14 +0,0 @@ ---- avidemux_core/ffmpeg_package/patches/libavcodec-Makefile.patch.orig 2015-06-01 05:59:45 UTC -+++ avidemux_core/ffmpeg_package/patches/libavcodec-Makefile.patch -@@ -0,0 +1,11 @@ -+--- libavcodec/Makefile.orig 2015-03-06 23:35:30.000000000 +0100 -++++ libavcodec/Makefile -+@@ -858,7 +858,7 @@ -+ old_codec_ids.h \ -+ tableprint.h \ -+ tableprint_vlc.h \ -+- $(ARCH)/vp56_arith.h \ -++ $(FFMPEG_ARCH)/vp56_arith.h \ -+ -+ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h -+ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h Property changes on: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch =================================================================== --- head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch (revision 428895) +++ head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch (revision 428896) @@ -1,28 +1,19 @@ --- avidemux_core/ffmpeg_package/patches/configure.patch.orig 2015-06-01 05:59:45 UTC +++ avidemux_core/ffmpeg_package/patches/configure.patch -@@ -0,0 +1,25 @@ +@@ -0,0 +1,16 @@ +--- configure.orig 2015-03-16 20:26:04.000000000 +0100 ++++ configure +@@ -2733,12 +2733,7 @@ + host_os=$target_os_default + + # machine +-if test "$target_os_default" = aix; then +- arch_default=$(uname -p) +- strip_default="strip -X32_64" +-else +- arch_default=$(uname -m) +-fi ++arch_default=$(uname -p) + cpu="generic" + intrinsics="none" + -+@@ -5621,7 +5616,7 @@ -+ SRC_PATH:=\$(SRC_PATH:.%=..%) -+ endif -+ CC_IDENT=$cc_ident -+-ARCH=$arch -++FFMPEG_ARCH=$arch -+ INTRINSICS=$intrinsics -+ CC=$cc -+ CXX=$cxx Index: head/multimedia/ffmpeg/Makefile =================================================================== --- head/multimedia/ffmpeg/Makefile (revision 428895) +++ head/multimedia/ffmpeg/Makefile (revision 428896) @@ -1,488 +1,489 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 3.2.2 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= yasm:devel/yasm \ ${LOCALBASE}/bin/as:devel/binutils HAS_CONFIGURE= yes USES= compiler:c11 cpe gmake localbase perl5 pkgconfig shebangfix tar:bzip2 USE_LDCONFIG= yes USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl +NOPRECIOUSMAKEVARS= yes # ARCH PORTSCOUT= limit:^3\. OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \ DEBUG DOCS EBUR128 FDK_AAC FFSERVER FLITE FONTCONFIG \ FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \ LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \ OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \ RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \ TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \ VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \ XVIDEO ZIMG ZMQ ZVBI OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \ VORBIS VPX X264 XVID OPTIONS_RADIO= RTMP SSL OPTIONS_RADIO_RTMP= GCRYPT GMP LIBRTMP OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_GROUP= LICENSE OPTIONS_GROUP_LICENSE= GPL3 NONFREE OPTIONS_DEFINE_amd64= MMX SSE OPTIONS_DEFINE_armv6= VFP NEON OPTIONS_DEFINE_armv6hf= VFP NEON OPTIONS_DEFINE_i386= MMX SSE OPTIONS_DEFAULT_amd64= MMX SSE OPTIONS_DEFAULT_i386= MMX SSE ASS_DESC= Subtitles rendering via libass BS2B_DESC= Bauer Stereophonic-to-Binaural filter CDIO_DESC= Audio CD grabbing with libcdio CHROMAPRINT_DESC= Audio fingerprinting with chromaprint DC1394_DESC= IIDC-1394 grabbing using libdc1394 EBUR128_DESC= EBU R128 measurement for loudnorm filter FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver FLITE_DESC= Voice synthesis support via libflite GME_DESC= Game Music Emu demuxer GPL3_DESC= Allow (L)GPL version 3 code(cs) ILBC_DESC= Internet Low Bit Rate codec KVAZAAR_DESC= H.265 video codec support via Kvazaar LICENSE_DESC= Licensing options NEON_DESC= Enable Media Processing Engine instructions NETCDF_DESC= SOFAlizer binaural filter NONFREE_DESC= Allow use of nonfree code OPENH264_DESC= H.264 video codec support via OpenH264 RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband RTCPU_DESC= Detect CPU capabilities at runtime RTMP_DESC= RTMP(T)E protocol support LIBRTMP_DESC= ${RTMP_DESC} via librtmp TESSERACT_DESC= Optical Character Recognition via Tesseract VFP_DESC= Enable Vector Floating Point instructions VIDSTAB_DESC= Video stabilization filter X11GRAB_DESC= X11 grabbing (legacy) XCB_DESC= X11 grabbing using XCB ZIMG_DESC= "z" library video scaling filter ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION} ZVBI_DESC= Teletext support via libzvbi OPTIONS_SUB= yes # alsa ALSA_CONFIGURE_OFF= --disable-indev=alsa \ --disable-outdev=alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib # Opencore AMR NB AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_NB_IMPLIES= GPL3 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb AMR_WB_IMPLIES= GPL3 # ass ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_ENABLE= libass # bs2b BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b BS2B_CONFIGURE_ENABLE= libbs2b # caca CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_ENABLE= libcaca # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # celt CELT_LIB_DEPENDS= libcelt0.so:audio/celt CELT_CONFIGURE_ENABLE= libcelt # chromaprint CHROMAPRINT_BROKEN= Dependency loop CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:audio/chromaprint CHROMAPRINT_CONFIGURE_ENABLE= chromaprint # dc1394 DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 DC1394_CONFIGURE_ENABLE= libdc1394 # debugging DEBUG_CONFIGURE_ON= --disable-stripping DEBUG_CONFIGURE_OFF= --disable-debug # docs DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html DOCS_CONFIGURE_ENABLE= htmlpages # ebur128 EBUR128_LIB_DEPENDS= libebur128.so:audio/libebur128 EBUR128_CONFIGURE_ENABLE= libebur128 # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FDK_AAC_IMPLIES= NONFREE # ffserver FFSERVER_CONFIGURE_ENABLE= ffserver FFSERVER_VARS= USE_RC_SUBR+=ffserver # flite FLITE_LIB_DEPENDS= libflite.so:audio/flite FLITE_CONFIGURE_ENABLE= libflite # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # fribidi FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_ENABLE= libfribidi # gcrypt GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CONFIGURE_ENABLE= gcrypt # gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls # gme GME_LIB_DEPENDS= libgme.so:audio/libgme GME_CONFIGURE_ENABLE= libgme # gmp GMP_LIB_DEPENDS= libgmp.so:math/gmp GMP_CONFIGURE_ENABLE= gmp GMP_IMPLIES= GPL3 # gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ENABLE= libgsm # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv # ilbc ILBC_LIB_DEPENDS= libilbc.so:net/libilbc ILBC_CONFIGURE_ENABLE= libilbc # jack JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_OFF= --disable-indev=jack # kvazaar KVAZAAR_LIB_DEPENDS= libkvazaar.so:multimedia/kvazaar KVAZAAR_CONFIGURE_ENABLE= libkvazaar # ladspa LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa LADSPA_CONFIGURE_ENABLE= ladspa # lame LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ENABLE= libv4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # mmx support MMX_CONFIGURE_ENABLE= mmx # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug # netcdf NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_CONFIGURE_ENABLE= netcdf # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencl OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_CONFIGURE_ENABLE= opencl # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core OPENCV_CONFIGURE_ENABLE= libopencv # opengl OPENGL_USE= GL=gl OPENGL_CONFIGURE_ENABLE= opengl # openh264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CONFIGURE_ENABLE= libopenh264 # openjpeg OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_IMPLIES= NONFREE # optimizations OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer # opus OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \ --disable-outdev=pulse # rubberband RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband RUBBERBAND_CONFIGURE_ENABLE= librubberband # rtcpu RTCPU_CONFIGURE_ENABLE= runtime-cpudetect # rtmp LIBRTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp LIBRTMP_CONFIGURE_ENABLE= librtmp # schroedinger SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger # sdl SDL_USE= SDL=sdl2 SDL_CONFIGURE_ENABLE= ffplay SDL_CONFIGURE_OFF= --disable-outdev=sdl --disable-sdl2 # smbclient SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient SMB_CONFIGURE_ENABLE= libsmbclient SMB_IMPLIES= GPL3 # snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy SNAPPY_CONFIGURE_ENABLE= libsnappy # sndio SNDIO_CONFIGURE_OFF= --disable-indev=sndio \ --disable-outdev=sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio # soxr SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr SOXR_CONFIGURE_ENABLE= libsoxr # speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # sse support SSE_CONFIGURE_ENABLE= sse SSE_IMPLIES= MMX # ssh SSH_LIB_DEPENDS= libssh.so:security/libssh SSH_CONFIGURE_ENABLE= libssh # tesseract TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract TESSERACT_CONFIGURE_ENABLE= libtesseract # theora THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora # twolame TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_ENABLE= libtwolame # vaapi VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vdpau VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # armv6 VFP_CONFIGURE_ENABLE= vfp NEON_CONFIGURE_ENABLE= neon .if ! ${CFLAGS:M-march*} NEON_CONFIGURE_ON= --cpu=armv7-a .endif # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VO_AMRWBENC_IMPLIES= GPL3 # vid.stab VIDSTAB_LIB_DEPENDS= libvidstab.so:multimedia/vid.stab VIDSTAB_CONFIGURE_ENABLE= libvidstab # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis # vp8 VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # wavpack WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_ENABLE= libwavpack # webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_ENABLE= libwebp # x11grab X11GRAB_USE= XORG=x11,xext,xfixes X11GRAB_CONFIGURE_ENABLE= x11grab # x264 X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xcb XCB_USE= XORG=xcb XCB_CONFIGURE_ENABLE= libxcb # xvid XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid # xv XVIDEO_USE= XORG=xv XVIDEO_CONFIGURE_OFF= --disable-outdev=xv # zimg ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg ZIMG_CONFIGURE_ENABLE= libzimg # zmq ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq${ZMQ_VERSION} ZMQ_CONFIGURE_ENABLE= libzmq ZMQ_VERSION?= 4 # zvbi ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi ZVBI_CONFIGURE_ENABLE= libzvbi # License knobs GPL3_CONFIGURE_ENABLE= version3 GPL3_VARS= LICENSE="GPLv3+ LGPL3+" LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 NONFREE_CONFIGURE_ENABLE=nonfree NONFREE_VARS= RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution" INSTALL_TARGET= install-progs install-doc install-data \ install-libs install-headers DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --datadir="${DATADIR}" \ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ --cc="${CC}" CONFIGURE_ENV_armv6_clang= ASFLAGS=-no-integrated-as CONFIGURE_ARGS_armv6= --disable-fast-unaligned CONFIGURE_ARGS_FreeBSD_9= --enable-memalign-hack DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * # Custom helpers. FOO_${ARCH} style from bsd.port.mk CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}} CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}} CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOC_FILES}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ "${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR}) post-install-FFSERVER-on: ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ ${STAGEDIR}${PREFIX}/etc/ffserver.conf.sample .include Index: head/multimedia/ffmpeg/files/patch-libavcodec-Makefile =================================================================== --- head/multimedia/ffmpeg/files/patch-libavcodec-Makefile (revision 428895) +++ head/multimedia/ffmpeg/files/patch-libavcodec-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- libavcodec/Makefile.orig 2016-02-15 02:29:38 UTC -+++ libavcodec/Makefile -@@ -935,7 +935,7 @@ SKIPHEADERS + - aaccoder_trellis.h \ - aacenc_quantization.h \ - aacenc_quantization_misc.h \ -- $(ARCH)/vp56_arith.h \ -+ $(FFMPEG_ARCH)/vp56_arith.h \ - - SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h Property changes on: head/multimedia/ffmpeg/files/patch-libavcodec-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/ffmpeg/files/patch-Makefile =================================================================== --- head/multimedia/ffmpeg/files/patch-Makefile (revision 428895) +++ head/multimedia/ffmpeg/files/patch-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.orig 2015-06-19 20:44:35 UTC -+++ Makefile -@@ -92,7 +92,7 @@ define DOSUBDIR - $(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)/$(FFMPEG_ARCH)/Makefile - -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile - include $(SRC_PATH)/library.mak - endef Property changes on: head/multimedia/ffmpeg/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile =================================================================== --- head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile (revision 428895) +++ head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- tests/checkasm/Makefile.orig 2016-10-01 01:12:42 UTC -+++ tests/checkasm/Makefile -@@ -24,7 +24,7 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) - CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes) - - ---include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile -+-include $(SRC_PATH)/tests/checkasm/$(FFMPEG_ARCH)/Makefile - - CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o - CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%)) Property changes on: head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/ffmpeg/files/patch-configure =================================================================== --- head/multimedia/ffmpeg/files/patch-configure (revision 428895) +++ head/multimedia/ffmpeg/files/patch-configure (revision 428896) @@ -1,57 +1,48 @@ --- configure.orig 2016-10-27 16:17:39 UTC +++ configure @@ -3189,12 +3189,7 @@ target_os_default=$(tolower $(uname -s)) host_os=$target_os_default # machine -if test "$target_os_default" = aix; then - arch_default=$(uname -p) - strip_default="strip -X32_64" -else - arch_default=$(uname -m) -fi +arch_default=$(uname -p) cpu="generic" intrinsics="none" @@ -6213,6 +6208,9 @@ elif enabled llvm_gcc; then elif enabled clang; then check_cflags -mllvm -stack-alignment=16 check_cflags -mstack-alignment=16 + if enabled x86_32; then + check_cflags -mstackrealign + fi check_cflags -Qunused-arguments check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes -@@ -6562,7 +6560,7 @@ ifndef MAIN_MAKEFILE - SRC_PATH:=\$(SRC_PATH:.%=..%) - endif - CC_IDENT=$cc_ident --ARCH=$arch -+FFMPEG_ARCH=$arch - INTRINSICS=$intrinsics - CC=$cc - CXX=$cxx @@ -6799,7 +6797,7 @@ exec_prefix=\${prefix} libdir=$libdir includedir=$incdir -Name: $name +Name: ${name}${build_suffix} Description: $comment Version: $version Requires: $(enabled shared || echo $requires) @@ -6813,10 +6811,10 @@ EOF mkdir -p doc/examples/pc-uninstalled includedir=${source_path} [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." - cat < doc/examples/pc-uninstalled/$name.pc + cat < doc/examples/pc-uninstalled/${name}${build_suffix}.pc prefix= exec_prefix= -libdir=\${pcfiledir}/../../../$name +libdir=\${pcfiledir}/../../../${name}${build_suffix} includedir=${includedir} Name: $name Index: head/multimedia/ffmpeg0/Makefile =================================================================== --- head/multimedia/ffmpeg0/Makefile (revision 428895) +++ head/multimedia/ffmpeg0/Makefile (revision 428896) @@ -1,380 +1,381 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 0.7.17 PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 0 MAINTAINER= wg@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 BUILD_DEPENDS= yasm:devel/yasm \ ${LOCALBASE}/bin/as:devel/binutils \ ${LOCALBASE}/bin/texi2html:textproc/texi2html PORTSCOUT= limit:^0\.7.* USES= cpe gmake perl5 pkgconfig tar:bzip2 shebangfix USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl +NOPRECIOUSMAKEVARS= yes # ARCH FFMPEG_SUFFIX= 0 HAS_CONFIGURE= yes CONFIGURE_LOG= config.err CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}" PROGS= ffmpeg ffprobe CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \ --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --datadir="${DATADIR}" \ --build-suffix="${FFMPEG_SUFFIX}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ --enable-runtime-cpudetect \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="-lpthread" SHLIB_VER= 1 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \ FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \ OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \ THEORA VORBIS VPX X264 XVID OPTIONS_SUB= yes FFSERVER_DESC= Build and install ffserver X11GRAB_DESC= Enable x11 grabbing ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --disable-indev=alsa \ --disable-outdev=alsa CELT_LIB_DEPENDS= libcelt0.so:audio/celt CELT_CONFIGURE_ENABLE= libcelt DIRAC_LIB_DEPENDS= libdirac_encoder.so:multimedia/dirac DIRAC_CONFIGURE_ENABLE= libdirac DEBUG_CONFIGURE_ON= --disable-stripping DEBUG_CONFIGURE_OFF= --disable-debug FFSERVER_CONFIGURE_OFF= --disable-ffserver FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ENABLE= libgsm LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg RTMP_USE= OPENSSL=yes SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= libspeex THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora X11GRAB_USE= XORG=x11,xext,xfixes X11GRAB_CONFIGURE_ON= --enable-x11grab X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx COMPAT_HEADERS=libavcodec/avcodec.h \ libavcodec/opt.h \ libavcodec/vdpau.h \ libavcodec/xvmc.h \ libavdevice/avdevice.h \ libavfilter/avfilter.h \ libavformat/avformat.h \ libavformat/avio.h \ libavutil/adler32.h \ libavutil/avstring.h \ libavutil/avutil.h \ libavutil/base64.h \ libavutil/common.h \ libavutil/crc.h \ libavutil/fifo.h \ libavutil/intfloat_readwrite.h \ libavutil/log.h \ libavutil/lzo.h \ libavutil/mathematics.h \ libavutil/md5.h \ libavutil/mem.h \ libavutil/pixfmt.h \ libavutil/rational.h \ libavutil/sha1.h \ libpostproc/postprocess.h \ libswscale/swscale.h .include .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as CFLAGS+= -no-integrated-as .endif DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE # under doc subdirectory DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html .if ${PORT_OPTIONS:MFFSERVER} USE_RC_SUBR= ffserver${FFMPEG_SUFFIX} PROGS+= ffserver .endif # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") _BUILTIN_VECTOR= yes .else CONFIGURE_ARGS+= --disable-sse .endif # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" CONFIGURE_ARGS+= --disable-mmx _NO_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse .if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR) CFLAGS+= -msse .endif # optimizations .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif #aacplus .if ${PORT_OPTIONS:MAACPLUS} FFMPEG_NONFREE= yes LIB_DEPENDS+= libaacplus.so:audio/libaacplus CONFIGURE_ARGS+= --enable-libaacplus .else CONFIGURE_ARGS+= --disable-libaacplus .endif # Opencore AMR NB .if ${PORT_OPTIONS:MAMR_NB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libopencore-amrnb.so:audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrnb .else CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif # Opencore AMR WB .if ${PORT_OPTIONS:MAMR_WB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libopencore-amrwb.so:audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrwb .else CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # faac .if ${PORT_OPTIONS:MFAAC} FFMPEG_NONFREE= yes LIB_DEPENDS+= libfaac.so:audio/faac CONFIGURE_ARGS+= --enable-libfaac .else CONFIGURE_ARGS+= --disable-libfaac .endif # rtmp .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+= librtmp.so:multimedia/librtmp CONFIGURE_ARGS+= --enable-librtmp . if ${OPENSSLBASE} != "/usr" FFMPEG_CFLAGS+= -I${OPENSSLINC} FFMPEG_LDFLAGS+= -L${OPENSSLLIB} . endif .else CONFIGURE_ARGS+= --disable-librtmp .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl PLIST_FILES+= bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz PROGS+= ffplay .else CONFIGURE_ARGS+= --disable-ffplay .endif # vaapi .if ${PORT_OPTIONS:MVAAPI} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libva.so:multimedia/libva CONFIGURE_ARGS+= --enable-vaapi .else CONFIGURE_ARGS+= --disable-vaapi .endif # vo-aacenc .if ${PORT_OPTIONS:MVO_AACENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libvo-aacenc.so:audio/vo-aacenc CONFIGURE_ARGS+= --enable-libvo-aacenc .else CONFIGURE_ARGS+= --disable-libvo-aacenc .endif # vo-amrwbenc .if ${PORT_OPTIONS:MVO_AMRWBENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libvo-amrwbenc.so:audio/vo-amrwbenc CONFIGURE_ARGS+= --enable-libvo-amrwbenc .else CONFIGURE_ARGS+= --disable-libvo-amrwbenc .endif # vorbis .if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbisenc.so:audio/libvorbis CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis .else CONFIGURE_ARGS+= --disable-libvorbis .endif # License knobs .if defined(FFMPEG_NONFREE) RESTRICTED= linking to libfaac or libaacplus restricts redistribution CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) LICENSE+= GPLv3+ LGPL3+ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/subdir.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|check_ldflags -Wl,--as-needed||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/multimedia/ffmpeg0/files/patch-libavcodec-Makefile =================================================================== --- head/multimedia/ffmpeg0/files/patch-libavcodec-Makefile (revision 428895) +++ head/multimedia/ffmpeg0/files/patch-libavcodec-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- libavcodec/Makefile.orig 2010-08-01 20:33:53.484907333 +0200 -+++ libavcodec/Makefile 2010-08-01 20:34:26.190893400 +0200 -@@ -590,7 +590,7 @@ - - OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ - ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile - - SKIPHEADERS = %_tablegen.h - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h Property changes on: head/multimedia/ffmpeg0/files/patch-libavcodec-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/ffmpeg0/files/patch-libavfilter-Makefile =================================================================== --- head/multimedia/ffmpeg0/files/patch-libavfilter-Makefile (revision 428895) +++ head/multimedia/ffmpeg0/files/patch-libavfilter-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- libavfilter/Makefile.orig 2011-06-23 16:22:46.163337772 +0200 -+++ libavfilter/Makefile 2011-06-23 16:22:53.731245405 +0200 -@@ -136,7 +136,7 @@ - OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o - - ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile - - DIRS = x86 libmpcodecs - Property changes on: head/multimedia/ffmpeg0/files/patch-libavfilter-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/ffmpeg0/files/patch-configure =================================================================== --- head/multimedia/ffmpeg0/files/patch-configure (revision 428895) +++ head/multimedia/ffmpeg0/files/patch-configure (revision 428896) @@ -1,39 +1,30 @@ --- configure.orig 2011-06-21 21:29:25.000000000 +0200 +++ configure 2011-06-23 13:36:46.099381871 +0200 @@ -1657,7 +1657,7 @@ nm_opts='-g' # machine -arch_default=$(uname -m) +arch_default=$(uname -p) cpu="generic" # OS @@ -2966,8 +2966,8 @@ texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html check_header linux/fb.h -check_header linux/videodev.h -check_header linux/videodev2.h +#check_header linux/videodev.h +#check_header linux/videodev2.h check_header sys/videoio.h check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" @@ -3128,6 +3128,7 @@ elif enabled llvm_gcc; then check_cflags -mllvm -stack-alignment=16 elif enabled clang; then check_cflags -mllvm -stack-alignment=16 + check_cflags -mstack-alignment=16 check_cflags -Qunused-arguments elif enabled armcc; then # 2523: use of inline assembler is deprecated -@@ -3322,7 +3322,7 @@ - SRC_PATH="$source_path" - SRC_PATH_BARE=$source_path - CC_IDENT=$cc_ident --ARCH=$arch -+FFMPEG_ARCH=$arch - CC=$cc - AS=$as - LD=$ld Index: head/multimedia/gstreamer-ffmpeg/Makefile =================================================================== --- head/multimedia/gstreamer-ffmpeg/Makefile (revision 428895) +++ head/multimedia/gstreamer-ffmpeg/Makefile (revision 428896) @@ -1,101 +1,96 @@ # Created by: Koop Mast # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-ffmpeg/Makefile,v 1.14 2006/07/20 13:40:27 ahze Exp $ PORTNAME= gstreamer PORTVERSION= 0.10.13 PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/:ffmpeg \ http://libav.org/releases/:libav PKGNAMESUFFIX= -ffmpeg DISTFILES= gst-ffmpeg-${PORTVERSION}.tar.bz2:ffmpeg MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer plug-in for manipulating MPEG video streams LICENSE= GPLv2 LIB_DEPENDS= liborc-0.4.so:devel/orc PORTSCOUT= limit:0\.10\..* LIBAV_VERSION= 0.7.7 WRKSRC= ${WRKDIR}/gst-ffmpeg-${PORTVERSION} USES= compiler:features gmake libtool pkgconfig USE_LDCONFIG= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= FFMPEG FFMPEG_DESC?= Use system ffmpeg instead of internal libav FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0 FFMPEG_CONFIGURE_WITH=system-ffmpeg +FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm FFMPEG_LDFLAGS_OFF=-Wl,-Bsymbolic FFMPEG_CONFIGURE_OFF=--with-ffmpeg-extra-configure="${FFMPEG_CONFIG}" FFMPEG_CONFIG= --cc=${CC} \ --enable-runtime-cpudetect \ --enable-pic # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") WITH_BUILTIN_VECTOR= yes .else FFMPEG_CONFIG+= --disable-sse .endif # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" FFMPEG_CONFIG+= --disable-mmx WITHOUT_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR) FFMPEG_CFLAGS_OFF+=-msse .endif .include .if ${ARCH} == aarch64 || ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as CFLAGS+= -no-integrated-as BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .if ! ${PORT_OPTIONS:MFFMPEG} .if ${ARCH} == powerpc64 FFMPEG_CONFIG+= --arch=ppc64 .endif .if ${COMPILER_TYPE} == "gcc" CFLAGS+= -fno-force-addr .endif post-extract: @${MV} ${WRKSRC}/gst-libs/ext/libav ${WRKSRC}/gst-libs/ext/libav.old @${MV} ${WRKDIR}/libav-${LIBAV_VERSION} ${WRKSRC}/gst-libs/ext/libav @${CP} ${WRKSRC}/gst-libs/ext/libav.old/config.* \ ${WRKSRC}/gst-libs/ext/libav/ .endif # FFMPEG post-patch: @${REINPLACE_CMD} -Ee '/sleep 15/d; /PKG_CONFIG/\ s/lib(av(format|codec|util)|postproc|swscale)/&0/g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \ - ${WRKSRC}/gst-libs/ext/libav/Makefile \ - ${WRKSRC}/gst-libs/ext/libav/common.mak \ - ${WRKSRC}/gst-libs/ext/libav/configure \ - ${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \ - ${WRKSRC}/gst-libs/ext/libav/libavfilter/Makefile .include Index: head/multimedia/libav/Makefile =================================================================== --- head/multimedia/libav/Makefile (revision 428895) +++ head/multimedia/libav/Makefile (revision 428896) @@ -1,232 +1,233 @@ # $FreeBSD$ PORTNAME= libav PORTVERSION= 11.7 PORTREVISION= 4 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ MAINTAINER= dem.procopiou@gmail.com COMMENT= Realtime audio/video conversion library BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= libopencv_core.so:graphics/opencv2-core \ libgmp.so:math/gmp \ libvdpau.so:multimedia/libvdpau \ libhogweed.so:security/nettle USES= cpe gmake perl5 pkgconfig tar:xz USE_XORG= x11 HAS_CONFIGURE= yes USE_PERL5= build USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} +NOPRECIOUSMAKEVARS= yes # ARCH CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/${PORTNAME}" \ --shlibdir="${PREFIX}/lib/${PORTNAME}" \ --incdir="${PREFIX}/include/${PORTNAME}" \ --mandir="${PREFIX}/man" \ --datadir="${DATADIR}" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --enable-pthreads \ --enable-shared \ --enable-runtime-cpudetect \ --disable-debug \ --cc="${CC}" OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE \ FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \ OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX THEORA V4L VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \ X264 XVID ZLIB OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ THEORA VAAPI VDPAU VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc X11GRAB_DESC= X11 grabbing DC1394_DESC= IIDC-1394 grabbing using libdc1394 OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa ALSA_CONFIGURE_OFF= --disable-indev=alsa --disable-outdev=alsa AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_WB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb BZIP2_CONFIGURE_ENABLE= bzlib CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio \ libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 DC1394_CONFIGURE_ENABLE= libdc1394 DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r FAAC_LIB_DEPENDS= libfaac.so:audio/faac FAAC_CONFIGURE_ENABLE= libfaac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ENABLE= libgsm ILBC_BUILD_DEPENDS= ${LOCALBASE}/include/ilbc.h:net/libilbc ILBC_CONFIGURE_ENABLE= libilbc JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ON= --enable-indev=jack JACK_CONFIGURE_OFF= --disable-indev=jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame OPENCV_LIB_DEPENDS= libopencv_gpu.so:graphics/opencv2 OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_USES= ssl OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= libopus PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= avplay SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= libspeex THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_CONFIGURE_ON= --enable-indev=v4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_ENABLE= libwavpack WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_ENABLE= libwebp X11GRAB_USE= XORG=x11,xext,xfixes X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid ZLIB_CONFIGURE_ENABLE= zlib .include .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif .if ${ARCH} == "i386" CONFIGURE_ARGS+= --extra-cflags=-m32 .endif # License definitions .if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL} RESTRICTED= linking to libfaac or libaacplus or using OpenSSL support restricts redistribution CONFIGURE_ARGS+= --enable-nonfree AV_NONFREE= true .endif .if ${PORT_OPTIONS:MCDIO} || ${PORT_OPTIONS:MX264} || ${PORT_OPTIONS:MXVID} || ${PORT_OPTIONS:MX11GRAB} CONFIGURE_ARGS+= --enable-gpl .if !defined(AV_NONFREE) LICENSE= GPLv2+ AV_ISGPL= true .endif .endif .if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || ${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC} CONFIGURE_ARGS+= --enable-version3 .if !defined(AV_NONFREE) .if defined(AV_ISGPL) LICENSE= GPLv3+ .else LICENSE= LGPL3+ .endif .endif .endif .if !defined(AV_NONFREE) && !defined(AV_ISGPL) && !defined(LICENSE) LICENSE= LGPL21+ .endif post-patch: @${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \ -e 's|-ldc1394 -lraw1394|-ldc1394|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/configure \ ${WRKSRC}/libavcodec/libgsmdec.c @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak post-configure-DOCS-off: @${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak post-install: .for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\ lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\ lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\ lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a} .endfor .include Index: head/multimedia/libav/files/patch-libavcodec_Makefile =================================================================== --- head/multimedia/libav/files/patch-libavcodec_Makefile (revision 428895) +++ head/multimedia/libav/files/patch-libavcodec_Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- libavcodec/Makefile.orig 2016-05-25 00:36:32 UTC -+++ libavcodec/Makefile -@@ -704,7 +704,7 @@ SKIPHEADERS + - aac_tablegen_decl.h \ - fft-internal.h \ - tableprint.h \ -- $(ARCH)/vp56_arith.h \ -+ $(LIBAV_ARCH)/vp56_arith.h \ - - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h - SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h Property changes on: head/multimedia/libav/files/patch-libavcodec_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libav/files/patch-common.mak =================================================================== --- head/multimedia/libav/files/patch-common.mak (revision 428895) +++ head/multimedia/libav/files/patch-common.mak (nonexistent) @@ -1,13 +0,0 @@ ---- common.mak.orig 2016-05-25 00:36:32 UTC -+++ common.mak -@@ -28,8 +28,8 @@ PATH_LIBNAME = $(foreach NAME,$(1),lib$( - DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib))) - - SRC_DIR := $(SRC_PATH)/lib$(NAME) --ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) --SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) -+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(LIBAV_ARCH)/*.h)) -+SKIPHEADERS += $(ARCH_HEADERS:%=$(LIBAV_ARCH)/%) $(SKIPHEADERS-) - SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) - HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) - checkheaders: $(HOBJS) Property changes on: head/multimedia/libav/files/patch-common.mak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libav/files/patch-Makefile =================================================================== --- head/multimedia/libav/files/patch-Makefile (revision 428895) +++ head/multimedia/libav/files/patch-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.orig 2016-05-25 00:36:32 UTC -+++ Makefile -@@ -129,7 +129,7 @@ define DOSUBDIR - $(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)/$(LIBAV_ARCH)/Makefile - -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile - include $(SRC_PATH)/library.mak - endef Property changes on: head/multimedia/libav/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libav/files/patch-configure =================================================================== --- head/multimedia/libav/files/patch-configure (revision 428895) +++ head/multimedia/libav/files/patch-configure (revision 428896) @@ -1,39 +1,30 @@ --- configure.orig 2016-05-25 00:36:32 UTC +++ configure @@ -780,8 +780,8 @@ ld_o(){ check_ld(){ log check_ld "$@" - flags=$(filter_out '-l*' "$@") - libs=$(filter '-l*' "$@") + flags=$(filter_out '-l*|*.so' "$@") + libs=$(filter '-l*|*.so' "$@") check_cc $($cflags_filter $flags) || return flags=$($ldflags_filter $flags) libs=$($ldflags_filter $libs) @@ -4436,6 +4436,7 @@ elif enabled llvm_gcc; then check_cflags -mllvm -stack-alignment=16 elif enabled clang; then check_cflags -mllvm -stack-alignment=16 + check_cflags -mstack-alignment=16 check_cflags -Qunused-arguments check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes -@@ -4644,7 +4644,7 @@ DOCDIR=\$(DESTDIR)$docdir - MANDIR=\$(DESTDIR)$mandir - SRC_PATH=$source_path - CC_IDENT=$cc_ident --ARCH=$arch -+LIBAV_ARCH=$arch - INTRINSICS=$intrinsics - CC=$cc - AS=$as @@ -4821,7 +4821,7 @@ pkgconfig_generate(){ requires=${requires%, } enabled ${name#lib} || return 0 mkdir -p $name - cat < $name/$name.pc + cat < $name/$name-libav.pc prefix=$prefix exec_prefix=\${prefix} libdir=$libdir Index: head/multimedia/mplayer/Makefile.common =================================================================== --- head/multimedia/mplayer/Makefile.common (revision 428895) +++ head/multimedia/mplayer/Makefile.common (revision 428896) @@ -1,49 +1,50 @@ # Contains the build infrastructural definitions for both # mplayer and mencoder....the variables that we need to set # before we include bsd.port.pre.mk # # $FreeBSD$ MPLAYER_PORT_VERSION= 1.3.0 MPLAYER_SNAPSHOT_DATE= 2016-09-12 PORTREVISION?= 3 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 USES= compiler:c11 gmake iconv ncurses tar:xz +NOPRECIOUSMAKEVARS= yes # ARCH GNU_CONFIGURE= yes CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc="${CC}" \ --host-cc="${CC}" \ --as="${AS}" \ --extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \ --extra-libs="-L${PREFIX}/lib" \ --disable-alsa \ --disable-bitmap-font \ --disable-crystalhd \ --disable-esd \ --disable-faad \ --disable-ggi \ --disable-ggiwmh \ --disable-liba52 \ --disable-libbs2b \ --disable-libdirac-lavc \ --disable-libilbc \ --disable-libnut \ --disable-libvorbis \ --disable-live \ --disable-joystick \ --disable-mad \ --disable-libmpeg2 \ --disable-nemesi \ --disable-real \ --enable-ass-internal WANT_GNOME= yes Index: head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile =================================================================== --- head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile (revision 428895) +++ head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile (nonexistent) @@ -1,19 +0,0 @@ ---- ffmpeg/tests/checkasm/Makefile.orig 2016-04-09 14:32:47 UTC -+++ ffmpeg/tests/checkasm/Makefile -@@ -20,7 +20,7 @@ AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += v - CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes) - - ---include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile -+-include $(SRC_PATH)/tests/checkasm/$(MPLAYER_ARCH)/Makefile - - CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o - CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%)) -@@ -43,6 +43,6 @@ checkasm: $(CHECKASM) - testclean:: checkasmclean - - checkasmclean: -- $(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%) -+ $(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(MPLAYER_ARCH)/%) - - .PHONY: checkasm Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/mplayer/files/patch-ffmpeg_Makefile =================================================================== --- head/multimedia/mplayer/files/patch-ffmpeg_Makefile (revision 428895) +++ head/multimedia/mplayer/files/patch-ffmpeg_Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- 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 ---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 Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile =================================================================== --- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile (revision 428895) +++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- ffmpeg/libavcodec/Makefile.orig 2016-02-16 20:31:33 UTC -+++ ffmpeg/libavcodec/Makefile -@@ -935,7 +935,7 @@ SKIPHEADERS + - aaccoder_trellis.h \ - aacenc_quantization.h \ - aacenc_quantization_misc.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 Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/mplayer/files/patch-configure =================================================================== --- head/multimedia/mplayer/files/patch-configure (revision 428895) +++ head/multimedia/mplayer/files/patch-configure (revision 428896) @@ -1,178 +1,169 @@ --- configure.orig 2015-12-18 14:53:21 UTC +++ configure @@ -646,7 +646,7 @@ armthumb=auto _iwmmxt=auto _mtrr=auto _altivec=auto -_install=install +_install=@${BSD_INSTALL_PROGRAM} _ranlib=ranlib _windres=windres _cc=cc @@ -988,7 +988,7 @@ for ac_option do ld_static='' ;; --enable-profile) - _profile='-p' + _profile='-pg' ;; --disable-profile) _profile= @@ -1459,7 +1459,6 @@ for ac_option do *) echo "Unknown parameter: $ac_option" - exit 1 ;; esac @@ -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 ;; - macppc|ppc*|Power*) host_arch=ppc ;; + macppc|powerpc|ppc*|Power*) host_arch=ppc ;; alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; @@ -1835,7 +1834,11 @@ echocheck "working compiler" 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 @@ -3194,6 +3197,13 @@ if arm ; then fi echores "$setend" + echocheck "ARM setend" + if test $setend = "auto" ; then + setend=no + inline_asm_check '"setend be"' && setend=yes + fi + echores "$setend" + echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no @@ -3944,7 +3954,7 @@ echocheck "pthread" if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then - THREAD_CFLAGS=-D_THREAD_SAFE + THREAD_CFLAGS= fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF @@ -3954,7 +3964,7 @@ int main(void) { pthread_t tid; return p EOF _pthreads=no if ! hpux ; then - for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do + for ld_tmp in "-lpthread" "-pthread" ; do # 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 @@ -4103,7 +4113,7 @@ int main(void) { } EOF _iconv=no - for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do + for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done @@ -5505,15 +5515,6 @@ EOF break fi done - if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then - _gl=yes - _gl_egl_x11=yes - libs_mplayer="$libs_mplayer -lEGL $ld_dl" - elif cc_check -DGL_EGL_ANDROID -lEGL ; then - _gl=yes - _gl_egl_android=yes - libs_mplayer="$libs_mplayer -lEGL $ld_dl" - fi if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes @@ -6077,7 +6078,7 @@ elif darwin ; then elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then - default_cdrom_device="/dev/acd0" + default_cdrom_device="/dev/cdrom" elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then @@ -6090,7 +6091,7 @@ else default_cdrom_device="/dev/cdrom" fi -if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then +if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" @@ -6607,7 +6608,7 @@ echores "$_speex" echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no - statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes + statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' @@ -7092,6 +7093,16 @@ if test "$_librtmp" = yes && test "$netw nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" + + if $_pkg_config --exists librtmp; then + _inc_tmp=$($_pkg_config --cflags librtmp) + _ld_tmp=$($_pkg_config --libs librtmp) + else + _inc_tmp="-I${LOCALBASE}/include" + _ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto" + fi + extra_ldflags="$extra_ldflags $_ld_tmp" + extra_cflags="$extra_cflags $_inc_tmp" else nolibrtmp=yes _librtmp=no @@ -7493,7 +7504,7 @@ echores "$_mp3lame" echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, - libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER" + libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER" fi echores "$_mencoder" @@ -8094,7 +8105,7 @@ libs_mplayer=$ld_tmp ############################################################################# -CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" +CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -@@ -8375,7 +8386,7 @@ TIMER = $_timer - EXESUF = $_exesuf - EXESUFS_ALL = .exe - --ARCH = $arch -+MPLAYER_ARCH = $arch - $(mak_enable "$arch_all" "$arch" ARCH) - $(mak_enable "$subarch_all" "$subarch" ARCH) - $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)