svn commit: r418382 - in head/multimedia: ffmpeg gstreamer1-plugins-openh264 openh264 openh264/files

[Jan Beich]

Author: jbeich
Date: Mon Jul 11 13:41:49 2016
New Revision: 418382
URL: https://svnweb.freebsd.org/changeset/ports/418382

Log:
  multimedia/openh264: oops, back out r418381
  
  Every consumer was broken except for net/pjsip which isn't actually
  building *against* openh264.

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	Mon Jul 11 13:20:30 2016	(r418381)
+++ head/multimedia/ffmpeg/Makefile	Mon Jul 11 13:41:49 2016	(r418382)
@@ -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	Mon Jul 11 13:20:30 2016	(r418381)
+++ head/multimedia/gstreamer1-plugins-openh264/Makefile	Mon Jul 11 13:41:49 2016	(r418382)
@@ -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	Mon Jul 11 13:20:30 2016	(r418381)
+++ head/multimedia/openh264/Makefile	Mon Jul 11 13:41:49 2016	(r418382)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	openh264
-PORTVERSION=	1.6.0
+PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=v
+PORTEPOCH=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko at FreeBSD.org

Modified: head/multimedia/openh264/distinfo
==============================================================================
--- head/multimedia/openh264/distinfo	Mon Jul 11 13:20:30 2016	(r418381)
+++ head/multimedia/openh264/distinfo	Mon Jul 11 13:41:49 2016	(r418382)
@@ -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	Mon Jul 11 13:20:30 2016	(r418381)
+++ head/multimedia/openh264/files/patch-Makefile	Mon Jul 11 13:41:49 2016	(r418382)
@@ -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	Mon Jul 11 13:20:30 2016	(r418381)
+++ head/multimedia/openh264/pkg-plist	Mon Jul 11 13:41:49 2016	(r418382)
@@ -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