[rpmfusion-packager] In Python 3 iwe need add the b flag
by Sérgio M. Basto
commit 6c66f7548ae28327416e5727815ff3503d847cb6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 28 02:21:28 2019 +0000
In Python 3 iwe need add the b flag
f2d2726d6e884d81c86adaafe2effbc53ee6220e.patch | 41 ++++++++++++++++++++++++++
rpmfusion-packager.spec | 7 ++++-
2 files changed, 47 insertions(+), 1 deletion(-)
---
diff --git a/f2d2726d6e884d81c86adaafe2effbc53ee6220e.patch b/f2d2726d6e884d81c86adaafe2effbc53ee6220e.patch
new file mode 100644
index 0000000..a6d0439
--- /dev/null
+++ b/f2d2726d6e884d81c86adaafe2effbc53ee6220e.patch
@@ -0,0 +1,41 @@
+commit f2d2726d6e884d81c86adaafe2effbc53ee6220e
+Author: Sérgio M. Basto <sergio(a)serjux.com>
+Date: Thu Mar 28 02:08:18 2019 +0000
+
+ In Python 3 add the b flag, also changes from 2to3
+
+ In Python 3 it makes a difference whether you open the file in binary or text mode. Just add the b flag to make it binary
+ This works in Python 2 too.
+ https://stackoverflow.com/questions/47027254/typeerror-write-argument-mus...
+
+diff --git a/src/rpmfusion-packager-setup.py.in b/src/rpmfusion-packager-setup.py.in
+index cf8de8f..9184292 100644
+--- a/src/rpmfusion-packager-setup.py.in
++++ b/src/rpmfusion-packager-setup.py.in
+@@ -17,7 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with rpmfusion-packager. If not, see <http://www.gnu.org/licenses/>.
+
+-from __future__ import print_function
++
+ from builtins import input
+ import os
+ import sys
+@@ -26,7 +26,7 @@ import subprocess
+
+ def download(location, file):
+ """Save data at location to file. WARNING: Overwrites files!"""
+- fh = open(file, 'w')
++ fh = open(file, 'wb')
+ curl = pycurl.Curl()
+ curl.setopt(pycurl.URL, location)
+ curl.setopt(pycurl.FOLLOWLOCATION, 1)
+@@ -51,7 +51,7 @@ if __name__ == "__main__":
+ USERHOME = os.path.expanduser('~')
+ print('Setting up RPM Fusion packager environment')
+ if not os.path.isfile(os.path.join(USERHOME, '.rpmfusion.user')):
+- username = input('Enter your RPM Fusion username: ')
++ username = eval(input('Enter your RPM Fusion username: '))
+ fh = open(os.path.join(USERHOME, '.rpmfusion.user'), 'w')
+ fh.write(username)
+ fh.close()
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index 8e81974..0f991fa 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -7,12 +7,13 @@
Name: rpmfusion-packager
Version: 0.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tools for setting up a rpmfusion maintainer environment
License: GPLv2+
URL: https://github.com/rpmfusion-infra/rpmfusion-packager
Source0: %url/archive/v%{version}/rpmfusion-packager-%{version}.tar.gz
+Patch1: f2d2726d6e884d81c86adaafe2effbc53ee6220e.patch
BuildArch: noarch
@@ -75,6 +76,7 @@ Provides rpmfusion-cert and the rpmfusion_cert python library
%prep
%setup -q
+%patch1 -p1
autoreconf -i
@@ -111,6 +113,9 @@ autoreconf -i
%endif
%changelog
+* Thu Mar 28 2019 Sérgio Basto <sergio(a)serjux.com> - 0.6.3-4
+- In Python 3 iwe need add the b flag
+
* Thu Mar 28 2019 Sérgio Basto <sergio(a)serjux.com> - 0.6.3-3
- python3-rpmfusion-cert obsoletes rpmfusion-cert to fix upgrade path
5 years, 8 months
[rpmfusion-packager] python3-rpmfusion-cert obsoletes rpmfusion-cert to fix upgrade path
by Sérgio M. Basto
commit 3c6dc98c84057b95e96bfbfe1695481869d3633c
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 28 00:40:22 2019 +0000
python3-rpmfusion-cert obsoletes rpmfusion-cert to fix upgrade path
rpmfusion-packager.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index 9ee93fe..8e81974 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -7,7 +7,7 @@
Name: rpmfusion-packager
Version: 0.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tools for setting up a rpmfusion maintainer environment
License: GPLv2+
@@ -54,6 +54,8 @@ Requires: python3-pyOpenSSL
Requires: python3-requests
Requires: python3-fedora
Requires: python3-six
+Provides: rpmfusion-cert = %{version}-%{release}
+Obsoletes: rpmfusion-cert < %{version}-%{release}
%description -n python3-rpmfusion-cert
Provides rpmfusion-cert and the rpmfusion_cert python3 library
@@ -109,6 +111,9 @@ autoreconf -i
%endif
%changelog
+* Thu Mar 28 2019 Sérgio Basto <sergio(a)serjux.com> - 0.6.3-3
+- python3-rpmfusion-cert obsoletes rpmfusion-cert to fix upgrade path
+
* Mon Mar 25 2019 Sérgio Basto <sergio(a)serjux.com> - 0.6.3-2
- Revert the sources format to tar.gz, to avoid possible confusion in the future.
5 years, 8 months
[libmimic] Update changelog
by Nicolas Chauvet
commit dd07e47b34e5ce82b976657dc8c917a3e28351d4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Mar 27 22:53:42 2019 +0100
Update changelog
libmimic.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libmimic.spec b/libmimic.spec
index 63935e8..f9b7d10 100644
--- a/libmimic.spec
+++ b/libmimic.spec
@@ -1,6 +1,6 @@
Name: libmimic
Version: 1.0.4
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Encoding/decoding library for Mimic V2.x
License: LGPLv2+
URL: http://farsight.sourceforge.net/
@@ -52,6 +52,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Wed Mar 27 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.4-14
+- Spec file clean-up
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.0.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 8 months
[libmimic] Spec file clean-up
by Nicolas Chauvet
commit ed85e94daa59259c00dd984cf75d548a02283a19
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Mar 27 22:52:54 2019 +0100
Spec file clean-up
libmimic.spec | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/libmimic.spec b/libmimic.spec
index c58deed..63935e8 100644
--- a/libmimic.spec
+++ b/libmimic.spec
@@ -2,7 +2,6 @@ Name: libmimic
Version: 1.0.4
Release: 13%{?dist}
Summary: Encoding/decoding library for Mimic V2.x
-Group: System Environment/Libraries
License: LGPLv2+
URL: http://farsight.sourceforge.net/
Source0: http://downloads.sourceforge.net/farsight/%{name}-%{version}.tar.gz
@@ -16,7 +15,6 @@ for webcam conversations.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, pkgconfig
%description devel
@@ -30,21 +28,20 @@ developing applications that use %{name}.
%build
%configure --disable-static
-make %{?_smp_mflags} libmimic_la_LIBADD="-lglib-2.0 -lm"
+%make_build libmimic_la_LIBADD="-lglib-2.0 -lm"
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%make_install
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
-%doc AUTHORS COPYING README
+%doc AUTHORS README
+%license COPYING
%{_libdir}/*.so.*
%files devel
5 years, 8 months
[avidemux/f28] (12 commits) ...Add new patches.
by Richard Shaw
Summary of changes:
9491b86... Rebuild for new libass version (*)
9229a16... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
9b53cac... Mass rebuild for x264 and/or x265 (*)
a913da7... Rebuild for new x265 (*)
1781867... Rebuild for ffmpeg-3.4.5 on el7 (*)
b156a27... Rebuild for new x265 (*)
5452f68... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
984ce28... Add patch for gcc 9 to fix bundled ffmpeg building, fixes R (*)
230b2b5... Mass rebuild for x264 (*)
8f4243f... Switch to nv-codec-headers (*)
0dbc916... Update to 2.7.3 and apply upstream patches per user request (*)
87158e0... Add new patches. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[avidemux/f29] (9 commits) ...Add new patches.
by Richard Shaw
Summary of changes:
a913da7... Rebuild for new x265 (*)
1781867... Rebuild for ffmpeg-3.4.5 on el7 (*)
b156a27... Rebuild for new x265 (*)
5452f68... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
984ce28... Add patch for gcc 9 to fix bundled ffmpeg building, fixes R (*)
230b2b5... Mass rebuild for x264 (*)
8f4243f... Switch to nv-codec-headers (*)
0dbc916... Update to 2.7.3 and apply upstream patches per user request (*)
87158e0... Add new patches. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[avidemux] Add new patches.
by Richard Shaw
commit 87158e065540afb086080170a7675b82969e2bca
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Mar 27 14:49:13 2019 -0500
Add new patches.
avidemux-2.7.3-ad_lav.patch | 41 +++++++
avidemux-2.7.3-frame_matching.patch | 223 ++++++++++++++++++++++++++++++++++++
2 files changed, 264 insertions(+)
---
diff --git a/avidemux-2.7.3-ad_lav.patch b/avidemux-2.7.3-ad_lav.patch
new file mode 100644
index 0000000..9e8af8e
--- /dev/null
+++ b/avidemux-2.7.3-ad_lav.patch
@@ -0,0 +1,41 @@
+From 1d714aacd5eeb47898ad6f4ce31993e1671e8722 Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Mon, 25 Mar 2019 20:23:26 +0100
+Subject: [PATCH] [ad_lav] Do not skip channel mapping on decoding error
+
+---
+ .../ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp b/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp
+index 21db257f8..cb69710b9 100644
+--- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp
++++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp
+@@ -442,7 +442,8 @@ uint8_t ADM_AudiocoderLavcodec::run(uint8_t *inptr, uint32_t nbIn, float *outptr
+ AVPacket pkt;
+ av_init_packet(&pkt);
+ int nbChunk,res=0;
+- while(_tail-_head>=_blockalign)
++ bool eof=false;
++ while(_tail-_head>=_blockalign && !eof)
+ {
+ nbChunk=(_tail-_head)/_blockalign;
+ pkt.size=nbChunk*_blockalign;
+@@ -458,14 +459,15 @@ uint8_t ADM_AudiocoderLavcodec::run(uint8_t *inptr, uint32_t nbIn, float *outptr
+ if(res==AVERROR(EAGAIN)) break; // we need to send more input
+ if(res==AVERROR_EOF)
+ {
+- return 1;
++ eof=true;
++ break;
+ }
+ if(res<0)
+ {
+ char er[2048]={0};
+ av_make_error_string(er, sizeof(er)-1, res);
+ ADM_warning("[ADM_ad_lav] decoding error: %s\n",er);
+- return 1;
++ break;
+ }
+
+ bool invalid=false;
diff --git a/avidemux-2.7.3-frame_matching.patch b/avidemux-2.7.3-frame_matching.patch
new file mode 100644
index 0000000..9e07660
--- /dev/null
+++ b/avidemux-2.7.3-frame_matching.patch
@@ -0,0 +1,223 @@
+From 0ec83347e268236109049fd038feeb2b07e20862 Mon Sep 17 00:00:00 2001
+From: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Mon, 25 Mar 2019 21:27:41 +0100
+Subject: [PATCH] [editor] Rework how we find a frame matching given PTS,
+ optimize search for the next keyframe, fix hang seeking to the end with some
+ videos, remove unused variables
+
+This patch addresses two issues in ADM_Composer::getFrameNumFromPtsOrBefore:
+
+1) An insufficient bounds check for tmpFrame not exceeding the total number of frames in the ref video could result in loop continuing until uint32_t has wrapped around, freezing the application;
+
+2) Trying to identify the matching frame purely by bisect is not guaranteed to succeed with frame reordering.
+---
+ .../common/ADM_editor/src/ADM_edSearch.cpp | 140 +++++++++++-------
+ 1 file changed, 88 insertions(+), 52 deletions(-)
+
+diff --git a/avidemux/common/ADM_editor/src/ADM_edSearch.cpp b/avidemux/common/ADM_editor/src/ADM_edSearch.cpp
+index 4ea2ac96d..6243d5ca4 100644
+--- a/avidemux/common/ADM_editor/src/ADM_edSearch.cpp
++++ b/avidemux/common/ADM_editor/src/ADM_edSearch.cpp
+@@ -208,13 +208,19 @@ bool r;
+ */
+ bool ADM_Composer::searchNextKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nkTime)
+ {
+- // Search from the end till we get a keyframe
++ int curFrame=0;
+ _VIDEOS *v=_segments.getRefVideo(ref);
++ // look up the frame we are starting from...
++ if(!getFrameNumFromPtsOrBefore(v,refTime,curFrame))
++ {
++ ADM_warning("Cannot identify the frame for time %s in reference.\n",ADM_us2plain(refTime));
++ }
+ uint32_t nbFrame=v->_nb_video_frames;
+ uint64_t pts,dts;
+- for(int i=0;i<nbFrame;i++)
++ curFrame -= 16; // safety margin to deal with early B-frames
++ if(curFrame < 0) curFrame = 0;
++ for(int i=curFrame;i<nbFrame;i++)
+ {
+- uint64_t p;
+ uint32_t flags;
+ v->_aviheader->getFlags(i,&flags);
+ if(!(flags & AVI_KEY_FRAME)) continue;
+@@ -243,18 +249,27 @@ bool ADM_Composer::searchNextKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nk
+ */
+ bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber)
+ {
++ if(refTime == ADM_NO_PTS)
++ return false;
++ if(refTime <= v->firstFramePts)
++ {
++ frameNumber = 0;
++ return true;
++ }
++
+ uint32_t nbFrame = v->_nb_video_frames;
+- uint64_t pts, dts;
++ uint64_t pts, dts, margin = v->timeIncrementInUs * 16;
++ const uint64_t rangeBegin = (refTime < margin)? 0 : (refTime - margin);
++ const uint64_t rangeEnd = refTime + margin;
+ uint32_t curFrame = nbFrame >> 1;
+ uint32_t splitMoval = (curFrame + 1) >> 1;
+ uint32_t minFrame = 0;
++ bool worked = false;
+ pivotPrintf("Looking for frame with pts %" PRIu64" us (%s)\n",refTime,ADM_us2plain(refTime));
+ // Try to find the frame that as the timestamp close enough to refTime, while being smaller
+ do
+ {
+ // seems like the pts determination, not always works -> retry if necessary
+- bool worked;
+- uint32_t skipped = 0;
+ uint32_t tmpFrame = curFrame;
+ do
+ {
+@@ -262,54 +277,47 @@ bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &f
+ worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
+ if(worked && pts != ADM_NO_PTS)
+ break; // found
+- if(!tmpFrame)
++ if(tmpFrame <= minFrame)
+ {
+- ADM_warning("The whole segment is corrupted. Aborting the search\n");
+- return false;
++ ADM_warning("Frames between %" PRIu32" and %" PRIu32" have no PTS.\n",minFrame,curFrame);
++ break;
+ }
+ tmpFrame--;
+- skipped++;
+ } while(true);
+- if(pts == refTime)
+- break;
+- if(skipped && pts < refTime)
+- { // if we slid past the target frame...
+- pivotPrintf("skipped %" PRIu32" frames seeking back\n",skipped);
+- skipped = 0;
+- tmpFrame = curFrame + 1; // ...go back to the frame where we first encountered corrupted video...
++ if(pts == ADM_NO_PTS)
++ {
++ tmpFrame = curFrame + 1;
+ do
+- { // ...and seek forward until we get a valid pts
+- pts = ADM_NO_PTS;
+- worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
+- if(worked && pts != ADM_NO_PTS)
+- break; // found
+- tmpFrame++;
+- if(tmpFrame == nbFrame)
+- {
+- ADM_warning("The whole segment is corrupted. Aborting the search\n");
+- return false;
+- }
+- skipped++;
+- } while(true);
+- if(skipped)
+ {
+- pivotPrintf("skipped %" PRIu32" frames seeking forward\n",skipped);
+- if(pts > refTime)
++ if(tmpFrame >= nbFrame)
+ {
+- ADM_warning("The video at the specified time in ref is corrupted. Aborting seek\n");
++ ADM_warning("The whole segment is corrupted, aborting seek.\n");
+ return false;
+- }else
+- {
+- minFrame = tmpFrame;
+ }
+- }
+- curFrame = tmpFrame;
++ minFrame = tmpFrame;
++ worked = v->_aviheader->getPtsDts(tmpFrame,&pts,&dts);
++ if(worked && pts != ADM_NO_PTS)
++ break; // found
++ tmpFrame++;
++ } while(true);
+ }
++ curFrame = tmpFrame; // resync
++ // are we lucky?
++ if(pts == refTime)
++ {
++ pivotPrintf("Perfect match for frame %" PRIu32"\n",curFrame);
++ frameNumber = curFrame;
++ return true;
++ }
++ // nope, are we at least close enough?
++ if(pts != ADM_NO_PTS && pts >= rangeBegin && pts <= rangeEnd)
++ break; // switch to linear search
++ // nope, continue to bisect
+ pivotPrintf("SplitMoval=%d\n",splitMoval);
+- if(!splitMoval)
+- break;
++ if(splitMoval < 16)
++ break;
+ pivotPrintf("Pivot frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
+- if (pts >= refTime)
++ if (pts > refTime)
+ {
+ if (curFrame <= splitMoval + minFrame)
+ {
+@@ -324,18 +332,47 @@ bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &f
+ if(curFrame >= nbFrame)
+ curFrame = nbFrame - 1;
+ }
+- if(splitMoval > 1)
+- splitMoval++;
++ splitMoval++;
+ splitMoval >>= 1;
+- pivotPrintf("Split=%d\n",splitMoval);
+ } while(refTime != pts);
+
+- pivotPrintf("Matching frame is %" PRIu32" at %s\n",curFrame,ADM_us2plain(pts));
+- if(pts > refTime && curFrame)
+- curFrame--;
+- pivotPrintf("Our target frame is %" PRIu32"\n",curFrame);
+- frameNumber = curFrame;
+- return true;
++ // linear search with a generous safety margin
++ curFrame = (curFrame < 32)? 0 : curFrame - 32;
++ pivotPrintf("Starting linear search at frame %" PRIu32", total frames: %" PRIu32"\n",curFrame,nbFrame);
++ int candidate = -1;
++ uint64_t last = 0;
++ for(int i = 0; i < 65; i++)
++ {
++ if(curFrame >= nbFrame) break;
++ pts = ADM_NO_PTS;
++ worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);
++ if(!worked || pts == ADM_NO_PTS)
++ {
++ pivotPrintf("Linear search, skipping frame %" PRIu32"\n",curFrame);
++ curFrame++;
++ continue;
++ }
++ if(pts == refTime)
++ {
++ pivotPrintf("Perfect match for frame %" PRIu32"\n",curFrame);
++ frameNumber = curFrame;
++ return true;
++ }
++ if(pts >= rangeBegin && pts > last && pts < refTime)
++ {
++ candidate = curFrame;
++ last = pts;
++ }
++ curFrame++;
++ }
++ if(candidate >= 0)
++ {
++ ADM_info("Best candidate for time %s in reference is frame %" PRIu32"\n",ADM_us2plain(refTime),candidate);
++ frameNumber = candidate;
++ return true;
++ }
++ ADM_warning("Search for frame matching time %s in reference failed.\n",ADM_us2plain(refTime));
++ return false;
+ }
+ /**
+ \fn searchPreviousKeyFrameInRef
+@@ -365,7 +402,6 @@ bool ADM_Composer::searchPreviousKeyFrameInRef(int ref,uint64_t refTime,uint64_t
+ // rewind until we find a keyframe
+ for (int i=curFrame; i>=0; i--)
+ {
+- uint64_t p;
+ uint32_t flags;
+ v->_aviheader->getFlags(i,&flags);
+ if(!(flags & AVI_KEY_FRAME))
5 years, 8 months
[avidemux] Update to 2.7.3 and apply upstream patches per user request. Fixes RFBZ#5208.
by Richard Shaw
commit 0dbc916580f499fca8970ef3e9e0ae6c67b3932d
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Mar 27 14:48:57 2019 -0500
Update to 2.7.3 and apply upstream patches per user request.
Fixes RFBZ#5208.
.gitignore | 1 +
avidemux-ffmpeg_gcc9.patch | 13 ----------
avidemux-qt.desktop | 9 -------
avidemux.spec | 51 ++++++++++-----------------------------
rpmfusion-avidemux-qt.appdata.xml | 28 ---------------------
sources | 2 +-
6 files changed, 15 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a23558b..6eaa0b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ avidemux_2.6.10.tar.gz
/avidemux_2.6.20.tar.gz
/avidemux_2.7.0.tar.gz
/avidemux_2.7.1.tar.gz
+/avidemux_2.7.3.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index f90a2f0..2e85e70 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -4,16 +4,16 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
Name: avidemux
-Version: 2.7.1
-Release: 12%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
-Source1: avidemux-qt.desktop
-Source2: rpmfusion-avidemux-qt.appdata.xml
-Source100: avidemux-ffmpeg_gcc9.patch
+
+Patch0: avidemux-2.7.3-ad_lav.patch
+Patch1: avidemux-2.7.3-frame_matching.patch
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
@@ -59,7 +59,6 @@ BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel >= 1.0.1
BuildRequires: libdca-devel
BuildRequires: opencore-amr-devel
-BuildRequires: libvpx-devel
BuildRequires: twolame-devel
BuildRequires: opus-devel
@@ -121,8 +120,6 @@ This package contains translation files for %{name}.
%prep
%autosetup -p1 -n %{name}_%{version}
-# nvenc is retired in favor nv-codec-headers
-sed -i -e 's@/usr/include/x86_64-linux-gnu@/usr/include/ffnvcodec@g' cmake/admCheckNvEnc.cmake
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -130,11 +127,6 @@ rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
avidemux_plugins/ADM_videoFilters6/ass/ADM_libass \
avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2
-# Add patch to bundled ffmpeg for gcc 9
-#
-install -pm 0644 %{SOURCE100} ./avidemux_core/ffmpeg_package/patches/libavutil_mem_h.patch
-
-
%build
# Build avidemux_core
export LDFLAGS="-lc -Wl,--as-needed"
@@ -230,31 +222,12 @@ rm -rf %{buildroot}%{_includedir}/%{name}
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
-# INstall PNG file
-mkdir -p %{buildroot}%{_datadir}/icons/%{name}
-install -pm 0644 ./appImage/%{name}.png %{buildroot}%{_datadir}/icons/%{name}/
-
-# Install desktop files
-desktop-file-install --vendor rpmfusion \
- --set-icon=%{_datadir}/icons/%{name}/%{name}.png \
- --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE1}
-
-# Install appdata file
-mkdir -p %{buildroot}%{_datadir}/metainfo
-install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo/
-
-# Install icons
-install -pDm 0644 avidemux/gtk/ADM_userInterfaces/glade/main/avidemux_icon_small.png \
- %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
-install -pDm 0644 avidemux_icon.png \
- %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
-
# Fix library permissions
find %{buildroot}%{_libdir} -type f -name "*.so.*" -exec chmod 0755 {} \;
%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
appstream-util validate-relax --nonet \
%{buildroot}%{_datadir}/metainfo/*.appdata.xml
@@ -267,7 +240,6 @@ appstream-util validate-relax --nonet \
%if 0%{?el7}
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
%postun
@@ -309,10 +281,9 @@ fi
%{_libdir}/libADM_openGLQT*.so
%{_libdir}/libADM_UIQT*.so
%{_libdir}/libADM_render6_QT5.so
-%{_datadir}/applications/rpmfusion-avidemux-qt.desktop
-%{_datadir}/metainfo/*.appdata.xml
-%{_datadir}/icons/hicolor/*/apps/avidemux.png
-%{_datadir}/icons/%{name}/
+%{_datadir}/applications/org.avidemux.Avidemux.desktop
+%{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/org.avidemux.Avidemux.png
# QT plugins
%{_libdir}/ADM_plugins6/videoEncoders/qt5/
%{_libdir}/ADM_plugins6/videoFilters/qt5/
@@ -323,6 +294,10 @@ fi
%changelog
+* Wed Mar 27 2019 Richard Shaw <hobbes1069(a)gmail.com> - 2.7.3-1
+- Update to 2.7.3 and apply upstream patches per user request.
+ Fixes RFBZ#5208.
+
* Wed Mar 13 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7.1-12
- Switch to nv-codec-headers
diff --git a/sources b/sources
index 9c39b52..1a2d61c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3510c858c9371283551b1b4b67d288b avidemux_2.7.1.tar.gz
+f01d2cfeda010b56ce0f1fb111201463 avidemux_2.7.3.tar.gz
5 years, 8 months
[dfhack] Fix FTBFS in Stonesense on Fedora 30 and up.
by Ben Rosser
commit 4143ba611cfc485b4b0fe523262eb3e6a2b75789
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Wed Mar 27 11:46:49 2019 -0400
Fix FTBFS in Stonesense on Fedora 30 and up.
53.patch | 23 +++++++++++++++++++++++
dfhack.spec | 13 ++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/53.patch b/53.patch
new file mode 100644
index 0000000..16a8e47
--- /dev/null
+++ b/53.patch
@@ -0,0 +1,23 @@
+From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <hhochleitner(a)gmail.com>
+Date: Sun, 1 Oct 2017 18:01:43 +0200
+Subject: [PATCH] include <GL/glext.h>
+
+this fixes `GLhandleARB` not being defined
+---
+ common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/common.h b/common.h
+index eb36691a..ef453890 100644
+--- a/common.h
++++ b/common.h
+@@ -31,6 +31,8 @@ using namespace df::enums;
+ #include <allegro5/allegro_opengl.h>
+ #include <allegro5/utf8.h>
+
++#include <GL/glext.h>
++
+ // allegro leaks X headers, undef some of it here:
+ #undef TileShape
+ #undef None
diff --git a/dfhack.spec b/dfhack.spec
index 5494838..ba79b67 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -40,7 +40,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 3.%{hackrelease}%{?dist}
+Release: 4.%{hackrelease}%{?dist}
Summary: Memory hacking library for Dwarf Fortress and a set of tools that use it
# It'd be nice if we could unbundle some of these things, but I suspect it won't happen.
@@ -79,6 +79,9 @@ Patch0: isoworld-external-allegro-agui.patch
# Patch to include cmath in isoworld.
Patch1: isoworld-cmath-include.patch
+# Patch to fix stonesense build failure on Fedora 30+
+Patch2: https://github.com/DFHack/stonesense/pull/53.patch
+
# See https://github.com/DFHack/dfhack/issues/961 for these isoworld issues.
# dfhack only supports DF architectures, of which there are two.
@@ -216,6 +219,11 @@ cp -a %SOURCE3 library/include/
%patch0 -p1
%patch1 -p1
+# This is a patch for *Stonesense*.
+cd plugins/stonesense
+%patch2 -p1
+cd ../../
+
# Manually (for now) apply fix to plugins/stonesense/CMakeLists.txt.
sed 's/dfhack-tinyxml/${DFHACK_TINYXML}/' -i plugins/stonesense/CMakeLists.txt
@@ -330,6 +338,9 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
+* Wed Mar 27 2019 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-4.r2
+- Fix FTBFS in Stonesense on Fedora 30 and up.
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.44.12-3.r2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 8 months
