[ffmpeg/f24] Updated to 3.1.5
by Julian Sikorski
commit c97bc29ac740275aace44ac8a14d3dc5a46f5adf
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Nov 5 18:10:02 2016 +0100
Updated to 3.1.5
.gitignore | 1 +
...nfigure-add-direct-detection-of-libopencv.patch | 39 ----------------------
ffmpeg.spec | 30 +++++++++++------
sources | 2 +-
4 files changed, 22 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c65d76..8727927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ffmpeg-2.8.7.tar.xz
/ffmpeg-3.0.3.tar.xz
/ffmpeg-3.0.4.tar.xz
+/ffmpeg-3.1.5.tar.xz
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b531a13..c12757e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -4,15 +4,22 @@
#global date 20110612
#global rel rc1
+%if 0%{?fedora} >= 25
+# OpenCV 3.X has an overlinking issue - unsuitable for core libraries
+# Reported as https://github.com/opencv/opencv/issues/7001
+%global _without_opencv 1
+%endif
+
%if 0%{?rhel}
%global _without_frei0r 1
%global _without_opencv 1
%global _without_vpx 1
+%global _without_nvenc 1
%endif
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 3.0.4
+Version: 3.1.5
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
@@ -25,7 +32,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-Patch0: 0001-configure-add-direct-detection-of-libopencv.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
@@ -56,7 +62,6 @@ BuildRequires: libiec61883-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libGL-devel
-%{?_with_mfx:BuildRequires: libmfx-devel}
Buildrequires: libmodplug-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
@@ -67,11 +72,14 @@ BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
%ifarch %{ix86} x86_64
+%{!?_without_mfx:BuildRequires: libmfx-devel}
BuildRequires: libXvMC-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
+BuildRequires: yasm
%endif
%{?_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_openal:BuildRequires: openal-soft-devel}
%if 0%{!?_without_opencl:1}
@@ -79,7 +87,7 @@ BuildRequires: opencl-headers ocl-icd-devel
Recommends: opencl-icd
%endif
%{!?_without_opencv:BuildRequires: opencv-devel}
-BuildRequires: openjpeg-devel
+BuildRequires: openjpeg2-devel
BuildRequires: opus-devel
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
@@ -101,9 +109,6 @@ BuildRequires: texinfo
BuildRequires: zlib-devel
%{?_with_zmq:BuildRequires: zeromq-devel}
%{?_with_zvbi:BuildRequires: zvbi-devel}
-%ifarch %{ix86} x86_64
-BuildRequires: yasm
-%endif
%description
FFmpeg is a complete and free Internet live audio and video
@@ -152,6 +157,7 @@ This package contains development files for %{name}
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--optflags="$RPM_OPT_FLAGS" \\\
+ --extra-ldflags="$RPM_LD_FLAGS" \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
@@ -177,10 +183,9 @@ This package contains development files for %{name}
%{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
%{?_with_ilbc:--enable-libilbc} \\\
- %{?_with_qsv:--enable-libmfx} \\\
--enable-libmp3lame \\\
%{?_with_netcdf:--enable-netcdf} \\\
- %{?_with_nvenc:--enable-nvenc --enable-nonfree} \\\
+ %{!?_without_nvenc:--enable-nvenc --extra-cflags="-I%{_includedir}/nvenc"} \\\
%{!?_without_openal:--enable-openal} \\\
%{!?_without_opencl:--enable-opencl} \\\
%{!?_without_opencv:--enable-libopencv} \\\
@@ -227,7 +232,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|-O3 -g|$RPM_OPT_FLAGS|" configure
mkdir -p _doc/examples
@@ -244,6 +248,9 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
+%ifarch %{ix86} x86_64
+ %{!?_without_qsv:--enable-libmfx} \
+%endif
%ifarch %{ix86} x86_64 ppc ppc64
--enable-runtime-cpudetect \
%endif
@@ -322,6 +329,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Sat Nov 05 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.5-1
+- Updated to 3.1.5
+
* Thu Oct 20 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.4-1
- Updated to 3.0.4
diff --git a/sources b/sources
index 257b4c5..e29d051 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c362e73204491ec36b0be084b28aaf63 ffmpeg-3.0.4.tar.xz
+a09f7730ceeb665c6f7da0b884dd00f9 ffmpeg-3.1.5.tar.xz
8 years
[buildsys-build-rpmfusion] Add ppc64le and missin aarch64
by Nicolas Chauvet
commit 687cddff525748e04e096669518a55a2fa49209e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Nov 5 18:05:18 2016 +0100
Add ppc64le and missin aarch64
buildsys-build-rpmfusion-list-kernels.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion-list-kernels.sh b/buildsys-build-rpmfusion-list-kernels.sh
index 10648c9..85cbc91 100755
--- a/buildsys-build-rpmfusion-list-kernels.sh
+++ b/buildsys-build-rpmfusion-list-kernels.sh
@@ -30,7 +30,7 @@ shopt -s extglob
myver="0.2.1"
repo=rpmfusion
myprog="buildsys-build-${repo}-kerneldevpkgs"
-supported_targetarchs="i686 x86_64 ppc ppc64 ppc64p7 armv5tel armv7l armv7hl s390x"
+supported_targetarchs="i686 x86_64 ppc ppc64 ppc64le ppc64p7 aarch64 armv5tel armv7l armv7hl s390x"
#This has changed in Fedora >= 20
variant_sep="+"
if [[ -e ./buildsys-build-${repo}-kerneldevpkgs-current ]]; then
@@ -72,6 +72,11 @@ bb_list_kernels_ppc64()
bb_list_kernels_default ${1}
}
+bb_list_kernels_ppc64le()
+{
+ bb_list_kernels_default ${1}
+}
+
bb_list_kernels_ppc64p7()
{
bb_list_kernels_default ${1}
8 years
[devedeng] Updated to new upstream release
by Andrea Musuruane
commit 28409e40b70638da14966a852d18ba47146739ec
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Nov 5 15:35:27 2016 +0100
Updated to new upstream release
.gitignore | 1 +
devedeng.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5884bdb..6abd3c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/devedeng-4.8.1.tar.gz
/devedeng-4.8.2.tar.gz
/devedeng-4.8.3.tar.gz
+/devedeng-4.8.4.tar.gz
diff --git a/devedeng.spec b/devedeng.spec
index 7db8660..2638ce8 100644
--- a/devedeng.spec
+++ b/devedeng.spec
@@ -1,5 +1,5 @@
Name: devedeng
-Version: 4.8.3
+Version: 4.8.4
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -111,6 +111,9 @@ fi
%changelog
+* Sat Nov 05 2016 Andrea Musuruane <musuruan(a)gmail.com> 4.8.4-1
+- Updated to new upstream release
+
* Sat Oct 29 2016 Andrea Musuruane <musuruan(a)gmail.com> 4.8.3-1
- Updated to new upstream release
diff --git a/sources b/sources
index 4cb7b2a..5cca35b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb14e79e87ce298bc24a59c3046fff0f devedeng-4.8.3.tar.gz
+2516a3e24c56db212f4caae469e8b510 devedeng-4.8.4.tar.gz
8 years
[ffmpeg] Updated to 3.2
by Julian Sikorski
commit 9a2383b5190a7ae25b4bea960d8614b63d4eacad
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Nov 5 15:28:21 2016 +0100
Updated to 3.2
- Dropped openjpeg2 patch
- Updated BuildRequires to SDL2-devel
- Incorporated some cleanups from RF #4243
.gitignore | 1 +
ffmpeg.spec | 41 ++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 26 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c3610a..095dc98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ ffmpeg-2.8.7.tar.xz
/ffmpeg-3.1.4.tar.xz
/ffmpeg-3.1.5.tar.bz2
/ffmpeg-3.1.5.tar.xz
+/ffmpeg-3.2.tar.xz
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ea984a5..fde7943 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -19,7 +19,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 3.1.5
+Version: 3.2
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
@@ -28,9 +28,9 @@ License: GPLv2+
%endif
URL: http://ffmpeg.org/
%if 0%{?date}
-Source0: ffmpeg-%{?branch}%{date}.tar.bz2
+Source0: %{name}-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
+Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
@@ -93,7 +93,7 @@ BuildRequires: opus-devel
BuildRequires: perl(Pod::Man)
%{?_with_rubberband:BuildRequires: rubberband-devel}
BuildRequires: schroedinger-devel
-BuildRequires: SDL-devel
+BuildRequires: SDL2-devel
%{?_with_snappy:BuildRequires: snappy-devel}
BuildRequires: soxr-devel
BuildRequires: speex-devel
@@ -152,12 +152,13 @@ This package contains development files for %{name}
--prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\
--datadir=%{_datadir}/%{name} \\\
+ --docdir=%{_docdir}/%{name} \\\
--incdir=%{_includedir}/%{name} \\\
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
- --optflags="$RPM_OPT_FLAGS" \\\
- --extra-ldflags="$RPM_LD_FLAGS" \\\
+ --optflags="%{optflags}" \\\
+ --extra-ldflags="%{?__global_ldflags}" \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
@@ -175,7 +176,7 @@ This package contains development files for %{name}
%{!?_without_cdio:--enable-libcdio} \\\
%{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
- %{?_with_fdk-aac:--enable-libfdk-aac --enable-nonfree} \\\
+ %{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\
%{?_with_flite:--enable-libflite} \\\
%{!?_without_jack:--enable-indev=jack} \\\
--enable-libfreetype \\\
@@ -227,13 +228,13 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
-%setup -q -n ffmpeg-%{?branch}%{date}
+%setup -q -n %{name}-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
-%setup -q -n ffmpeg-%{version}
+%setup -q
%endif
# fix -O3 -g in host_cflags
-sed -i "s|-O3 -g|$RPM_OPT_FLAGS|" configure
+sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
@@ -275,15 +276,15 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%endif
%endif
-make %{?_smp_mflags} V=1
+%make_build V=1
make documentation V=1
make alltools V=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT V=1
-rm -r $RPM_BUILD_ROOT%{_datadir}/ffmpeg/examples
+%make_install V=1
+rm -r %{buildroot}%{_datadir}/%{name}/examples
%if 0%{!?ffmpegsuffix:1}
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
+install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
%post libs -p /sbin/ldconfig
@@ -306,7 +307,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%{_mandir}/man1/ffplay*.1*
%{_mandir}/man1/ffprobe*.1*
%{_mandir}/man1/ffserver*.1*
-%{_datadir}/ffmpeg
+%{_datadir}/%{name}
%endif
%files libs
@@ -322,13 +323,19 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%files devel
%doc MAINTAINERS doc/APIchanges doc/*.txt
%doc _doc/examples
-%doc %{_docdir}/ffmpeg/*.html
-%{_includedir}/ffmpeg
+%doc %{_docdir}/%{name}/*.html
+%{_includedir}/%{name}
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
%changelog
+* Sat Oct 29 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.2-1
+- Updated to 3.2
+- Dropped openjpeg2 patch
+- Updated BuildRequires to SDL2-devel
+- Incorporated some cleanups from RF #4243
+
* Tue Oct 25 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.5-1
- Updated to 3.1.5
diff --git a/sources b/sources
index e29d051..2356ae7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a09f7730ceeb665c6f7da0b884dd00f9 ffmpeg-3.1.5.tar.xz
+3c065fb5baae1aeb1494a09ac984b2de ffmpeg-3.2.tar.xz
8 years
[libdvbpsi] Attempt to use git admin account
by Nicolas Chauvet
commit f8842c9f83364503aade59da26970bb6fb0a2cea
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 4 11:56:55 2016 +0100
Attempt to use git admin account
dead.package | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/dead.package b/dead.package
index 3aa0b6e..fd0f2c8 100644
--- a/dead.package
+++ b/dead.package
@@ -1 +1 @@
-Moved to Fedora
+Moved to Fedora - review #1376450
8 years
