aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-07-11 21:20:30 +0800
committerjbeich <jbeich@FreeBSD.org>2016-07-11 21:20:30 +0800
commit1dc2b1fe80f4a44a335a41292040f44729b2c8b7 (patch)
tree24bb6699b5e6c5e10f733a9425d45ce6042b1a71 /multimedia
parent0c946222685b9af11b2504bacdfe0d6a198221eb (diff)
downloadfreebsd-ports-gnome-1dc2b1fe80f4a44a335a41292040f44729b2c8b7.tar.gz
freebsd-ports-gnome-1dc2b1fe80f4a44a335a41292040f44729b2c8b7.tar.zst
freebsd-ports-gnome-1dc2b1fe80f4a44a335a41292040f44729b2c8b7.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
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/gstreamer1-plugins-openh264/Makefile5
-rw-r--r--multimedia/msopenh264/Makefile1
-rw-r--r--multimedia/openh264/Makefile4
-rw-r--r--multimedia/openh264/distinfo4
-rw-r--r--multimedia/openh264/files/patch-Makefile10
-rw-r--r--multimedia/openh264/pkg-plist2
7 files changed, 23 insertions, 7 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6da6555a229f..76f8b5e57ddd 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.8.7
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -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 5b5c388225c1..6638ce4f3849 100644
--- a/multimedia/gstreamer1-plugins-openh264/Makefile
+++ b/multimedia/gstreamer1-plugins-openh264/Makefile
@@ -1,10 +1,13 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
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/msopenh264/Makefile b/multimedia/msopenh264/Makefile
index 74abf4aa9936..a474eb2c2311 100644
--- a/multimedia/msopenh264/Makefile
+++ b/multimedia/msopenh264/Makefile
@@ -2,6 +2,7 @@
PORTNAME= msopenh264
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= multimedia net
MASTER_SITES= SAVANNAH/linphone/plugins/sources/
diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index 929e54494dda..41b8a9f32227 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
CATEGORIES= multimedia
@@ -59,7 +59,7 @@ pre-build:
${LN} -sf ${LOCALBASE}/lib/libgtest.so ${WRKSRC}/libgtest.a
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.1
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.*
post-install-PLUGINS-on:
${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
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