[avidemux/el7] (65 commits) ...Rebuild for ffmpeg-3.4.5 on el7
by Antonio
Summary of changes:
2bca45b... * Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6 (*)
fd613c7... Add patch for libva i686 build. (*)
737504c... * Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6 (*)
f4b90e4... Add the correct linker flag. (*)
d5b6321... * Thu Mar 06 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6 (*)
6afc523... * Sat Mar 22 2014 Sérgio Basto <sergio(a)serjux.com> - 2.6.7 (*)
2b7b638... * Sun May 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6 (*)
375842d... Update libass patch. (*)
ee67197... Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mas (*)
b0fbe2e... * Wed Jan 21 2015 Richard Shaw <hobbes1069(a)gmail.com> - 2.6 (*)
5d06a83... * Tue Jun 16 2015 Richard Shaw <hobbes1069(a)gmail.com> - 2.6 (*)
b201d0d... Add patch to find qt5 version of lrelease. Fix desktop file (*)
5520858... Commit correct patch. (*)
a0760d5... Revert back to QT4. (*)
fc28d74... Fix permissions of some libraries and update to latest rele (*)
2b32893... Commit updated patches. (*)
5c7af2e... Fix release and changelog. (*)
c610864... Remove QT5 for now. (*)
41a4bb3... Bump for rebuild in new infra. (*)
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 (*)
9e18b0e... Add patch to fix qt gui issues, fixes BZ#4035. (*)
f7e9ed0... Add hardening to LDFLAGS as the custom export overrides the (*)
4d26f1a... Remove all old GTK packages and references, also fixes scri (*)
8d547ca... Rebuild for x265-2.1 (*)
f26d4e9... Update to the 2.6.15 release, rfbz#4344 (*)
8b8a09e... Update to the 2.6.15 release, rfbz#4344 (*)
14df586... Commit new source. (*)
59e7572... Update to the 2.6.16 release. Include pull request from RFB (*)
a4207db... rebuild for x265 (*)
7bbfdc2... Disable byte-compiling of python scrips as they are designe (*)
227ed6a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
5957922... Add aarch64 to ExcludeArch (*)
3b9bbd7... Build for x86 only (*)
6421ee8... Update to latest upstream release, 2.6.19. (*)
3988629... Update to latest upstream release, 2.6.19. (*)
04f4d8c... Update to latest upstream release, 2.6.20. (*)
864b82f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
626ed8a... Update to latest upstream release, 2.7.0. (*)
a37621f... Rebuild for f28. Add patch to deal with removal of pow10f f (*)
5ddb06e... Add appdata file. (*)
b92e8f2... Rebuild for ffmpeg update (*)
d1ed13e... Mass rebuild for x264 and x265 (*)
5b1e19b... rebuilt (*)
65dea2b... Rebuilt for new x265 (*)
9b7b670... Update to 2.7.1 (*)
e72b60b... Appdata fixes and build requires tweaks. (*)
0ecfa28... Update to 2.7.1 Fix appdata file and build requires tweaks. (*)
a05a89e... Fix source name in spec. (*)
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 (*)
03df632... Rebuild for ffmpeg-3.4.5 on el7
6881056... Rebuild for ffmpeg-3.4.5 on el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[avidemux] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 1781867a49e1ad9850d202e5e7356e997a2e2cd5
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 22:49:41 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
avidemux.spec | 65 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 51 insertions(+), 14 deletions(-)
---
diff --git a/avidemux.spec b/avidemux.spec
index d3dfe90..d2f2f91 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -5,7 +5,7 @@
Name: avidemux
Version: 2.7.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -19,6 +19,7 @@ ExclusiveArch: i686 x86_64
# Utilities
BuildRequires: cmake3 gcc-c++ yasm
+%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: gettext intltool
BuildRequires: libxslt
BuildRequires: desktop-file-utils
@@ -100,6 +101,7 @@ BuildRequires: qt5-linguist
BuildRequires: libxslt
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: hicolor-icon-theme
Obsoletes: %{name}-gtk < 2.6.10
Obsoletes: %{name}-help
@@ -131,7 +133,7 @@ export LDFLAGS="-lc -Wl,--as-needed"
rm -rf build_core && mkdir build_core && pushd build_core
%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
../avidemux_core
-make
+%make_build V=1
# We have to do a fake install so header files are avaialble for the other
# packages.
@@ -143,7 +145,7 @@ rm -rf build_cli && mkdir build_cli && pushd build_cli
%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/cli
-make %{?_smp_mflags}
+%make_build V=1
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -153,7 +155,7 @@ rm -rf build_qt5 && mkdir build_qt5 && pushd build_qt5
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
-DENABLE_QT5=TRUE \
../avidemux/qt4
-make %{?_smp_mflags}
+%make_build V=1
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -169,7 +171,7 @@ rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins
-DUSE_EXTERNAL_LIBA52=TRUE \
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
-make %{?_smp_mflags}
+%make_build V=1
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -185,7 +187,7 @@ rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
-DUSE_EXTERNAL_LIBA52=TRUE \
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
-make %{?_smp_mflags}
+%make_build V=1
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -201,18 +203,18 @@ rm -rf build_plugins_qt5 && mkdir build_plugins_qt5 && pushd build_plugins_qt5
-DUSE_EXTERNAL_LIBA52=TRUE \
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
-make %{?_smp_mflags}
+%make_build V=1
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
%install
-make -C build_core install DESTDIR=%{buildroot}
-make -C build_cli install DESTDIR=%{buildroot}
-make -C build_qt5 install DESTDIR=%{buildroot}
-make -C build_plugins_common install DESTDIR=%{buildroot}
-make -C build_plugins_cli install DESTDIR=%{buildroot}
-make -C build_plugins_qt5 install DESTDIR=%{buildroot}
+%make_install -C build_core
+%make_install -C build_cli
+%make_install -C build_qt5
+%make_install -C build_plugins_common
+%make_install -C build_plugins_cli
+%make_install -C build_plugins_qt5
# Remove useless devel files
rm -rf %{buildroot}%{_includedir}/%{name}
@@ -220,8 +222,13 @@ 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}
@@ -244,6 +251,29 @@ appstream-util validate-relax --nonet \
%ldconfig_scriptlets libs
+%ldconfig_scriptlets qt
+%ldconfig_scriptlets cli
+
+
+%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
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ /bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
+fi
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
+%endif
%files
%doc AUTHORS README
@@ -251,7 +281,6 @@ appstream-util validate-relax --nonet \
%files libs -f build_plugins_common/install_manifest.txt
%license COPYING
%dir %{_datadir}/avidemux6
-%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_render*
%exclude %{_libdir}/libADM_UI*
@@ -273,6 +302,8 @@ appstream-util validate-relax --nonet \
%{_libdir}/libADM_render6_QT5.so
%{_datadir}/applications/rpmfusion-avidemux-qt.desktop
%{_datadir}/metainfo/*.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/avidemux.png
+%{_datadir}/icons/%{name}/
# QT plugins
%{_libdir}/ADM_plugins6/videoEncoders/qt5/
%{_libdir}/ADM_plugins6/videoFilters/qt5/
@@ -283,6 +314,12 @@ appstream-util validate-relax --nonet \
%changelog
+* Wed Nov 21 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.7.1-7
+- Rebuild for x265-2.9 on el7
+- Rebuild for x264-0.148 on el7
+- Install avidemux.png
+- Add scriptlets for epel
+
* Sun Nov 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7.1-6
- Rebuild for new x265
5 years, 11 months
[mplayer/el7: 55/55] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit 22db9a3aecca31ca14c67435b5871ee84caa6378
Merge: 644e052 dc7f1a7
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 22:12:47 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
.gitignore | 7 +-
mplayer-ffmpeg.patch | 196 ++++++++++++++-------------------------------
mplayer-nodvdcss.patch | 43 ----------
mplayer-snapshot.sh | 6 +-
mplayer.spec | 213 +++++++++++++++++++++++++++++++++++++++++--------
sources | 4 +-
6 files changed, 248 insertions(+), 221 deletions(-)
---
5 years, 11 months
[mplayer/el7] (55 commits) ...Rebuild for ffmpeg-3.4.5 on el7
by Antonio
Summary of changes:
cdfbd1c... * Sun Jan 12 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
8234b2e... Patched to allow building with -Werror=format-security (*)
09109ea... * Tue Feb 11 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
5d4b9b6... Uploaded correct sources (*)
d6fc589... * Sat Mar 01 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
59c4974... * Thu Mar 06 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1 (*)
4980e97... * Tue Mar 18 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
a45fcc2... * Fri Mar 21 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
cead689... * Thu Mar 27 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
715edce... * Sat Jul 12 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
1c04ef4... * Wed Aug 06 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
ae93ea8... * Thu Sep 25 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
d8b7f1a... * Sat Sep 27 2014 kwizart <kwizart(a)gmail.com> - 1.1-28.2014 (*)
60b558d... * Wed Oct 01 2014 Sérgio Basto <sergio(a)serjux.com> - 1.1-2 (*)
3f1830a... Rebuilt for FFmpeg 2.4.3 (*)
3248cbf... * Tue Oct 21 2014 Julian Sikorski <belegdol(a)fedoraproject.o (*)
ffe8cb9... * Sat Jan 31 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
9eba0cf... * Thu May 07 2015 Julian Sikorski <belegdol(a)fedoraproject.o (*)
3df293c... Updated to 1.2 (*)
984a51b... Updated to 1.2.1 (*)
d1c0b57... Fixed BuildRequires so that audio CD support actually works (*)
40701a1... Updated to 1.3.0 (*)
0039d1c... Rebuilt for ffmpeg-3.1.1 (*)
5b37027... BR: perl-generators for proper dependency generation (*)
fd2109d... Add provides mplayer-backend (rfbz#4284) (*)
022f60b... Rebuilt for libcdio-0.94 (*)
40f04b0... Fix screenshot crash (rfbz#4391) (*)
7253493... Fix vo_png with recent ffmpeg (rfbz#4470) (*)
7cb900d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
0eed7e6... Rebuild for ffmpeg update (*)
eefa988... Perl 5.26 rebuild (*)
7752553... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
d0f50cf... Rebuild for ffmpeg update (*)
767e04e... Exclude ix86 (rfbz #4687) (*)
4a8471b... Mass rebuild for x264 and x265 (*)
edf5fc3... Rebuilt for ffmpeg-3.5 git (*)
258d4c2... Update to latest svn (*)
977ac27... fix version (*)
4aa8063... Rebuilt (*)
9af01d2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
a71ef72... Disable runtime cpu detection for i686 (*)
c8f442f... - Rebuilt for new ffmpeg snapshot (*)
770cc9b... Rebuild for ffmpeg-4.0 release (*)
8f319e0... Update to latest svn (*)
b7cd7fa... Rebuild for new libass version (*)
cba237c... Enable runtime cpu detection for i686 again (*)
493b0cd... readd lost source (*)
91b9cd4... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
9b29c9e... Mass rebuild for x264 and/or x265 (*)
a0fe5d4... Fix this message error [1] on rfpkg push (*)
3b6c0d2... Add BuildRequires: gcc-c++ (*)
3ef425a... Fix ambiguous python shebang (*)
4b39f0f... fix typo (*)
dc7f1a7... Rebuild for ffmpeg-3.4.5 on el7 (*)
22db9a3... Rebuild for ffmpeg-3.4.5 on el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[mplayer] Rebuild for ffmpeg-3.4.5 on el7
by Antonio
commit dc7f1a7afcfc5a2a8f2f5239bced60c9d9539b19
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 22:06:37 2018 +0100
Rebuild for ffmpeg-3.4.5 on el7
mplayer.spec | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index c7cffd6..04c49bd 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,9 +7,9 @@
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 26.%{?pre}%{?dist}
+Release: 27.%{?pre}%{?dist}
%else
-Release: 26%{?dist}
+Release: 27%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -105,7 +105,7 @@ BuildRequires: libxml2
BuildRequires: libxslt
%endif
Obsoletes: mplayer-fonts
-Requires: faad2-libs >= %{faad2min}
+Requires: faad2-libs%{?_isa} >= %{faad2min}
Requires: mplayer-common = %{version}-%{release}
Provides: mplayer-backend
@@ -161,8 +161,8 @@ MPlayer documentation in various languages.
%package tools
Summary: Useful scripts for MPlayer
-Requires: mencoder = %{version}-%{release}
-Requires: mplayer = %{version}-%{release}
+Requires: mencoder%{?_isa} = %{version}-%{release}
+Requires: mplayer%{?_isa} = %{version}-%{release}
%description tools
This package contains various scripts from MPlayer TOOLS directory.
@@ -234,24 +234,28 @@ cp -a `ls -1|grep -v GUI` GUI/
%build
pushd GUI
+export CC=gcc
+export CXX=g++
%{mp_configure}--enable-gui --disable-mencoder
-%{__make} V=1 %{?_smp_mflags}
+%make_build V=1
popd
+export CC=gcc
+export CXX=g++
%{mp_configure}
-%{__make} V=1 %{?_smp_mflags}
+%make_build V=1
%if 0%{?svn}
# build HTML documentation from XML files
-%{__make} html-chunked
+%make_build V=1 html-chunked
%endif
%install
rm -rf $RPM_BUILD_ROOT doc
-make install DESTDIR=$RPM_BUILD_ROOT INSTALLSTRIP=
+%make_install INSTALLSTRIP=
for file in aconvert.sh divx2svcd.sh mencvcd.sh midentify.sh mpconsole.sh qepdvcd.sh subsearch.sh ; do
install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .sh`
done
@@ -306,6 +310,19 @@ desktop-file-install \
install -dm 755 $RPM_BUILD_ROOT%{codecdir}
sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}/vobshift
+%if 0%{?rhel}
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%endif
%files
%{_bindir}/mplayer
@@ -374,6 +391,11 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}
%{_datadir}/mplayer/*.fp
%changelog
+* Mon Nov 12 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 1.3.0-27.20180620svn
+- Rebuild for ffmpeg-3.4.5 on el7
+- Rebuild for x264-0.148 on el7
+- Add icon-cache scriptlets for epel only
+
* Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com> - 1.3.0-26.20180620svn
- Mass rebuild for x264 and/or x265
- Fix sources
5 years, 11 months
[mlt-freeworld/el7] Fix Release number
by Antonio
commit 8cf94c251b9f8f3aa9fa363e27103b407f8ffbfd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 21:31:00 2018 +0100
Fix Release number
mlt-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index 699be9f..060bae6 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -1,6 +1,6 @@
Name: mlt-freeworld
Version: 6.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
5 years, 11 months
[xine-lib/el7: 13/13] Rebuild for ffmpeg-3.* on el7
by Antonio
commit a6b8c1177789f6f0038e4b1e6096fcdd396772c4
Merge: 4f08665 2e2c1f2
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 21:02:44 2018 +0100
Rebuild for ffmpeg-3.* on el7
xine-lib.spec | 49 +++++++++++++++++++++++++++++++++++++++----------
1 file changed, 39 insertions(+), 10 deletions(-)
---
5 years, 11 months
[xine-lib/el7] (13 commits) ...Rebuild for ffmpeg-3.* on el7
by Antonio
Summary of changes:
0807780... rebuilt (*)
b23f61e... Rebuilt for ffmpeg-3.5 git (*)
f23924c... Rebuild for new libcdio, libvpx and vcdimager (*)
2991f82... fix i686 build (*)
53aa5e9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
9db90b7... - Rebuilt for new ffmpeg snapshot (*)
df58290... BR: gcc (*)
2942033... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
15c9d43... - Rebuilt for Fedora 29 Mass Rebuild binutils issue (*)
0426ef3... ImageMagick soname bump (*)
3ca7dd5... ImageMagick soname bump, 2nd try (*)
2e2c1f2... Rebuild for ffmpeg-3.* on el7 (*)
a6b8c11... Rebuild for ffmpeg-3.* on el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[xine-lib] Rebuild for ffmpeg-3.* on el7
by Antonio
commit 2e2c1f2e98c5258360560a1b96c57095fb12bdcf
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 20:03:20 2018 +0100
Rebuild for ffmpeg-3.* on el7
xine-lib.spec | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 29760e3..92aea96 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -12,7 +12,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.9
-Release: 10%{?dist}.1
+Release: 11%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
@@ -24,6 +24,7 @@ Obsoletes: xine-lib-extras-freeworld < 1.1.21-10
Provides: xine-lib-extras-freeworld = %{version}-%{release}
BuildRequires: gcc
+%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: gettext-devel
# X11
BuildRequires: libX11-devel
@@ -86,7 +87,7 @@ common multimedia formats available - and some uncommon formats, too.
%package devel
Summary: Xine library development files
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: zlib-devel
+Requires: zlib-devel%{?_isa}
%description devel
This package contains development files for %{name}.
@@ -106,7 +107,7 @@ This package contains extra plugins for %{name}:
%prep
%setup -q
-autoreconf -i
+autoreconf -ivf
%build
@@ -139,11 +140,11 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags} V=1
+%make_build V=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
%find_lang libxine2
cp -pR $RPM_BUILD_ROOT%{_docdir}/xine-lib __docs
rm -rf $RPM_BUILD_ROOT%{_docdir}/xine-lib
@@ -156,9 +157,7 @@ rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine*.la __docs/README \
mkdir -p $RPM_BUILD_ROOT%{codecdir}
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files -f libxine2.lang
@@ -300,6 +299,9 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%changelog
+* Thu Dec 06 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 1.2.9-11
+- Rebuild for ffmpeg-3.* on el7
+
* Wed Aug 29 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-10.1
- Rebuilt for ImageMagick soname bump.
5 years, 11 months
[mlt-freeworld/el7] Rename patch
by Antonio
commit 2c5355b48bebe64b3537eea92b15edc53772a4fd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 19:44:56 2018 +0100
Rename patch
mlt-a3188e301b5a9a1f25dbb98a510e366363348e64.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
---
diff --git a/mlt-a3188e301b5a9a1f25dbb98a510e366363348e64.patch b/mlt-a3188e301b5a9a1f25dbb98a510e366363348e64.patch
new file mode 100644
index 0000000..8c4512e
--- /dev/null
+++ b/mlt-a3188e301b5a9a1f25dbb98a510e366363348e64.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp
+index 47a598bc..45522e40 100644
+--- a/src/mlt++/MltRepository.cpp
++++ b/src/mlt++/MltRepository.cpp
+@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository repository ) :
+
+ Repository::~Repository( )
+ {
+- if ( instance )
+- mlt_repository_close( instance );
+ instance = NULL;
+ }
+
5 years, 11 months