[ffmpeg/f27] Add requires ffmpeg-libs to libavdevice (rfbz#4768)
by Leigh Scott
commit 97c5e95c9aca463842d1081022fc7c2821d6fd09
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 16 10:29:38 2018 +0000
Add requires ffmpeg-libs to libavdevice (rfbz#4768)
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 71bf53d..c13f8b8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -189,6 +189,7 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%description -n libavdevice%{?flavor}
Libavdevice is a complementary library to libavf "libavformat". It provides
6 years, 7 months
[ffmpeg/f26] Fix up cuda and libnpp
by Leigh Scott
commit b769eff635f25710808c3dfc371d4d1491eb9415
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 16 10:22:39 2018 +0000
Fix up cuda and libnpp
ffmpeg.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 59f3a2f..1af60c3 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -53,11 +53,11 @@
%endif
%global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/')
%if 0%{?_with_cuda:1}
-%global cuda_cflags $(pkg-config --cflags cuda-%{cuda_version})
+%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version})
%global cuda_ldflags -L%{_libdir}/nvidia
%endif
-%if 0%{?_with_libnpp}
+if 0%{?_with_libnpp:1}
%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version})
%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version})
%endif
@@ -89,7 +89,7 @@ Patch0: LibOpenJPEG-2.2.patch
Patch1: LibOpenJPEG-2.3.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
-%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
+%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
6 years, 7 months
[ffmpeg/f27] Fix up cuda and libnpp
by Leigh Scott
commit 09feb1b8f514d3916568d8bb0af83b450b8d8556
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 16 10:22:39 2018 +0000
Fix up cuda and libnpp
ffmpeg.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f5a3ae5..71bf53d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -53,11 +53,11 @@
%endif
%global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/')
%if 0%{?_with_cuda:1}
-%global cuda_cflags $(pkg-config --cflags cuda-%{cuda_version})
+%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version})
%global cuda_ldflags -L%{_libdir}/nvidia
%endif
-%if 0%{?_with_libnpp}
+if 0%{?_with_libnpp:1}
%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version})
%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version})
%endif
@@ -91,7 +91,7 @@ Patch1: LibOpenJPEG-2.3.patch
Patch2: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
-%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
+%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
6 years, 7 months
[ffmpeg/f26] Add build requires alsa-lib-devel (rfbz#4820)
by Leigh Scott
commit cb14530c49aca5e20859f91a2d38ae2b48634f2c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 16 10:10:01 2018 +0000
Add build requires alsa-lib-devel (rfbz#4820)
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 9e0a746..59f3a2f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -90,6 +90,7 @@ Patch1: LibOpenJPEG-2.3.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
+BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
6 years, 7 months
[ffmpeg/f26] Add _cuda_version macro
by Leigh Scott
commit fa22cea4e66957decb7731397009c4e14e604dbe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 17 21:13:51 2017 +0100
Add _cuda_version macro
ffmpeg.spec | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5b3315b..9e0a746 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -48,14 +48,18 @@
%if 0%{!?_without_nvenc:1}
%global nvenc_cflags -I%{_includedir}/nvenc
%endif
-%if 0%{?_with_cuda}
-%global cuda_cflags $(pkg-config --cflags cuda-8.0)
+%if 0%{!?_cuda_version:1}
+%global _cuda_version 9.1
+%endif
+%global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/')
+%if 0%{?_with_cuda:1}
+%global cuda_cflags $(pkg-config --cflags cuda-%{cuda_version})
%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)
+%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version})
+%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version})
%endif
%if 0%{?_without_gpl}
@@ -84,8 +88,8 @@ Patch0: LibOpenJPEG-2.2.patch
# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/41d6d627024393c142cf7cd93e...
Patch1: LibOpenJPEG-2.3.patch
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}
+%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
+%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
6 years, 7 months
[ffmpeg/f27] Add build requires alsa-lib-devel (rfbz#4820)
by Leigh Scott
commit 94b7541dfe278cc3fe916c3e0c9ede8b850b2ad5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 16 10:10:01 2018 +0000
Add build requires alsa-lib-devel (rfbz#4820)
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ebc4c15..f5a3ae5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -92,6 +92,7 @@ Patch2: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
+BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
6 years, 7 months
[ffmpeg] Add build requires alsa-lib-devel (rfbz#4820)
by Leigh Scott
commit 2b4ddfa5c374443ef6c8f1191a10954a56c239c6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 16 10:06:02 2018 +0000
Add build requires alsa-lib-devel (rfbz#4820)
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e824bef..5bdbffa 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -83,6 +83,7 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
+BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
6 years, 7 months
