[ffmpegthumbnailer] Update ffmpegthumbnailer to 2.2.2
by Leigh Scott
commit 9592b33d6a7565ca733c77cfa0848a41287b540c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 8 10:30:29 2020 +0000
Update ffmpegthumbnailer to 2.2.2
.gitignore | 1 +
ffmpegthumbnailer.spec | 24 ++++++++++++++-------
fix_object_target.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 75 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18f7113..cac50f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ffmpegthumbnailer-2.0.9.tar.gz
/ffmpegthumbnailer-2.1.1.tar.gz
/ffmpegthumbnailer-2.1.2.tar.gz
/ffmpegthumbnailer-2.2.0.tar.gz
+/ffmpegthumbnailer-2.2.2.tar.gz
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index 3c2fe5a..5d068b2 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -1,14 +1,19 @@
Name: ffmpegthumbnailer
-Version: 2.2.0
-Release: 9%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
Summary: Lightweight video thumbnailer that can be used by file managers
License: GPLv2+
-URL: http://code.google.com/p/ffmpegthumbnailer/
-Source0: https://github.com/dirkvdb/%{name}/archive/%{version}/%{name}-%{version}....
-
-BuildRequires: ffmpeg-devel, libpng-devel, libjpeg-devel
-BuildRequires: chrpath, cmake3, gcc-c++
+URL: https://github.com/dirkvdb/%{name}
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0: %{url}/commit/339ebc5aa634b4680585d7c36317ab6f162ca2a9.patch#/fix_object_target.patch
+
+BuildRequires: ffmpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-devel
+BuildRequires: chrpath
+BuildRequires: cmake3
+BuildRequires: gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
@@ -24,7 +29,7 @@ This video thumbnailer can be used to create thumbnails for your video files,
development package.
%prep
-%setup -q
+%autosetup -p1
chmod -x README INSTALL COPYING AUTHORS
%build
@@ -57,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Wed Jan 08 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.2-1
+- Update ffmpegthumbnailer to 2.2.2
+
* Tue Aug 06 2019 Leigh Scott <leigh123linux(a)gmail.com> - 2.2.0-9
- Rebuild for new ffmpeg version
diff --git a/fix_object_target.patch b/fix_object_target.patch
new file mode 100644
index 0000000..e332f7e
--- /dev/null
+++ b/fix_object_target.patch
@@ -0,0 +1,57 @@
+From 339ebc5aa634b4680585d7c36317ab6f162ca2a9 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb(a)gmail.com>
+Date: Tue, 7 Jan 2020 13:00:59 +0100
+Subject: [PATCH] Fixed object target configuration
+
+---
+ CMakeLists.txt | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 671b93a..8616c56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,6 +92,15 @@ add_library(libffmpegthumbnailerobj OBJECT
+ libffmpegthumbnailer/filmstripfilter.cpp
+ )
+
++target_link_libraries(libffmpegthumbnailerobj
++ FFmpeg::avformat
++ FFmpeg::avcodec
++ FFmpeg::avutil
++ FFmpeg::avfilter
++ $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
++ $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
++)
++
+ # we use our own deprecated struct menbers, so disable the warning about it
+ set_source_files_properties(libffmpegthumbnailer/videothumbnailerc.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
+
+@@ -118,12 +127,7 @@ set (FFMPEGTHUMBNAILER_SOVERSION_AGE 1)
+ if (ENABLE_STATIC)
+ add_library(libffmpegthumbnailerstatic STATIC $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
+ target_link_libraries(libffmpegthumbnailerstatic
+- FFmpeg::avformat
+- FFmpeg::avcodec
+- FFmpeg::avutil
+- FFmpeg::avfilter
+- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
+- $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
++ libffmpegthumbnailerobj
+ $<$<BOOL:${ENABLE_GIO}>:${CMAKE_DL_LIBS}>
+ )
+
+@@ -140,12 +144,7 @@ endif ()
+ if (ENABLE_SHARED)
+ add_library(libffmpegthumbnailer SHARED $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
+ target_link_libraries(libffmpegthumbnailer
+- FFmpeg::avformat
+- FFmpeg::avcodec
+- FFmpeg::avutil
+- FFmpeg::avfilter
+- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
+- $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
++ libffmpegthumbnailerobj
+ )
+
+ set_target_properties(libffmpegthumbnailer PROPERTIES
diff --git a/sources b/sources
index 43d0dfe..2b00b70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2832537a6793593b464c3b8f8d252a62 ffmpegthumbnailer-2.2.0.tar.gz
+SHA512 (ffmpegthumbnailer-2.2.2.tar.gz) = f18f7293074a818e7937f62eb9616fb1e2a7c3451147581894676e64f8dc4edb4de046e2e86f23cec0a5b938c5b2181a91331e9a1dec0851c3f36b08886e617e
4 years, 4 months
[ffmpeg/f30] Update to 4.1.5 release
by Leigh Scott
commit 114792b5c8d7d108d56aab335e372cf3c0aec909
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 7 22:09:52 2020 +0000
Update to 4.1.5 release
4361293fcf59edb56879c36edcd25f0a91e0edf8.patch | 32 --------------------------
ffmpeg.spec | 11 ++++-----
sources | 2 +-
3 files changed, 6 insertions(+), 39 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6f4627f..9a3dbc2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -86,8 +86,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.1.4
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 4.1.5
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -95,9 +95,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-#Backport avutil/mem: Fix invalid use of av_alloc_size
-#See rfbz#5221
-Patch0: 4361293fcf59edb56879c36edcd25f0a91e0edf8.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -322,7 +319,6 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -429,6 +425,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Jan 07 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.1.5-1
+- Update to 4.1.5 release
+
* Sat Sep 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.4-2
- Enable libjack (rfbz #5346)
diff --git a/sources b/sources
index fcf0ca9..49625b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5307931aeb7aaee5e1509d9996040661 ffmpeg-4.1.4.tar.xz
+SHA512 (ffmpeg-4.1.5.tar.xz) = 3fe235bbd85b3d3b26eaadfc1105cd44f4029aa38afd6a7f1b9476aa3ffcdc9ab31f5df8510abf56bf01b79e98f542c0d5778a307b50bdb737f86e0c0c8a2dce
4 years, 4 months
[nvidia-340xx-kmod] remove old patch
by Leigh Scott
commit ea6eb128eab717728df00f1768bb7fc5d9fbb513
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 7 20:22:56 2020 +0000
remove old patch
xf86-video-nvidia-legacy-02-fix-linux-5.1.patch | 15 ---------------
1 file changed, 15 deletions(-)
4 years, 4 months
[nvidia-340xx-kmod/f30] remove old patch
by Leigh Scott
commit bcefb611104def5dd3faa15ebda07e4b6d32d98e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 7 20:21:15 2020 +0000
remove old patch
buildfix_kernel_5.3.patch | 49 -----------------------------------------------
1 file changed, 49 deletions(-)
4 years, 4 months