Merge ~vpa1977/ubuntu/+source/libwebm:LP2004442-add-headers into ubuntu/+source/libwebm:ubuntu/devel

[Vladimir Petko]

In order to switch aom package to building with system libwebm,
additional headers need to be published.

The change adds
    - /usr/include/webm/common/webmids.h
    - /usr/include/webm/mkvparser/mkvparser.h
    - /usr/include/webm/mkvparser/mkvreader.h
    - /usr/include/webm/mkvmuxer/mkvmuxer.h
    - /usr/include/webm/mkvmuxer/mkvmuxertypes.h
    - /usr/include/webm/mkvmuxer/mkvuxerutil.h
    - /usr/include/webm/mkvmuxer/mkvmuxerutil.h

needed to build aom package.

PPA: ppa:vpa1977/libheif

Testing:
 - Install package. Headers listed above should be included:

# add-apt-repository ppa:vpa1977/libheif
...
# apt install libwebm-dev
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following additional packages will be installed:
  libwebm1
The following NEW packages will be installed:
  libwebm-dev libwebm1
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
Need to get 237 kB of archives.
After this operation, 938 kB of additional disk space will be used.
Do you want to continue? [Y/n] Y
Get:1 https://ppa.launchpadcontent.net/vpa1977/libheif/ubuntu lunar/main amd64 libwebm1 amd64 1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1 [197 kB]
Get:2 https://ppa.launchpadcontent.net/vpa1977/libheif/ubuntu lunar/main amd64 libwebm-dev amd64 1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1 [39.6 kB]
Fetched 237 kB in 3s (69.0 kB/s)
perl: warning: Setting locale failed.
perl: warning: Please check that your locale settings:
 LANGUAGE = "en_NZ:en",
 LC_ALL = (unset),
 LANG = "en_NZ.UTF-8"
    are supported and installed on your system.
perl: warning: Falling back to the standard locale ("C").
Selecting previously unselected package libwebm1:amd64.
(Reading database ... 15249 files and directories currently installed.)
Preparing to unpack .../libwebm1_1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1_amd64.deb ...
Unpacking libwebm1:amd64 (1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1) ...
Selecting previously unselected package libwebm-dev:amd64.
Preparing to unpack .../libwebm-dev_1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1_amd64.deb ...
Unpacking libwebm-dev:amd64 (1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1) ...
Setting up libwebm1:amd64 (1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1) ...
Setting up libwebm-dev:amd64 (1.0.0.29-1ubuntu1~20230208-202302080121~ubuntu23.04.1) ...
Processing triggers for libc-bin (2.36-0ubuntu4) ...

# find /usr/include/webm/
/usr/include/webm/
/usr/include/webm/callback.h
/usr/include/webm/webm_parser.h
/usr/include/webm/mkvparser
/usr/include/webm/mkvparser/mkvreader.h
/usr/include/webm/mkvparser/mkvparser.h
/usr/include/webm/dom_types.h
/usr/include/webm/istream_reader.h
/usr/include/webm/element.h
/usr/include/webm/id.h
/usr/include/webm/file_reader.h
/usr/include/webm/common
/usr/include/webm/common/webmids.h
/usr/include/webm/status.h
/usr/include/webm/mkvmuxer
/usr/include/webm/mkvmuxer/mkvmuxer.h
/usr/include/webm/mkvmuxer/mkvmuxertypes.h
/usr/include/webm/mkvmuxer/mkvmuxerutil.h
/usr/include/webm/mkvmuxer/mkvwriter.h
/usr/include/webm/buffer_reader.h
/usr/include/webm/reader.h

#

[Vladimir Petko (vpa1977)]

Notes:
 - vcpkg exports this set of headers:
https://github.com/microsoft/vcpkg/commit/b11941140ce64dd4ccefec44fed6a7719ba3aaf5

I will check in webm mailing list if they have
any guarantees of the API/ABI compatibility.

Unmerged commits

209421d... by Vladimir Petko on 2023-02-08

changelog

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

control

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

add additional public headers to libwebm library

diff --git a/debian/changelog b/debian/changelog
index fa4019e..da37b5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libwebm (1.0.0.29-1ubuntu1) lunar; urgency=medium
+
+  * debian/patches/0004-add-public-headers.patch: Add additional public headers
+    for aom build
+
+ -- Vladimir Petko <[e-mail]>  Wed, 08 Feb 2023 13:53:37 +1300
+
 libwebm (1.0.0.29-1) unstable; urgency=medium
 
   * New upstream version 1.0.0.29
diff --git a/debian/control b/debian/control
index 98fde10..1b16049 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libwebm
 Priority: optional
 Section: libs
-Maintainer: Debian Multimedia Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <[e-mail]>
 Uploaders: Vasyl Gello <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
  cmake,
diff --git a/debian/patches/0004-add-public-headers.patch b/debian/patches/0004-add-public-headers.patch
new file mode 100644
index 0000000..c6f33b7
--- /dev/null
+++ b/debian/patches/0004-add-public-headers.patch
@@ -0,0 +1,77 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,15 +67,23 @@
+     "${LIBWEBM_SRC_DIR}/common/hdr_util.h"
+     "${LIBWEBM_SRC_DIR}/common/webmids.h")
+ 
+-set(mkvmuxer_sources
+-    "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.cc"
++set(webmid_public_headers
++    "${LIBWEBM_SRC_DIR}/common/webmids.h"
++)
++set(mkvmuxer_public_headers
+     "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.h"
+     "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxertypes.h"
+-    "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.cc"
+     "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.h"
+-    "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cc"
+     "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.h"
+-    "${LIBWEBM_SRC_DIR}/common/webmids.h")
++)
++
++set(mkvmuxer_sources
++    ${webmid_public_headers}
++    ${mkvmuxer_public_headers}
++    "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.cc"
++    "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.cc"
++    "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cc"
++)
+ 
+ set(mkvmuxer_sample_sources
+     "${LIBWEBM_SRC_DIR}/mkvmuxer_sample.cc"
+@@ -87,12 +95,17 @@
+     "${LIBWEBM_SRC_DIR}/testing/test_util.cc"
+     "${LIBWEBM_SRC_DIR}/testing/test_util.h")
+ 
++set(mkvparser_public_headers
++    "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.h"
++    "${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.h"
++)
++
+ set(mkvparser_sources
++    ${mkvparser_public_headers}
++    ${webmid_public_headers}
+     "${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.cc"
+-    "${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.h"
+     "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cc"
+-    "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.h"
+-    "${LIBWEBM_SRC_DIR}/common/webmids.h")
++)
+ 
+ set(mkvparser_sample_sources "${LIBWEBM_SRC_DIR}/mkvparser_sample.cc")
+ set(mkvparser_tests_sources
+@@ -323,7 +336,24 @@
+ 
+ # Targets.
+ add_library(mkvmuxer OBJECT ${mkvmuxer_sources})
++set_target_properties(mkvmuxer PROPERTIES PUBLIC_HEADER
++                                          "${mkvmuxer_public_headers}")
++install(TARGETS mkvmuxer
++  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/mkvmuxer)
++
++add_library(webmid_common INTERFACE)
++set_target_properties(webmid_common PROPERTIES PUBLIC_HEADER
++                                          "${webmid_public_headers}")
++install(TARGETS webmid_common
++  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/common)
++
++
+ add_library(mkvparser OBJECT ${mkvparser_sources})
++set_target_properties(mkvparser PROPERTIES PUBLIC_HEADER
++                                          "${mkvparser_public_headers}")
++install(TARGETS mkvparser
++  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/mkvparser)
++
+ add_library(webvtt_common OBJECT ${webvtt_common_sources})
+ 
+ add_library(webm ${libwebm_common_sources}
diff --git a/debian/patches/series b/debian/patches/series
index a6e1979..e251fca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-system-googletest.patch
 0002-Build-install-libwebm-tools.patch
 0003-Provide-SOVERSION.patch
+0004-add-public-headers.patch