aboutsummaryrefslogtreecommitdiff
path: root/multimedia/openh264/files
diff options
context:
space:
mode:
authorBeat Gaetzi <beat@FreeBSD.org>2015-01-14 08:06:43 +0000
committerBeat Gaetzi <beat@FreeBSD.org>2015-01-14 08:06:43 +0000
commit7483da328d17b5d766e5b026b06266e1ac09a580 (patch)
tree765357df2fbaa48356ce21607d5cc39741229da2 /multimedia/openh264/files
parent6cbf8fb6e3a10b9c46c448ba239a71c682221ac7 (diff)
downloadports-7483da328d17b5d766e5b026b06266e1ac09a580.tar.gz
ports-7483da328d17b5d766e5b026b06266e1ac09a580.zip
- 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
Notes
Notes: svn path=/head/; revision=376999
Diffstat (limited to 'multimedia/openh264/files')
-rw-r--r--multimedia/openh264/files/patch-Makefile18
1 files changed, 6 insertions, 12 deletions
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