Skip to content

Commit

Permalink
MacPorts: ffmpeg with snappy
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay authored and User committed Nov 21, 2017
1 parent 47148b9 commit f6488d9
Showing 4 changed files with 22 additions and 18 deletions.
6 changes: 3 additions & 3 deletions tools/MacPorts/graphics/tiff/Portfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ PortGroup xcodeversion 1.0
PortGroup muniversal 1.0

name tiff
version 4.0.8
version 4.0.9
categories graphics
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
@@ -30,8 +30,8 @@ homepage http://simplesystems.org/libtiff/
master_sites http://download.osgeo.org/libtiff/ \
freebsd

checksums rmd160 0d8bc26c98035810c73b8f876f76dc48efba7da8 \
sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910
checksums rmd160 ab5b3b7297e79344775b1e70c4d54c90c06836a3 \
sha256 6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd

depends_lib path:lib/libjpeg.dylib:jpeg \
port:xz \
6 changes: 3 additions & 3 deletions tools/MacPorts/graphics/tiff/Portfile.orig
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ PortGroup xcodeversion 1.0
PortGroup muniversal 1.0

name tiff
version 4.0.8
version 4.0.9
categories graphics
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
@@ -30,8 +30,8 @@ homepage http://simplesystems.org/libtiff/
master_sites http://download.osgeo.org/libtiff/ \
freebsd

checksums rmd160 0d8bc26c98035810c73b8f876f76dc48efba7da8 \
sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910
checksums rmd160 ab5b3b7297e79344775b1e70c4d54c90c06836a3 \
sha256 6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd

depends_lib port:jpeg \
port:xz \
4 changes: 3 additions & 1 deletion tools/MacPorts/multimedia/ffmpeg/Portfile
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ name ffmpeg
conflicts ffmpeg-devel
epoch 1
version 3.4
revision 1
revision 2
license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
@@ -83,6 +83,7 @@ depends_lib port:lame \
port:libbluray \
port:gnutls \
port:openh264 \
port:snappy \
port:openjpeg \
port:fontconfig \
port:freetype \
@@ -136,6 +137,7 @@ configure.args --enable-swscale \
--enable-libtheora \
--enable-libopenjpeg \
--enable-libopenh264 \
--enable-libsnappy \
--enable-libmodplug \
--enable-libvpx \
--enable-libsoxr \
24 changes: 13 additions & 11 deletions tools/MacPorts/multimedia/ffmpeg/Portfile.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
--- Portfile.orig 2017-10-24 10:13:17.000000000 +0200
+++ Portfile 2017-11-18 19:36:13.000000000 +0100
@@ -81,6 +81,7 @@
+++ Portfile 2017-11-21 19:34:50.000000000 +0100
@@ -81,6 +81,8 @@
port:libass \
port:libbluray \
port:gnutls \
+ port:openh264 \
+ port:snappy \
port:openjpeg \
port:fontconfig \
port:freetype \
@@ -114,6 +115,11 @@
@@ -114,6 +116,11 @@
universal_variant no
}

@@ -20,31 +21,32 @@
# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
@@ -128,6 +134,7 @@
@@ -128,6 +135,8 @@
--enable-librsvg \
--enable-libtheora \
--enable-libopenjpeg \
+ --enable-libopenh264 \
+ --enable-libsnappy \
--enable-libmodplug \
--enable-libvpx \
--enable-libsoxr \
@@ -142,6 +149,7 @@
@@ -142,6 +151,7 @@
--disable-libxcb \
--disable-libxcb-shm \
--disable-libxcb-xfixes \
+ --disable-xlib \
--disable-indev=jack \
--disable-outdev=xv \
--disable-vda \
@@ -150,6 +158,7 @@
@@ -150,6 +160,7 @@
--disable-sdl2 \
--mandir=${prefix}/share/man \
--enable-shared --enable-pthreads \
+ --cxx=${configure.cxx} \
--cc=${configure.cc}


@@ -226,6 +235,17 @@
@@ -226,6 +237,17 @@
# configure isn't autoconf and they do use a dep cache
#

@@ -62,7 +64,7 @@
post-destroot {
file mkdir ${destroot}${prefix}/share/doc/ffmpeg
file copy ${worksrcpath}/doc/APIchanges ${destroot}${prefix}/share/doc/ffmpeg
@@ -250,6 +270,15 @@
@@ -250,6 +272,15 @@
configure.universal_args-delete --disable-dependency-tracking

if {[variant_isset universal]} {
@@ -78,7 +80,7 @@
foreach arch ${configure.universal_archs} {
set merger_host($arch) ""
lappend merger_configure_args($arch) --arch=${arch}
@@ -275,11 +304,53 @@
@@ -275,11 +306,53 @@
#
depends_lib-append port:xorg-libxcb \
port:xorg-libXext \
@@ -132,7 +134,7 @@
}

if {[variant_isset x11]} {
@@ -323,6 +394,14 @@
@@ -323,6 +396,14 @@
require_active_variants x264 "" high10
}

@@ -147,7 +149,7 @@
variant gpl2 description {Enable GPL code, license will be GPL-2+} {
configure.args-append --enable-gpl \
--enable-postproc \
@@ -344,6 +423,12 @@
@@ -344,6 +425,12 @@
port:samba3

license GPL-3+

0 comments on commit f6488d9

Please sign in to comment.