Date: Wed, 17 Sep 2014 08:54:34 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1699 - in trunk/multimedia/openh264: . files Message-ID: <201409170854.s8H8sYgE021307@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Sep 17 08:54:33 2014
New Revision: 1699
Log:
link in module objects into plugin
Modified:
trunk/multimedia/openh264/Makefile
trunk/multimedia/openh264/files/patch-Makefile
Modified: trunk/multimedia/openh264/Makefile
==============================================================================
--- trunk/multimedia/openh264/Makefile Wed Sep 17 08:53:30 2014 (r1698)
+++ trunk/multimedia/openh264/Makefile Wed Sep 17 08:54:33 2014 (r1699)
@@ -2,7 +2,7 @@
PORTNAME= openh264
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MAINTAINER= gecko@FreeBSD.org
@@ -18,7 +18,6 @@
USES= gmake
USE_LDCONFIG= yes
-CFLAGS+= -I${LOCALBASE}/include
MAKE_ARGS= OS=freebsd ARCH="${ARCH:S/amd64/x86_64/}" \
CFLAGS_OPT="" SHAREDLIBSUFFIX=so.0 \
PREFIX="${STAGEDIR}${PREFIX}"
@@ -30,6 +29,7 @@
PLUGINS_BUILD_DEPENDS=gmp-api>=33.0:${PORTSDIR}/multimedia/gmp-api \
gmp-api<34.0:${PORTSDIR}/multimedia/gmp-api
+PLUGINS_CFLAGS= -I${LOCALBASE}/include/gmp-api
PLUGINS_MAKE_ARGS=HAVE_GMP_API=Yes
PLUGINS_ALL_TARGET=plugin
PLUGINS_USES= webplugin:gecko
@@ -39,6 +39,7 @@
SUB_LIST+= PORTVERSION=${PORTVERSION} WEBPLUGIN_DIR="${WEBPLUGIN_DIR}"
TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest
+TEST_CFLAGS= -I${LOCALBASE}/include
TEST_MAKE_ARGS= HAVE_GTEST=Yes
TEST_ALL_TARGET=test
Modified: trunk/multimedia/openh264/files/patch-Makefile
==============================================================================
--- trunk/multimedia/openh264/files/patch-Makefile Wed Sep 17 08:53:30 2014 (r1698)
+++ trunk/multimedia/openh264/files/patch-Makefile Wed Sep 17 08:54:33 2014 (r1699)
@@ -5,7 +5,7 @@
endif
-$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
-+$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
++$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
$(QUIET)rm -f $@
$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS) $(MODULE_LDFLAGS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409170854.s8H8sYgE021307>