Initial import

1 files changed, 112 insertions, 0 deletions

diff --git a/configure.patch b/configure.patch
new file mode 100644
index 000000000000..9c93ffb91f3f
--- /dev/null
+++ b/configure.patch
@@ -0,0 +1,112 @@
+diff -ru libvpx-1.4.0/build/make/configure.sh patched/build/make/configure.sh
+--- libvpx-1.4.0/build/make/configure.sh	2015-05-01 00:28:10.192824758 +0200
++++ patched/build/make/configure.sh	2015-05-01 00:31:21.116258394 +0200
+@@ -1181,11 +1181,13 @@
+         win32)
+           add_asflags -f win32
+           enabled debug && add_asflags -g cv8
++          add_ldflags "-Wl,-no-undefined"
+           EXE_SFX=.exe
+           ;;
+         win64)
+           add_asflags -f x64
+           enabled debug && add_asflags -g cv8
++          add_ldflags "-Wl,-no-undefined"
+           EXE_SFX=.exe
+           ;;
+         linux*|solaris*|android*)
+diff -ru libvpx-1.4.0/build/make/Makefile patched/build/make/Makefile
+--- libvpx-1.4.0/build/make/Makefile	2015-05-01 00:28:10.192824758 +0200
++++ patched/build/make/Makefile	2015-05-01 00:32:53.467910006 +0200
+@@ -296,6 +296,7 @@
+ 	$(if $(quiet),@echo "    [LD] $$@")
+ 	$(qexec)$$(LD) -shared $$(LDFLAGS) \
+             -Wl,--no-undefined -Wl,-soname,$$(SONAME) \
++            -Wl,-out-implib,libvpx.dll.a \
+             -Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
+             $$(filter %.o,$$^) $$(extralibs)
+ endef
+@@ -383,7 +384,7 @@
+ .libs: $(LIBS)
+ 	@touch $@
+ $(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
+-$(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
++$(foreach lib,$(filter %dll.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
+ $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
+ 
+ INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
+diff -ru libvpx-1.4.0/configure patched/configure
+--- libvpx-1.4.0/configure	2015-05-01 00:28:10.196158153 +0200
++++ patched/configure	2015-05-01 00:29:58.051434745 +0200
+@@ -528,18 +528,18 @@
+ }
+ 
+ process_detect() {
+-    if enabled shared; then
++#    if enabled shared; then
+         # Can only build shared libs on a subset of platforms. Doing this check
+         # here rather than at option parse time because the target auto-detect
+         # magic happens after the command line has been parsed.
+-        if ! enabled linux; then
+-            if enabled gnu; then
+-                echo "--enable-shared is only supported on ELF; assuming this is OK"
+-            else
+-                die "--enable-shared only supported on ELF for now"
+-            fi
+-        fi
+-    fi
++        #if ! enabled linux; then
++        #    if enabled gnu; then
++        #        echo "--enable-shared is only supported on ELF; assuming this is OK"
++        #    else
++        #        die "--enable-shared only supported on ELF for now"
++        #    fi
++        #fi
++    #fi
+     if [ -z "$CC" ] || enabled external_build; then
+         echo "Bypassing toolchain for environment detection."
+         enable_feature external_build
+Only in patched/: configure.orig
+diff -ru libvpx-1.4.0/libs.mk patched/libs.mk
+--- libvpx-1.4.0/libs.mk	2015-05-01 00:28:10.202824940 +0200
++++ patched/libs.mk	2015-05-01 00:35:51.277744002 +0200
+@@ -239,18 +239,18 @@
+ LIBVPX_SO_SYMLINKS      := $(addprefix $(LIBSUBDIR)/, \
+                              libvpx.dylib  )
+ else
+-LIBVPX_SO               := libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH)
++LIBVPX_SO               := libvpx.dll.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH)
+ EXPORT_FILE             := libvpx.ver
+ LIBVPX_SO_SYMLINKS      := $(addprefix $(LIBSUBDIR)/, \
+-                             libvpx.so libvpx.so.$(SO_VERSION_MAJOR) \
+-                             libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR))
++                             libvpx.dll libvpx.dll.$(SO_VERSION_MAJOR) \
++                             libvpx.dll.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR))
+ endif
+ 
+ LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
+                            $(notdir $(LIBVPX_SO_SYMLINKS))
+ $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
+ $(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
+-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR)
++$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.dll.$(SO_VERSION_MAJOR)
+ $(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
+ 
+ libvpx.ver: $(call enabled,CODEC_EXPORTS)
+@@ -282,6 +282,7 @@
+ 
+ INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBVPX_SO_SYMLINKS)
+ INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBSUBDIR)/$(LIBVPX_SO)
++INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBSUBDIR)/libvpx.dll.a
+ 
+ 
+ LIBS-$(BUILD_LIBVPX) += vpx.pc
+@@ -443,7 +444,7 @@
+ BINS-$(BUILD_LIBVPX) += $(LIBVPX_TEST_BINS)
+ 
+ CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
+-CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.a)
++CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.dll,.a)
+ $(foreach bin,$(LIBVPX_TEST_BINS),\
+     $(if $(BUILD_LIBVPX),$(eval $(bin): \
+         lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\