commit 1175276d2812ef70af24e2621f964377ff2d25d2 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Mar 1 00:37:13 2023 +0000 Update medialibrary to 0.12.3 Disable libvlc fix the build (tip from Debian package) gcc-10.patch | 11 ------- gcc-13.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ medialibrary.spec | 34 +++++++++++---------- sources | 2 +- 4 files changed, 110 insertions(+), 27 deletions(-) --- diff --git a/gcc-13.patch b/gcc-13.patch new file mode 100644 index 0000000..f7a9ab0 --- /dev/null +++ b/gcc-13.patch @@ -0,0 +1,90 @@ +--- ./src/Metadata.h.orig 2023-03-01 00:49:56.952593415 +0000 ++++ ./src/Metadata.h 2023-03-01 00:50:11.255545771 +0000 +@@ -26,6 +26,7 @@ + #include "Types.h" + + #include <vector> ++#include <cstdint> + + namespace medialibrary + { +--- ./include/medialibrary/IMetadata.h.orig 2023-03-01 00:58:09.325953307 +0000 ++++ ./include/medialibrary/IMetadata.h 2023-03-01 00:58:20.263916874 +0000 +@@ -23,6 +23,7 @@ + #pragma once + + #include <string> ++#include <cstdint> + + namespace medialibrary + { +--- ./include/medialibrary/filesystem/IFile.h.orig 2023-03-01 01:00:11.239547235 +0000 ++++ ./include/medialibrary/filesystem/IFile.h 2023-03-01 01:00:27.725492319 +0000 +@@ -23,6 +23,7 @@ + #pragma once + + #include <string> ++#include <cstdint> + + namespace medialibrary + { +--- ./src/utils/File.h.orig 2023-03-01 01:04:16.556730318 +0000 ++++ ./src/utils/File.h 2023-03-01 01:04:31.993679030 +0000 +@@ -23,6 +23,7 @@ + #pragma once + + #include <string> ++#include <cstdint> + + namespace medialibrary + { +--- ./src/utils/Strings.cpp.orig 2023-03-01 01:06:20.895317203 +0000 ++++ ./src/utils/Strings.cpp 2023-03-01 01:06:58.120193519 +0000 +@@ -29,6 +29,7 @@ + #include <algorithm> + #include <cctype> + #include <cassert> ++#include <cstdint> + + namespace medialibrary + { +--- ./src/utils/TitleAnalyzer.h.orig 2023-03-01 01:08:07.761962128 +0000 ++++ ./src/utils/TitleAnalyzer.h 2023-03-01 01:08:26.667899312 +0000 +@@ -24,6 +24,7 @@ + + #include <string> + #include <tuple> ++#include <cstdint> + + namespace medialibrary + { +--- ./src/utils/XxHasher.h.orig 2023-03-01 01:09:38.122661901 +0000 ++++ ./src/utils/XxHasher.h 2023-03-01 01:09:56.757599989 +0000 +@@ -24,6 +24,7 @@ + + #include <string> + #include <cstddef> ++#include <cstdint> + + namespace medialibrary + { +--- ./src/utils/Url.cpp.orig 2023-03-01 01:11:23.788310828 +0000 ++++ ./src/utils/Url.cpp 2023-03-01 01:11:55.677204876 +0000 +@@ -32,6 +32,7 @@ + #include <cstring> + #include <algorithm> + #include <iterator> ++#include <cstdint> + + namespace + { +--- ./src/Deprecated.h.orig 2023-03-01 01:13:07.136967446 +0000 ++++ ./src/Deprecated.h 2023-03-01 01:13:21.637919267 +0000 +@@ -28,6 +28,7 @@ + */ + + #include <string> ++#include <cstdint> + + namespace medialibrary + { diff --git a/medialibrary.spec b/medialibrary.spec index 80dce09..f2e1435 100644 --- a/medialibrary.spec +++ b/medialibrary.spec @@ -1,22 +1,26 @@ %global commit 0c3868052024a1c6256383294e92baeeedcb44e9 Name: medialibrary -Version: 0.6.0 -Release: 6%{?dist} +Version: 0.12.3 +Release: 1%{?dist} Summary: Cross platform media library License: GPLv2+ URL: https://code.videolan.org/videolan/medialibrary -Source0: %{url}/repository/%{version}/archive.tar.gz#/%{name}-%{version}.tar.gz -Patch0: gcc-10.patch +Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: gcc-13.patch BuildRequires: libtool BuildRequires: gcc-c++ +BuildRequires: pkgconfig(benchmark) BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libvlc) +#BuildRequires: pkgconfig(libvlc) BuildRequires: pkgconfig(libvlcpp) +BuildRequires: pkgconfig(libxxhash) BuildRequires: pkgconfig(sqlite3) +BuildRequires: cmake +BuildRequires: meson %description @@ -33,22 +37,18 @@ developing applications that use %{name}. %prep -%autosetup -p1 -n medialibrary-%{version}-%{commit} -./bootstrap - +%autosetup -p1 -n medialibrary-%{version} %build -%configure --disable-static -%make_build V=1 - +%meson -Dlibvlc=disabled +%meson_build %install -%make_install +%meson_install find %{buildroot} -name '*.la' -exec rm -f {} ';' - -%ldconfig_scriptlets - +%check +%meson_test %files %license COPYING @@ -61,6 +61,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Fri Jan 27 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 0.12.3-1 +- Update medialibrary to 0.12.3 +- Disable libvlc fix the build (tip from Debian package) + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0.6.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 874570b..573e9f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (medialibrary-0.6.0.tar.gz) = ce8ded05a168f6e65dd72584f9af76087b7f9cbe7dc416cf8dd7142fcb3a580ced2debf872b6764f649112680a7f3c43668203446e7758a52955fc93cf679f6c +SHA512 (medialibrary-0.12.3.tar.gz) = 7dfc18cd0aad26cf2961165caea551bc2408f23fbffbc3ca974ef7ac151e44b6d80ae67ade83f5edbc9e6209fca997f70f497942758d9edfc6ba6ca41615beb9