|
1 | | ---- libvpx-1.11.0.orig/build/make/Makefile 2021-10-06 19:41:19.000000000 +0200 |
2 | | -+++ libvpx-1.11.0/build/make/Makefile 2022-03-28 10:41:12.000000000 +0200 |
3 | | -@@ -320,7 +320,7 @@ |
| 1 | +diff -urN libvpx-1.15.1.orig/build/make/Makefile libvpx-1.15.1/build/make/Makefile |
| 2 | +--- libvpx-1.15.1.orig/build/make/Makefile 2025-01-10 20:30:59.000000000 +0100 |
| 3 | ++++ libvpx-1.15.1/build/make/Makefile 2025-05-16 12:51:03.935009212 +0200 |
| 4 | +@@ -350,7 +350,7 @@ |
4 | 5 | $(if $(quiet),@echo " [LD] $$@") |
5 | 6 | $(qexec)$$(LD) -dynamiclib $$(LDFLAGS) \ |
6 | 7 | -exported_symbols_list $$(EXPORTS_FILE) \ |
|
9 | 10 | -o $$@ \ |
10 | 11 | $$(filter %.o,$$^) $$(extralibs) |
11 | 12 | endef |
12 | | -@@ -336,6 +336,20 @@ |
| 13 | +@@ -366,6 +366,20 @@ |
13 | 14 | $$(filter %.o,$$^) $$(extralibs) $$(EXPORTS_FILE) |
14 | 15 | endef |
15 | 16 |
|
|
30 | 31 |
|
31 | 32 | # |
32 | 33 | # Get current configuration |
33 | | -@@ -395,6 +409,7 @@ |
| 34 | +@@ -425,6 +439,7 @@ |
34 | 35 | $(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib)))) |
35 | 36 | $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib)))) |
36 | 37 | $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_template,$(lib)))) |
37 | 38 | +$(foreach lib,$(filter %-$(VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_gnu_template,$(lib),-$(VERSION_MAJOR).dll))) |
38 | 39 |
|
39 | 40 | INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS) |
40 | 41 | ifeq ($(MAKECMDGOALS),dist) |
41 | | ---- libvpx-1.11.0.orig/build/make/configure.sh 2021-10-06 19:41:19.000000000 +0200 |
42 | | -+++ libvpx-1.11.0/build/make/configure.sh 2022-03-29 19:54:58.000000000 +0200 |
43 | | -@@ -650,7 +650,10 @@ |
| 42 | +diff -urN libvpx-1.15.1.orig/build/make/configure.sh libvpx-1.15.1/build/make/configure.sh |
| 43 | +--- libvpx-1.15.1.orig/build/make/configure.sh 2025-01-10 20:30:59.000000000 +0100 |
| 44 | ++++ libvpx-1.15.1/build/make/configure.sh 2025-05-16 12:51:03.935009212 +0200 |
| 45 | +@@ -703,7 +703,10 @@ |
44 | 46 | --libdir=*) |
45 | 47 | libdir="${optval}" |
46 | 48 | ;; |
|
52 | 54 | die "Option ${opt} requires argument" |
53 | 55 | ;; |
54 | 56 | --help|-h) |
55 | | -@@ -679,9 +682,14 @@ |
| 57 | +@@ -732,9 +735,14 @@ |
56 | 58 | prefix="${prefix%/}" |
57 | 59 | libdir="${libdir:-${prefix}/lib}" |
58 | 60 | libdir="${libdir%/}" |
|
67 | 69 | } |
68 | 70 |
|
69 | 71 | post_process_cmdline() { |
70 | | ---- libvpx-1.11.0.orig/configure 2021-10-06 19:41:19.000000000 +0200 |
71 | | -+++ libvpx-1.11.0/configure 2022-03-29 19:54:58.000000000 +0200 |
72 | | -@@ -501,6 +501,7 @@ |
| 72 | +diff -urN libvpx-1.15.1.orig/configure libvpx-1.15.1/configure |
| 73 | +--- libvpx-1.15.1.orig/configure 2025-01-10 20:30:59.000000000 +0100 |
| 74 | ++++ libvpx-1.15.1/configure 2025-05-16 12:51:03.935009212 +0200 |
| 75 | +@@ -532,6 +532,7 @@ |
73 | 76 | DIST_DIR?=\$(DESTDIR)${prefix} |
74 | 77 | endif |
75 | 78 | LIBSUBDIR=${libdir##${prefix}/} |
76 | 79 | +BINSUBDIR=${bindir##${prefix}/} |
77 | 80 |
|
78 | 81 | VERSION_STRING=${VERSION_STRING} |
79 | 82 |
|
80 | | -@@ -539,6 +540,8 @@ |
| 83 | +@@ -570,6 +571,8 @@ |
81 | 84 | *) |
82 | 85 | if enabled gnu; then |
83 | 86 | echo "--enable-shared is only supported on ELF; assuming this is OK" |
|
86 | 89 | else |
87 | 90 | die "--enable-shared only supported on ELF, OS/2, and Darwin for now" |
88 | 91 | fi |
89 | | ---- libvpx-1.11.0.orig/libs.mk 2021-10-06 19:41:19.000000000 +0200 |
90 | | -+++ libvpx-1.11.0/libs.mk 2022-03-29 19:54:58.000000000 +0200 |
91 | | -@@ -137,6 +137,7 @@ |
| 92 | +diff -urN libvpx-1.15.1.orig/libs.mk libvpx-1.15.1/libs.mk |
| 93 | +--- libvpx-1.15.1.orig/libs.mk 2025-01-10 20:30:59.000000000 +0100 |
| 94 | ++++ libvpx-1.15.1/libs.mk 2025-05-16 12:51:03.935009212 +0200 |
| 95 | +@@ -150,6 +150,7 @@ |
92 | 96 | INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx/% |
93 | 97 | INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx_ports/% |
94 | 98 | INSTALL_MAPS += $(LIBSUBDIR)/% % |
95 | 99 | +INSTALL_MAPS += $(BINSUBDIR)/% % |
96 | 100 | INSTALL_MAPS += src/% $(SRC_PATH_BARE)/% |
97 | 101 | ifeq ($(CONFIG_MSVS),yes) |
98 | 102 | INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Release/%) |
99 | | -@@ -322,6 +323,13 @@ |
| 103 | +@@ -336,6 +337,13 @@ |
100 | 104 | LIBVPX_SO_SYMLINKS := |
101 | 105 | LIBVPX_SO_IMPLIB := libvpx_dll.a |
102 | 106 | else |
|
110 | 114 | LIBVPX_SO := libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH) |
111 | 115 | SHARED_LIB_SUF := .so |
112 | 116 | EXPORT_FILE := libvpx.ver |
113 | | -@@ -331,6 +339,7 @@ |
| 117 | +@@ -345,6 +353,7 @@ |
114 | 118 | endif |
115 | 119 | endif |
116 | 120 | endif |
117 | 121 | +endif |
118 | 122 |
|
119 | 123 | LIBS-$(CONFIG_SHARED) += $(BUILD_PFX)$(LIBVPX_SO)\ |
120 | 124 | $(notdir $(LIBVPX_SO_SYMLINKS)) \ |
121 | | -@@ -353,6 +362,10 @@ libvpx_dll.a: $(LIBVPX_SO) |
| 125 | +@@ -367,6 +376,10 @@ |
122 | 126 | $(qexec)emximp -o $@ $< |
123 | 127 | CLEAN-OBJS += libvpx_dll.a |
124 | 128 |
|
|
129 | 133 | define libvpx_symlink_template |
130 | 134 | $(1): $(2) |
131 | 135 | @echo " [LN] $(2) $$@" |
132 | | -@@ -371,3 +384,3 @@ |
| 136 | +@@ -383,7 +396,7 @@ |
| 137 | + |
| 138 | + |
133 | 139 | INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS) |
134 | 140 | -INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO) |
135 | 141 | +INSTALL-LIBS-$(CONFIG_SHARED) += $(if $(filter win%,$(TGT_OS)),$(BINSUBDIR),$(LIBSUBDIR))/$(LIBVPX_SO) |
136 | 142 | INSTALL-LIBS-$(CONFIG_SHARED) += $(if $(LIBVPX_SO_IMPLIB),$(LIBSUBDIR)/$(LIBVPX_SO_IMPLIB)) |
| 143 | + |
| 144 | + |
0 commit comments