[buildsys-build-rpmfusion-rpi] Improve macro for pi
by Nicolas Chauvet
commit fb9a32ff8d80f4cd180a551bea36fd6a9a5a82b5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 17:59:36 2018 +0100
Improve macro for pi
macros.buildsys-build-rpmfusion-rpi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/macros.buildsys-build-rpmfusion-rpi b/macros.buildsys-build-rpmfusion-rpi
index 9bd6b6a..610c83c 100644
--- a/macros.buildsys-build-rpmfusion-rpi
+++ b/macros.buildsys-build-rpmfusion-rpi
@@ -1,2 +1,2 @@
%_with_rpi 1
-%dist .fc%{fedora}rpi
+%dist .%{?fedora:fc%{fedora}}%{?rhel:el%{rhel}}rpi
6 years
[buildsys-build-rpmfusion-rpi] Initial import
by Nicolas Chauvet
commit 16b6962daff181376c5981527b5ca45b408ffbb6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 17:41:32 2018 +0100
Initial import
buildsys-build-rpmfusion-rpi.spec | 42 +++++++++++++++++++++++++++++++++++++
macros.buildsys-build-rpmfusion-rpi | 2 ++
2 files changed, 44 insertions(+)
---
diff --git a/buildsys-build-rpmfusion-rpi.spec b/buildsys-build-rpmfusion-rpi.spec
new file mode 100644
index 0000000..95658cd
--- /dev/null
+++ b/buildsys-build-rpmfusion-rpi.spec
@@ -0,0 +1,42 @@
+%define repo rpmfusion-rpi
+
+Name: buildsys-build-%{repo}
+Version: 29
+Release: 1
+Summary: Tools and files used by the %{repo} buildsys
+
+License: MIT
+URL: http://rpmfusion.org
+
+Source0: macros.%{name}
+
+# unneeded
+%define debug_package %{nil}
+
+%description
+This package contains RPM macros for %{repo}
+
+
+%prep
+echo nothing to prep
+
+
+%build
+echo nothing to build
+
+
+%install
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+
+# install the stuff we need
+install -p -m 0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm
+
+
+%files
+%{_sysconfdir}/rpm/macros.%{name}
+
+
+%changelog
+* Thu Nov 08 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-1
+- Initial spec file.
+
diff --git a/macros.buildsys-build-rpmfusion-rpi b/macros.buildsys-build-rpmfusion-rpi
new file mode 100644
index 0000000..9bd6b6a
--- /dev/null
+++ b/macros.buildsys-build-rpmfusion-rpi
@@ -0,0 +1,2 @@
+%_with_rpi 1
+%dist .fc%{fedora}rpi
6 years
[ffmpeg] Correct project case, either rpmfusion or RPM Fusion
by Nicolas Chauvet
commit bfebb1966e7d11fb889929ff625450212f5707da
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 14:03:13 2018 +0100
Correct project case, either rpmfusion or RPM Fusion
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 50240a6..48452eb 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -311,7 +311,7 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
%setup -q -n ffmpeg-%{?branch}%{date}
-echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
+echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
6 years
[ffmpeg] Add ExclusiveArch for rpi
by Nicolas Chauvet
commit dbb31f96e573d4421a4cc732116a53d6feee9858
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 10:46:12 2018 +0100
Add ExclusiveArch for rpi
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 69db4ec..50240a6 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -69,6 +69,7 @@
%if 0%{?_with_rpi:1}
%global _with_mmal 1
+ExclusiveArch: armv7hnl
%endif
%if 0%{?_without_gpl}
6 years
[ffmpeg] Add changelog
by Nicolas Chauvet
commit a460f3d6cc16a3831c70ce7dfefec5ddf08de773
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 10:41:21 2018 +0100
Add changelog
ffmpeg.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ce5651d..69db4ec 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -84,7 +84,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.1
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -419,6 +419,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Thu Nov 08 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1-2
+- Add support for rpi
+- Enable libvmaf for x86_64
+
* Tue Nov 06 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1-1
- Update to 4.1 release
6 years
[ffmpeg] Enable vmaf
by Nicolas Chauvet
commit a6372d185e883341bec78bf5397b97de35b518f7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 10:40:48 2018 +0100
Enable vmaf
ffmpeg.spec | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 90999bf..ce5651d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -22,6 +22,12 @@
%global _without_vpx 1
%endif
+%if 0%{?fedora}
+%ifarch x86_64
+%global _with_vmaf 1
+%endif
+%endif
+
# flavor nonfree
%if 0%{?_with_nonfree:1}
%global flavor -nonfree
@@ -162,6 +168,7 @@ BuildRequires: subversion
#BuildRequires: texi2html
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
+%{?_with_vmaf:BuildRequires: libvmaf-devel}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
@@ -281,6 +288,7 @@ This package contains development files for %{name}
--enable-libvorbis \\\
--enable-libv4l2 \\\
%{!?_without_vidstab:--enable-libvidstab} \\\
+ %{?_with_vmaf:--enable-libvmaf} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
6 years
[ffmpeg] Add support for rpi
by Nicolas Chauvet
commit d8aab0019fff986870522b483b3abb25225fc545
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 10:34:53 2018 +0100
Add support for rpi
ffmpeg.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ecd1199..90999bf 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -61,6 +61,10 @@
%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version})
%endif
+%if 0%{?_with_rpi:1}
+%global _with_mmal 1
+%endif
+
%if 0%{?_without_gpl}
%global lesser L
%endif
@@ -135,6 +139,7 @@ BuildRequires: nasm
%endif
%{?_with_webp:BuildRequires: libwebp-devel}
%{?_with_netcdf:BuildRequires: netcdf-devel}
+%{?_with_rpi:BuildRequires: raspberrypi-vc-libs-devel}
%{!?_without_nvenc:BuildRequires: nv-codec-headers}
%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
@@ -253,6 +258,7 @@ This package contains development files for %{name}
%{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\
--enable-libmp3lame \\\
%{?_with_netcdf:--enable-netcdf} \\\
+ %{?_with_mmal:--enable-mmal} \\\
%{!?_without_nvenc:--enable-nvenc} \\\
%{!?_without_openal:--enable-openal} \\\
%{!?_without_opencl:--enable-opencl} \\\
6 years
[mythtv] Update to 29.1.53.20181105git9f0acf372d from branch fixes/29
by Sérgio M. Basto
commit 9fc12d85a9d99fdec6bbbf5863e5bceda2b45e10
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Nov 8 01:22:07 2018 +0000
Update to 29.1.53.20181105git9f0acf372d from branch fixes/29
.gitignore | 1 +
mythtv.spec | 11 +++++++----
sources | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 735f6eb..dbb4f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ mythtv-0.27.5.tar.gz
/mythtv-29.1-74fff5c285.tar.gz
/mythtv-29.1.tar.gz
/v29.1..74fff5c285.patch
+/v29.1..9f0acf372d.patch
diff --git a/mythtv.spec b/mythtv.spec
index 3690dc9..26ada66 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -57,10 +57,10 @@
%define desktop_applications mythfrontend mythtv-setup
# MythTV Version string -- preferably the output from git describe
-%define githash 74fff5c2856d592b8b2dfd41ac5cc08f372a8993
+%define githash 9f0acf372dec880800a57a77d67c19a68dedbd24
%define shorthash %(c=%{githash}; echo ${c:0:10})
-%define vers_string v29.1-39-g74fff5c285
-%define rel_string .39.20181004git74fff5c285
+%define vers_string v29.1-53-g9f0acf372d
+%define rel_string .53.20181105git9f0acf372d
%define branch fixes/29
@@ -72,7 +72,7 @@
#
Name: mythtv
Version: 29.1
-Release: 25%{?rel_string}%{?dist}
+Release: 26%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1395,6 +1395,9 @@ exit 0
%changelog
+* Thu Nov 08 2018 Sérgio Basto <sergio(a)serjux.com> - 29.1-26.53.20181105git9f0acf372d
+- Update to 29.1.53.20181105git9f0acf372d from branch fixes/29
+
* Fri Oct 05 2018 Sérgio Basto <sergio(a)serjux.com> - 29.1-25.39.20181004git74fff5c285
- Update to 29.1.39.20181004git74fff5c285 from branch fixes/29
- Fixes ERROR: ambiguous python shebang in F30
diff --git a/sources b/sources
index aca16e3..a86a392 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
52f47a4288ce95e0edaddab84d5cc901 mythtv-29.1.tar.gz
-1bc57d039647678f56aef5bec55d1c51 v29.1..74fff5c285.patch
+46598e9d5a5faa6ff684fdaa76cc110d v29.1..9f0acf372d.patch
6 years