From b32c080f40f3a85d52949e5798b2630262c39eb9 Mon Sep 17 00:00:00 2001 From: Vascom Date: Jan 13 2015 08:12:32 +0000 Subject: Update to 0.7.72 --- diff --git a/.gitignore b/.gitignore index bc6e93d..8c226b0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libmediainfo_0.7.69.tar.bz2 /libmediainfo_0.7.70.tar.bz2 /libmediainfo_0.7.71.tar.bz2 +/libmediainfo_0.7.72.tar.bz2 diff --git a/libmediainfo-external-tinyxml2.patch b/libmediainfo-external-tinyxml2.patch index 2d6f677..3e04f7a 100644 --- a/libmediainfo-external-tinyxml2.patch +++ b/libmediainfo-external-tinyxml2.patch @@ -1,104 +1,43 @@ -diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt -index 01d2c60..395722e 100755 ---- a/Project/CMake/CMakeLists.txt -+++ b/Project/CMake/CMakeLists.txt -@@ -2,6 +2,8 @@ project(MediaInfoLib) - - cmake_minimum_required(VERSION 2.8.11) - -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +diff --git a/Project/CMake/cmake/modules/FindTinyXML.cmake b/Project/CMake/cmake/modules/FindTinyXML.cmake +new file mode 100644 +index 0000000..220a6c2 +--- /dev/null ++++ b/Project/CMake/cmake/modules/FindTinyXML.cmake +@@ -0,0 +1,37 @@ ++# Try to find the TinyXML library ++# TinyXML_FOUND - system has TinyXML ++# TinyXML_INCLUDE_DIRS - TinyXML include directory ++# TinyXML_LIBRARY_DIRS - TinyXML library directory ++# TinyXML_LIBRARIES - TinyXML libraries ++# Copyright (C) 2012 iCub Facility, Istituto Italiano di Tecnologia ++# Author: Daniele E. Domenichelli ++# ++# CopyPolicy: Released under the terms of the LGPLv2.1 or later + - set(MediaInfoLib_MAJOR_VERSION 0) - set(MediaInfoLib_MINOR_VERSION 7) - set(MediaInfoLib_PATCH_VERSION 71) -@@ -77,9 +79,11 @@ elseif(APPLE) - set(CMAKE_DEBUG_POSTFIX "_debug") - endif() - -+# use bundled tinyxml only if no system -+find_package(TinyXML REQUIRED) ++if(NOT WIN32) ++ find_package(PkgConfig) ++ if(PKG_CONFIG_FOUND) ++ if(TinyXML_FIND_VERSION) ++ if(TinyXML_FIND_VERSION_EXACT) ++ pkg_check_modules(PC_TINYXML QUIET tinyxml2=${TinyXML_FIND_VERSION}) ++ else(TinyXML_FIND_VERSION_EXACT) ++ pkg_check_modules(PC_TINYXML QUIET tinyxml2>=${TinyXML_FIND_VERSION}) ++ endif(TinyXML_FIND_VERSION_EXACT) ++ else(TinyXML_FIND_VERSION) ++ pkg_check_modules(PC_TINYXML QUIET tinyxml2) ++ endif(TinyXML_FIND_VERSION) ++ endif(PKG_CONFIG_FOUND) ++endif(NOT WIN32) + - include_directories(${MediaInfoLib_SOURCES_PATH}) - include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/) --include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/) - include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/base64/) - include_directories(${ZLIB_INCLUDE_DIRS}) - -@@ -93,7 +97,6 @@ set(MediaInfoLib_PUBLIC_HDRS - ) - - set(MediaInfoLib_SRCS -- ${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/tinyxml2.cpp - ${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/md5.c - ${MediaInfoLib_SOURCES_PATH}/MediaInfo/File__Analyze.cpp - ${MediaInfoLib_SOURCES_PATH}/MediaInfo/File__Analyze_Buffer.cpp -@@ -302,6 +305,10 @@ set(MediaInfoLib_SRCS - ${MediaInfoLib_SOURCES_PATH}/MediaInfoDLL/MediaInfoDLL.def - ) - -+if(NOT TinyXML_FOUND) -+ include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/) -+ list(APPEND MediaInfoLib_SRCS ${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/tinyxml2.cpp) -+endif() - - add_library(mediainfo ${MediaInfoLib_SRCS}) - target_include_directories(mediainfo INTERFACE ${INCLUDE_INSTALL_DIR}) -@@ -318,9 +325,14 @@ target_include_directories(mediainfo PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ZenLib/Source - ${MediaInfoLib_SOURCES_PATH} - ${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/ -- ${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/ - ${MediaInfoLib_SOURCES_PATH}/ThirdParty/base64/) - -+if(NOT TinyXML_FOUND) -+ target_include_directories(mediainfo PRIVATE ${MediaInfoLib_SOURCES_PATH}/ThirdParty/tinyxml2/) -+else() -+ target_link_libraries(mediainfo "${TinyXML_LIBRARIES}") -+endif() ++set(TinyXML_INCLUDE_DIRS ${PC_TINYXML_INCLUDE_DIRS} CACHE PATH "TinyXML include directory" FORCE) ++set(TinyXML_LIBRARY_DIRS ${PC_TINYXML_LIBRARY_DIRS} CACHE PATH "TinyXML library directory" FORCE) ++set(TinyXML_LIBRARIES ${PC_TINYXML_LIBRARIES} CACHE STRING "TinyXML libraries" FORCE) ++include(FindPackageHandleStandardArgs) + - if(BUILD_ZENLIB) - target_include_directories(mediainfo PRIVATE ${ZLIB_INCLUDE_DIRS}) - endif() -diff --git a/Project/CMake/cmake/modules/FindTinyXML.cmake b/Project/CMake/cmake/modules/FindTinyXML.cmake -new file mode 100644 -index 0000000..220a6c2 ---- /dev/null -+++ b/Project/CMake/cmake/modules/FindTinyXML.cmake -@@ -0,0 +1,37 @@ -+# Try to find the TinyXML library -+# TinyXML_FOUND - system has TinyXML -+# TinyXML_INCLUDE_DIRS - TinyXML include directory -+# TinyXML_LIBRARY_DIRS - TinyXML library directory -+# TinyXML_LIBRARIES - TinyXML libraries -+# Copyright (C) 2012 iCub Facility, Istituto Italiano di Tecnologia -+# Author: Daniele E. Domenichelli -+# -+# CopyPolicy: Released under the terms of the LGPLv2.1 or later -+ -+if(NOT WIN32) -+ find_package(PkgConfig) -+ if(PKG_CONFIG_FOUND) -+ if(TinyXML_FIND_VERSION) -+ if(TinyXML_FIND_VERSION_EXACT) -+ pkg_check_modules(PC_TINYXML QUIET tinyxml2=${TinyXML_FIND_VERSION}) -+ else(TinyXML_FIND_VERSION_EXACT) -+ pkg_check_modules(PC_TINYXML QUIET tinyxml2>=${TinyXML_FIND_VERSION}) -+ endif(TinyXML_FIND_VERSION_EXACT) -+ else(TinyXML_FIND_VERSION) -+ pkg_check_modules(PC_TINYXML QUIET tinyxml2) -+ endif(TinyXML_FIND_VERSION) -+ endif(PKG_CONFIG_FOUND) -+endif(NOT WIN32) -+ -+set(TinyXML_INCLUDE_DIRS ${PC_TINYXML_INCLUDE_DIRS} CACHE PATH "TinyXML include directory" FORCE) -+set(TinyXML_LIBRARY_DIRS ${PC_TINYXML_LIBRARY_DIRS} CACHE PATH "TinyXML library directory" FORCE) -+set(TinyXML_LIBRARIES ${PC_TINYXML_LIBRARIES} CACHE STRING "TinyXML libraries" FORCE) -+include(FindPackageHandleStandardArgs) -+ -+find_package_handle_standard_args(TinyXML -+ DEFAULT_MSG -+ TinyXML_LIBRARIES -+ ) -+ -+set(TinyXML_FOUND ${TINYXML_FOUND}) -+mark_as_advanced(TinyXML_INCLUDE_DIRS TinyXML_LIBRARY_DIRS TinyXML_LIBRARIES) ++find_package_handle_standard_args(TinyXML ++ DEFAULT_MSG ++ TinyXML_LIBRARIES ++ ) ++ ++set(TinyXML_FOUND ${TINYXML_FOUND}) ++mark_as_advanced(TinyXML_INCLUDE_DIRS TinyXML_LIBRARY_DIRS TinyXML_LIBRARIES) diff --git a/libmediainfo.spec b/libmediainfo.spec index 9ae9427..ca2765b 100644 --- a/libmediainfo.spec +++ b/libmediainfo.spec @@ -1,6 +1,6 @@ Name: libmediainfo -Version: 0.7.71 -Release: 3%{?dist} +Version: 0.7.72 +Release: 1%{?dist} Summary: Library for supplies technical and tag information about a video or audio file Summary(ru): Библиотека для предоставления полной информации о видео или аудио файле @@ -10,9 +10,6 @@ URL: http://mediaarea.net/MediaInfo Source0: http://mediaarea.net/download/source/%{name}/%{version}/%{name}_%{version}.tar.bz2 Patch0: libmediainfo-missed-cmake-files.patch Patch1: libmediainfo-external-tinyxml2.patch -Patch2: libmediainfo-external-curl.patch -# To fix compilation on epel7 -Patch3: libmediainfo-cmake-syntax.patch BuildRequires: libzen-devel >= 0.4.30-2 BuildRequires: zlib-devel @@ -90,8 +87,6 @@ Include files and mandatory libraries for development. %setup -q -n MediaInfoLib %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 cp Release/ReadMe_DLL_Linux.txt ReadMe.txt mv History_DLL.txt History.txt @@ -146,6 +141,10 @@ rm -f %{buildroot}%{_libdir}/%{name}.la %{_libdir}/cmake/mediainfolib/ %changelog +* Tue Jan 13 2015 Vasiliy N. Glazov 0.7.72-1 +- Update to 0.7.72 +- Drop some patches + * Wed Dec 10 2014 Ivan Romanov - 0.7.71-3 - fixed epel7 building diff --git a/sources b/sources index ac438dc..afdd5f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -310940f3afa7f88f37bc9da971454a61 libmediainfo_0.7.71.tar.bz2 +ad84c9aa462cfba5b7401aa0f69008b6 libmediainfo_0.7.72.tar.bz2