Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libvpx: Get patchset from LRN. To have compatibility with WinXP.

Browse Source
This commit is contained in:
Alexpux
2014-07-23 12:41:42 +04:00
parent d5beb4172a
commit c38856eb4a
12 changed files with 297 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
mingw-w64-libvpx/0001-enable-shared-on.mingw.patch Normal file
View File

@@ -0,0 +1,136 @@
--- libvpx-v1.2.0/configure.orig 2013-09-04 18:49:22.000000000 +0000
+++ libvpx-v1.2.0/configure 2013-10-02 08:57:41.927885400 +0000
@@ -458,9 +459,13 @@
# 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"
+ echo "--enable-shared is only supported on ELF and PE; assuming this is OK"
+ elif enabled win32; then
+ echo "--enable-shared is only supported on ELF and PE; assuming this is OK"
+ elif enabled win64; then
+ echo "--enable-shared is only supported on ELF and PE; assuming this is OK"
else
- die "--enable-shared only supported on ELF for now"
+ die "--enable-shared only supported on ELF and PE for now"
fi
fi
fi
--- libvpx-v1.0.0/build/make/Makefile.orig 2012-01-27 22:36:39 +0400
+++ libvpx-v1.0.0/build/make/Makefile 2012-04-16 01:33:19 +0400
@@ -316,7 +316,7 @@
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
-$(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
+$(foreach lib,$(filter %-$(VERSION_MAJOR).dll,$(LIBS)),$(eval $(call so_template,$(lib))))
$(foreach lib,$(filter %$(VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
--- libvpx-v1.0.0/configure.orig 2012-04-16 01:18:31 +0400
+++ libvpx-v1.0.0/configure 2012-04-16 02:01:35 +0400
@@ -406,6 +406,7 @@
DIST_DIR?=\$(DESTDIR)${prefix}
endif
LIBSUBDIR=${libdir##${prefix}/}
+BINSUBDIR=${bindir##${prefix}/}
VERSION_STRING=${VERSION_STRING}
--- libvpx-v1.0.0/build/make/configure.sh.orig 2012-01-27 22:36:39 +0400
+++ libvpx-v1.0.0/build/make/configure.sh 2012-04-16 02:15:12 +0400
@@ -477,11 +477,14 @@
--libdir=*)
libdir="${optval}"
;;
+ --bindir=*)
+ bindir="${optval}"
+ ;;
--sdk-path=*)
[ -d "${optval}" ] || die "Not a directory: ${optval}"
sdk_path="${optval}"
;;
- --libc|--as|--prefix|--libdir|--sdk-path)
+ --libc|--as|--prefix|--libdir|--bindir|--sdk-path)
die "Option ${opt} requires argument"
;;
--help|-h) show_help
@@ -508,9 +511,14 @@
prefix="${prefix%/}"
libdir="${libdir:-${prefix}/lib}"
libdir="${libdir%/}"
+ bindir="${bindir:-${prefix}/bin}"
+ bindir="${bindir%/}"
if [ "${libdir#${prefix}}" = "${libdir}" ]; then
die "Libdir ${libdir} must be a subdirectory of ${prefix}"
fi
+ if [ "${bindir#${prefix}}" = "${bindir}" ]; then
+ die "Bindir ${bindir} must be a subdirectory of ${prefix}"
+ fi
}
--- libvpx-v1.3.0/libs.mk.orig 2014-01-10 20:12:42.000000000 +0000
+++ libvpx-v1.3.0/libs.mk 2014-02-09 17:56:21.946849800 +0000
@@ -162,6 +162,7 @@
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx/%
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx_ports/%
INSTALL_MAPS += $(LIBSUBDIR)/% %
+INSTALL_MAPS += $(BINSUBDIR)/% %
INSTALL_MAPS += src/% $(SRC_PATH_BARE)/%
ifeq ($(CONFIG_MSVS),yes)
INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Release/%)
@@ -271,19 +272,19 @@
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
libvpx.dylib )
else
-LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
+LIBVPX_SO := libvpx-$(VERSION_MAJOR).dll
EXPORT_FILE := libvpx.ver
SYM_LINK := libvpx.so
-LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
- libvpx.so libvpx.so.$(VERSION_MAJOR) \
- libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR))
+LIBVPX_SO_SYMLINKS := $(addprefix $(BINSUBDIR)/, \
+ libvpx.dll libvpx-$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH).dll \
+ libvpx-$(VERSION_MAJOR).$(VERSION_MINOR).dll)
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.$(VERSION_MAJOR)
+$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx-$(VERSION_MAJOR).dll
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@@ -314,7 +315,7 @@
INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBVPX_SO_SYMLINKS)
-INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBSUBDIR)/$(LIBVPX_SO)
+INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(BINSUBDIR)/$(LIBVPX_SO)
LIBS-$(BUILD_LIBVPX) += vpx.pc
@@ -476,7 +477,7 @@
INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(LIBVPX_TEST_SRCS)
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 ))\
--- libvpx-v1.3.0/examples.mk.orig 2014-02-09 17:35:42.615974800 +0000
+++ libvpx-v1.3.0/examples.mk 2014-02-09 17:58:15.301744100 +0000
@@ -191,7 +191,7 @@
# Instantiate linker template for all examples.
CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
-SHARED_LIB_SUF=$(if $(filter darwin%,$(TGT_OS)),.dylib,.so)
+SHARED_LIB_SUF=$(if $(filter darwin%,$(TGT_OS)),.dylib,.dll)
CODEC_LIB_SUF=$(if $(CONFIG_SHARED),$(SHARED_LIB_SUF),.a)
$(foreach bin,$(BINS-yes),\
$(if $(BUILD_OBJS),$(eval $(bin):\

30
mingw-w64-libvpx/0002-no-pthreads.mingw.patch Normal file
View File

@@ -0,0 +1,30 @@
--- libvpx-v1.1.0/configure.orig 2012-09-15 16:20:38 +0400
+++ libvpx-v1.1.0/configure 2012-09-15 16:24:16 +0400
@@ -224,7 +224,6 @@
vpx_ports
stdint_h
alt_tree_layout
- pthread_h
sys_mman_h
unistd_h
"
@@ -487,7 +486,6 @@
EOF
# check system headers
check_header stdint.h
- check_header pthread.h
check_header sys/mman.h
check_header vpx/vpx_integer.h -I${source_path} && enable vpx_ports
--- libvpx-v1.1.0/vp8/common/generic/systemdependent.c.orig 2012-05-09 03:14:00 +0400
+++ libvpx-v1.1.0/vp8/common/generic/systemdependent.c 2012-09-15 16:44:06 +0400
@@ -21,7 +21,8 @@
#if CONFIG_MULTITHREAD
#if HAVE_UNISTD_H && !defined(__OS2__)
#include <unistd.h>
-#elif defined(_WIN32)
+#endif
+#if defined(_WIN32)
#include <windows.h>
typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
#elif defined(__OS2__)

23
mingw-w64-libvpx/0003-cross-with-native-binutils.mingw.patch Normal file
View File

@@ -0,0 +1,23 @@
--- libvpx-v1.2.0/build/make/configure.sh.orig 2013-10-02 08:59:30.678194900 +0000
+++ libvpx-v1.2.0/build/make/configure.sh 2013-10-02 09:00:28.811576900 +0000
@@ -584,13 +584,13 @@
}
setup_gnu_toolchain() {
- CC=${CC:-${CROSS}gcc}
- CXX=${CXX:-${CROSS}g++}
- AR=${AR:-${CROSS}ar}
- LD=${LD:-${CROSS}${link_with_cc:-ld}}
- AS=${AS:-${CROSS}as}
- STRIP=${STRIP:-${CROSS}strip}
- NM=${NM:-${CROSS}nm}
+ CC=${CC:-gcc}
+ CXX=${CXX:-g++}
+ AR=${AR:-ar}
+ LD=${LD:-${link_with_cc:-ld}}
+ AS=${AS:-as}
+ STRIP=${STRIP:-strip}
+ NM=${NM:-nm}
AS_SFX=.s
EXE_SFX=
}

20
mingw-w64-libvpx/0004-implib.mingw.patch Normal file
View File

@@ -0,0 +1,20 @@
--- libvpx-v1.3.0/build/make/Makefile.orig 2014-02-09 17:58:58.119181200 +0000
+++ libvpx-v1.3.0/build/make/Makefile 2014-02-09 18:01:00.974781900 +0000
@@ -270,7 +270,7 @@
$(qexec)$$(LD) -shared $$(LDFLAGS) \
-Wl,--no-undefined -Wl,-soname,$$(SONAME) \
-Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
- $$(filter %.o,$$^) $$(extralibs)
+ -Wl,--out-implib=$$(subst $(2),.dll.a,$(1)) $$(filter %.o,$$^) $$(extralibs)
endef
define dl_template
@@ -351,7 +351,7 @@
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
-$(foreach lib,$(filter %-$(VERSION_MAJOR).dll,$(LIBS)),$(eval $(call so_template,$(lib))))
+$(foreach lib,$(filter %-$(VERSION_MAJOR).dll,$(LIBS)),$(eval $(call so_template,$(lib),-$(VERSION_MAJOR).dll)))
$(foreach lib,$(filter %$(VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)

10
mingw-w64-libvpx/0005-fix-exports.mingw.patch Normal file
View File

@@ -0,0 +1,10 @@
--- libvpx-v1.1.0/vpx/exports_enc.orig 2012-05-08 23:14:00.000000000 +0000
+++ libvpx-v1.1.0/vpx/exports_enc 2013-07-31 12:26:36.692171900 +0000
@@ -1,6 +1,7 @@
text vpx_codec_enc_config_default
text vpx_codec_enc_config_set
text vpx_codec_enc_init_ver
+text vpx_codec_enc_init_multi_ver
text vpx_codec_encode
text vpx_codec_get_cx_data
text vpx_codec_get_global_headers

10
mingw-w64-libvpx/0006-instll-implib.mingw.patch Normal file
View File

@@ -0,0 +1,10 @@
--- libvpx-v1.1.0/libs.mk.orig 2013-07-31 12:18:41.045772500 +0000
+++ libvpx-v1.1.0/libs.mk 2013-07-31 12:56:22.862986800 +0000
@@ -126,6 +126,7 @@
endif
else
INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
+INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/libvpx.dll.a
INSTALL-LIBS-$(CONFIG_DEBUG_LIBS) += $(LIBSUBDIR)/libvpx_g.a
endif

16
mingw-w64-libvpx/0007-fix-mingw-w64-strtok.mingw.patch Normal file
View File

@@ -0,0 +1,16 @@
--- libvpx-v1.3.0/vpx/src/svc_encodeframe.c.orig 2014-01-10 20:12:42.000000000 +0000
+++ libvpx-v1.3.0/vpx/src/svc_encodeframe.c 2014-02-09 18:20:00.603996400 +0000
@@ -23,10 +23,12 @@
#include "vpx/vp8cx.h"
#include "vpx/vpx_encoder.h"
-#if defined(__MINGW32__) && !defined(MINGW_HAS_SECURE_API)
+#if defined(__MINGW32__)
#define strtok_r strtok_s
+# if !defined(MINGW_HAS_SECURE_API)
// proto from /usr/x86_64-w64-mingw32/include/sec_api/string_s.h
_CRTIMP char *__cdecl strtok_s(char *str, const char *delim, char **context);
+# endif
#endif
#ifdef _MSC_VER

26
mingw-w64-libvpx/0008-fix-ln-on-install.mingw.patch Normal file
View File

@@ -0,0 +1,26 @@
--- libvpx-v1.3.0/libs.mk.orig 2014-02-09 18:20:42.290790000 +0000
+++ libvpx-v1.3.0/libs.mk 2014-02-09 18:38:54.500983000 +0000
@@ -301,7 +301,7 @@
CLEAN-OBJS += libvpx.syms
define libvpx_symlink_template
-$(1): $(2)
+$(1): $(3)
@echo " [LN] $(2) $$@"
$(qexec)mkdir -p $$(dir $$@)
$(qexec)ln -sf $(2) $$@
@@ -309,10 +309,12 @@
$(eval $(call libvpx_symlink_template,\
$(addprefix $(BUILD_PFX),$(notdir $(LIBVPX_SO_SYMLINKS))),\
- $(BUILD_PFX)$(LIBVPX_SO)))
+ $(BUILD_PFX)$(LIBVPX_SO),\
+ $(BUILD_PFX)$(LIBVPX_SO)))
$(eval $(call libvpx_symlink_template,\
$(addprefix $(DIST_DIR)/,$(LIBVPX_SO_SYMLINKS)),\
- $(LIBVPX_SO)))
+ $(LIBVPX_SO),\
+ $(DIST_DIR)/bin/$(LIBVPX_SO)))
INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBVPX_SO_SYMLINKS)

40
mingw-w64-libvpx/PKGBUILD
View File

@@ -4,28 +4,43 @@ _realname=libvpx
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.3.0
pkgrel=2
pkgrel=3
pkgdesc="The VP8 Codec SDK (mingw-w64)"
arch=('any')
license=('BSD')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-yasm")
url=('http://www.webmproject.org/')
source=(https://webm.googlecode.com/files/${_realname}-v${pkgver}.tar.bz2
'configure.patch'
'mingwstrtok.patch'
'fix-dll-name.patch')
0001-enable-shared-on.mingw.patch
0002-no-pthreads.mingw.patch
0003-cross-with-native-binutils.mingw.patch
0004-implib.mingw.patch
0005-fix-exports.mingw.patch
0006-instll-implib.mingw.patch
0007-fix-mingw-w64-strtok.mingw.patch
0008-fix-ln-on-install.mingw.patch)
options=('strip' 'staticlibs')
md5sums=('14783a148872f2d08629ff7c694eb31f'
'7c50751fc42580dca0ff277e83e3b55f'
'ada9eb8f4b982a0cc1749aaab4153c11'
'344d70d33ca2d30c83c0f816e548b084')
'91e8e57bd26acb1acf5b0df5fbf36532'
'8799da31817a2d0d6a3db4717e80ac24'
'76677cf7a34fa84db945ecca2e8efaed'
'33f066c4d11a928bad02f5877b36d148'
'ccfc3e6d0bd8aeea89b29605ad783242'
'816bb55c8593e639c2b083bf13509542'
'5b1411bb3a36f8f126a6da74d3dcb305'
'4fa75aed4f5929a6630f59b2b3114ff7')
prepare() {
cd ${srcdir}/$_realname-v$pkgver
patch -Np1 -i ${srcdir}/configure.patch
patch -Np1 -i ${srcdir}/mingwstrtok.patch
patch -Np1 -i ${srcdir}/fix-dll-name.patch
patch -Np1 -i ${srcdir}/0001-enable-shared-on.mingw.patch
patch -Np1 -i ${srcdir}/0002-no-pthreads.mingw.patch
patch -Np1 -i ${srcdir}/0003-cross-with-native-binutils.mingw.patch
patch -Np1 -i ${srcdir}/0004-implib.mingw.patch
patch -Np1 -i ${srcdir}/0005-fix-exports.mingw.patch
patch -Np1 -i ${srcdir}/0006-instll-implib.mingw.patch
patch -Np1 -i ${srcdir}/0007-fix-mingw-w64-strtok.mingw.patch
patch -Np1 -i ${srcdir}/0008-fix-ln-on-install.mingw.patch
}
build() {
@@ -60,8 +75,5 @@ package() {
cd "${srcdir}/build-$MINGW_CHOST"
make DIST_DIR="${pkgdir}${MINGW_PREFIX}" install
#Move the hacked in shared libs to bin
mkdir ${pkgdir}${MINGW_PREFIX}/bin
mv ${pkgdir}${MINGW_PREFIX}/lib/libvpx.dll ${pkgdir}${MINGW_PREFIX}/bin/
rm ${pkgdir}${MINGW_PREFIX}/lib/libvpx.dll.1*
rm ${pkgdir}${MINGW_PREFIX}/bin/libvpx{.dll,-1.3}*
}

113
mingw-w64-libvpx/configure.patch
View File

@@ -1,113 +0,0 @@
diff -ru libvpx-1.3.0/build/make/configure.sh patched/build/make/configure.sh
--- libvpx-1.3.0/build/make/configure.sh 2013-12-08 01:20:08.208739000 +0100
+++ patched/build/make/configure.sh 2013-12-08 01:23:07.608081037 +0100
@@ -1129,11 +1129,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.3.0/build/make/Makefile patched/build/make/Makefile
--- libvpx-1.3.0/build/make/Makefile 2013-12-08 01:20:08.208739000 +0100
+++ patched/build/make/Makefile 2013-12-08 01:26:08.194104011 +0100
@@ -269,6 +269,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
@@ -351,7 +352,7 @@
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
-$(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
+$(foreach lib,$(filter %dll.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
$(foreach lib,$(filter %$(VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
diff -ru libvpx-1.3.0/configure patched/configure
--- libvpx-1.3.0/configure 2013-12-08 01:20:08.385408000 +0100
+++ patched/configure 2013-12-08 01:27:23.421890185 +0100
@@ -501,18 +501,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
diff -ru libvpx-1.3.0/libs.mk patched/libs.mk
--- libvpx-1.3.0/libs.mk 2013-12-08 01:20:08.255406000 +0100
+++ patched/libs.mk 2013-12-08 01:32:17.116255790 +0100
@@ -271,19 +271,19 @@
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
libvpx.dylib )
else
-LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
+LIBVPX_SO := libvpx.dll.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
EXPORT_FILE := libvpx.ver
-SYM_LINK := libvpx.so
+SYM_LINK := libvpx.dll
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
- libvpx.so libvpx.so.$(VERSION_MAJOR) \
- libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR))
+ libvpx.dll libvpx.dll.$(VERSION_MAJOR) \
+ libvpx.dll.$(VERSION_MAJOR).$(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.$(VERSION_MAJOR)
+$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.dll.$(VERSION_MAJOR)
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@@ -315,6 +315,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
@@ -476,7 +477,7 @@
INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(LIBVPX_TEST_SRCS)
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 ))\

55
mingw-w64-libvpx/fix-dll-name.patch
View File

@@ -1,55 +0,0 @@
--- libvpx-v1.3.0/libs.mk.orig 2014-01-12 11:34:21.201600000 +0400
+++ libvpx-v1.3.0/libs.mk 2014-01-12 11:38:18.092800000 +0400
@@ -271,11 +271,11 @@
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
libvpx.dylib )
else
-LIBVPX_SO := libvpx.dll.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
+LIBVPX_SO := libvpx.dll
EXPORT_FILE := libvpx.ver
-SYM_LINK := libvpx.dll
+SYM_LINK := libvpx.dll.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
- libvpx.dll libvpx.dll.$(VERSION_MAJOR) \
+ libvpx.dll.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) libvpx.dll.$(VERSION_MAJOR) \
libvpx.dll.$(VERSION_MAJOR).$(VERSION_MINOR))
endif
@@ -283,7 +283,7 @@
$(notdir $(LIBVPX_SO_SYMLINKS))
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.dll.$(VERSION_MAJOR)
+$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.dll
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@@ -302,7 +302,7 @@
$(1): $(2)
@echo " [LN] $(2) $$@"
$(qexec)mkdir -p $$(dir $$@)
- $(qexec)ln -sf $(2) $$@
+ $(qexec)cp -pR $(2) $$@
endef
$(eval $(call libvpx_symlink_template,\
--- libvpx-v1.3.0/build/make/Makefile.orig 2014-01-12 12:00:08.731000000 +0400
+++ libvpx-v1.3.0/build/make/Makefile 2014-01-12 12:00:42.879400000 +0400
@@ -268,7 +268,7 @@
$(1):
$(if $(quiet),@echo " [LD] $$@")
$(qexec)$$(LD) -shared $$(LDFLAGS) \
- -Wl,--no-undefined -Wl,-soname,$$(SONAME) \
+ -Wl,--no-undefined \
-Wl,-out-implib,libvpx.dll.a \
-Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
$$(filter %.o,$$^) $$(extralibs)
@@ -352,7 +352,7 @@
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
-$(foreach lib,$(filter %dll.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
+$(foreach lib,$(filter %dll,$(LIBS)),$(eval $(call so_template,$(lib))))
$(foreach lib,$(filter %$(VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)

12
mingw-w64-libvpx/mingwstrtok.patch
View File

@@ -1,12 +0,0 @@
diff -ru libvpx-1.3.0/vpx/src/svc_encodeframe.c patched/vpx/src/svc_encodeframe.c
--- libvpx-1.3.0/vpx/src/svc_encodeframe.c 2013-12-08 01:20:08.398741000 +0100
+++ patched/vpx/src/svc_encodeframe.c 2013-12-08 01:35:52.289449377 +0100
@@ -23,6 +23,8 @@
#include "vpx/vp8cx.h"
#include "vpx/vpx_encoder.h"
+#undef MINGW_HAS_SECURE_API
+
#if defined(__MINGW32__) && !defined(MINGW_HAS_SECURE_API)
#define strtok_r strtok_s
// proto from /usr/x86_64-w64-mingw32/include/sec_api/string_s.h