[ffmpeg/el7: 51/52] Add wildcard in gitignore
by Nicolas Chauvet
commit 7da346cd27e2998cb744faa96f9b163a5644de1d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 3 11:28:50 2017 +0100
Add wildcard in gitignore
.gitignore | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a382d4..f656912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-ffmpeg-2.8.7.tar.xz
-/ffmpeg-2.8.8.tar.xz
-/ffmpeg-2.8.9.tar.xz
-/ffmpeg-2.8.10.tar.xz
+ffmpeg-*.tar.xz
7 years, 3 months
[ffmpeg/el7: 50/52] Merge branch 'f23' into el7
by Nicolas Chauvet
commit 8f665202744674e3a905b2122b77e571c6fc5d0b
Merge: b989f51 61f3bda
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 3 11:28:05 2017 +0100
Merge branch 'f23' into el7
.gitignore | 5 +-
ffmpeg.spec | 246 +++++++++++++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 182 insertions(+), 71 deletions(-)
---
7 years, 3 months
[ffmpeg/el7] (52 commits) ...Document that we don't use autotools script here
by Nicolas Chauvet
Summary of changes:
bb17051... * Thu Jan 16 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
b3e2597... * Tue Feb 25 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
8aba11e... Rebuilt for x264 (*)
9224fc8... * Tue Mar 18 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
9cc2d45... * Fri Mar 21 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
6fb1ad2... * Mon Mar 24 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
456e295... Update to 2.2.1 (*)
866f8d1... * Mon May 05 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
9916d8c... * Wed Jun 04 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
067cf9e... * Tue Jul 08 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
02c843f... * Tue Jul 15 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
edd973d... * Sun Aug 03 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
966fdf1... * Tue Aug 12 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
7c533be... * Tue Sep 02 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
516c058... Disable libcelt by default - orphaned upstream (*)
cc6308a... * Thu Sep 25 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
7c67956... Revert update to 2.4.1 (*)
6af1218... Revert back to ffmpeg 2.3.x (*)
14adfb4... * Fri Oct 03 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
0585a98... * Sun Oct 19 2014 Sérgio Basto <sergio(a)serjux.com> - 2.4.2 (*)
1ca8fad... * Sun Nov 02 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
e485033... Rebuild for vaapi 0.36 (*)
b975078... * Mon Dec 01 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
eedb3d6... enable support for libx265 by default (rfbz#3421, patch by (*)
dd7629a... * Sun Dec 21 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
7fcce32... * Wed Jan 14 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
16a5394... - enable OpenCL support - BR texinfo instead of texi2html t (*)
8882fc6... - enable LADSPA support (rfbz#3134) (*)
0ae8650... * Sun Feb 15 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
fa04c8c... * Mon Mar 30 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
043b883... Fix patch for f22 build (*)
143f4a4... rebuilt for new x265 (*)
1fdcab6... * Tue Apr 28 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
96ff1a6... * Tue May 05 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
3c92993... - Disable opencl by default - rfbz#3640 - Add with conditio (*)
2e59088... Rebuilt for x265 (*)
ce6cd70... Updated to 2.6.3 (*)
8248029... Updated to 2.6.4 (*)
7a1d19b... Update to 2.8.1 (*)
1641a91... Fixup _docdir (*)
086b58f... Update to 2.8.2 (*)
22805c1... Updated to 2.8.3 (*)
50ca257... Updated to 2.8.4 (*)
80fb431... Updated to 2.8.5 (*)
abf9423... Updated to 2.8.6 (*)
eb5efb6... Updated to 2.8.7 (*)
e42e2fd... Updated to 2.8.8 (*)
b00d838... Updated to 2.8.9 (*)
61f3bda... Updated to 2.8.10 (*)
8f66520... Merge branch 'f23' into el7
7da346c... Add wildcard in gitignore
a8c62ef... Document that we don't use autotools script here
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[ffmpeg] fix year in the latest changelog entry
by Dominik Mierzejewski
commit 9abe864a056b8213669c2bc03e6059c4a33c58a6
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 3 02:14:43 2017 +0100
fix year in the latest changelog entry
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6e68b78..f0eec74 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -381,7 +381,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
-* Mon Jan 02 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.2.2-2
+* Mon Jan 02 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.2.2-2
- enable optional nonfree build with cuda, cuvid, npp and fdk-aac
(most credit for this goes to Nicolas Chauvet)
- allow disabling x11grab (conflicts with nonfree builds)
7 years, 3 months
[ffmpeg] Enable amr - rfbz#4367
by Dominik Mierzejewski
commit 2ac01a8c49c93f9b54fdcc4403a23ac3858bfb67
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 22 14:07:21 2016 +0100
Enable amr - rfbz#4367
ffmpeg.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6e03ebb..6e68b78 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -53,7 +53,7 @@
%global lesser L
%endif
-%if 0%{?_with_amr} || 0%{?_with_gmp} || 0%{?_with_smb}
+%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb}
%global ffmpeg_license %{?lesser}GPLv3+
%else
%global ffmpeg_license %{?lesser}GPLv2+
@@ -120,7 +120,7 @@ BuildRequires: yasm
%{?_with_webp:BuildRequires: libwebp-devel}
%{?_with_netcdf:BuildRequires: netcdf-devel}
%{!?_without_nvenc:BuildRequires: nvenc-devel}
-%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
+%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
%if 0%{!?_without_opencl:1}
BuildRequires: opencl-headers ocl-icd-devel
@@ -204,7 +204,7 @@ This package contains development files for %{name}
%{?flavor:--disable-manpages} \\\
%{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\
%{?build_suffix:--build-suffix=%{build_suffix}} \\\
- %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
+ %{!?_without_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
%{!?_with_crystalhd:--disable-crystalhd} \\\
@@ -386,6 +386,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
(most credit for this goes to Nicolas Chauvet)
- allow disabling x11grab (conflicts with nonfree builds)
- use Recommends only on Fedora (patch by Nicolas Chauvet)
+- enable AMR codecs by default (rfbz#4367, patch by Nicolas Chauvet)
* Tue Dec 06 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2.2-1
- Updated to 3.2.2
7 years, 3 months
[ffmpeg] Use Recommends on fedora
by Dominik Mierzejewski
commit 828c84d58579aa4eb8fae13b678e4734db2a04ed
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 22 14:05:32 2016 +0100
Use Recommends on fedora
ffmpeg.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 8457a96..6e03ebb 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -124,7 +124,7 @@ BuildRequires: yasm
%{!?_without_openal:BuildRequires: openal-soft-devel}
%if 0%{!?_without_opencl:1}
BuildRequires: opencl-headers ocl-icd-devel
-Recommends: opencl-icd
+%{?fedora:Recommends: opencl-icd}
%endif
%{!?_without_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg2-devel
@@ -385,6 +385,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
- enable optional nonfree build with cuda, cuvid, npp and fdk-aac
(most credit for this goes to Nicolas Chauvet)
- allow disabling x11grab (conflicts with nonfree builds)
+- use Recommends only on Fedora (patch by Nicolas Chauvet)
* Tue Dec 06 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2.2-1
- Updated to 3.2.2
7 years, 3 months
[ffmpeg] add a missing changelog entry
by Dominik Mierzejewski
commit 243f00e9cc43d2325b82569c3fb8b15e58963a44
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 3 01:54:58 2017 +0100
add a missing changelog entry
ffmpeg.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 71fd751..8457a96 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -62,7 +62,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.2.2
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -381,6 +381,11 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Jan 02 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.2.2-2
+- enable optional nonfree build with cuda, cuvid, npp and fdk-aac
+ (most credit for this goes to Nicolas Chauvet)
+- allow disabling x11grab (conflicts with nonfree builds)
+
* Tue Dec 06 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2.2-1
- Updated to 3.2.2
7 years, 3 months
[ffmpeg] support building with NPP independently of CUDA
by Dominik Mierzejewski
commit 9a53cdf016062f98eea6b46336ba1bdc9ffe2a54
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 3 01:48:01 2017 +0100
support building with NPP independently of CUDA
add proper dependencies for NPP
ffmpeg.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 61a4105..71fd751 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -44,6 +44,11 @@
%global cuda_ldflags -L%{_libdir}/nvidia
%endif
+%if 0%{?_with_libnpp}
+%global libnpp_cflags $(pkg-config --cflags nppi-8.0 nppc-8.0)
+%global libnpp_ldlags $(pkg-config --libs-only-L nppi-8.0 nppc-8.0)
+%endif
+
%if 0%{?_without_gpl}
%global lesser L
%endif
@@ -67,6 +72,7 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}}
+%{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0 cuda-npp-dev-8-0}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
@@ -193,8 +199,8 @@ This package contains development files for %{name}
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--optflags="%{optflags}" \\\
- --extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags}" \\\
- --extra-cflags="%{?nvenc_cflags} %{?cuda_cflags}" \\\
+ --extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags} %{?libnpp_ldlags}" \\\
+ --extra-cflags="%{?nvenc_cflags} %{?cuda_cflags} %{?libnpp_cflags}" \\\
%{?flavor:--disable-manpages} \\\
%{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\
%{?build_suffix:--build-suffix=%{build_suffix}} \\\
7 years, 3 months
[ffmpeg] add proper dependencies for CUDA
by Dominik Mierzejewski
commit 6860f3604fbf92da0c7b87e2149c610795f1ee14
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 3 01:45:16 2017 +0100
add proper dependencies for CUDA
Requires nVidia repo to be enabled:
https://developer.nvidia.com/cuda-downloads
ffmpeg.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2b47615..61a4105 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -40,8 +40,7 @@
%global nvenc_cflags -I%{_includedir}/nvenc
%endif
%if 0%{?_with_cuda}
-%{!?_cuda_includedir:%global _cuda_includedir $(pkg-config --cflags cuda-8.0)}
-%global cuda_cflags -I%{_cuda_includedir}
+%global cuda_cflags $(pkg-config --cflags cuda-8.0)
%global cuda_ldflags -L%{_libdir}/nvidia
%endif
@@ -67,6 +66,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
7 years, 3 months
[ffmpeg] disable xvid when building with nonfree
by Dominik Mierzejewski
commit c549af65d97292d0d28b38a8dc48177b10f6b3ac
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 3 01:26:58 2017 +0100
disable xvid when building with nonfree
(xvid requires --enable-gpl)
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 843f201..2b47615 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -32,6 +32,7 @@
%global _without_x264 1
%global _without_x265 1
%global _without_x11grab 1
+%global _without_xvid 1
%endif
# extras flags
7 years, 3 months