Merge ~vpa1977/ubuntu/+source/aom:use-system-libwebm into ubuntu/+source/aom:ubuntu/devel

[Vladimir Petko]

This merge proposal adds a patch to CMake to replace bundled libwebm with the system one. It depends on https://code.launchpad.net/~vpa1977/ubuntu/+source/libwebm/+git/libwebm/+merge/436986

There should be no functional changes in the package.

PPA: ppa:vpa1977/libheif

Testing:
 - autopackage tests should pass:
Download image:
$ autopkgtest-buildvm-ubuntu-cloud -v -r lunar --post-command "apt install bzip2 dpkg-dev libdpkg-perl lto-disabled-list make"
....
$ autopkgtest -U -s --setup-commands="sudo add-apt-repository -y -u -s ppa:vpa1977/libheif" -B aom -- qemu autopkgtest-lunar-amd64.img
....
autopkgtest [16:09:31]: @@@@@@@@@@@@@@@@@@@@ summary
encode-decode PASS
library-build PASS

Unmerged commits

1a42648... by Vladimir Petko on 2023-02-08

changelog

96c87ce... by Vladimir Petko on 2023-02-08

add patch description

c556b45... by Vladimir Petko on 2023-02-08

add libwebm-dev dependency

51aeee9... by Vladimir Petko on 2023-02-08

use system libwebm

diff --git a/debian/changelog b/debian/changelog
index 52e6af9..1226193 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aom (3.5.0-1ubuntu1) lunar; urgency=medium
+
+  * debian/patches/0003-use-system-libwebm.patch, debian/rules: Use system
+    libwebm instead of the bundled one.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 08 Feb 2023 14:30:01 +1300
+
 aom (3.5.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1f48b62..6bb2851 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  cmake (>= 3.6),
  debhelper-compat (= 13),
  libyuv-dev,
+ libwebm-dev,
  yasm [any-amd64 any-i386],
 Build-Depends-Indep:
  doxygen,
diff --git a/debian/patches/0003-use-system-libwebm.patch b/debian/patches/0003-use-system-libwebm.patch
 new file mode 100644
index 0000000..99dc8f6
--- /dev/null
+++ b/debian/patches/0003-use-system-libwebm.patch
@@ -0,0 +1,81 @@
+Description: Use system libwebm library instead of the bundled one
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -735,26 +735,29 @@
+   endif()
+ 
+   if(CONFIG_WEBM_IO)
+-    add_library(webm OBJECT ${AOM_LIBWEBM_SOURCES})
+-    include_directories("${AOM_ROOT}/third_party/libwebm")
+-    target_compile_definitions(webm PRIVATE __STDC_CONSTANT_MACROS)
+-    target_compile_definitions(webm PRIVATE __STDC_LIMIT_MACROS)
+-
+-    if(NOT MSVC)
+-      target_compile_options(webm PRIVATE -Wno-shadow)
++    target_link_libraries(aom ${AOM_LIB_LINK_TYPE} webm)
++    target_include_directories(aom PRIVATE /usr/include/webm)
++    if(BUILD_SHARED_LIBS)
++      target_link_libraries(aom_static ${AOM_LIB_LINK_TYPE} webm)
++      target_include_directories(aom_static PRIVATE /usr/include/webm)
+     endif()
+ 
+     # Add to existing targets.
+     if(CONFIG_AV1_DECODER)
++      target_link_libraries(aom_decoder_app_util ${AOM_LIB_LINK_TYPE} webm)
++      target_include_directories(aom_decoder_app_util PRIVATE /usr/include/webm)
+       target_sources(aom_decoder_app_util PRIVATE ${AOM_WEBM_DECODER_SOURCES})
+     endif()
+ 
+     if(CONFIG_AV1_ENCODER)
++      target_link_libraries(aom_encoder_app_util ${AOM_LIB_LINK_TYPE} webm)
++      target_include_directories(aom_encoder_app_util PRIVATE /usr/include/webm)
+       target_sources(aom_encoder_app_util PRIVATE ${AOM_WEBM_ENCODER_SOURCES})
+     endif()
+ 
+     foreach(aom_app ${AOM_APP_TARGETS})
+-      target_sources(${aom_app} PRIVATE $<TARGET_OBJECTS:webm>)
++      target_include_directories(${aom_app} PRIVATE /usr/include/webm)
++      target_link_libraries(${aom_app} PRIVATE webm)
+       set_property(TARGET ${aom_app} PROPERTY LINKER_LANGUAGE CXX)
+     endforeach()
+   endif()
+--- a/common/webmdec.cc
++++ b/common/webmdec.cc
+@@ -15,8 +15,8 @@
+ #include <cstring>
+ #include <cstdio>
+ 
+-#include "third_party/libwebm/mkvparser/mkvparser.h"
+-#include "third_party/libwebm/mkvparser/mkvreader.h"
++#include <mkvparser/mkvparser.h>
++#include <mkvparser/mkvreader.h>
+ 
+ namespace {
+ 
+--- a/common/webmenc.cc
++++ b/common/webmenc.cc
+@@ -19,9 +19,9 @@
+ #include <string>
+ 
+ #include "common/av1_config.h"
+-#include "third_party/libwebm/mkvmuxer/mkvmuxer.h"
+-#include "third_party/libwebm/mkvmuxer/mkvmuxerutil.h"
+-#include "third_party/libwebm/mkvmuxer/mkvwriter.h"
++#include <mkvmuxer/mkvmuxer.h>
++#include <mkvmuxer/mkvmuxerutil.h>
++#include <mkvmuxer/mkvwriter.h>
+ 
+ namespace {
+ const uint64_t kDebugTrackUid = 0xDEADBEEF;
+--- a/test/test.cmake
++++ b/test/test.cmake
+@@ -467,7 +467,8 @@
+ #    target_sources(test_libaom PRIVATE $<TARGET_OBJECTS:yuv>)
+ #  endif()
+   if(CONFIG_WEBM_IO)
+-    target_sources(test_libaom PRIVATE $<TARGET_OBJECTS:webm>)
++    target_link_libraries(test_libaom ${AOM_LIB_LINK_TYPE} webm)
++    target_include_directories(test_libaom PRIVATE ${CMAKE_INCLUDE_PATH}/webm)
+   endif()
+   if(HAVE_SSE2)
+     add_intrinsics_source_to_target("-msse2" "test_libaom"
diff --git a/debian/patches/series b/debian/patches/series
index 464179c..f3424a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-doc-Use-libjs-mathjax-rather-than-cloudflare-copy.patch
 0002-use-system-libyuv.patch
+0003-use-system-libwebm.patch
diff --git a/debian/rules b/debian/rules
index 450c322..7d48528 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ endif
 # Force building with system libyuv
 execute_before_dh_auto_configure:
 	rm -rf $(CURDIR)/third_party/libyuv
+	rm -rf $(CURDIR)/third_party/libwebm
 
 # Examples and tools not built because they require various private
 #  symbols from libaom.so which we filter out.