[chromaprint-tools] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit e180c1e2152ad2825fa44ce4b07585a281bfdb06
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:25 2016 +0200
Rebuilt for ffmpeg-3.1.1
chromaprint-tools.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/chromaprint-tools.spec b/chromaprint-tools.spec
index 63c9ad1..228dea7 100644
--- a/chromaprint-tools.spec
+++ b/chromaprint-tools.spec
@@ -1,6 +1,6 @@
Name: chromaprint-tools
Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Chromaprint audio fingerprinting tools
Group: Applications/Multimedia
License: LGPLv2+
@@ -49,6 +49,9 @@ rm -f %{buildroot}%{_libdir}/lib*.so*
%{_bindir}/fpcalc
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2-3
+- Rebuilt for ffmpeg-3.1.1
+
* Tue Jul 19 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2-2
- patch for ffmpeg-3
8 years, 6 months
[bombono-dvd] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit 1fed77f06148ad745d170c48f111fcb49302eec0
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:22 2016 +0200
Rebuilt for ffmpeg-3.1.1
bombono-dvd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/bombono-dvd.spec b/bombono-dvd.spec
index 01b7f6c..7072059 100644
--- a/bombono-dvd.spec
+++ b/bombono-dvd.spec
@@ -2,7 +2,7 @@
Name: bombono-dvd
Version: 1.2.2
-Release: 13%{?rel_tag}%{?dist}
+Release: 14%{?rel_tag}%{?dist}
Summary: DVD authoring program with nice and clean GUI
# License breakdown in README.
License: GPLv2 and GPLv2+ and Boost and Python and LGPLv2+
@@ -124,6 +124,9 @@ fi
%{_mandir}/man1/*
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.2-14
+- Rebuilt for ffmpeg-3.1.1
+
* Mon Jul 04 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-13
- rebuilt
8 years, 6 months
[bino] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit 7eceba8bd41735e2e5a0c3821609f8d7a56ab69c
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:19 2016 +0200
Rebuilt for ffmpeg-3.1.1
bino.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/bino.spec b/bino.spec
index 79306e8..4c95511 100644
--- a/bino.spec
+++ b/bino.spec
@@ -1,6 +1,6 @@
Name: bino
Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D video player
Group: System Environment/Base
License: GPLv3+
@@ -88,6 +88,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.6.3-2
+- Rebuilt for ffmpeg-3.1.1
+
* Sat Jul 09 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.6.3-1
- update to 1.6.3 release
- patch for ffmpeg-3.0
8 years, 6 months
[audacity-freeworld] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit a3538589882581178900a8ccb998fb2ce3cf88d8
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:16 2016 +0200
Rebuilt for ffmpeg-3.1.1
audacity-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 35da385..73cf1bf 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -6,7 +6,7 @@
Name: audacity-freeworld
Version: 2.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -213,6 +213,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.1.2-3
+- Rebuilt for ffmpeg-3.1.1
+
* Wed Jun 22 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.2-2
- Backport fix for gcc6
8 years, 6 months
[audacious-plugins-freeworld] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit 1e0e7a42dfcbb249e97ad37284ac16bcbb968787
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:13 2016 +0200
Rebuilt for ffmpeg-3.1.1
audacious-plugins-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 060a70d..e8e965b 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -5,7 +5,7 @@
Name: audacious-plugins-freeworld
Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -140,6 +140,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.7.2-2
+- Rebuilt for ffmpeg-3.1.1
+
* Wed May 18 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.7.2-1
- Upgrade to 3.7.2
8 years, 6 months
[aqualung] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit b224300cfa8aa593c85a8a4bebf11742b4d86018
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:09 2016 +0200
Rebuilt for ffmpeg-3.1.1
aqualung.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/aqualung.spec b/aqualung.spec
index 7d4984a..fbfbee7 100644
--- a/aqualung.spec
+++ b/aqualung.spec
@@ -18,7 +18,7 @@
Name: aqualung
Version: 1.0
-Release: 0.3.rc1git%{shortcommit0}%{?dist}
+Release: 0.4.rc1git%{shortcommit0}%{?dist}
Summary: Music Player for GNU/Linux
License: GPLv2+
URL: http://aqualung.jeremyevans.net/
@@ -133,6 +133,9 @@ update-desktop-database &> /dev/null || :
%{_docdir}/%{name}
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.4.rc1git05dfcb7
+- Rebuilt for ffmpeg-3.1.1
+
* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.3.rc1git05dfcb7
- Rebuilt for ffmpeg-3.1.1
8 years, 6 months
[alsa-plugins-freeworld] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit cdfdbaf2a528440be6f5a38001fdd2d0ea3f9172
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:54:06 2016 +0200
Rebuilt for ffmpeg-3.1.1
alsa-plugins-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/alsa-plugins-freeworld.spec b/alsa-plugins-freeworld.spec
index b90805f..3b84128 100644
--- a/alsa-plugins-freeworld.spec
+++ b/alsa-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -98,6 +98,9 @@ install -pm 0644 %{SOURCE1} %{SOURCE2} \
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1.1-2
+- Rebuilt for ffmpeg-3.1.1
+
* Sat Jul 09 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.1-1
- Update to 1.1.1
8 years, 6 months
[aqualung] Rebuilt for ffmpeg-3.1.1
by Julian Sikorski
commit 732518fffcd9ad36bfe32408288008b9041603ad
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 15:53:48 2016 +0200
Rebuilt for ffmpeg-3.1.1
aqualung.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/aqualung.spec b/aqualung.spec
index 6bbd8a2..7d4984a 100644
--- a/aqualung.spec
+++ b/aqualung.spec
@@ -18,7 +18,7 @@
Name: aqualung
Version: 1.0
-Release: 0.2.rc1git%{shortcommit0}%{?dist}
+Release: 0.3.rc1git%{shortcommit0}%{?dist}
Summary: Music Player for GNU/Linux
License: GPLv2+
URL: http://aqualung.jeremyevans.net/
@@ -133,6 +133,9 @@ update-desktop-database &> /dev/null || :
%{_docdir}/%{name}
%changelog
+* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.3.rc1git05dfcb7
+- Rebuilt for ffmpeg-3.1.1
+
* Fri Jul 01 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.0-0.2.rc1git05dfcb7
- Switched from svn to git
- Update to 1.0-0.2.rc1git05dfcb7
8 years, 6 months
[ffmpeg] Updated to 3.1.1
by Julian Sikorski
commit 2d4420649903c24839c063ed282ad080f4201b18
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sat Jul 30 09:59:13 2016 +0200
Updated to 3.1.1
- Dropped included patch
- Added $RPM_LD_FLAGS to %configure
- Switched to openjpeg2
- Fixed build with openjpeg2-2.1.1 (patch by Sandro Mani)
.gitignore | 1 +
...nfigure-add-direct-detection-of-libopencv.patch | 39 ----------------------
ffmpeg.spec | 18 +++++++---
ffmpeg_opj2.patch | 36 ++++++++++++++++++++
sources | 2 +-
5 files changed, 51 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2dbc12b..2565935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ffmpeg-2.8.7.tar.xz
+/ffmpeg-3.1.1.tar.xz
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e27142c..8da881d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -12,8 +12,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 3.0.2
-Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 3.1.1
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
%else
@@ -25,7 +25,7 @@ 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
+Patch0: %{name}_opj2.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
@@ -79,7 +79,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)
@@ -152,6 +152,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} \\\
@@ -227,7 +228,7 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1
+%patch0 -p1 -b .opj2
# fix -O3 -g in host_cflags
sed -i "s|-O3 -g|$RPM_OPT_FLAGS|" configure
mkdir -p _doc/examples
@@ -322,6 +323,13 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Wed Jul 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.1-1
+- Updated to 3.1.1
+- Dropped included patch
+- Added $RPM_LD_FLAGS to %%configure
+- Switched to openjpeg2
+- Fixed build with openjpeg2-2.1.1 (patch by Sandro Mani)
+
* Sat Jul 23 2016 Igor Gnatenko <ignatenko(a)redhat.com> - 3.0.2-5
- Rebuild for libvpx soname bump
diff --git a/ffmpeg_opj2.patch b/ffmpeg_opj2.patch
new file mode 100644
index 0000000..11e66b4
--- /dev/null
+++ b/ffmpeg_opj2.patch
@@ -0,0 +1,36 @@
+diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
+--- ffmpeg-3.1.1/configure 2016-06-27 01:54:28.000000000 +0200
++++ ffmpeg-3.1.1-new/configure 2016-07-27 22:25:36.585141648 +0200
+@@ -5669,7 +5669,7 @@ enabled libopencv && { check_hea
+ require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+ require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
++enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+ check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
+ check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
+ check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
+--- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c 2016-06-27 01:54:29.000000000 +0200
++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c 2016-07-27 22:25:45.509327071 +0200
+@@ -24,8 +24,6 @@
+ * JPEG 2000 decoder using libopenjpeg
+ */
+
+-#define OPJ_STATIC
+-
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"
+ #include "libavutil/intreadwrite.h"
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
+--- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c 2016-06-27 01:54:29.000000000 +0200
++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c 2016-07-27 22:25:40.298218807 +0200
+@@ -24,8 +24,6 @@
+ * JPEG 2000 encoder using libopenjpeg
+ */
+
+-#define OPJ_STATIC
+-
+ #include "libavutil/avassert.h"
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"
diff --git a/sources b/sources
index 6d37bd9..0247300 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb5c69c671aba1386e7156fc2af1ab6 ffmpeg-3.0.2.tar.xz
+4ba7033da5d9ac4d0391516c7e5d97e4 ffmpeg-3.1.1.tar.xz
8 years, 6 months
