Date: Tue, 12 Jul 2016 04:30:32 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418413 - in head/multimedia: ffmpeg gstreamer1-plugins-openh264 openh264 openh264/files Message-ID: <201607120430.u6C4UW6q040531@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jul 12 04:30:32 2016 New Revision: 418413 URL: https://svnweb.freebsd.org/changeset/ports/418413 Log: multimedia/openh264: back out r418381 (try#2) As every consumer was broken except for net/pjsip which isn't actually linking against openh264 there's no need to bump PORTREVISION. Modified: head/multimedia/ffmpeg/Makefile (contents, props changed) head/multimedia/gstreamer1-plugins-openh264/Makefile (contents, props changed) head/multimedia/openh264/Makefile (contents, props changed) head/multimedia/openh264/distinfo (contents, props changed) head/multimedia/openh264/files/patch-Makefile (contents, props changed) head/multimedia/openh264/pkg-plist (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Tue Jul 12 03:24:20 2016 (r418412) +++ head/multimedia/ffmpeg/Makefile Tue Jul 12 04:30:32 2016 (r418413) @@ -233,8 +233,6 @@ 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 Modified: head/multimedia/gstreamer1-plugins-openh264/Makefile ============================================================================== --- head/multimedia/gstreamer1-plugins-openh264/Makefile Tue Jul 12 03:24:20 2016 (r418412) +++ head/multimedia/gstreamer1-plugins-openh264/Makefile Tue Jul 12 04:30:32 2016 (r418413) @@ -5,9 +5,6 @@ CATEGORIES= multimedia COMMENT= GStreamer (openh264) plugin -BROKEN= gstopenh264enc.cpp:737:32: error: no member \ - named 'sSliceCfg' in 'SSpatialLayerConfig' - GST_PLUGIN= openh264 DIST= bad Modified: head/multimedia/openh264/Makefile ============================================================================== --- head/multimedia/openh264/Makefile Tue Jul 12 03:24:20 2016 (r418412) +++ head/multimedia/openh264/Makefile Tue Jul 12 04:30:32 2016 (r418413) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= openh264 -PORTVERSION= 1.6.0 +PORTVERSION= 1.5.0 DISTVERSIONPREFIX=v -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org Modified: head/multimedia/openh264/distinfo ============================================================================== --- head/multimedia/openh264/distinfo Tue Jul 12 03:24:20 2016 (r418412) +++ head/multimedia/openh264/distinfo Tue Jul 12 04:30:32 2016 (r418413) @@ -1,2 +1,2 @@ -SHA256 (cisco-openh264-v1.6.0_GH0.tar.gz) = 951109b86cf82be7d2aa65e7542edf4bdf26ae9ec93674c638d28c02a9d1a59a -SIZE (cisco-openh264-v1.6.0_GH0.tar.gz) = 37865360 +SHA256 (cisco-openh264-v1.5.0_GH0.tar.gz) = 98077bd5d113c183ce02b678733b0cada2cf36750370579534c4d70f0b6c27b5 +SIZE (cisco-openh264-v1.5.0_GH0.tar.gz) = 37851166 Modified: head/multimedia/openh264/files/patch-Makefile ============================================================================== --- head/multimedia/openh264/files/patch-Makefile Tue Jul 12 03:24:20 2016 (r418412) +++ head/multimedia/openh264/files/patch-Makefile Tue Jul 12 04:30:32 2016 (r418413) @@ -1,17 +1,7 @@ -# 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 Modified: head/multimedia/openh264/pkg-plist ============================================================================== --- head/multimedia/openh264/pkg-plist Tue Jul 12 03:24:20 2016 (r418412) +++ head/multimedia/openh264/pkg-plist Tue Jul 12 04:30:32 2016 (r418413) @@ -13,5 +13,5 @@ include/wels/codec_ver.h %%PLUGINS%%%%WEBPLUGIN_DIR%%/libgmpopenh264.so lib/libopenh264.a lib/libopenh264.so -lib/libopenh264.so.2 +lib/libopenh264.so.1 libdata/pkgconfig/openh264.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607120430.u6C4UW6q040531>