[mplayer/f32] (3 commits) ...Add AV1 support
by Leigh Scott
Summary of changes:
8e8adb6... - Rebuild for ffmpeg-4.3 git (*)
5e35cdb... Rebuild for new libcdio version (*)
5a24c2d... Add AV1 support (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[mplayer] Add AV1 support
by Leigh Scott
commit 5a24c2d187492fe94a869158b8a6430c2529e613
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 17 07:44:21 2020 +0100
Add AV1 support
...ecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch | 46 ++++++++++++++++++++++
...odecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch | 34 ++++++++++++++++
0003-codecs.conf-Bump-version.patch | 38 ++++++++++++++++++
mplayer.spec | 15 +++++--
4 files changed, 130 insertions(+), 3 deletions(-)
---
diff --git a/0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch b/0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch
new file mode 100644
index 0000000..6d2b2af
--- /dev/null
+++ b/0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch
@@ -0,0 +1,46 @@
+From 03e10eabcd7b72c3730ca75ffe5276db2b7de1b6 Mon Sep 17 00:00:00 2001
+From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Tue, 24 Dec 2019 10:41:24 +0000
+Subject: [PATCH 1/5] codecs.conf: Add AV1 decoder dav1d via FFmpeg
+
+Thanks to
+
+* Andrew-R (in ticket #2355)
+* Sylvain (on mplayer-dev-eng ml)
+* Carl Eugen Hoyos (in private communication)
+
+You all provided helpful patches, suggestions and comments!
+
+Fixes part of ticket #2355
+
+
+
+git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38155 b3059339-0415-0410-9bf9-f77b7e298cf2
+---
+ etc/codecs.conf | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/etc/codecs.conf b/etc/codecs.conf
+index 8b3db9797..a0757c79d 100644
+--- a/etc/codecs.conf
++++ b/etc/codecs.conf
+@@ -8,6 +8,16 @@ release 20111012
+ ;=============================================================================
+ ; VIDEO CODECS
+ ;=============================================================================
++videocodec fflibdav1d
++ info "FFmpeg wrapper for libdav1d"
++ status working
++ fourcc AV01,av01
++ driver ffmpeg
++ dll libdav1d
++ out YV12,420P10,420P12
++ out 422P,422P10,422P12
++ out 444P,444P10,444P12
++ out GBR24P,GBR10P,GBR12P
+
+ videocodec ffiff
+ info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN"
+--
+2.26.0
+
diff --git a/0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch b/0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch
new file mode 100644
index 0000000..719f4ab
--- /dev/null
+++ b/0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch
@@ -0,0 +1,34 @@
+From 327dd40996e0eb671c3f6cdcdc429d9a7be25187 Mon Sep 17 00:00:00 2001
+From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Tue, 24 Dec 2019 10:43:45 +0000
+Subject: [PATCH 2/5] codecs.conf: Add AOM AV1 decoder via FFmpeg
+
+git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38156 b3059339-0415-0410-9bf9-f77b7e298cf2
+---
+ etc/codecs.conf | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/etc/codecs.conf b/etc/codecs.conf
+index a0757c79d..fa8f1fedb 100644
+--- a/etc/codecs.conf
++++ b/etc/codecs.conf
+@@ -19,6 +19,16 @@ videocodec fflibdav1d
+ out 444P,444P10,444P12
+ out GBR24P,GBR10P,GBR12P
+
++videocodec fflibaomav1
++ info "FFmpeg wrapper for libaom/AV1"
++ status working
++ fourcc AV01,av01
++ driver ffmpeg
++ dll libaom-av1
++ out YV12,420P10,420P12
++ out 422P,422P10,422P12
++ out 444P,444P10,444P12
++
+ videocodec ffiff
+ info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN"
+ status working
+--
+2.26.0
+
diff --git a/0003-codecs.conf-Bump-version.patch b/0003-codecs.conf-Bump-version.patch
new file mode 100644
index 0000000..1c5752b
--- /dev/null
+++ b/0003-codecs.conf-Bump-version.patch
@@ -0,0 +1,38 @@
+From 667b86fb135c4ee16a3dc1978c170c42b43a0ae3 Mon Sep 17 00:00:00 2001
+From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Tue, 24 Dec 2019 10:46:23 +0000
+Subject: [PATCH 3/5] codecs.conf: Bump version
+
+In SVN r38154 , ffmpeg12vdpau was removed and ffmpeg1vdpau and
+ffmpeg2vdpau were added as replacement.
+
+In previous commits AV1 codecs were added, and a lot more changes
+were done in 8 years.
+
+Bump codecs.conf, so users with a customized codecs.conf based on
+an older version will fallback to the internal version and get a
+message about having an outdated codecs.conf lying around.
+
+
+
+git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@38157 b3059339-0415-0410-9bf9-f77b7e298cf2
+---
+ etc/codecs.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/codecs.conf b/etc/codecs.conf
+index fa8f1fedb..f4ff4425b 100644
+--- a/etc/codecs.conf
++++ b/etc/codecs.conf
+@@ -3,7 +3,7 @@
+ ; Before editing this file, please read DOCS/tech/codecs.conf.txt !
+ ;=============================================================================
+
+-release 20111012
++release 20191203
+
+ ;=============================================================================
+ ; VIDEO CODECS
+--
+2.26.0
+
diff --git a/mplayer.spec b/mplayer.spec
index 4317c38..47cff9d 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -6,9 +6,9 @@
Name: mplayer
Version: 1.4
%if 0%{?svn}
-Release: 8{?pre:.%{pre}}%{?dist}
+Release: 9{?pre:.%{pre}}%{?dist}
%else
-Release: 8%{?dist}
+Release: 9%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -33,6 +33,9 @@ Patch1: %{name}-manlinks.patch
# use system FFmpeg libraries
Patch3: %{name}-ffmpeg.patch
+Patch4: 0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch
+Patch5: 0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch
+Patch6: 0003-codecs.conf-Bump-version.patch
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -225,6 +228,9 @@ rm -rf ffmpeg
%patch0 -p1 -b .config
%patch1 -p1 -b .manlinks
%patch3 -p1 -b .ffmpeg
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -309,7 +315,7 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}
%find_lang %{name} --with-man
%find_lang mencoder --with-man
-%if 0%{?rhel}
+%if (0%{?rhel} && 0%{?rhel} <= 7)
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -373,6 +379,9 @@ fi
%{_datadir}/mplayer/*.fp
%changelog
+* Fri Apr 17 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.4-9
+- Add AV1 support
+
* Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.4-8
- Rebuild for new libcdio version
4 years, 7 months
[swftools/f32] Drop python2 module
by Mohamed ElMorabity
commit f86ec55e4afa70fcb3d78841337c2bd722b4de33
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Apr 16 22:16:34 2020 +0200
Drop python2 module
swftools.spec | 29 +++++++----------------------
1 file changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/swftools.spec b/swftools.spec
index 82ba0de..e602825 100644
--- a/swftools.spec
+++ b/swftools.spec
@@ -1,14 +1,13 @@
Name: swftools
Version: 0.9.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: SWF manipulation and generation utilities
-Group: Applications/Multimedia
# swftools is GPLv2+ licensed, lib/MD5.c is BSD licensed,
# lib/action/actioncompiler.c is LGPLv2+ licensed
License: GPLv3+ and LGPLv2+ and BSD
URL: http://www.swftools.org/
-Source0: http://www.swftools.org/%{name}-%{version}.tar.gz
+Source0: %{url}/%{name}-%{version}.tar.gz
# Fix installation
Patch0: swftools-0.9.2-install.patch
# Fix build with giflib >= 5
@@ -19,8 +18,7 @@ BuildRequires: fftw-devel
BuildRequires: fontconfig-devel
BuildRequires: giflib-devel
BuildRequires: lame-devel
-BuildRequires: python2-devel
-BuildRequires: python2-pillow-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: zziplib-devel
%description
@@ -30,16 +28,6 @@ them, and creating them from other content (like images, sound files, videos or
source code).
-%package -n python2-%{name}
-Summary: Python bindings for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name}
-This package provides Python bindings for %{name}.
-
-
%prep
%autosetup -p0
@@ -64,9 +52,6 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-install -dm 0755 $RPM_BUILD_ROOT%{python2_sitearch}/
-install -Dp lib/python/*.so $RPM_BUILD_ROOT%{python2_sitearch}/
-
%files
%doc AUTHORS ChangeLog doc/fileformat.sc
@@ -76,11 +61,11 @@ install -Dp lib/python/*.so $RPM_BUILD_ROOT%{python2_sitearch}/
%{_datadir}/%{name}/
-%files -n python2-%{name}
-%{python2_sitearch}/*.so
-
-
%changelog
+* Thu Apr 16 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.2-13
+- Drop Python 2 module
+- Spec cleanup
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 7 months
[swftools/f32] Fix build with GCC 10
by Mohamed ElMorabity
commit 2718f6f052ffc134668f2623f6abc8af0f94687d
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Apr 16 23:50:26 2020 +0200
Fix build with GCC 10
swftools.spec | 6 +--
swftools.spec.bak | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 142 insertions(+), 4 deletions(-)
---
diff --git a/swftools.spec b/swftools.spec
index 0be9336..82ba0de 100644
--- a/swftools.spec
+++ b/swftools.spec
@@ -55,10 +55,8 @@ done
%build
-export PYTHON_INCLUDES=$(python2-config --includes)/Imaging/
-export PYTHON_LIB=$(python2-config --libs)
-export PYTHON_LIB2=$PYTHON_LIB
-export HAVE_PYTHON_IMAGING_LIB=1
+export CFLAGS="$RPM_OPT_FLAGS -fcommon"
+export CXXFLAGS="$CFLAGS"
%configure
make %{?_smp_mflags}
diff --git a/swftools.spec.bak b/swftools.spec.bak
new file mode 100644
index 0000000..075aa4d
--- /dev/null
+++ b/swftools.spec.bak
@@ -0,0 +1,140 @@
+Name: swftools
+Version: 0.9.2
+Release: 11%{?dist}
+Summary: SWF manipulation and generation utilities
+
+# swftools is GPLv2+ licensed, lib/MD5.c is BSD licensed,
+# lib/action/actioncompiler.c is LGPLv2+ licensed
+License: GPLv3+ and LGPLv2+ and BSD
+URL: http://www.swftools.org/
+Source0: %{url}/%{name}-%{version}.tar.gz
+# Fix installation
+Patch0: swftools-0.9.2-install.patch
+# Fix build with giflib >= 5
+Patch1: swftools-0.9.2-giflib5.patch
+
+BuildRequires: gcc-c++
+BuildRequires: fftw-devel
+BuildRequires: fontconfig-devel
+BuildRequires: giflib-devel
+BuildRequires: lame-devel
+BuildRequires: python3-devel
+BuildRequires: python3-pillow-devel
+BuildRequires: zziplib-devel
+
+%description
+SWFTools is a collection of utilities for working with Adobe Flash files (SWF
+files). The tool collection includes programs for reading SWF files, combining
+them, and creating them from other content (like images, sound files, videos or
+source code).
+
+
+%package -n python3-%{name}
+Summary: Python bindings for %{name}
+Requires: %{name} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-%{name}
+This package provides Python 3 bindings for %{name}.
+
+
+%prep
+%autosetup -p0
+
+# Fix permissions
+chmod -x lib/*.[ch] lib/action/*.[ch]
+
+# Fix encoding
+for file in AUTHORS src/{jpeg2swf.1,swfstrings.1}; do
+ iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+
+
+%build
+export PYTHON_INCLUDES=$(python3-config --includes)/Imaging/
+export PYTHON_LIB=$(python3-config --libs)
+export PYTHON_LIB2=$PYTHON_LIB
+export HAVE_PYTHON_IMAGING_LIB=1
+%configure
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+install -dm 0755 $RPM_BUILD_ROOT%{python2_sitearch}/
+install -Dp lib/python/*.so $RPM_BUILD_ROOT%{python2_sitearch}/
+
+
+%files
+%doc AUTHORS ChangeLog doc/fileformat.sc
+%license COPYING
+%{_bindir}/*
+%{_mandir}/man1/*.1.*
+%{_datadir}/%{name}/
+
+
+%files -n python3-%{name}
+%{python2_sitearch}/*.so
+
+
+%changelog
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.9.2-9
+- Rebuilt for Fedora 29 Mass Rebuild binutils issue
+
+* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Feb 24 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.2-7
+- Spec cleanup
+- Update for latest Python guidelines
+- Fix build with giflib >= 5
+
+* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.9.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.9.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Aug 01 2016 Sérgio Basto <sergio(a)serjux.com> - 0.9.2-4
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
+
+* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.9.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.9.2-2
+- Mass rebuilt for Fedora 19 Features
+
+* Tue Apr 10 2012 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.2-1
+- Update to 0.9.2
+
+* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.9.1-6
+- Rebuilt for c++ ABI breakage
+
+* Tue Jan 24 2012 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.1-5
+- Fix License tag
+
+* Wed Nov 30 2011 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.1-4
+- Spec cleanup
+
+* Mon Jan 10 2011 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.1-3
+- Remove pdflib-devel from BuildRequires
+
+* Thu Nov 11 2010 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.1-2
+- Add missing BuildRequires fftw-devel and zziplib-devel
+- Re-enable Python modules build
+
+* Sun Jun 13 2010 Mohamed El Morabity <melmorabity(a)fedoraproject.org> 0.9.1-1
+- Update to 0.9.1
+- Disable Python modules build (broken in 0.9.1)
+
+* Thu Jun 3 2010 Mohamed El Morabity <melmorabity(a)fedoraproject.org> 0.9.0-1
+- Initial RPM release
4 years, 7 months
[swftools] Fix build with GCC 10
by Mohamed ElMorabity
commit f8839d55a5c359c055fd2aefbe8745e9fcaf5ec6
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Apr 16 23:50:26 2020 +0200
Fix build with GCC 10
swftools.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/swftools.spec b/swftools.spec
index 85e1214..e602825 100644
--- a/swftools.spec
+++ b/swftools.spec
@@ -43,6 +43,8 @@ done
%build
+export CFLAGS="$RPM_OPT_FLAGS -fcommon"
+export CXXFLAGS="$CFLAGS"
%configure
make %{?_smp_mflags}
4 years, 7 months
[swftools] Drop python2 module
by Mohamed ElMorabity
commit b957c06872391ee8d0bff7e94c3d6b0e909e1199
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Apr 16 22:16:34 2020 +0200
Drop python2 module
swftools.spec | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/swftools.spec b/swftools.spec
index 0be9336..85e1214 100644
--- a/swftools.spec
+++ b/swftools.spec
@@ -1,14 +1,13 @@
Name: swftools
Version: 0.9.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: SWF manipulation and generation utilities
-Group: Applications/Multimedia
# swftools is GPLv2+ licensed, lib/MD5.c is BSD licensed,
# lib/action/actioncompiler.c is LGPLv2+ licensed
License: GPLv3+ and LGPLv2+ and BSD
URL: http://www.swftools.org/
-Source0: http://www.swftools.org/%{name}-%{version}.tar.gz
+Source0: %{url}/%{name}-%{version}.tar.gz
# Fix installation
Patch0: swftools-0.9.2-install.patch
# Fix build with giflib >= 5
@@ -19,8 +18,7 @@ BuildRequires: fftw-devel
BuildRequires: fontconfig-devel
BuildRequires: giflib-devel
BuildRequires: lame-devel
-BuildRequires: python2-devel
-BuildRequires: python2-pillow-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: zziplib-devel
%description
@@ -30,16 +28,6 @@ them, and creating them from other content (like images, sound files, videos or
source code).
-%package -n python2-%{name}
-Summary: Python bindings for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name}
-This package provides Python bindings for %{name}.
-
-
%prep
%autosetup -p0
@@ -55,10 +43,6 @@ done
%build
-export PYTHON_INCLUDES=$(python2-config --includes)/Imaging/
-export PYTHON_LIB=$(python2-config --libs)
-export PYTHON_LIB2=$PYTHON_LIB
-export HAVE_PYTHON_IMAGING_LIB=1
%configure
make %{?_smp_mflags}
@@ -66,9 +50,6 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-install -dm 0755 $RPM_BUILD_ROOT%{python2_sitearch}/
-install -Dp lib/python/*.so $RPM_BUILD_ROOT%{python2_sitearch}/
-
%files
%doc AUTHORS ChangeLog doc/fileformat.sc
@@ -78,11 +59,11 @@ install -Dp lib/python/*.so $RPM_BUILD_ROOT%{python2_sitearch}/
%{_datadir}/%{name}/
-%files -n python2-%{name}
-%{python2_sitearch}/*.so
-
-
%changelog
+* Thu Apr 16 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.2-13
+- Drop Python 2 module
+- Spec cleanup
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 7 months
[obs-studio/el7] (8 commits) ...Updated to 25.0.6
by Leigh Scott
Summary of changes:
204bd73... - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass (*)
60ee41d... add define for legacy_common_support (*)
9c19a69... Update to 24.0.6 (*)
e5c18b4... - Rebuild for ffmpeg-4.3 git (*)
e7f39ad... Update to 25.0.1 (*)
938e837... Updated to 25.0.3 (*)
5275e14... Updated to 25.0.4 (*)
3f204fb... Updated to 25.0.6 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
