commit edfe753af6f71476e7ef90e3cbed20bed6add9b1
Author: Jakub Bogusz <[email protected]>
Date: Tue Apr 12 22:42:21 2022 +0200
- updated to 2.2.2
- updated pc patch
ffmpegthumbnailer-pc.patch | 19 ++++---------------
ffmpegthumbnailer.spec | 11 +++++------
2 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index 757c50e..de2825b 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -5,16 +5,16 @@
Summary: Lightweight video thumbnailer
Summary(pl.UTF-8): Lekki program do wykonywania miniaturek dla filmów
Name: ffmpegthumbnailer
-Version: 2.2.0
-Release: 2
+Version: 2.2.2
+Release: 1
License: GPL v2
Group: Applications/Graphics
#Source0Download: https://github.com/dirkvdb/ffmpegthumbnailer/releases
Source0:
https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: ed3754b3b8b9af93a93c490e17def0d0
+# Source0-md5: ef466e64df666ba006c0b071eb48018e
Patch0: %{name}-pc.patch
URL: https://github.com/dirkvdb/ffmpegthumbnailer
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.5
# libavcodec >= 52.26.0 libavformat libavutil libswscale
BuildRequires: ffmpeg-devel >= 0.6
BuildRequires: libjpeg-devel
@@ -81,8 +81,7 @@ cd build
%install
rm -rf $RPM_BUILD_ROOT
-cd build
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
diff --git a/ffmpegthumbnailer-pc.patch b/ffmpegthumbnailer-pc.patch
index 59e6d35..225225b 100644
--- a/ffmpegthumbnailer-pc.patch
+++ b/ffmpegthumbnailer-pc.patch
@@ -1,21 +1,10 @@
---- ffmpegthumbnailer-2.1.1/libffmpegthumbnailer.pc.in.orig 2015-04-26
17:08:35.000000000 +0200
-+++ ffmpegthumbnailer-2.1.1/libffmpegthumbnailer.pc.in 2016-05-14
14:42:05.413671933 +0200
+--- ffmpegthumbnailer-2.2.2/libffmpegthumbnailer.pc.in.orig 2022-04-12
22:06:32.569084782 +0200
++++ ffmpegthumbnailer-2.2.2/libffmpegthumbnailer.pc.in 2022-04-12
22:08:00.168610214 +0200
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@CMAKE_INSTALL_LIBDIR@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=${prefix}/include
Name: libffmpegthumbnailer
---- ffmpegthumbnailer-2.2.0/CMakeLists.txt.fix 2017-01-12 21:46:43.054580133
+0100
-+++ ffmpegthumbnailer-2.2.0/CMakeLists.txt 2017-01-12 21:47:15.777922670
+0100
-@@ -109,7 +109,7 @@ ENDIF ()
- LIST(APPEND FFMPEGTHUMBNAILER_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR}
${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${AVFILTER_INCLUDE_DIR})
- LIST(APPEND FFMPEGTHUMBNAILER_LIBRARIES ${AVFORMAT_LIBRARY}
${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${AVFILTER_LIBRARY})
-
--SET(FFMPEGTHUMBNAILER_PKG_LIBS "-L${AVCODEC_PKG_LIBRARY_DIRS}
-l${AVCODEC_PKG_LIBRARIES} -l${AVFILTER_PKG_LIBRARIES}
-l${AVFORMAT_PKG_LIBRARIES} -l${AVUTIL_PKG_LIBRARIES}")
-+SET(FFMPEGTHUMBNAILER_PKG_LIBS "-l${AVCODEC_PKG_LIBRARIES}
-l${AVFILTER_PKG_LIBRARIES} -l${AVFORMAT_PKG_LIBRARIES}
-l${AVUTIL_PKG_LIBRARIES}")
- FOREACH(VAL ${JPEG_LIBRARIES})
- SET(FFMPEGTHUMBNAILER_PKG_LIBS "${FFMPEGTHUMBNAILER_PKG_LIBS} ${VAL}")
- ENDFOREACH()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpegthumbnailer.git/commitdiff/edfe753af6f71476e7ef90e3cbed20bed6add9b1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
