- Update openh264 to 1.3.1

- Update Thunderbird to 31.4.0
- Update Firefox to 35.0
- Update Firefox ESR to 31.4.0
- Update libxul to 31.4.0

Submitted by:	Jan Beich
MFH:		2015Q1
Security:	http://www.vuxml.org/freebsd/bd62c640-9bb9-11e4-a5ad-000c297fb80f.html

4 files changed, 27 insertions, 24 deletions

diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index da9770ec30b8..e0123fb54f44 100644
--- a/multimedia/openh264/Makefile
+++ b/multimedia/openh264/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openh264
-PORTVERSION=	1.2
+PORTVERSION=	1.3.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -12,20 +12,21 @@ LICENSE=	BSD2CLAUSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	cisco
 GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${GH_COMMIT} # v${PORTVERSION}
-GH_COMMIT=	ca0ed2a # openh264v1.2
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	3a182d4
 
 USES=		gmake
 USE_LDCONFIG=	yes
 MAKE_ARGS=	OS=freebsd ARCH="${ARCH:S/amd64/x86_64/}" \
-		CFLAGS_OPT="" SHAREDLIBSUFFIX=so.0 \
+		CFLAGS_OPT="" CFLAGS_DEBUG="" \
 		PREFIX="${STAGEDIR}${PREFIX}"
 ALL_TARGET=	all
 
-OPTIONS_DEFINE=	PLUGINS TEST
+OPTIONS_DEFINE=	DEBUG PLUGINS TEST
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
 
+DEBUG_MAKE_ARGS=BUILDTYPE=Debug
 PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:${PORTSDIR}/multimedia/gmp-api
 #			gmp-api<36.0:${PORTSDIR}/multimedia/gmp-api
 PLUGINS_CFLAGS=	-I${LOCALBASE}/include/gmp-api
@@ -44,22 +45,28 @@ TEST_ALL_TARGET=test
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == amd64 || ${ARCH} == arm || ${ARCH} == i386
+.if ! ${PORT_OPTIONS:MDEBUG}
+. if ${ARCH} == amd64 || ${ARCH} == arm || ${ARCH} == i386
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+. endif
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e '/gtest-targets\.mk/d' \
+		-e '/pkgconfig/s/lib/libdata/' \
+		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's,@prefix@,${PREFIX},' \
+		${WRKSRC}/${PORTNAME}.pc.in
+
 pre-build:
 	${LN} -sf ${LOCALBASE}/lib/libgtest.so ${WRKSRC}/libgtest.a
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0
-	cd ${STAGEDIR}${PREFIX}/lib && \
-		${LN} -sf lib${PORTNAME}.so.0 lib${PORTNAME}.so
 .if ${PORT_OPTIONS:MPLUGINS}
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKSRC}/gmp${PORTNAME}.info ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so.0 \
-		${STAGEDIR}${WEBPLUGIN_DIR}/libgmp${PORTNAME}.so
+	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKDIR}/gmp${PORTNAME}.js ${STAGEDIR}${WEBPLUGIN_DIR}
 .endif
 
diff --git a/multimedia/openh264/distinfo b/multimedia/openh264/distinfo
index e97efd9baacb..2c9fe6f26c8d 100644
--- a/multimedia/openh264/distinfo
+++ b/multimedia/openh264/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openh264-1.2.tar.gz) = 88ab5baf463c99cb6c546884ae91a42e774bf5c3cf248c4e247b5cf8d2908301
-SIZE (openh264-1.2.tar.gz) = 13338846
+SHA256 (openh264-1.3.1.tar.gz) = e2a5ad3b3542a78999f0fcfbdd9ecb9c3dcf2cc89d9b2f9441984a2c472ce16b
+SIZE (openh264-1.3.1.tar.gz) = 37643357
diff --git a/multimedia/openh264/files/patch-Makefile b/multimedia/openh264/files/patch-Makefile
index ab63611ae991..0ce626de9e73 100644
--- a/multimedia/openh264/files/patch-Makefile
+++ b/multimedia/openh264/files/patch-Makefile
@@ -1,19 +1,13 @@
+# Force gmp plugin to link dynamically against libopenh264
+
 --- Makefile~
 +++ Makefile
-@@ -202,7 +202,7 @@ plugin:
+@@ -210,7 +210,7 @@ plugin:
  	@echo "You do not have gmp-api.  Run make gmp-bootstrap to get the gmp-api headers."
  endif
  
--$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
-+$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
+-$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
++$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER): $(MODULE_OBJS) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
  	$(QUIET)rm -f $@
- 	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS) $(MODULE_LDFLAGS)
+ 	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS) $(MODULE_LDFLAGS)
  
-@@ -225,7 +225,6 @@ install: install-static install-shared
- 	@:
- 
- ifeq ($(HAVE_GTEST),Yes)
--include $(SRC_PATH)build/gtest-targets.mk
- include $(SRC_PATH)test/api/targets.mk
- include $(SRC_PATH)test/decoder/targets.mk
- include $(SRC_PATH)test/encoder/targets.mk
diff --git a/multimedia/openh264/pkg-plist b/multimedia/openh264/pkg-plist
index 877f3adeb01b..b4f0ccc2c353 100644
--- a/multimedia/openh264/pkg-plist
+++ b/multimedia/openh264/pkg-plist
@@ -1,6 +1,7 @@
 include/wels/codec_api.h
 include/wels/codec_app_def.h
 include/wels/codec_def.h
+include/wels/codec_ver.h
 %%PLUGINS%%%%WEBPLUGIN_DIR%%/gmpopenh264.info
 %%PLUGINS%%@rmtry lib/firefox-nightly/defaults/pref/gmpopenh264.js
 %%PLUGINS%%@rmtry lib/firefox/defaults/pref/gmpopenh264.js
@@ -13,3 +14,4 @@ include/wels/codec_def.h
 lib/libopenh264.a
 lib/libopenh264.so
 lib/libopenh264.so.0
+libdata/pkgconfig/openh264.pc