[lives] Patched for ffmpeg-3.0 on f24 too.
by Antonio
commit da83893b7574d9979345255f97199c65bd3344fa
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Jul 9 12:06:33 2016 +0200
Patched for ffmpeg-3.0 on f24 too.
lives.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index 9619861..3356d3e 100644
--- a/lives.spec
+++ b/lives.spec
@@ -1,6 +1,6 @@
Name: lives
Version: 2.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -81,7 +81,7 @@ It is small in size, yet it has many advanced features.
%prep
%setup -q
-%if 0%{?fedora} > 24
+%if 0%{?fedora} > 23
%patch0 -p0
%endif
@@ -173,6 +173,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Sat Jul 09 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.3-3
+- Patched for ffmpeg-3.0 on f24 too
+
* Fri Jul 08 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.3-2
- Fix compatibility with ffmpeg-3.0
8 years, 4 months
[vdr-tvguideng/f24] Added %{pname}-gcc6.patch
by Martin Gansser
commit c60f7f24995387f9edf6c6569c630a67139d0872
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jul 9 11:56:16 2016 +0200
Added %{pname}-gcc6.patch
tvguideng-gcc6.patch | Bin 0 -> 1802161 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
---
diff --git a/tvguideng-gcc6.patch b/tvguideng-gcc6.patch
new file mode 100644
index 0000000..e877bba
Binary files /dev/null and b/tvguideng-gcc6.patch differ
8 years, 4 months
[vdr-tvguideng] Added %{pname}-gcc6.patch
by Martin Gansser
commit d7510a99283a76588ffa39767c60614b05ce75ac
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jul 9 11:47:08 2016 +0200
Added %{pname}-gcc6.patch
.gitignore | 1 +
sources | 1 +
tvguideng-gcc6.patch | Bin 0 -> 1802161 bytes
vdr-tvguideng.spec | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 80 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f87621d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/vdr-plugin-tvguideng-0.3.0.tar.bz2
diff --git a/sources b/sources
index e69de29..f5161fb 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+dd810a231a1718444d4f02180ae39bb5 vdr-plugin-tvguideng-0.3.0.tar.bz2
diff --git a/tvguideng-gcc6.patch b/tvguideng-gcc6.patch
new file mode 100644
index 0000000..e877bba
Binary files /dev/null and b/tvguideng-gcc6.patch differ
diff --git a/vdr-tvguideng.spec b/vdr-tvguideng.spec
new file mode 100644
index 0000000..17e49b8
--- /dev/null
+++ b/vdr-tvguideng.spec
@@ -0,0 +1,78 @@
+%global pname tvguideng
+
+Name: vdr-%{pname}
+Version: 0.3.0
+Release: 2%{?dist}
+Summary: TvGuideNG is a highly customizable 2D EPG viewer plugin
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://projects.vdr-developer.org/projects/plg-tvguideng
+Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguideng.git/snapshot/...
+# https://projects.vdr-developer.org/issues/2427
+Patch0: %{pname}-gcc6.patch
+
+BuildRequires: vdr-devel >= 2.0.0
+BuildRequires: libskindesignerapi-devel
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires: vdr-skindesigner >= 0.4.0
+Requires: vdr-epgsearch
+
+%description
+"TvGuideNG" is a highly customizable 2D EPG viewer plugin.
+The "Search & Recordings" Menue provided by the red button allows to search
+in the EPG and manage timers, search timers, series timers and switch
+timers in an convenient way.
+
+%prep
+%setup -qn vdr-plugin-%{pname}-%{version}
+%patch0 -p1
+
+# std::auto_ptr deprecation warning in libstdc++ 5.1
+sed -i -e 's| std::auto_ptr| std::unique_ptr|g' services/epgsearch.h
+
+%build
+make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
+
+%install
+make install DESTDIR=%{buildroot}
+
+%find_lang %{name}
+
+%files -f %{name}.lang
+%doc HISTORY* README*
+%license COPYING
+%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
+
+%changelog
+* Sat Jul 09 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-2
+- Added %%{pname}-gcc6.patch
+
+* Mon Mar 14 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-1
+- Update to 0.3.0
+
+* Sun Jan 31 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.0-1
+- Update to 0.2.0
+
+* Wed Jan 06 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.6-1
+- Update to 0.1.6
+
+* Fri Jun 26 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.5-1
+- Update to 0.1.5
+
+* Fri May 01 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.3-1
+- Update to 0.1.3
+
+* Sun Apr 12 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2
+- added BR libskindesignerapi-devel
+
+* Fri Mar 20 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.3-1
+- Update to 0.0.3
+
+* Sat Mar 14 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.2-1
+- Update to 0.0.2
+- corrected typo in %%description
+
+* Fri Mar 13 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.1-1
+- initial build
+
8 years, 4 months
[lives] Fix compatibility with ffmpeg-3.0 and GCC-6.1.1.
by Antonio
commit a245dc22e2f4adeb2c0d43c322e0ffd5754c14cb
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Jul 9 11:40:53 2016 +0200
Fix compatibility with ffmpeg-3.0 and GCC-6.1.1.
lives-ffmpeg-3-0.patch | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++
lives.spec | 27 ++++++++++++++--
2 files changed, 111 insertions(+), 2 deletions(-)
---
diff --git a/lives-ffmpeg-3-0.patch b/lives-ffmpeg-3-0.patch
new file mode 100644
index 0000000..0bbf18b
--- /dev/null
+++ b/lives-ffmpeg-3-0.patch
@@ -0,0 +1,86 @@
+--- lives-plugins/weed-plugins/toonz.cpp
++++ lives-plugins/weed-plugins/toonz.cpp
+@@ -38,7 +38,8 @@
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-
++#include <array>
++#include <random>
+
+ #ifdef HAVE_SYSTEM_WEED
+ #include <weed/weed.h>
+
+--- configure.ac
++++ configure.ac
+@@ -524,10 +524,12 @@
+ AM_CONDITIONAL(HAVE_AV_CODEC_SET_PKT_TIMEBASE,$HAVE_AV_CODEC_SET_PKT_TIMEBASE)
+ AM_CONDITIONAL(HAVE_AVFORMAT_NEW_STREAM,$HAVE_AVFORMAT_NEW_STREAM)
+ AM_CONDITIONAL(HAVE_AVPACKET_UNREF,$HAVE_AVPACKET_UNREF)
++AM_CONDITIONAL(HAVE_AVFRAME_UNREF,$HAVE_AVFRAME_UNREF)
+ AM_CONDITIONAL(HAVE_AVFORMAT_FIND_STREAM_INFO,$HAVE_AVFORMAT_FIND_STREAM_INFO)
+ AM_CONDITIONAL(HAVE_AVFORMAT_CLOSE_INPUT,$HAVE_AVFORMAT_CLOSE_INPUT)
+ AM_CONDITIONAL(HAVE_AVFORMAT_INTERNAL_H,$HAVE_AVFORMAT_INTERNAL_H)
+ AM_CONDITIONAL(HAVE_AV_SET_PTS_INFO,$HAVE_AV_SET_PTS_INFO)
++AM_CONDITIONAL(HAVE_AVPRIV_SET_PTS_INFO,$HAVE_AVPRIV_SET_PTS_INFO)
+
+ HAVE_OPENCV=false
+
+--- lives-plugins/plugins/decoders/Makefile.am
++++ lives-plugins/plugins/decoders/Makefile.am
+@@ -78,8 +78,20 @@
+ libav_cflags += -DHAVE_AVCODEC_ALLOC_CONTEXT3=1
+ endif
+
++if HAVE_AV_CODEC_SET_PKT_TIMEBASE
++libav_cflags += -DHAVE_AV_CODEC_SET_PKT_TIMEBASE=1
++endif
++
+ if HAVE_AVFORMAT_NEW_STREAM
+ libav_cflags += -DHAVE_AVFORMAT_NEW_STREAM=1
++endif
++
++if HAVE_AVPACKET_UNREF
++libav_cflags += -DHAVE_AVPACKET_UNREF=1
++endif
++
++if HAVE_AVFRAME_UNREF
++libav_cflags += -DHAVE_AVFRAME_UNREF=1
+ endif
+
+ if HAVE_AVFORMAT_FIND_STREAM_INFO
+@@ -97,6 +109,12 @@
+ if HAVE_AV_SET_PTS_INFO
+ libav_cflags += -DHAVE_AV_SET_PTS_INFO=1
+ endif
++
++if HAVE_AVPRIV_SET_PTS_INFO
++libav_cflags += -DHAVE_AVPRIV_SET_PTS_INFO=1
++endif
++
++
+
+ flv_libs = flv_decoder.la
+ FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
+
+--- lives-plugins/plugins/decoders/libav_helper.h
++++ lives-plugins/plugins/decoders/libav_helper.h
+@@ -62,8 +62,8 @@
+
+
+ #if !HAVE_AV_SET_PTS_INFO
+-#if HAVE_AVFORMAT_INTERNAL_H
+
++#if HAVE_AVFORMAT_INTERNAL_H && HAVE_AVPRIV_SET_PTS_INFO
+ #include <avformat/internal.h>
+ #define av_set_pts_info(a,b,c,d) avpriv_set_pts_info(a,b,c,d)
+
+@@ -77,7 +77,7 @@
+
+
+
+-static UNUSED void av_set_pts_info(AVStream *s, int pts_wrap_bits,
++static UNUSED void av_set_pts_info(AVStream *s, int pts_wrap_bits,
+ unsigned int pts_num, unsigned int pts_den) {
+ AVRational new_tb;
+ if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) {
diff --git a/lives.spec b/lives.spec
index 88588bb..9619861 100644
--- a/lives.spec
+++ b/lives.spec
@@ -1,6 +1,6 @@
Name: lives
Version: 2.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -8,6 +8,9 @@ Source0: http://lives-video.com/releases/LiVES-%{version}.tar.bz2
## Appdata file downloaded from http://sourceforge.net/p/lives/code/HEAD/tree/trunk/LiVES.appdata.xml
Source1: LiVES.appdata.xml
+# Fix compatibility with ffmpeg-3.0
+Patch0: lives-ffmpeg-3-0.patch
+
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(libpulse)
@@ -34,7 +37,7 @@ BuildRequires: pkgconfig(mjpegtools)
BuildRequires: ladspa-devel
BuildRequires: GLee-devel
BuildRequires: x264-libs
-BuildRequires: gettext
+BuildRequires: gettext-devel
BuildRequires: doxygen
BuildRequires: chrpath, desktop-file-utils
BuildRequires: bison
@@ -43,6 +46,11 @@ BuildRequires: ffmpeg-devel
BuildRequires: bzip2-devel
BuildRequires: libappstream-glib
+# Packages for re-configuration
+%if 0%{?fedora} > 24
+BuildRequires: autoconf, automake, libtool
+%endif
+
Requires: mplayer
Requires: mencoder
Requires: sox
@@ -73,12 +81,24 @@ It is small in size, yet it has many advanced features.
%prep
%setup -q
+%if 0%{?fedora} > 24
+%patch0 -p0
+%endif
+
+# Fix to compile with GCC-6.1.1
+%if 0%{?fedora} > 23
+sed -e 's|toonz.cpp||g' -i lives-plugins/weed-plugins/Makefile.am
+%endif
+
##Remove spurious executable permissions
for i in `find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.txt" \)`; do
chmod a-x $i
done
%build
+%if 0%{?fedora} > 24
+autoreconf -ivf
+%endif
%configure --disable-silent-rules --enable-shared --enable-static \
--enable-largefile --enable-threads --disable-rpath --enable-profiling \
--enable-doxygen --disable-projectM --disable-libvisual
@@ -153,6 +173,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Fri Jul 08 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.3-2
+- Fix compatibility with ffmpeg-3.0
+
* Mon May 09 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.3-1
- Update to 2.6.3
8 years, 4 months
[bino/f23] add exclude armv7hl
by Leigh Scott
Summary of changes:
dfc5c27... add exclude armv7hl (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[bino/f24] add exclude armv7hl
by Leigh Scott
Summary of changes:
dfc5c27... add exclude armv7hl (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
