Skip to content

Commit

Permalink
ffmpeg: bump to 3.2.11 and provide 64-bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@alarcher
alarcher committed Sep 11, 2018
1 parent 47b6873 commit 6706fec
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 117 deletions.
19 changes: 10 additions & 9 deletions components/encumbered/ffmpeg/Makefile
View file
Expand Up @@ -13,16 +13,17 @@
# Copyright 2015 Alexander Pyhalov
#

PREFERRED_BITS=64

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= ffmpeg
COMPONENT_VERSION= 2.8.13
COMPONENT_REVISION= 1
COMPONENT_VERSION= 3.2.11
COMPONENT_SUMMARY= A very fast video and audio converter
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
sha256:df9b98cb584a004ce8e29b4c954cfb8d9e45dac52b4c6d036f25dfbaa3086778
sha256:9180652c08bfb3d7a539a9420f92992a083c4cec5b8060a300bdc2299d78c373
COMPONENT_ARCHIVE_URL= \
http://www.ffmpeg.org/releases/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL = http://www.ffmpeg.org/
Expand All @@ -43,7 +44,6 @@ CFLAGS.32 += -mpreferred-stack-boundary=4
CFLAGS += $(CFLAGS.$(BITS))
CFLAGS += -I/usr/X11/include
CFLAGS += $(CPP_LARGEFILES)
CFLAGS += -DHAVE_OPENJPEG_2_0_OPENJPEG_H

CPPFLAGS += $($(COMPILER)_C99_ENABLE)

Expand Down Expand Up @@ -94,14 +94,15 @@ CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
COMPONENT_TEST_ENV+= PATH=$(PROTO_DIR)/usr/bin:$(PATH)
COMPONENT_TEST_ENV+= LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib

$(TEST_32): $(INSTALL_32)
$(TEST_32_and_64): $(INSTALL_32_and_64)

build: $(BUILD_32)
build: $(BUILD_32_and_64)

install: $(INSTALL_32)
install: $(INSTALL_32_and_64)

test: $(TEST_32)
test: $(TEST_32_and_64)

# Auto-generated dependencies
REQUIRED_PACKAGES += audio/lame
REQUIRED_PACKAGES += codec/libtheora
REQUIRED_PACKAGES += codec/speex
Expand All @@ -112,7 +113,7 @@ REQUIRED_PACKAGES += library/audio/libgsm
REQUIRED_PACKAGES += library/audio/openal
REQUIRED_PACKAGES += library/graphics/libvdpau
REQUIRED_PACKAGES += library/libvorbis
REQUIRED_PACKAGES += library/sdl
REQUIRED_PACKAGES += library/sdl2
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/video/libass
REQUIRED_PACKAGES += library/video/libschroedinger
Expand Down
145 changes: 113 additions & 32 deletions components/encumbered/ffmpeg/ffmpeg.p5m
View file
Expand Up @@ -22,16 +22,23 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/$(MACH32)/ffmpeg
file path=usr/bin/$(MACH32)/ffplay
file path=usr/bin/$(MACH32)/ffprobe
file path=usr/bin/$(MACH32)/ffserver
file path=usr/bin/ffmpeg
file path=usr/bin/ffplay
file path=usr/bin/ffprobe
file path=usr/bin/ffserver
file path=usr/include/libavcodec/avcodec.h
file path=usr/include/libavcodec/avdct.h
file path=usr/include/libavcodec/avfft.h
file path=usr/include/libavcodec/d3d11va.h
file path=usr/include/libavcodec/dirac.h
file path=usr/include/libavcodec/dv_profile.h
file path=usr/include/libavcodec/dxva2.h
file path=usr/include/libavcodec/old_codec_ids.h
file path=usr/include/libavcodec/jni.h
file path=usr/include/libavcodec/mediacodec.h
file path=usr/include/libavcodec/qsv.h
file path=usr/include/libavcodec/vaapi.h
file path=usr/include/libavcodec/vda.h
Expand All @@ -42,8 +49,6 @@ file path=usr/include/libavcodec/vorbis_parser.h
file path=usr/include/libavcodec/xvmc.h
file path=usr/include/libavdevice/avdevice.h
file path=usr/include/libavdevice/version.h
file path=usr/include/libavfilter/asrc_abuffer.h
file path=usr/include/libavfilter/avcodec.h
file path=usr/include/libavfilter/avfilter.h
file path=usr/include/libavfilter/avfiltergraph.h
file path=usr/include/libavfilter/buffersink.h
Expand All @@ -56,9 +61,9 @@ file path=usr/include/libavresample/avresample.h
file path=usr/include/libavresample/version.h
file path=usr/include/libavutil/adler32.h
file path=usr/include/libavutil/aes.h
file path=usr/include/libavutil/aes_ctr.h
file path=usr/include/libavutil/attributes.h
file path=usr/include/libavutil/audio_fifo.h
file path=usr/include/libavutil/audioconvert.h
file path=usr/include/libavutil/avassert.h
file path=usr/include/libavutil/avconfig.h
file path=usr/include/libavutil/avstring.h
Expand All @@ -74,6 +79,7 @@ file path=usr/include/libavutil/channel_layout.h
file path=usr/include/libavutil/common.h
file path=usr/include/libavutil/cpu.h
file path=usr/include/libavutil/crc.h
file path=usr/include/libavutil/des.h
file path=usr/include/libavutil/dict.h
file path=usr/include/libavutil/display.h
file path=usr/include/libavutil/downmix_info.h
Expand All @@ -85,26 +91,33 @@ file path=usr/include/libavutil/file.h
file path=usr/include/libavutil/frame.h
file path=usr/include/libavutil/hash.h
file path=usr/include/libavutil/hmac.h
file path=usr/include/libavutil/hwcontext.h
file path=usr/include/libavutil/hwcontext_cuda.h
file path=usr/include/libavutil/hwcontext_dxva2.h
file path=usr/include/libavutil/hwcontext_qsv.h
file path=usr/include/libavutil/hwcontext_vaapi.h
file path=usr/include/libavutil/hwcontext_vdpau.h
file path=usr/include/libavutil/imgutils.h
file path=usr/include/libavutil/intfloat.h
file path=usr/include/libavutil/intreadwrite.h
file path=usr/include/libavutil/lfg.h
file path=usr/include/libavutil/log.h
file path=usr/include/libavutil/lzo.h
file path=usr/include/libavutil/macros.h
file path=usr/include/libavutil/mastering_display_metadata.h
file path=usr/include/libavutil/mathematics.h
file path=usr/include/libavutil/md5.h
file path=usr/include/libavutil/mem.h
file path=usr/include/libavutil/motion_vector.h
file path=usr/include/libavutil/murmur3.h
file path=usr/include/libavutil/old_pix_fmts.h
file path=usr/include/libavutil/opt.h
file path=usr/include/libavutil/parseutils.h
file path=usr/include/libavutil/pixdesc.h
file path=usr/include/libavutil/pixelutils.h
file path=usr/include/libavutil/pixfmt.h
file path=usr/include/libavutil/random_seed.h
file path=usr/include/libavutil/rational.h
file path=usr/include/libavutil/rc4.h
file path=usr/include/libavutil/replaygain.h
file path=usr/include/libavutil/ripemd.h
file path=usr/include/libavutil/samplefmt.h
Expand All @@ -116,6 +129,7 @@ file path=usr/include/libavutil/threadmessage.h
file path=usr/include/libavutil/time.h
file path=usr/include/libavutil/timecode.h
file path=usr/include/libavutil/timestamp.h
file path=usr/include/libavutil/tree.h
file path=usr/include/libavutil/twofish.h
file path=usr/include/libavutil/version.h
file path=usr/include/libavutil/xtea.h
Expand All @@ -125,33 +139,69 @@ file path=usr/include/libswresample/swresample.h
file path=usr/include/libswresample/version.h
file path=usr/include/libswscale/swscale.h
file path=usr/include/libswscale/version.h
link path=usr/lib/libavcodec.so target=libavcodec.so.56.60.100
link path=usr/lib/libavcodec.so.56 target=libavcodec.so.56.60.100
file path=usr/lib/libavcodec.so.56.60.100
link path=usr/lib/libavdevice.so target=libavdevice.so.56.4.100
link path=usr/lib/libavdevice.so.56 target=libavdevice.so.56.4.100
file path=usr/lib/libavdevice.so.56.4.100
link path=usr/lib/libavfilter.so target=libavfilter.so.5.40.101
link path=usr/lib/libavfilter.so.5 target=libavfilter.so.5.40.101
file path=usr/lib/libavfilter.so.5.40.101
link path=usr/lib/libavformat.so target=libavformat.so.56.40.101
link path=usr/lib/libavformat.so.56 target=libavformat.so.56.40.101
file path=usr/lib/libavformat.so.56.40.101
link path=usr/lib/libavresample.so target=libavresample.so.2.1.0
link path=usr/lib/libavresample.so.2 target=libavresample.so.2.1.0
file path=usr/lib/libavresample.so.2.1.0
link path=usr/lib/libavutil.so target=libavutil.so.54.31.100
link path=usr/lib/libavutil.so.54 target=libavutil.so.54.31.100
file path=usr/lib/libavutil.so.54.31.100
link path=usr/lib/libpostproc.so target=libpostproc.so.53.3.100
link path=usr/lib/libpostproc.so.53 target=libpostproc.so.53.3.100
file path=usr/lib/libpostproc.so.53.3.100
link path=usr/lib/libswresample.so target=libswresample.so.1.2.101
link path=usr/lib/libswresample.so.1 target=libswresample.so.1.2.101
file path=usr/lib/libswresample.so.1.2.101
link path=usr/lib/libswscale.so target=libswscale.so.3.1.101
link path=usr/lib/libswscale.so.3 target=libswscale.so.3.1.101
file path=usr/lib/libswscale.so.3.1.101
link path=usr/lib/$(MACH64)/libavcodec.so target=libavcodec.so.57.64.101
link path=usr/lib/$(MACH64)/libavcodec.so.57 target=libavcodec.so.57.64.101
file path=usr/lib/$(MACH64)/libavcodec.so.57.64.101
link path=usr/lib/$(MACH64)/libavdevice.so target=libavdevice.so.57.1.100
link path=usr/lib/$(MACH64)/libavdevice.so.57 target=libavdevice.so.57.1.100
file path=usr/lib/$(MACH64)/libavdevice.so.57.1.100
link path=usr/lib/$(MACH64)/libavfilter.so target=libavfilter.so.6.65.100
link path=usr/lib/$(MACH64)/libavfilter.so.6 target=libavfilter.so.6.65.100
file path=usr/lib/$(MACH64)/libavfilter.so.6.65.100
link path=usr/lib/$(MACH64)/libavformat.so target=libavformat.so.57.56.101
link path=usr/lib/$(MACH64)/libavformat.so.57 target=libavformat.so.57.56.101
file path=usr/lib/$(MACH64)/libavformat.so.57.56.101
link path=usr/lib/$(MACH64)/libavresample.so target=libavresample.so.3.1.0
link path=usr/lib/$(MACH64)/libavresample.so.3 target=libavresample.so.3.1.0
file path=usr/lib/$(MACH64)/libavresample.so.3.1.0
link path=usr/lib/$(MACH64)/libavutil.so target=libavutil.so.55.34.101
link path=usr/lib/$(MACH64)/libavutil.so.55 target=libavutil.so.55.34.101
file path=usr/lib/$(MACH64)/libavutil.so.55.34.101
link path=usr/lib/$(MACH64)/libpostproc.so target=libpostproc.so.54.1.100
link path=usr/lib/$(MACH64)/libpostproc.so.54 target=libpostproc.so.54.1.100
file path=usr/lib/$(MACH64)/libpostproc.so.54.1.100
link path=usr/lib/$(MACH64)/libswresample.so target=libswresample.so.2.3.100
link path=usr/lib/$(MACH64)/libswresample.so.2 target=libswresample.so.2.3.100
file path=usr/lib/$(MACH64)/libswresample.so.2.3.100
link path=usr/lib/$(MACH64)/libswscale.so target=libswscale.so.4.2.100
link path=usr/lib/$(MACH64)/libswscale.so.4 target=libswscale.so.4.2.100
file path=usr/lib/$(MACH64)/libswscale.so.4.2.100
file path=usr/lib/$(MACH64)/pkgconfig/libavcodec.pc
file path=usr/lib/$(MACH64)/pkgconfig/libavdevice.pc
file path=usr/lib/$(MACH64)/pkgconfig/libavfilter.pc
file path=usr/lib/$(MACH64)/pkgconfig/libavformat.pc
file path=usr/lib/$(MACH64)/pkgconfig/libavresample.pc
file path=usr/lib/$(MACH64)/pkgconfig/libavutil.pc
file path=usr/lib/$(MACH64)/pkgconfig/libpostproc.pc
file path=usr/lib/$(MACH64)/pkgconfig/libswresample.pc
file path=usr/lib/$(MACH64)/pkgconfig/libswscale.pc
link path=usr/lib/libavcodec.so target=libavcodec.so.57.64.101
link path=usr/lib/libavcodec.so.57 target=libavcodec.so.57.64.101
file path=usr/lib/libavcodec.so.57.64.101
link path=usr/lib/libavdevice.so target=libavdevice.so.57.1.100
link path=usr/lib/libavdevice.so.57 target=libavdevice.so.57.1.100
file path=usr/lib/libavdevice.so.57.1.100
link path=usr/lib/libavfilter.so target=libavfilter.so.6.65.100
link path=usr/lib/libavfilter.so.6 target=libavfilter.so.6.65.100
file path=usr/lib/libavfilter.so.6.65.100
link path=usr/lib/libavformat.so target=libavformat.so.57.56.101
link path=usr/lib/libavformat.so.57 target=libavformat.so.57.56.101
file path=usr/lib/libavformat.so.57.56.101
link path=usr/lib/libavresample.so target=libavresample.so.3.1.0
link path=usr/lib/libavresample.so.3 target=libavresample.so.3.1.0
file path=usr/lib/libavresample.so.3.1.0
link path=usr/lib/libavutil.so target=libavutil.so.55.34.101
link path=usr/lib/libavutil.so.55 target=libavutil.so.55.34.101
file path=usr/lib/libavutil.so.55.34.101
link path=usr/lib/libpostproc.so target=libpostproc.so.54.1.100
link path=usr/lib/libpostproc.so.54 target=libpostproc.so.54.1.100
file path=usr/lib/libpostproc.so.54.1.100
link path=usr/lib/libswresample.so target=libswresample.so.2.3.100
link path=usr/lib/libswresample.so.2 target=libswresample.so.2.3.100
file path=usr/lib/libswresample.so.2.3.100
link path=usr/lib/libswscale.so target=libswscale.so.4.2.100
link path=usr/lib/libswscale.so.4 target=libswscale.so.4.2.100
file path=usr/lib/libswscale.so.4.2.100
file path=usr/lib/pkgconfig/libavcodec.pc
file path=usr/lib/pkgconfig/libavdevice.pc
file path=usr/lib/pkgconfig/libavfilter.pc
Expand All @@ -161,6 +211,37 @@ file path=usr/lib/pkgconfig/libavutil.pc
file path=usr/lib/pkgconfig/libpostproc.pc
file path=usr/lib/pkgconfig/libswresample.pc
file path=usr/lib/pkgconfig/libswscale.pc
file path=usr/share/doc/ffmpeg/developer.html
file path=usr/share/doc/ffmpeg/faq.html
file path=usr/share/doc/ffmpeg/fate.html
file path=usr/share/doc/ffmpeg/ffmpeg-all.html
file path=usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html
file path=usr/share/doc/ffmpeg/ffmpeg-codecs.html
file path=usr/share/doc/ffmpeg/ffmpeg-devices.html
file path=usr/share/doc/ffmpeg/ffmpeg-filters.html
file path=usr/share/doc/ffmpeg/ffmpeg-formats.html
file path=usr/share/doc/ffmpeg/ffmpeg-protocols.html
file path=usr/share/doc/ffmpeg/ffmpeg-resampler.html
file path=usr/share/doc/ffmpeg/ffmpeg-scaler.html
file path=usr/share/doc/ffmpeg/ffmpeg-utils.html
file path=usr/share/doc/ffmpeg/ffmpeg.html
file path=usr/share/doc/ffmpeg/ffplay-all.html
file path=usr/share/doc/ffmpeg/ffplay.html
file path=usr/share/doc/ffmpeg/ffprobe-all.html
file path=usr/share/doc/ffmpeg/ffprobe.html
file path=usr/share/doc/ffmpeg/ffserver-all.html
file path=usr/share/doc/ffmpeg/ffserver.html
file path=usr/share/doc/ffmpeg/general.html
file path=usr/share/doc/ffmpeg/git-howto.html
file path=usr/share/doc/ffmpeg/libavcodec.html
file path=usr/share/doc/ffmpeg/libavdevice.html
file path=usr/share/doc/ffmpeg/libavfilter.html
file path=usr/share/doc/ffmpeg/libavformat.html
file path=usr/share/doc/ffmpeg/libavutil.html
file path=usr/share/doc/ffmpeg/libswresample.html
file path=usr/share/doc/ffmpeg/libswscale.html
file path=usr/share/doc/ffmpeg/nut.html
file path=usr/share/doc/ffmpeg/platform.html
file path=usr/share/ffmpeg/examples/Makefile
file path=usr/share/ffmpeg/examples/README
file path=usr/share/ffmpeg/examples/avio_dir_cmd.c
Expand Down

0 comments on commit 6706fec

Please sign in to comment.