summarylogtreecommitdiffstats
path: root/cmake_install.patch
diff options
context:
space:
mode:
authorMichael Hansen2021-12-27 15:39:59 -0800
committerMichael Hansen2021-12-27 15:39:59 -0800
commit6d964b9ed6c2603fea9fadf4532dfd59cd3f1985 (patch)
tree84f842fbc36c73978ea527092e291e12deb050ba /cmake_install.patch
parent2cfc1c403fbbf6632f371c0085dea765221c2957 (diff)
downloadaur-6d964b9ed6c2603fea9fadf4532dfd59cd3f1985.tar.gz
Update to 1.0.0.28
Diffstat (limited to 'cmake_install.patch')
-rw-r--r--cmake_install.patch70
1 files changed, 42 insertions, 28 deletions
diff --git a/cmake_install.patch b/cmake_install.patch
index d183e3b12119..e768e9362a31 100644
--- a/cmake_install.patch
+++ b/cmake_install.patch
@@ -1,33 +1,47 @@
diff -rupN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2021-03-05 09:48:21.956029900 -0800
-+++ b/CMakeLists.txt 2021-03-05 09:50:02.526984700 -0800
-@@ -12,7 +12,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/bui
- set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+--- a/CMakeLists.txt 2021-04-23 16:34:08.000000000 -0700
++++ b/CMakeLists.txt 2021-12-27 15:34:25.764905166 -0800
+@@ -330,6 +330,43 @@ add_library(webm ${libwebm_common_source
+ $<TARGET_OBJECTS:mkvmuxer>
+ $<TARGET_OBJECTS:mkvparser>)
- # Libwebm section.
--add_library(webm STATIC
-+add_library(webm
- "${LIBWEBM_SRC_DIR}/mkvmuxer.cpp"
- "${LIBWEBM_SRC_DIR}/mkvmuxer.hpp"
- "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"
-@@ -62,3 +62,20 @@ add_executable(webm2pes
- "${LIBWEBM_SRC_DIR}/webm2pes.cc"
- "${LIBWEBM_SRC_DIR}/webm2pes.h")
- target_link_libraries(webm2pes LINK_PUBLIC webm)
-+
-+install(TARGETS webm
-+ RUNTIME DESTINATION bin
-+ ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib)
-+
+install(
+ FILES
-+ "mkvmuxer.hpp"
-+ "mkvmuxertypes.hpp"
-+ "mkvmuxerutil.hpp"
-+ "mkvparser.hpp"
-+ "mkvreader.hpp"
-+ "mkvwriter.hpp"
-+ "webmids.hpp"
++ mkvmuxer.hpp
++ mkvmuxertypes.hpp
++ mkvmuxerutil.hpp
++ mkvparser.hpp
++ mkvreader.hpp
++ mkvwriter.hpp
++ webmids.hpp
+ DESTINATION
-+ "include/libwebm")
++ include/libwebm
++)
++
++install(
++ DIRECTORY mkvmuxer/
++ DESTINATION include/libwebm/mkvmuxer
++ FILES_MATCHING PATTERN "*.h"
++)
++
++install(
++ DIRECTORY mkvparser/
++ DESTINATION include/libwebm/mkvparser
++ FILES_MATCHING PATTERN "*.h"
++)
++
++install(
++ DIRECTORY webvtt/
++ DESTINATION include/libwebm/webvtt
++ FILES_MATCHING PATTERN "*.h"
++)
++
++install(
++ DIRECTORY common/
++ DESTINATION include/libwebm/common
++ FILES_MATCHING PATTERN "*.h"
++)
++
+ if (WIN32)
+ # Use libwebm and libwebm.lib for project and library name on Windows (instead
+ # webm and webm.lib).