diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-07-11 21:42:24 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-07-11 21:42:24 +0800 |
| commit | ccb52c25638d5112a0d90eb027f1d7a6a70c2a9b (patch) | |
| tree | 68e2525539371bb34cd7b36964cb2abd647a9ec0 | |
| parent | 9735dee9369a814d3ff6f3d49c7e40d919e002c4 (diff) | |
| download | freebsd-ports-gnome-ccb52c25638d5112a0d90eb027f1d7a6a70c2a9b.tar.gz freebsd-ports-gnome-ccb52c25638d5112a0d90eb027f1d7a6a70c2a9b.tar.zst freebsd-ports-gnome-ccb52c25638d5112a0d90eb027f1d7a6a70c2a9b.zip | |
multimedia/openh264: update to 1.6.0
API/ABI has changed, so bump PORTREVISION in consumers. Some of those
are marked BROKEN that may need a fix similar to libav.
https://git.libav.org/?p=libav.git;a=commitdiff;h=d825b1a53065
Changes: https://github.com/cisco/openh264/releases/tag/v1.6.0
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/gstreamer1-plugins-openh264/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/openh264/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/openh264/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/openh264/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | multimedia/openh264/pkg-plist | 2 |
6 files changed, 19 insertions, 4 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 32e90d2d0331..76f8b5e57ddd 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -233,6 +233,8 @@ OPENGL_USE= GL=gl OPENGL_CONFIGURE_ENABLE= opengl # openh264 +OPENH264_BROKEN= libavcodec/libopenh264enc.c:132:29: error: \ + no member named 'sSliceCfg' in 'SSpatialLayerConfig' OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CONFIGURE_ENABLE= libopenh264 diff --git a/multimedia/gstreamer1-plugins-openh264/Makefile b/multimedia/gstreamer1-plugins-openh264/Makefile index ad17bad74c1c..6638ce4f3849 100644 --- a/multimedia/gstreamer1-plugins-openh264/Makefile +++ b/multimedia/gstreamer1-plugins-openh264/Makefile @@ -5,6 +5,9 @@ CATEGORIES= multimedia COMMENT= GStreamer (openh264) plugin +BROKEN= gstopenh264enc.cpp:737:32: error: no member \ + named 'sSliceCfg' in 'SSpatialLayerConfig' + GST_PLUGIN= openh264 DIST= bad diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile index 12da2dbe9d39..8f532dd414b8 100644 --- a/multimedia/openh264/Makefile +++ b/multimedia/openh264/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openh264 -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 DISTVERSIONPREFIX=v PORTEPOCH= 1 CATEGORIES= multimedia diff --git a/multimedia/openh264/distinfo b/multimedia/openh264/distinfo index 6c646814c82a..4585d6c0aee3 100644 --- a/multimedia/openh264/distinfo +++ b/multimedia/openh264/distinfo @@ -1,2 +1,2 @@ -SHA256 (cisco-openh264-v1.5.0_GH0.tar.gz) = 98077bd5d113c183ce02b678733b0cada2cf36750370579534c4d70f0b6c27b5 -SIZE (cisco-openh264-v1.5.0_GH0.tar.gz) = 37851166 +SHA256 (cisco-openh264-v1.6.0_GH0.tar.gz) = 951109b86cf82be7d2aa65e7542edf4bdf26ae9ec93674c638d28c02a9d1a59a +SIZE (cisco-openh264-v1.6.0_GH0.tar.gz) = 37865360 diff --git a/multimedia/openh264/files/patch-Makefile b/multimedia/openh264/files/patch-Makefile index 0ce626de9e73..3e1762a80037 100644 --- a/multimedia/openh264/files/patch-Makefile +++ b/multimedia/openh264/files/patch-Makefile @@ -1,7 +1,17 @@ +# Restore SONAME after https://github.com/cisco/openh264/commit/af8240a # Force gmp plugin to link dynamically against libopenh264 --- Makefile~ +++ Makefile +@@ -34,7 +34,7 @@ CCASFLAGS=$(CFLAGS) + STATIC_LDFLAGS=-lstdc++ + + VERSION=1.6 +-SHAREDLIBVERSION=0 ++SHAREDLIBVERSION=2 + + ifeq (,$(wildcard $(SRC_PATH)gmp-api)) + HAVE_GMP_API=No @@ -210,7 +210,7 @@ plugin: @echo "You do not have gmp-api. Run make gmp-bootstrap to get the gmp-api headers." endif diff --git a/multimedia/openh264/pkg-plist b/multimedia/openh264/pkg-plist index d1d167921622..80783041744a 100644 --- a/multimedia/openh264/pkg-plist +++ b/multimedia/openh264/pkg-plist @@ -13,5 +13,5 @@ include/wels/codec_ver.h %%PLUGINS%%%%WEBPLUGIN_DIR%%/libgmpopenh264.so lib/libopenh264.a lib/libopenh264.so -lib/libopenh264.so.1 +lib/libopenh264.so.2 libdata/pkgconfig/openh264.pc |