[freshplayerplugin/f24] first build
by Mauricio Teixeira
Summary of changes:
61c7266... first build (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[freshplayerplugin/f23] first build
by Mauricio Teixeira
Summary of changes:
61c7266... first build (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[freshplayerplugin] first build
by Mauricio Teixeira
commit 61c7266ac271efd8586338026ede55a611000b8d
Author: Mauricio Teixeira <mteixeir(a)redhat.com>
Date: Tue Jul 12 10:09:10 2016 -0300
first build
.gitignore | 1 +
freshplayerplugin.spec | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 89 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6145a7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/freshplayerplugin-0.3.5.tar.gz
diff --git a/freshplayerplugin.spec b/freshplayerplugin.spec
new file mode 100644
index 0000000..49899b4
--- /dev/null
+++ b/freshplayerplugin.spec
@@ -0,0 +1,87 @@
+Name: freshplayerplugin
+Version: 0.3.5
+Release: 1%{?dist}
+Summary: PPAPI-host NPAPI-plugin adapter
+Group: Applications/Internet
+License: MIT
+URL: https://github.com/i-rinat/freshplayerplugin
+Source0: https://github.com/i-rinat/%{name}/archive/v%{version}.tar.gz#/%{name}-%{...
+
+BuildRequires: glib2-devel libX11-devel uriparser-devel cairo-devel pango-devel freetype-devel gtk2-devel gcc-c++ alsa-lib-devel libconfig-devel libevent-devel mesa-libGLES-devel cmake make ragel pulseaudio-libs-devel openssl-devel jack-audio-connection-kit-devel soxr-devel libv4l-devel libva-devel ffmpeg-devel libvdpau-devel
+
+Requires: mozilla-filesystem
+
+%description
+As you know, Adobe have suspended further development of Flash player plugin
+for GNU/Linux. Latest available as an NPAPI plugin version 11.2 will get
+security updates for five years (since its release on May 4th, 2012), but
+further development have been ceased.
+Fortunately or not, newer versions are still available for Linux as a part of
+Chrome browser, where Flash comes bundled in a form of PPAPI plugin. PPAPI or
+Pepper Plugin API is an interface promoted by Chromium/Chrome team for browser
+plugins.
+It's NPAPI-inspired yet significantly different API which have every
+conceivable function plugin may want. Two-dimensional graphics, OpenGL ES,
+font rendering, network access, audio, and so on.
+It's huge, there are 107 groups of functions, called interfaces which today's
+Chromium browser offers to plugins.
+And specs are not final yet. Interfaces are changing, newer versions are
+arising, older ones are getting deleted. For various reasons Firefox
+developers are not interested now in implementing PPAPI in Firefox.
+However that does not mean it cannot be done.
+The main goal of this project is to get PPAPI (Pepper) Flash player working
+in Firefox. This can be done in two ways. First one is to implement full PPAPI
+interface in Firefox itself.
+Other one is to implement a wrapper, some kind of adapter which will look like
+browser to PPAPI plugin and look like NPAPI plugin for browser.
+First approach requires strong knowledge of Firefox internals,and moreover
+additional effort to get the code into mainstream.
+Maintaining a set of patches doesn't look like a good idea.
+Second approach allows to concentrate on two APIs only.
+Yes one of them is big, but still graspable.
+Second way will be used for the project. It will benefit other browsers too,
+not only Firefox.
+
+%prep
+%setup -q
+
+%build
+mkdir build
+cd build
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_SKIP_RPATH=true ..
+make %{?_smp_mflags}
+
+%install
+pushd build
+%make_install
+popd
+install -Dm 0644 data/freshwrapper.conf.example %{buildroot}/etc/freshwrapper.conf
+
+%files
+%doc README.md doc/*
+%license LICENSE
+%{_libdir}/mozilla/plugins/libfreshwrapper-flashplayer.so
+%config(noreplace) %{_sysconfdir}/freshwrapper.conf
+
+%changelog
+* Tue Jul 12 2016 Mauricio Teixeira <mauricio.teixeira(a)gmail.com> - 0.3.5-1
+- Upgrade to 0.3.5
+
+* Tue Jan 05 2016 Mauricio Teixeira <mauricio.teixeira(a)gmail.com> - 0.3.4-1
+- Upgrade to 0.3.4
+
+* Thu Nov 12 2015 Mauricio Teixeira <mauricio.teixeira(a)gmail.com> - 0.3.3-1
+- Update to 0.3.3
+- Added install rule to cmake (patch from sergio(a)serjux.com)
+
+* Tue Sep 29 2015 Sérgio Basto <sergio(a)serjux.com> - 0.3.2-2
+- Removed Requires it is a shared library, so requires will be automatic.
+
+* Tue Sep 22 2015 Sérgio Basto <sergio(a)serjux.com> - 0.3.2-1
+- Some fixes and merged some of the work of postinstallerf.
+
+* Mon Sep 21 2015 Mauricio Teixeira <mauricio.teixeira(a)gmail.com> - 0.3.2-0
+- Initial RPM Fusion package based on retired 'dacr' package (Fedora Copr)
+
+* Mon Aug 10 2015 David Vásquez <davidjeremias82 AT gmail DOT com> - 0.3.1-20150810-acb0ee4-1
+- Updated to 0.3.1-20150810-acb0ee4
diff --git a/sources b/sources
index e69de29..993c88e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a1dfa71caba60c13c54ff5c743ef50bc freshplayerplugin-0.3.5.tar.gz
8 years, 4 months
[qmmp-plugin-pack-freeworld/f24] new version 0.9.3
by Karel Volný
commit 203db66c14a3730cefd4f88c76d1c1dc7470654a
Author: Karel Volný <kvolny(a)redhat.com>
Date: Mon Jul 11 23:26:55 2016 +0200
new version 0.9.3
- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
- uses Qt5
.gitignore | 1 +
qmmp-plugin-pack-freeworld.spec | 12 ++++++++----
sources | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69f159e..25edebb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
qmmp-plugin-pack-0.8.3.tar.bz2
qmmp-plugin-pack-0.9.3.tar.bz2
+/qmmp-plugin-pack-1.0.2.tar.bz2
diff --git a/qmmp-plugin-pack-freeworld.spec b/qmmp-plugin-pack-freeworld.spec
index 075b081..f80fd68 100644
--- a/qmmp-plugin-pack-freeworld.spec
+++ b/qmmp-plugin-pack-freeworld.spec
@@ -1,5 +1,5 @@
Name: qmmp-plugin-pack-freeworld
-Version: 0.9.3
+Version: 1.0.2
Release: 1%{?dist}
Summary: A set of extra plugins for Qmmp
@@ -11,11 +11,10 @@ Source1: qmmp-plugin-pack-filter-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-plugin-pack-filter-provides.sh
-BuildRequires: qmmp >= %{version}
-BuildRequires: qmmp-devel >= %{version}
+BuildRequires: qmmp-devel >= 1.0.0
BuildRequires: cmake
BuildRequires: libmpg123-devel
-BuildRequires: qt-devel
+BuildRequires: qt5-linguist
BuildRequires: taglib-devel
%description
@@ -46,6 +45,11 @@ make DESTDIR=%{buildroot} install -C src/Input/mpg123
%changelog
+* Mon Jul 11 2016 Karel Volný <kvolny(a)redhat.com> 1.0.2-1
+- new version 0.9.3
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+- uses Qt5
+
* Mon Jan 04 2016 Karel Volný <kvolny(a)redhat.com> 0.9.3-1
- new version 0.9.3
- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
diff --git a/sources b/sources
index d6e6b21..87518dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59f01f015a74446e32c4620500f71296 qmmp-plugin-pack-0.9.3.tar.bz2
+fb1ec3b022aab9dd43cc48b60de07e63 qmmp-plugin-pack-1.0.2.tar.bz2
8 years, 4 months
[qmmp-plugin-pack-freeworld] new version 1.1.1
by Karel Volný
commit 922c52dce9dd7d52fee6f47aa45f55f5c9a1110a
Author: Karel Volný <kvolny(a)redhat.com>
Date: Mon Jul 11 23:05:04 2016 +0200
new version 1.1.1
- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
- uses Qt5
.gitignore | 1 +
qmmp-plugin-pack-freeworld.spec | 12 ++++++++----
sources | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69f159e..1409d52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
qmmp-plugin-pack-0.8.3.tar.bz2
qmmp-plugin-pack-0.9.3.tar.bz2
+/qmmp-plugin-pack-1.1.1.tar.bz2
diff --git a/qmmp-plugin-pack-freeworld.spec b/qmmp-plugin-pack-freeworld.spec
index 075b081..4d9d121 100644
--- a/qmmp-plugin-pack-freeworld.spec
+++ b/qmmp-plugin-pack-freeworld.spec
@@ -1,5 +1,5 @@
Name: qmmp-plugin-pack-freeworld
-Version: 0.9.3
+Version: 1.1.1
Release: 1%{?dist}
Summary: A set of extra plugins for Qmmp
@@ -11,11 +11,10 @@ Source1: qmmp-plugin-pack-filter-provides.sh
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-plugin-pack-filter-provides.sh
-BuildRequires: qmmp >= %{version}
-BuildRequires: qmmp-devel >= %{version}
+BuildRequires: qmmp-devel >= 1.1.0
BuildRequires: cmake
BuildRequires: libmpg123-devel
-BuildRequires: qt-devel
+BuildRequires: qt5-linguist
BuildRequires: taglib-devel
%description
@@ -46,6 +45,11 @@ make DESTDIR=%{buildroot} install -C src/Input/mpg123
%changelog
+* Mon Jul 11 2016 Karel Volný <kvolny(a)redhat.com> 1.1.1-1
+- new version 1.1.1
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+- uses Qt5
+
* Mon Jan 04 2016 Karel Volný <kvolny(a)redhat.com> 0.9.3-1
- new version 0.9.3
- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
diff --git a/sources b/sources
index d6e6b21..770d3b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59f01f015a74446e32c4620500f71296 qmmp-plugin-pack-0.9.3.tar.bz2
+b254498c6b38816f9d1efbd663ef8773 qmmp-plugin-pack-1.1.1.tar.bz2
8 years, 4 months
[qmmp-plugins-freeworld] version bump to 1.1.1
by Karel Volný
commit eda41e0728b5a819c010ce6ed65fad0f5a02d0d1
Author: Karel Volný <kvolny(a)redhat.com>
Date: Mon Jul 11 15:40:17 2016 +0200
version bump to 1.1.1
.gitignore | 1 +
qmmp-plugins-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87fcf8d..93a945a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ qmmp-0.8.3.tar.bz2
qmmp-0.9.5.tar.bz2
qmmp-0.9.6.tar.bz2
/qmmp-1.1.0.tar.bz2
+/qmmp-1.1.1.tar.bz2
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index bc6cc60..71d684d 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,5 +1,5 @@
Name: qmmp-plugins-freeworld
-Version: 1.1.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
@@ -184,6 +184,9 @@ fi
%changelog
+* Mon Jul 11 2016 Karel Volný <kvolny(a)redhat.com> 1.1.1-1
+- version bump to 1.1.1
+
* Fri Jun 24 2016 Karel Volný <kvolny(a)redhat.com> 1.1.0-1
- version bump to 1.1.0
- uses Qt5
diff --git a/sources b/sources
index f08f27e..21f4a87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc9db01a0f38ff33158dda35410f16b2 qmmp-1.1.0.tar.bz2
+9931bd1d6f92f75582f947c2144b695b qmmp-1.1.1.tar.bz2
8 years, 4 months
[avidemux/f24] (11 commits) ...Really fix building with GCC6, patch provided by Dan Horák <dan@danny.cz>
by jwrdegoede
Summary of changes:
52a92e7... Bump for rebuild in new infra. (*)
df6f9cc... Add GCC 6 operator patch. (*)
dac8756... Update gcc 6 patch. (*)
7dcb568... More tweaks to the gcc 6 patch. (*)
ef437c1... More gcc 6 fixes. (*)
4940e19... More gcc 6 fixes. (*)
c7abbb7... Attempt to fix narrowing conversion issue. (*)
337c4f9... Attempt to fix narrowing conversion issue. (*)
794d167... Try try again... (*)
2dee0bb... Try again. (*)
9209640... Really fix building with GCC6, patch provided by Dan Horák (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[avidemux] Really fix building with GCC6, patch provided by Dan Horák <dan@danny.cz>
by jwrdegoede
commit 9209640cfbc1a7da4480e9bab0f3f198a90be761
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Jul 11 14:19:55 2016 +0200
Really fix building with GCC6, patch provided by Dan Horák <dan(a)danny.cz>
avidemux-2.6.12-gcc6.patch | 150 ++++++++++++++++++++++++++++++++++++++++++++-
avidemux.spec | 5 +-
2 files changed, 152 insertions(+), 3 deletions(-)
---
diff --git a/avidemux-2.6.12-gcc6.patch b/avidemux-2.6.12-gcc6.patch
index 489d040..5aeee25 100644
--- a/avidemux-2.6.12-gcc6.patch
+++ b/avidemux-2.6.12-gcc6.patch
@@ -56,6 +56,40 @@
bool tsPacket::decodePesHeader(TS_PESpacket *pes)
{
uint8_t *start=pes->payload+6;
+diff --git a/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h b/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h
+index be2c4fe..c5761bc 100644
+--- a/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h
++++ b/avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h
+@@ -43,9 +43,9 @@
+ 0, /* max_b_frames */ \
+ 0, /* mpeg_quant */ \
+ 1, /* is_luma_elim_threshold */ \
+- -2, /* luma_elim_threshold */ \
++ 0, /* luma_elim_threshold */ \
+ 1, /* is_chroma_elim_threshold */ \
+- -5, /* chroma_elim_threshold */ \
++ 0, /* chroma_elim_threshold */ \
+ 0.05, /*lumi_masking */ \
+ 1, /* is lumi */ \
+ 0.01, /*dark_masking */ \
+diff --git a/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h b/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h
+index 77e73c8..c037cf0 100644
+--- a/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h
++++ b/avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h
+@@ -53,9 +53,9 @@ enum
+ 2, /* max_b_frames */ \
+ 1, /* mpeg_quant */ \
+ 1, /* is_luma_elim_threshold */ \
+- -2, /* luma_elim_threshold */ \
++ 0, /* luma_elim_threshold */ \
+ 1, /* is_chroma_elim_threshold */ \
+- -5, /* chroma_elim_threshold */ \
++ 0, /* chroma_elim_threshold */ \
+ 0.05, /*lumi_masking */ \
+ 1, /* is lumi */ \
+ 0.01, /*dark_masking */ \
+diff --git a/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h b/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h
+index c0e2ede..751d2b4 100644
--- a/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h
+++ b/avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h
@@ -43,9 +43,9 @@
@@ -63,10 +97,122 @@
0, /* mpeg_quant */ \
1, /* is_luma_elim_threshold */ \
- -2, /* luma_elim_threshold */ \
-+ (uint32)-2, /* luma_elim_threshold */ \
++ 0, /* luma_elim_threshold */ \
1, /* is_chroma_elim_threshold */ \
- -5, /* chroma_elim_threshold */ \
-+ (uint32)-5, /* chroma_elim_threshold */ \
++ 0, /* chroma_elim_threshold */ \
0.05, /*lumi_masking */ \
1, /* is lumi */ \
0.01, /*dark_masking */ \
+diff --git a/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp b/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp
+index 38d8bed..8ad7ba5 100644
+--- a/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp
++++ b/avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp
+@@ -44,7 +44,7 @@ typedef struct
+
+ static const dvProfileClass supportedProfiles[]=
+ {
+- {720,480,29.97,dvColor422},
++ {720,480,30,dvColor422},
+ {720,576,25,dvColor420},
+ };
+
+diff --git a/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp b/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp
+index cf09168..5f6939a 100644
+--- a/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp
++++ b/avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp
+@@ -54,7 +54,7 @@ typedef enum
+ RD_SQUARE = RD_HPEL_QPEL_8 | XVID_ME_EXTSEARCH_RD
+ } RateDistortionMode;
+
+-uint32_t rdMode[5]=
++int32_t rdMode[5]=
+ {
+ RD_NONE,
+ RD_DCT_ME,
+diff --git a/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h b/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h
+index 6ad2830..d9de814 100644
+--- a/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h
++++ b/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h
+@@ -108,7 +108,7 @@ extern "C"
+ 1.0, /* float rate_tolerance; */ \
+ 0, /* uint32_t vbv_max_bitrate; */ \
+ 0, /* uint32_t vbv_buffer_size; */ \
+- 0.9, /* uint32_t vbv_buffer_init; */ \
++ 1, /* uint32_t vbv_buffer_init; */ \
+ 1.4, /* float ip_factor; */ \
+ 1.3, /* float pb_factor; */ \
+ 1, /* uint32_t aq_mode; */ \
+diff --git a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h
+index 6ac5742..b2d6cc3 100644
+--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h
++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h
+@@ -85,7 +85,7 @@ extern "C"
+ 1.0, /* float rate_tolerance; */ \
+ 0, /* uint32_t vbv_max_bitrate; */ \
+ 0, /* uint32_t vbv_buffer_size; */ \
+- 0.9, /* uint32_t vbv_buffer_init; */ \
++ 1, /* uint32_t vbv_buffer_init; */ \
+ 1.4, /* float ip_factor; */ \
+ 1.3, /* float pb_factor; */ \
+ 2, /* uint32_t aq_mode; */ \
+commit 7dee579d3ac16d731898305d24bb771834ae0ce0
+Author: Andrew J. Schultz <ajschult(a)verizon.net>
+Date: Sun Jul 3 14:56:41 2016 -0400
+
+ Explicitly cast to unsigned int
+
+diff --git a/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp b/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp
+index 4c3b5dc..ab5b21e 100644
+--- a/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp
++++ b/avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp
+@@ -38,7 +38,7 @@ typedef struct
+ }idcToken;
+
+ static const idcToken listOfIdc[]={
+- {-1,"Auto"},
++ {(unsigned int)-1,"Auto"},
+ {10,"1"},
+ {11,"1.1"},
+ {12,"1.2"},
+diff --git a/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp b/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp
+index 21172ab..fe94dd8 100644
+--- a/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp
++++ b/avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp
+@@ -38,7 +38,7 @@ typedef struct
+ }idcToken;
+
+ static const idcToken listOfIdc[]={
+- {-1,"Auto"},
++ {(unsigned int)-1,"Auto"},
+ {10,"1"},
+ {20,"2"},
+ {21,"2.1"},
+commit 6ad028d9f9caf929819c1afcb693611aade0af0b
+Author: Andrew J. Schultz <ajschult(a)verizon.net>
+Date: Sun Jul 3 14:50:55 2016 -0400
+
+ Cast to int so we can take abs()
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp b/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
+index d8e6f24..e8d9a9c 100644
+--- a/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
+@@ -240,7 +240,7 @@ teleCide *_param=&configuration;
+ {
+ // The chosen frame doesn't match the prediction.
+ if (predicted_metric == 0) mismatch = 0.0;
+- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
++ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
+ if (mismatch < gthresh)
+ {
+ // It's close enough, so use the predicted one.
+@@ -283,7 +283,7 @@ teleCide *_param=&configuration;
+ {
+ // The chosen frame doesn't match the prediction.
+ if (predicted_metric == 0) mismatch = 0.0;
+- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
++ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
+ if ((int) mismatch <= gthresh)
+ {
+ // It's close enough, so use the predicted one.
diff --git a/avidemux.spec b/avidemux.spec
index d5c2ac0..6ee6869 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.6.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -370,6 +370,9 @@ fi
%changelog
+* Mon Jul 11 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.6.12-3
+- Really fix building with GCC6, patch provided by Dan Horák <dan(a)danny.cz>
+
* Sat Jun 25 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.12-2
- Bump for rebuild in new infra.
- Add patch for GCC 6 narrowing conversion and other GCC 6 errors.
8 years, 4 months
[zboy/f23] First import
by Andrea Musuruane
Summary of changes:
df3a263... First import (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[zboy/f24] First import
by Andrea Musuruane
Summary of changes:
df3a263... First import (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
