[Midnightbsd-cvs] mports [24523] trunk/multimedia/openh264: update to 1.8

[laffer1 at midnightbsd.org]

Revision: 24523
          http://svnweb.midnightbsd.org/mports/?rev=24523
Author:   laffer1
Date:     2018-10-15 23:56:17 -0400 (Mon, 15 Oct 2018)
Log Message:
-----------
update to 1.8

Modified Paths:
--------------
    trunk/multimedia/openh264/Makefile
    trunk/multimedia/openh264/distinfo
    trunk/multimedia/openh264/files/patch-Makefile
    trunk/multimedia/openh264/pkg-plist

Added Paths:
-----------
    trunk/multimedia/openh264/files/patch-clang

Modified: trunk/multimedia/openh264/Makefile
===================================================================
--- trunk/multimedia/openh264/Makefile	2018-10-16 03:45:46 UTC (rev 24522)
+++ trunk/multimedia/openh264/Makefile	2018-10-16 03:56:17 UTC (rev 24523)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/multimedia/openh264/Makefile 418413 2016-07-12 04:30:32Z jbeich $
 
 PORTNAME=	openh264
-PORTVERSION=	1.5.0
+PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=v
 PORTEPOCH=	2
 CATEGORIES=	multimedia
@@ -19,14 +19,13 @@
 USES=		compiler cpe gmake
 CPE_VENDOR=	cisco
 USE_LDCONFIG=	yes
-ASFLAGS+=	${ASFLAGS_${MACHINE}_${CHOSEN_COMPILER_TYPE}}
-ASFLAGS_arm_clang=	-no-integrated-as
-ASFLAGS_arm64_clang=	-no-integrated-as
-MAKE_ARGS=	PREFIX="${PREFIX}" \
+MAKE_ARGS=	PREFIX="${TRUE_PREFIX}" \
 		OS=bsd ARCH="${ARCH:S/amd64/x86_64/}" \
 		CCASFLAGS='$$(CFLAGS) ${ASFLAGS}' \
 		CFLAGS_OPT="" CFLAGS_DEBUG=""
 ALL_TARGET=	all
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
+LDFLAGS_i386=	-Wl,-znotext
 
 OPTIONS_DEFINE=	DEBUG PLUGINS TEST
 OPTIONS_DEFAULT=PLUGINS
@@ -62,9 +61,11 @@
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.*
-	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_DATA} ${WRKSRC}/gmp${PORTNAME}.info ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_DATA} ${WRKDIR}/gmp${PORTNAME}.js ${STAGEDIR}${WEBPLUGIN_DIR}
 
+post-install-PLUGINS-on:
+	${MKDIR} ${FAKE_DESTDIR}${WEBPLUGIN_DIR}
+	${INSTALL_DATA} ${WRKSRC}/gmp${PORTNAME}.info ${FAKE_DESTDIR}${WEBPLUGIN_DIR}
+	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so ${FAKE_DESTDIR}${WEBPLUGIN_DIR}
+	${INSTALL_DATA} ${WRKDIR}/gmp${PORTNAME}.js ${FAKE_DESTDIR}${WEBPLUGIN_DIR}
+
 .include <bsd.port.mk>

Modified: trunk/multimedia/openh264/distinfo
===================================================================
--- trunk/multimedia/openh264/distinfo	2018-10-16 03:45:46 UTC (rev 24522)
+++ trunk/multimedia/openh264/distinfo	2018-10-16 03:56:17 UTC (rev 24523)
@@ -1,2 +1,3 @@
-SHA256 (openh264-v1.5.0_GH0.tar.gz) = 98077bd5d113c183ce02b678733b0cada2cf36750370579534c4d70f0b6c27b5
-SIZE (openh264-v1.5.0_GH0.tar.gz) = 37851166
+TIMESTAMP = 1539661753
+SHA256 (openh264-v1.8.0_GH0.tar.gz) = 08670017fd0bb36594f14197f60bebea27b895511251c7c64df6cd33fc667d34
+SIZE (openh264-v1.8.0_GH0.tar.gz) = 38695675

Modified: trunk/multimedia/openh264/files/patch-Makefile
===================================================================
--- trunk/multimedia/openh264/files/patch-Makefile	2018-10-16 03:45:46 UTC (rev 24522)
+++ trunk/multimedia/openh264/files/patch-Makefile	2018-10-16 03:56:17 UTC (rev 24523)
@@ -1,13 +1,13 @@
 # Force gmp plugin to link dynamically against libopenh264
 
---- Makefile~
+--- Makefile.orig	2017-06-16 04:20:14 UTC
 +++ Makefile
-@@ -210,7 +210,7 @@ plugin:
- 	@echo "You do not have gmp-api.  Run make gmp-bootstrap to get the gmp-api headers."
- endif
+@@ -263,7 +263,7 @@ endif
+ echo-plugin-name:
+ 	@echo $(MODULE)
  
--$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
-+$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER): $(MODULE_OBJS) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
+-$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXFULLVER): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
++$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXFULLVER): $(MODULE_OBJS) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
  	$(QUIET)rm -f $@
  	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS) $(MODULE_LDFLAGS)
- 
+ ifeq (True, $(PROCESS_FILES))

Added: trunk/multimedia/openh264/files/patch-clang
===================================================================
--- trunk/multimedia/openh264/files/patch-clang	                        (rev 0)
+++ trunk/multimedia/openh264/files/patch-clang	2018-10-16 03:56:17 UTC (rev 24523)
@@ -0,0 +1,22 @@
+Based on https://github.com/cisco/openh264/pull/2877
+
+--- codec/common/arm64/arm_arch64_common_macro.S.orig	2018-06-27 01:36:43 UTC
++++ codec/common/arm64/arm_arch64_common_macro.S
+@@ -52,13 +52,17 @@ ret
+ .align 2
+ .global \funcName
+ .type \funcName, %function
++#ifndef __clang__
+ .func \funcName
++#endif
+ \funcName:
+ .endm
+ 
+ .macro WELS_ASM_AARCH64_FUNC_END
+ ret
++#ifndef __clang__
+ .endfunc
++#endif
+ .endm
+ 
+ #endif


Property changes on: trunk/multimedia/openh264/files/patch-clang
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/openh264/pkg-plist
===================================================================
--- trunk/multimedia/openh264/pkg-plist	2018-10-16 03:45:46 UTC (rev 24522)
+++ trunk/multimedia/openh264/pkg-plist	2018-10-16 03:56:17 UTC (rev 24523)
@@ -13,5 +13,6 @@
 %%PLUGINS%%lib/browser_plugins/gmp-gmpopenh264/libgmpopenh264.so
 lib/libopenh264.a
 lib/libopenh264.so
-lib/libopenh264.so.1
+lib/libopenh264.so.%%PORTVERSION%%
+lib/libopenh264.so.4
 libdata/pkgconfig/openh264.pc