From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 22 Nov 2015 22:13:03 +0000 (+0100)
Subject: Stop linking widgets.o into the shared library.
X-Git-Tag: 1.3.0~19
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=e9523ce68f9f08d5178615c8c4a031eec67d1455;ds=sidebyside

Stop linking widgets.o into the shared library.

This was never intended to be there, and we don't install headers for it
(so no API/ABI break); it is actively harmful because it has a static
ResourcePool, which is attempted destroyed during shutdown (which causes
use of uninitialized memory as we try to get the current context).
---

diff --git a/Makefile.in b/Makefile.in
index 0021c98..f15fabf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,7 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
 LDLIBS += -lgcov
 endif
 
-DEMO_OBJS=demo.o
+DEMO_OBJS=demo.o widgets.o
 
 # Inputs.
 TESTED_INPUTS = flat_input
@@ -89,7 +89,7 @@ EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)
 # Unit tests.
 TESTS=effect_chain_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test)
 
-LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o fp16.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)
+LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o fp16.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)
 
 # Default target:
 all: libmovit.la $(TESTS)