Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bcmatroska2 for openSUSE:Factory checked in at 2024-03-28 13:55:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bcmatroska2 (Old)
and /work/SRC/openSUSE:Factory/.bcmatroska2.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcmatroska2"
Thu Mar 28 13:55:28 2024 rev:7 rq:1163270 version:5.3.26
Changes:
--------
--- /work/SRC/openSUSE:Factory/bcmatroska2/bcmatroska2.changes 2023-01-04 17:53:45.294589076 +0100
+++ /work/SRC/openSUSE:Factory/.bcmatroska2.new.1905/bcmatroska2.changes 2024-03-28 14:31:58.864395652 +0100
@@ -1,0 +2,7 @@
+Wed Mar 27 08:44:43 UTC 2024 - Paolo Stivanin <info(a)paolostivanin.com>
+
+- Update to 5.3.26 (no changelog).
+- Drop remove-file.patch
+- Drop fix-libmatroska-cmake.patch
+
+-------------------------------------------------------------------
Old:
----
bcmatroska2-5.2.1.tar.bz2
fix-libmatroska-cmake.patch
remove-file.patch
New:
----
bcmatroska2-5.3.26.tar.bz2
BETA DEBUG BEGIN:
Old:- Drop remove-file.patch
- Drop fix-libmatroska-cmake.patch
Old:- Update to 5.3.26 (no changelog).
- Drop remove-file.patch
- Drop fix-libmatroska-cmake.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bcmatroska2.spec ++++++
--- /var/tmp/diff_new_pack.yAv4jD/_old 2024-03-28 14:32:10.240814014 +0100
+++ /var/tmp/diff_new_pack.yAv4jD/_new 2024-03-28 14:32:10.240814014 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bcmatroska2
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define sover 0
Name: bcmatroska2
-Version: 5.2.1
+Version: 5.3.26
Release: 0
Summary: C Library to Deal with Matroska Files
License: BSD-3-Clause AND Zlib AND GPL-2.0-or-later
@@ -28,11 +28,9 @@
Source1: baselibs.conf
Patch0: bcmatroska2-include-subdir.patch
Patch1: fix-cmakelist-version.patch
-Patch2: remove-file.patch
-Patch3: fix-libmatroska-cmake.patch
BuildRequires: chrpath
BuildRequires: cmake
-BuildRequires: pkgconfig(bctoolbox) >= 5.2.0
+BuildRequires: pkgconfig(bctoolbox) >= 5.3.20
%description
Bcmatroska2 is a C library to parse Matroska files (.mkv and .mka).
@@ -78,13 +76,15 @@
%files devel
%dir %{_includedir}/%{name}
%dir %{_includedir}/%{name}/corec
+%dir %{_includedir}/corec
%dir %{_includedir}/%{name}/ebml
%dir %{_includedir}/%{name}/matroska
%{_includedir}/%{name}/corec/*
+%{_includedir}/corec/*bcmatroska2_config.h
%{_includedir}/%{name}/ebml/*
%{_includedir}/%{name}/matroska/*
%{_libdir}/libbcmatroska2.so
-%dir %{_datadir}/bcmatroska2
-%dir %{_datadir}/bcmatroska2/cmake
-%{_datadir}/bcmatroska2/cmake/*
+%dir %{_datadir}/BCMatroska2
+%dir %{_datadir}/BCMatroska2/cmake
+%{_datadir}/BCMatroska2/cmake/*
++++++ bcmatroska2-5.2.1.tar.bz2 -> bcmatroska2-5.3.26.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/BCMatroska2Config.cmake.in new/bcmatroska2-5.3.26/BCMatroska2Config.cmake.in
--- old/bcmatroska2-5.2.1/BCMatroska2Config.cmake.in 1970-01-01 01:00:00.000000000 +0100
+++ new/bcmatroska2-5.3.26/BCMatroska2Config.cmake.in 2024-01-22 18:00:54.000000000 +0100
@@ -0,0 +1,51 @@
+############################################################################
+# BCMatroska2Config.cmake
+# Copyright (C) 2015-2023 Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+############################################################################
+#
+# Config file for the bcmatroska2 package.
+#
+# Targets
+# ^^^^^^^
+#
+# The following targets are defined:
+# bcmatroska2 - The bcmatroska2 library target
+#
+#
+# Result variables
+# ^^^^^^^^^^^^^^^^
+#
+# This config file will set the following variables in your project:
+#
+# BCMatroska2_FOUND - The bcmatroska2 library has been found
+# BCMatroska2_TARGET - The name of the CMake target for the bcmatroska2 library
+
+
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/BCMatroska2Targets.cmake")
+
+set(BCMatroska2_TARGET bcmatroska2)
+
+# We must propagate the public dependencies and the private dependencies for static build
+include(CMakeFindDependencyMacro)
+find_dependency(BCToolbox)
+
+check_required_components(BCMatroska2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/BcMatroska2Config.cmake.in new/bcmatroska2-5.3.26/BcMatroska2Config.cmake.in
--- old/bcmatroska2-5.2.1/BcMatroska2Config.cmake.in 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/BcMatroska2Config.cmake.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-############################################################################
-# BcMatroska2Config.cmake
-# Copyright (C) 2015 Belledonne Communications, Grenoble France
-#
-############################################################################
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-############################################################################
-#
-# Config file for the Matroska2 package.
-# It defines the following variables:
-#
-# BCMATROSKA2_FOUND - system has BcMatroska2
-# BCMATROSKA2_INCLUDE_DIRS - the BcMatroska2 include directory
-# BCMATROSKA2_LIBRARIES - The libraries needed to use BcMatroska2
-
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/BcMatroska2Targets.cmake")
-
-set(BCMATROSKA2_TARGETNAME "bcmatroska2")
-
-if(@ENABLE_SHARED@)
- set(BCMATROSKA2_LIBRARIES "${BCMATROSKA2_TARGETNAME}")
-else()
- get_target_property(BCMATROSKA2_LIBRARIES ${BCMATROSKA2_TARGETNAME} LOCATION)
-endif()
-
-set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-
-set(BCMATROSKA2_FOUND 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/CMakeLists.txt new/bcmatroska2-5.3.26/CMakeLists.txt
--- old/bcmatroska2-5.2.1/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/CMakeLists.txt 2024-01-22 18:00:54.000000000 +0100
@@ -1,6 +1,6 @@
############################################################################
# CMakeLists.txt
-# Copyright (C) 2016-2018 Belledonne Communications, Grenoble France
+# Copyright (C) 2016-2023 Belledonne Communications, Grenoble France
#
############################################################################
#
@@ -22,18 +22,16 @@
cmake_minimum_required(VERSION 3.1)
-project(bcmatroska2
+project(BCMatroska2
VERSION 0.23
LANGUAGES C
)
-option(ENABLE_SHARED "Build shared library." YES)
-option(ENABLE_STATIC "Build static library." YES)
option(CONFIG_EBML_WRITING "Enable EBML file writing support" ON)
option(CONFIG_EBML_UNICODE "Enable Unicode support" ON)
option(CONFIG_DEBUGCHECKS "Enable internal checks" ON)
option(CONFIG_STDIO "Use stdio.h for writing" ON)
-option(CONFIG_FILEPOS_64 "Encode filepos_t on 64bits" ON)
+#option(CONFIG_FILEPOS_64 "Encode filepos_t on 64bits" ON)
option(CONFIG_DEBUG_LEAKS "Enable internal menory leaks checking support" OFF)
include(GNUInstallDirs)
@@ -43,12 +41,16 @@
message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}")
endif()
-configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+set(CONFIG_64BITS_SYSTEM 1)
+endif()
+
+configure_file(config.h.cmake ${PROJECT_BINARY_DIR}/bcmatroska2_config.h)
-find_package(bctoolbox REQUIRED CONFIG)
+find_package(BCToolbox 5.3.0 REQUIRED)
include_directories(
- ${CMAKE_BINARY_DIR}
+ ${PROJECT_BINARY_DIR}
corec
)
@@ -62,10 +64,10 @@
string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}")
if(WIN32)
- add_definitions(
- "-DEBML2_EXPORTS"
- "-DMATROSKA2_EXPORTS"
- "-DSTR_EXPORTS"
+ add_compile_definitions(
+ "EBML2_EXPORTS"
+ "MATROSKA2_EXPORTS"
+ "STR_EXPORTS"
)
endif()
add_compile_options(-w)
@@ -74,37 +76,29 @@
add_subdirectory(libebml2)
add_subdirectory(libmatroska2)
-install(FILES ${CMAKE_BINARY_DIR}/config.h
+install(FILES ${PROJECT_BINARY_DIR}/bcmatroska2_config.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec
)
-include(CMakePackageConfigHelpers)
-set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
-
-write_basic_package_version_file(
- ${CMAKE_BINARY_DIR}/BcMatroska2ConfigVersion.cmake
- VERSION ${MATROSKA2_VERSION}
- COMPATIBILITY AnyNewerVersion
-)
-
-export(EXPORT BcMatroska2Targets
- FILE "${CMAKE_CURRENT_BINARY_DIR}/BcMatroska2Targets.cmake"
-)
+add_subdirectory(build)
-configure_package_config_file(BcMatroska2Config.cmake.in
- "${CMAKE_CURRENT_BINARY_DIR}/BcMatroska2Config.cmake"
- INSTALL_DESTINATION ${CONFIG_PACKAGE_LOCATION}
+include(CMakePackageConfigHelpers)
+set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
+configure_package_config_file("${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}"
NO_SET_AND_CHECK_MACRO
)
-
-install(EXPORT BcMatroska2Targets
- FILE BcMatroska2Targets.cmake
- DESTINATION ${CONFIG_PACKAGE_LOCATION}
+write_basic_package_version_file("${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+ VERSION ${PROJECT_VERSION}
+ COMPATIBILITY AnyNewerVersion
)
install(FILES
- ${CMAKE_BINARY_DIR}/BcMatroska2ConfigVersion.cmake
- ${CMAKE_BINARY_DIR}/BcMatroska2Config.cmake
- DESTINATION ${CONFIG_PACKAGE_LOCATION}
+ "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+ DESTINATION ${CMAKE_MODULES_INSTALL_DIR}
)
-add_subdirectory(build)
+install(EXPORT ${PROJECT_NAME}Targets
+ FILE "${PROJECT_NAME}Targets.cmake"
+ DESTINATION ${CMAKE_MODULES_INSTALL_DIR}
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/build/CMakeLists.txt new/bcmatroska2-5.3.26/build/CMakeLists.txt
--- old/bcmatroska2-5.2.1/build/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/build/CMakeLists.txt 2024-01-22 18:00:54.000000000 +0100
@@ -1,6 +1,6 @@
############################################################################
# CMakeLists.txt
-# Copyright (C) 2018 Belledonne Communications, Grenoble France
+# Copyright (C) 2018-2023 Belledonne Communications, Grenoble France
#
############################################################################
#
@@ -21,7 +21,8 @@
############################################################################
if(NOT CPACK_PACKAGE_NAME)
- set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+ string(TOLOWER "${PROJECT_NAME}" LOWERCASE_PROJECT_NAME)
+ set(CPACK_PACKAGE_NAME "${LOWERCASE_PROJECT_NAME}")
ENDIF()
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/config.h.cmake new/bcmatroska2-5.3.26/config.h.cmake
--- old/bcmatroska2-5.2.1/config.h.cmake 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/config.h.cmake 2024-01-22 18:00:54.000000000 +0100
@@ -2,5 +2,12 @@
#cmakedefine CONFIG_EBML_UNICODE
#cmakedefine CONFIG_DEBUGCHECKS
#cmakedefine CONFIG_STDIO
-#cmakedefine CONFIG_FILEPOS_64
#cmakedefine CONFIG_DEBUG_LEAKS
+
+
+#cmakedefine CONFIG_64BITS_SYSTEM
+
+#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || defined(CONFIG_64BITS_SYSTEM)
+/* Use CONFIG_FILEPOS_64 only on 64 bits systems or 32 bits systems that have _FILE_OFFSET_BITS set to 64. */
+#define CONFIG_FILEPOS_64 1
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/corec/corec/CMakeLists.txt new/bcmatroska2-5.3.26/corec/corec/CMakeLists.txt
--- old/bcmatroska2-5.2.1/corec/corec/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/corec/corec/CMakeLists.txt 2024-01-22 18:00:54.000000000 +0100
@@ -52,7 +52,6 @@
else()
list(APPEND COREC_SOURCES
helpers/date/date_libc.c
- helpers/file/file_libc.c
helpers/file/file_bctbx.c
multithread/multithread_pthread.c
)
@@ -90,9 +89,9 @@
)
endif()
-add_library(corec-objects OBJECT ${COREC_SOURCES})
-set_target_properties(corec-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-target_include_directories(corec-objects PRIVATE
+add_library(bcmatroska2-corec-objects OBJECT ${COREC_SOURCES})
+set_target_properties(bcmatroska2-corec-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+target_include_directories(bcmatroska2-corec-objects PRIVATE
$<TARGET_PROPERTY:bctoolbox,INTERFACE_INCLUDE_DIRECTORIES>)
install(FILES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/corec/corec/confhelper.h new/bcmatroska2-5.3.26/corec/corec/confhelper.h
--- old/bcmatroska2-5.2.1/corec/corec/confhelper.h 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/corec/corec/confhelper.h 2024-01-22 18:00:54.000000000 +0100
@@ -55,7 +55,7 @@
#define CONFIG_UNALIGNED_ACCESS /* pointers can use unaligned memory */
#endif
-#if defined(TARGET_WIN32) || defined(TARGET_WIN64) || defined(TARGET_WINCE) || defined(TARGET_OSX) || defined(TARGET_LINUX)
+#if (!defined(CONFIG_FILEPOS_64)) && ( defined(TARGET_WIN32) || defined(TARGET_WIN64) || defined(TARGET_WINCE) || defined(TARGET_OSX) || defined(TARGET_LINUX))
#define CONFIG_FILEPOS_64 /* platforms where 64 bits file position/size should be favoured */
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/corec/corec/helpers/file/file_bctbx.c new/bcmatroska2-5.3.26/corec/corec/helpers/file/file_bctbx.c
--- old/bcmatroska2-5.2.1/corec/corec/helpers/file/file_bctbx.c 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/corec/corec/helpers/file/file_bctbx.c 2024-01-22 18:00:54.000000000 +0100
@@ -27,7 +27,7 @@
*
****************************************************************************/
-#include "config.h"
+#include "bcmatroska2_config.h"
#ifdef CONFIG_FILEPOS_64
#define __USE_FILE_OFFSET64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/corec/corec/helpers/file/file_libc.c new/bcmatroska2-5.3.26/corec/corec/helpers/file/file_libc.c
--- old/bcmatroska2-5.2.1/corec/corec/helpers/file/file_libc.c 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/corec/corec/helpers/file/file_libc.c 2024-01-22 18:00:54.000000000 +0100
@@ -27,7 +27,7 @@
*
****************************************************************************/
-#include "config.h"
+#include "bcmatroska2_config.h"
#ifdef CONFIG_FILEPOS_64
#define __USE_FILE_OFFSET64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/corec/corec/portab.h new/bcmatroska2-5.3.26/corec/corec/portab.h
--- old/bcmatroska2-5.2.1/corec/corec/portab.h 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/corec/corec/portab.h 2024-01-22 18:00:54.000000000 +0100
@@ -769,7 +769,7 @@
#define UNUSED_PARAM(x) (x)
#endif
-#include "config.h"
+#include "bcmatroska2_config.h"
#if defined(COREMAKE_CONFIG_HELPER)
#include "config_helper.h"
#else /* COREMAKE_CONFIG_HELPER */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/libebml2/CMakeLists.txt new/bcmatroska2-5.3.26/libebml2/CMakeLists.txt
--- old/bcmatroska2-5.2.1/libebml2/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/libebml2/CMakeLists.txt 2024-01-22 18:00:54.000000000 +0100
@@ -20,7 +20,7 @@
#
############################################################################
-add_library(ebml2-objects OBJECT
+add_library(bcmatroska2-ebml-objects OBJECT
ebmlmain.c
ebmlelement.c
ebmlmaster.c
@@ -31,7 +31,7 @@
ebmldate.c
ebmlvoid.c
)
-set_target_properties(ebml2-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+set_target_properties(bcmatroska2-ebml-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
install(DIRECTORY ebml
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt new/bcmatroska2-5.3.26/libmatroska2/CMakeLists.txt
--- old/bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt 2022-11-29 11:25:07.000000000 +0100
+++ new/bcmatroska2-5.3.26/libmatroska2/CMakeLists.txt 2024-01-22 18:00:54.000000000 +0100
@@ -1,6 +1,6 @@
############################################################################
# CMakeLists.txt
-# Copyright (C) 2016 Belledonne Communications, Grenoble France
+# Copyright (C) 2016-2023 Belledonne Communications, Grenoble France
#
############################################################################
#
@@ -32,49 +32,44 @@
endif()
string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}")
-if(ENABLE_STATIC)
- add_library(bcmatroska2 STATIC $<TARGET_OBJECTS:corec-objects> $<TARGET_OBJECTS:ebml2-objects> ${MATROSKA2_SOURCE_FILES})
- set_target_properties(bcmatroska2 PROPERTIES OUTPUT_NAME bcmatroska2)
- set_target_properties(bcmatroska2 PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- if(NOT "${LINK_FLAGS_STR}" STREQUAL "")
- set_target_properties(bcmatroska2 PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
- endif()
- target_include_directories(bcmatroska2 PRIVATE ../libebml2 .)
- if(LIBS)
- target_link_libraries(bcmatroska2 ${LIBS})
- endif()
- install(TARGETS bcmatroska2 EXPORT BcMatroska2Targets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
+add_library(bcmatroska2 $<TARGET_OBJECTS:bcmatroska2-corec-objects> $<TARGET_OBJECTS:bcmatroska2-ebml-objects> ${MATROSKA2_SOURCE_FILES})
+set_target_properties(bcmatroska2 PROPERTIES VERSION 0.0.0 SOVERSION 0)
+set_target_properties(bcmatroska2 PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+if(NOT "${LINK_FLAGS_STR}" STREQUAL "")
+ set_target_properties(bcmatroska2 PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
endif()
-if(ENABLE_SHARED)
- add_library(bcmatroska2 SHARED $<TARGET_OBJECTS:corec-objects> $<TARGET_OBJECTS:ebml2-objects> ${MATROSKA2_SOURCE_FILES})
- set_target_properties(bcmatroska2 PROPERTIES VERSION 0.0.0 SOVERSION 0)
- set_target_properties(bcmatroska2 PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- if(NOT "${LINK_FLAGS_STR}" STREQUAL "")
- set_target_properties(bcmatroska2 PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
- endif()
- target_include_directories(bcmatroska2 PRIVATE ../libebml2 .)
- if(LIBS)
- target_link_libraries(bcmatroska2 ${LIBS})
- endif()
- if(MSVC)
- if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- install(FILES $<TARGET_PDB_FILE:bcmatroska2>
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
- endif()
+target_include_directories(bcmatroska2 PRIVATE ../libebml2 .)
+target_include_directories(bcmatroska2 INTERFACE
+ $<INSTALL_INTERFACE:include/>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/libmatroska2>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/libebml2>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/corec>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/corec/tools/coremake>
+ $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
+ PRIVATE ../libebml2 .
+)
+target_link_libraries(bcmatroska2 PUBLIC ${BCToolbox_TARGET})
+if(LIBS)
+ target_link_libraries(bcmatroska2 PRIVATE ${LIBS})
+endif()
+
+if(MSVC AND BUILD_SHARED_LIBS)
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+ install(FILES $<TARGET_PDB_FILE:bcmatroska2>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
endif()
- install(TARGETS bcmatroska2 EXPORT BcMatroska2Targets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
endif()
+install(TARGETS bcmatroska2 EXPORT ${PROJECT_NAME}Targets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
+
install(DIRECTORY matroska
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
++++++ bcmatroska2-include-subdir.patch ++++++
--- /var/tmp/diff_new_pack.yAv4jD/_old 2024-03-28 14:32:10.744832549 +0100
+++ /var/tmp/diff_new_pack.yAv4jD/_new 2024-03-28 14:32:10.748832696 +0100
@@ -1,33 +1,8 @@
-Index: bcmatroska2-5.2.1/BcMatroska2Config.cmake.in
+Index: bcmatroska2-5.3.26/corec/corec/CMakeLists.txt
===================================================================
---- bcmatroska2-5.2.1.orig/BcMatroska2Config.cmake.in
-+++ bcmatroska2-5.2.1/BcMatroska2Config.cmake.in
-@@ -39,6 +39,6 @@ else()
- get_target_property(BCMATROSKA2_LIBRARIES ${BCMATROSKA2_TARGETNAME} LOCATION)
- endif()
-
--set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-+set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@/bcmatroska2")
-
- set(BCMATROSKA2_FOUND 1)
-Index: bcmatroska2-5.2.1/CMakeLists.txt
-===================================================================
---- bcmatroska2-5.2.1.orig/CMakeLists.txt
-+++ bcmatroska2-5.2.1/CMakeLists.txt
-@@ -75,7 +75,7 @@ add_subdirectory(libebml2)
- add_subdirectory(libmatroska2)
-
- install(FILES ${CMAKE_BINARY_DIR}/config.h
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec
- )
-
- include(CMakePackageConfigHelpers)
-Index: bcmatroska2-5.2.1/corec/corec/CMakeLists.txt
-===================================================================
---- bcmatroska2-5.2.1.orig/corec/corec/CMakeLists.txt
-+++ bcmatroska2-5.2.1/corec/corec/CMakeLists.txt
-@@ -104,18 +104,18 @@ install(FILES
+--- bcmatroska2-5.3.26.orig/corec/corec/CMakeLists.txt
++++ bcmatroska2-5.3.26/corec/corec/CMakeLists.txt
+@@ -103,18 +103,18 @@ install(FILES
memalloc.h
memheap.h
portab.h
@@ -52,7 +27,7 @@
install(FILES
helpers/parser/buffer.h
helpers/parser/dataheap.h
-@@ -125,16 +125,16 @@ install(FILES
+@@ -124,16 +124,16 @@ install(FILES
helpers/parser/strtab.h
helpers/parser/strtypes.h
helpers/parser/urlpart.h
@@ -74,23 +49,23 @@
)
-install(FILES str/str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/str)
+install(FILES str/str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/str)
-Index: bcmatroska2-5.2.1/libebml2/CMakeLists.txt
+Index: bcmatroska2-5.3.26/libebml2/CMakeLists.txt
===================================================================
---- bcmatroska2-5.2.1.orig/libebml2/CMakeLists.txt
-+++ bcmatroska2-5.2.1/libebml2/CMakeLists.txt
-@@ -34,5 +34,5 @@ add_library(ebml2-objects OBJECT
- set_target_properties(ebml2-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+--- bcmatroska2-5.3.26.orig/libebml2/CMakeLists.txt
++++ bcmatroska2-5.3.26/libebml2/CMakeLists.txt
+@@ -34,5 +34,5 @@ add_library(bcmatroska2-ebml-objects OBJ
+ set_target_properties(bcmatroska2-ebml-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
install(DIRECTORY ebml
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2
)
-Index: bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt
+Index: bcmatroska2-5.3.26/libmatroska2/CMakeLists.txt
===================================================================
---- bcmatroska2-5.2.1.orig/libmatroska2/CMakeLists.txt
-+++ bcmatroska2-5.2.1/libmatroska2/CMakeLists.txt
-@@ -76,5 +76,5 @@ if(ENABLE_SHARED)
- endif()
+--- bcmatroska2-5.3.26.orig/libmatroska2/CMakeLists.txt
++++ bcmatroska2-5.3.26/libmatroska2/CMakeLists.txt
+@@ -71,5 +71,5 @@ install(TARGETS bcmatroska2 EXPORT ${PRO
+ )
install(DIRECTORY matroska
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++++++ fix-cmakelist-version.patch ++++++
--- /var/tmp/diff_new_pack.yAv4jD/_old 2024-03-28 14:32:10.764833284 +0100
+++ /var/tmp/diff_new_pack.yAv4jD/_new 2024-03-28 14:32:10.768833432 +0100
@@ -1,11 +1,13 @@
---- bcmatroska2-5.2.1/CMakeLists.txt.orig 2023-01-04 12:40:40.042374227 +0100
-+++ bcmatroska2-5.2.1/CMakeLists.txt 2023-01-04 12:40:46.822409717 +0100
+Index: bcmatroska2-5.3.26/CMakeLists.txt
+===================================================================
+--- bcmatroska2-5.3.26.orig/CMakeLists.txt
++++ bcmatroska2-5.3.26/CMakeLists.txt
@@ -23,7 +23,7 @@
cmake_minimum_required(VERSION 3.1)
- project(bcmatroska2
+ project(BCMatroska2
- VERSION 0.23
-+ VERSION 5.2.1
++ VERSION 5.3.26
LANGUAGES C
)
