[ffmpeg] don't try to enable libmfx on non-x86
by Dominik Mierzejewski
commit 2a81e2241e828151f18f8220049c5e1d19a9621e
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Sep 3 14:45:05 2016 +0200
don't try to enable libmfx on non-x86
ffmpeg.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ea034cb..4a92ae5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -178,7 +178,6 @@ This package contains development files for %{name}
%{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
%{?_with_ilbc:--enable-libilbc} \\\
- %{!?_without_qsv:--enable-libmfx} \\\
--enable-libmp3lame \\\
%{?_with_netcdf:--enable-netcdf} \\\
%{!?_without_nvenc:--enable-nvenc --extra-cflags="-I%{_includedir}/nvenc"} \\\
@@ -245,6 +244,9 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
+%ifarch %{ix86} x86_64
+ %{!?_without_qsv:--enable-libmfx} \\\
+%endif
%ifarch %{ix86} x86_64 ppc ppc64
--enable-runtime-cpudetect \
%endif
7 years, 7 months
[ffmpeg] QSV is x86 only
by Dominik Mierzejewski
commit 58638f632d43531e0fa155cb8ca1b2885d21507e
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Sep 3 14:11:19 2016 +0200
QSV is x86 only
- put x86-specific BRs in one place
ffmpeg.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4671215..ea034cb 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -57,7 +57,6 @@ BuildRequires: libiec61883-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libGL-devel
-%{!?_without_mfx:BuildRequires: libmfx-devel}
Buildrequires: libmodplug-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
@@ -68,8 +67,10 @@ BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
%ifarch %{ix86} x86_64
+%{!?_without_mfx:BuildRequires: libmfx-devel}
BuildRequires: libXvMC-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
+BuildRequires: yasm
%endif
%{?_with_webp:BuildRequires: libwebp-devel}
%{?_with_netcdf:BuildRequires: netcdf-devel}
@@ -103,9 +104,6 @@ BuildRequires: texinfo
BuildRequires: zlib-devel
%{?_with_zmq:BuildRequires: zeromq-devel}
%{?_with_zvbi:BuildRequires: zvbi-devel}
-%ifarch %{ix86} x86_64
-BuildRequires: yasm
-%endif
%description
FFmpeg is a complete and free Internet live audio and video
@@ -327,6 +325,8 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
* Sat Sep 03 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.1.3-2
- enable QSV support by default, since libmfx is in Fedora now
+- QSV is x86 only
+- put x86-specific BRs in one place
* Sat Aug 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.3-1
- Updated to 3.1.3
7 years, 7 months
[ffmpeg] enable QSV support by default, since libmfx is in Fedora now
by Dominik Mierzejewski
commit 1ccc67bf6450a105aedcab3de5d4cfca7019da08
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Sep 3 14:07:04 2016 +0200
enable QSV support by default, since libmfx is in Fedora now
ffmpeg.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 33cc6a4..4671215 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -14,7 +14,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 3.1.3
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
%else
@@ -57,7 +57,7 @@ BuildRequires: libiec61883-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libGL-devel
-%{?_with_mfx:BuildRequires: libmfx-devel}
+%{!?_without_mfx:BuildRequires: libmfx-devel}
Buildrequires: libmodplug-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
%{?_with_smb:BuildRequires: libsmbclient-devel}
@@ -180,7 +180,7 @@ This package contains development files for %{name}
%{?_with_gme:--enable-libgme} \\\
--enable-libgsm \\\
%{?_with_ilbc:--enable-libilbc} \\\
- %{?_with_qsv:--enable-libmfx} \\\
+ %{!?_without_qsv:--enable-libmfx} \\\
--enable-libmp3lame \\\
%{?_with_netcdf:--enable-netcdf} \\\
%{!?_without_nvenc:--enable-nvenc --extra-cflags="-I%{_includedir}/nvenc"} \\\
@@ -325,6 +325,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Sat Sep 03 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.1.3-2
+- enable QSV support by default, since libmfx is in Fedora now
+
* Sat Aug 27 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.3-1
- Updated to 3.1.3
7 years, 7 months
[xroar/f23] Upgrade to 0.34.3
by Andrea Musuruane
Summary of changes:
f9e9adb... Upgrade to 0.34.3 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 7 months
[xroar/f24] Upgrade to 0.34.3
by Andrea Musuruane
Summary of changes:
f9e9adb... Upgrade to 0.34.3 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 7 months
[xroar/f25] Upgrade to 0.34.3
by Andrea Musuruane
Summary of changes:
f9e9adb... Upgrade to 0.34.3 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 7 months
[xroar] Upgrade to 0.34.3
by Andrea Musuruane
commit f9e9adb5d9e0762ed6fbd8f447b166de7dffb7d7
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Sep 3 09:46:37 2016 +0200
Upgrade to 0.34.3
.gitignore | 1 +
sources | 2 +-
xroar.spec | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f40791..498fe99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xroar-0.33.1.tar.gz
dragon.rom
/xroar-0.34.tar.gz
/xroar-0.34.1.tar.gz
+/xroar-0.34.3.tar.gz
diff --git a/sources b/sources
index 37c86a8..60a8d5b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a70546560b8d96d3cf5afdab70310d34 xroar-0.34.1.tar.gz
+f5678a1fd32ca6382076c151fb43207a xroar-0.34.3.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
diff --git a/xroar.spec b/xroar.spec
index 12732ae..2924808 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,5 +1,5 @@
Name: xroar
-Version: 0.34.1
+Version: 0.34.3
Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv2+
@@ -36,8 +36,8 @@ minimal firmware is included.
%build
-%configure
-make %{?_smp_mflags} VERBOSE=1
+%configure --without-oss
+%make_build
# Build docs
make html
@@ -70,8 +70,7 @@ EOF
%install
-make install DEB_BUILD_OPTIONS=nostrip \
- DESTDIR=%{buildroot}
+%make_install DEB_BUILD_OPTIONS=nostrip
# Install ROM
mkdir -p %{buildroot}%{_datadir}/%{name}/roms
@@ -130,12 +129,16 @@ fi
%{_datadir}/applications/%{name}-minifirm.desktop
%{_infodir}/%{name}*
%{_mandir}/man1/%{name}.1*
-%doc ChangeLog COPYING.GPL COPYING.LGPL-2.1 README
+%license COPYING.GPL COPYING.LGPL-2.1
+%doc ChangeLog README
%doc doc/%{name}.html doc/%{name}-screens.png doc/%{name}-timebandit-af.png
%doc doc/%{name}.pdf
%changelog
+* Sat Aug 27 2016 Andrea Musuruane <musuruan(a)gmail.com> 0.34.3-1
+- Upgrade to 0.34.3
+
* Sat Aug 13 2016 Andrea Musuruane <musuruan(a)gmail.com> 0.34.1-1
- Upgrade to 0.34.1
7 years, 7 months
[qtav] Disabled config test by adding no_config_tests
by Martin Gansser
commit de40dd91930f4de18b4ff33566e73ee230349a4a
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Sep 3 09:19:23 2016 +0200
Disabled config test by adding no_config_tests
qtav.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/qtav.spec b/qtav.spec
index b1a6e71..b805424 100644
--- a/qtav.spec
+++ b/qtav.spec
@@ -7,7 +7,7 @@
Name: qtav
Version: 1.11.0
-Release: 0.3git%{shortcommit0}%{?dist}
+Release: 0.4git%{shortcommit0}%{?dist}
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
Group: Development/Libraries
@@ -133,7 +133,7 @@ mkdir build; pushd build
QMAKE_CFLAGS="%{optflags}" \
QMAKE_CXXFLAGS="%{optflags}" \
QMAKE_LFLAGS="-Wl,--as-needed" \
- CONFIG+="no_rpath recheck config_libass_link debug" \
+ CONFIG+="no_rpath recheck config_libass_link no-tests debug" \
..
%make_build
@@ -222,6 +222,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
+* Fri Sep 02 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.11.0-0.4gitc5db90b
+- Disabled config test by adding no_config_tests
+
* Mon Aug 29 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.11.0-0.3gitc5db90b
- update to last git release
7 years, 7 months