From 565a3ffb49ae85276ede115ab5ef7a3ca2f9e9f4 Mon Sep 17 00:00:00 2001
From: jbeich <jbeich@FreeBSD.org>
Date: Tue, 12 Jul 2016 04:30:32 +0000
Subject: 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.
---
 multimedia/ffmpeg/Makefile                      |  2 --
 multimedia/gstreamer1-plugins-openh264/Makefile |  3 ---
 multimedia/openh264/Makefile                    |  4 ++--
 multimedia/openh264/distinfo                    |  4 ++--
 multimedia/openh264/files/patch-Makefile        | 10 ----------
 multimedia/openh264/pkg-plist                   |  2 +-
 6 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 76f8b5e57ddd..32e90d2d0331 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -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
 
diff --git a/multimedia/gstreamer1-plugins-openh264/Makefile b/multimedia/gstreamer1-plugins-openh264/Makefile
index 6638ce4f3849..ad17bad74c1c 100644
--- a/multimedia/gstreamer1-plugins-openh264/Makefile
+++ b/multimedia/gstreamer1-plugins-openh264/Makefile
@@ -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
 
diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index 8f532dd414b8..bec99c2e4427 100644
--- a/multimedia/openh264/Makefile
+++ b/multimedia/openh264/Makefile
@@ -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
diff --git a/multimedia/openh264/distinfo b/multimedia/openh264/distinfo
index 4585d6c0aee3..6c646814c82a 100644
--- a/multimedia/openh264/distinfo
+++ b/multimedia/openh264/distinfo
@@ -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
diff --git a/multimedia/openh264/files/patch-Makefile b/multimedia/openh264/files/patch-Makefile
index 3e1762a80037..0ce626de9e73 100644
--- a/multimedia/openh264/files/patch-Makefile
+++ b/multimedia/openh264/files/patch-Makefile
@@ -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
diff --git a/multimedia/openh264/pkg-plist b/multimedia/openh264/pkg-plist
index 80783041744a..d1d167921622 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.2
+lib/libopenh264.so.1
 libdata/pkgconfig/openh264.pc
-- 
cgit