[mlt-freeworld/el7] Rebuild for ffmpeg-3.* on el7
by Antonio
commit 0161f51a3fe00d75ad2b9938e6f2ea14202c8589
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 19:43:44 2018 +0100
Rebuild for ffmpeg-3.* on el7
a3188e301b5a9a1f25dbb98a510e366363348e64.diff | 13 -------------
mlt-freeworld.spec | 27 ++++++++++++---------------
2 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index 52fa168..699be9f 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -7,10 +7,10 @@ Summary: Toolkit for broadcasters, video editors, media players, transcod
# but is not used in Linux
License: GPLv3 and LGPLv2+
URL: http://www.mltframework.org/
-Group: System Environment/Libraries
Source0: https://github.com/mltframework/mlt/archive/v%{version}/mlt-%{version}.ta...
-Patch1: a3188e301b5a9a1f25dbb98a510e366363348e64.diff
+Patch1: mlt-a3188e301b5a9a1f25dbb98a510e366363348e64.patch
+BuildRequires: gcc, gcc-c++
BuildRequires: frei0r-devel
BuildRequires: opencv-devel
BuildRequires: qt5-qtbase-devel
@@ -29,12 +29,7 @@ BuildRequires: libsamplerate-devel
BuildRequires: ladspa-devel
BuildRequires: libxml2-devel
BuildRequires: sox-devel
-%if 0%{?fedora} >= 25
-# verion 3.0.11 needed for php7 IIRC
-BuildRequires: swig >= 3.0.11
-%else
BuildRequires: swig
-%endif
BuildRequires: python2-devel
BuildRequires: freetype-devel
BuildRequires: libexif-devel
@@ -42,7 +37,7 @@ BuildRequires: fftw-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: alsa-lib-devel
BuildRequires: vid.stab-devel
-%if 0%{?fedora} >= 25
+%if 0%{?fedora}
BuildRequires: movit-devel
%endif
BuildRequires: eigen3-devel
@@ -50,7 +45,7 @@ BuildRequires: libebur128-devel
BuildRequires: ffmpeg-devel
BuildRequires: xine-lib-devel
-Requires: mlt = %{version}
+Requires: mlt%{?_isa} = %{version}
%description
MLT was packaged in Fedora proper without ffmpeg support , this package give us
@@ -82,18 +77,18 @@ sed -i -e 's|qmake|qmake-qt5|' src/modules/qt/configure
# be sure that aren't used
rm -r src/win32/
-%if 0%{?fedora} >= 25
sed -i 's|-php5|-php7|g' src/swig/php/build
sed -i 's|mlt_wrap.cpp|mlt_wrap.cxx|g' src/swig/php/build
# xlocale.h is gone in F26
sed -r -i 's/#include <xlocale.h>/#include <locale.h>/' src/framework/mlt_property.h
-%endif
%build
#export STRIP=/bin/true
-CXXFLAGS="-std=c++11 %{optflags}"
+export CXXFLAGS="-std=c++11 %{optflags}"
+export CC=gcc
+export CXX=g++
%configure \
--enable-gpl \
@@ -115,14 +110,16 @@ find %{buildroot} -type f | grep -vP "mlt/avformat|libmltavformat.so" | xargs rm
find %{buildroot} -type l -delete
find %{buildroot} -type d -empty -delete
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
%files
%{_libdir}/mlt/
%{_datadir}/mlt/
%changelog
+* Mon Nov 12 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 6.4.1-3
+- Rebuild for ffmpeg-3.* on el7
+- ld scriptlets removed
+- movit excluded on el7
+
* Sat Nov 03 2018 Sérgio Basto <sergio(a)serjux.com> - 6.4.1-2
- Sync with Fedora counterpart
5 years, 11 months
[kodi/f29] Rebuilt for fmt
by Nicolas Chauvet
Summary of changes:
f1cfd41... Rebuilt for fmt (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[kodi] Rebuilt for fmt
by Nicolas Chauvet
commit f1cfd41c38398f0dd2f913229c09836e20a95107
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 6 19:25:34 2018 +0100
Rebuilt for fmt
kodi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index b3fdffb..3095a68 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -30,7 +30,7 @@
Name: kodi
Version: 18.0
-Release: 0.19.rc2%{?dist}
+Release: 0.20.rc2%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -481,6 +481,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Thu Dec 06 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 18.0-0.20.rc2
+- Rebuilt for fmt
+
* Mon Dec 03 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.19.rc2
- Kodi 18.0 RC2
5 years, 11 months
[gstreamer1-libav/el7] Turn back on system ffmpeg
by Nicolas Chauvet
commit 4b9431d090ed2c0af3ba9712c8a9d29792213bbe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 6 16:42:21 2018 +0100
Turn back on system ffmpeg
gstreamer1-libav.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 1cb78b5..f8cb268 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,6 +1,6 @@
Name: gstreamer1-libav
Version: 1.10.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
@@ -11,6 +11,7 @@ BuildRequires: gstreamer1-devel >= 1.10.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.10.0
BuildRequires: orc-devel
BuildRequires: bzip2-devel
+BuildRequires: ffmpeg-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
BuildRequires: yasm
@@ -50,8 +51,10 @@ plug-in.
export CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations"
%configure --disable-dependency-tracking \
--disable-static \
+ --with-system-libav \
--with-package-name="gst-libav 1.0 rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/"
+
make %{?_smp_mflags} V=1
@@ -71,6 +74,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Thu Dec 06 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.10.4-2
+- Turn back system-libav
+
* Tue Sep 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.10.4-1
- Update to 1.10.4
- Use bundled libav till ffmpeg-3 is packaged
5 years, 11 months
[mjpegtools] Fix Patch2
by Antonio
commit 1cffb576e936d862ada5f876f87bddf4769fa29b
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 16:38:11 2018 +0100
Fix Patch2
mjpegtools-2.1.0-pic.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/mjpegtools-2.1.0-pic.patch b/mjpegtools-2.1.0-pic.patch
index 7d0d1b6..0fda6c7 100644
--- a/mjpegtools-2.1.0-pic.patch
+++ b/mjpegtools-2.1.0-pic.patch
@@ -4,8 +4,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
---- y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12
-+++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13
+--- a/y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12
++++ b/y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13
@@ -4,8 +4,8 @@
EXTRA_DIST = implementation.html
@@ -23,8 +23,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
---- y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2
-+++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3
+--- a/y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2
++++ b/y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3
@@ -4,7 +4,7 @@
INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
@@ -40,8 +40,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
---- y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7
-+++ y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8
+--- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7
++++ b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8
@@ -2,7 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in
@@ -57,8 +57,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
---- yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5
-+++ yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6
+--- a/yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5
++++ b/yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6
@@ -18,6 +18,6 @@
EXTRA_DIST = yuvscaler_implementation.txt
5 years, 11 months
[mjpegtools/el7] Fix Patch2
by Antonio
commit 69a3909f2987571d6f61d8032d39a83cd80dfcb9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 16:35:50 2018 +0100
Fix Patch2
mjpegtools-2.1.0-pic.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/mjpegtools-2.1.0-pic.patch b/mjpegtools-2.1.0-pic.patch
index 7d0d1b6..0fda6c7 100644
--- a/mjpegtools-2.1.0-pic.patch
+++ b/mjpegtools-2.1.0-pic.patch
@@ -4,8 +4,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
---- y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12
-+++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13
+--- a/y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12
++++ b/y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13
@@ -4,8 +4,8 @@
EXTRA_DIST = implementation.html
@@ -23,8 +23,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
---- y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2
-+++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3
+--- a/y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2
++++ b/y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3
@@ -4,7 +4,7 @@
INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
@@ -40,8 +40,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
---- y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7
-+++ y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8
+--- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7
++++ b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8
@@ -2,7 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in
@@ -57,8 +57,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
---- yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5
-+++ yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6
+--- a/yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5
++++ b/yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6
@@ -18,6 +18,6 @@
EXTRA_DIST = yuvscaler_implementation.txt
5 years, 11 months
[mjpegtools] Rebuild for ffmpeg-3.* on el7
by Antonio
commit 302de0359e76900d2de508b0078993e26933d7a5
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 16:27:37 2018 +0100
Rebuild for ffmpeg-3.* on el7
mjpegtools.spec | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/mjpegtools.spec b/mjpegtools.spec
index 15e55ae..c5f0b40 100644
--- a/mjpegtools.spec
+++ b/mjpegtools.spec
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 2.1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Tools to manipulate MPEG data
License: GPLv2
URL: http://mjpeg.sourceforge.net/
@@ -9,7 +9,8 @@ Patch0: mjpegtools-2.1.0-sdl-cflags.patch
Patch1: mjpegtools-2.1.0-no_format.patch
Patch2: mjpegtools-2.1.0-pic.patch
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++, gcc
+%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: libjpeg-devel
BuildRequires: nasm
BuildRequires: libdv-devel
@@ -21,15 +22,13 @@ BuildRequires: gtk2-devel >= 2.4.0
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-lav%{?_isa} = %{version}-%{release}
# mencoder for lav2avi.sh
-Requires: mencoder
+Requires: mencoder%{?_isa}
# ffmpeg main package, y4mscaler and which for anytovcd.sh
-Requires: ffmpeg
+Requires: ffmpeg%{?_isa}
Provides: y4mscaler = 9.0-14
# Could be dropped on Fedora 22
Obsoletes: y4mscaler < 9.0-14
Requires: which
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
%description
The mjpeg programs are a set of tools that can do recording of videos
@@ -94,10 +93,7 @@ for building applications that use mjpegtools lavpipe libraries.
%prep
-%setup -q
-%patch0 -p1 -b .sdl
-%patch1 -p1 -b .format
-%patch2 -p0 -b .fpic
+%autosetup -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
@@ -122,14 +118,6 @@ rm -f %buildroot{%{_infodir}/dir,%{_libdir}/lib*.la}
# too broken/outdated to be useful in 1.[89].0 (and would come with dep chain)
rm %buildroot%{_bindir}/mpegtranscode
-
-%post
-/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || :
-
-%preun
-[ $1 -eq 0 ] && \
-/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || :
-
%ldconfig_scriptlets libs
%ldconfig_scriptlets lav
@@ -179,6 +167,10 @@ rm %buildroot%{_bindir}/mpegtranscode
%changelog
+* Mon Nov 12 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.1.0-14
+- Rebuild for ffmpeg-3.4.5 on el7
+- infodir scriptlets deprecated
+
* Fri Oct 12 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.1.0-13
- Remove Group tag
- Add missing isa on Requires
5 years, 11 months