[ffmpeg] fix building nonfree flavor from release tarball
by Dominik Mierzejewski
commit 21edab7ecfe326f412d5c4d92e89c6619602cc75
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Mon Jan 2 22:29:16 2017 +0100
fix building nonfree flavor from release tarball
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2622724..843f201 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -272,7 +272,7 @@ This package contains development files for %{name}
%setup -q -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
-%setup -q
+%setup -q -n ffmpeg-%{version}
%endif
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
7 years, 10 months
[ffmpeg] Add nonfreeflavor RPM Conditional
by Dominik Mierzejewski
commit 5c6836525743067dc72995d8f5ab483754d8d9ff
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 15 15:45:06 2016 +0100
Add nonfreeflavor RPM Conditional
ffmpeg.spec | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1dd0fe4..2622724 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -17,6 +17,23 @@
%global _without_nvenc 1
%endif
+# flavor nonfree
+%if 0%{?_with_nonfree:1}
+%global flavor -nonfree
+%global progs_suffix -nonfree
+#global build_suffix -lgpl
+%global _with_cuda 1
+%global _with_cuvid 1
+%global _with_libnpp 1
+%global _with_fdk_aac 1
+%global _without_cdio 1
+%global _without_frei0r 1
+%global _without_gpl 1
+%global _without_x264 1
+%global _without_x265 1
+%global _without_x11grab 1
+%endif
+
# extras flags
%if 0%{!?_without_nvenc:1}
%global nvenc_cflags -I%{_includedir}/nvenc
7 years, 10 months
[ffmpeg] Allow build_suffix and prog_suffix
by Dominik Mierzejewski
commit 334bda6d66f3da0bb67db951c6eb12e888516e2e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 15 15:37:11 2016 +0100
Allow build_suffix and prog_suffix
ffmpeg.spec | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index da71297..1dd0fe4 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -178,6 +178,8 @@ This package contains development files for %{name}
--extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags}" \\\
--extra-cflags="%{?nvenc_cflags} %{?cuda_cflags}" \\\
%{?flavor:--disable-manpages} \\\
+ %{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\
+ %{?build_suffix:--build-suffix=%{build_suffix}} \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
@@ -305,7 +307,7 @@ make alltools V=1
%install
%make_install V=1
rm -r %{buildroot}%{_datadir}/%{name}/examples
-%if 0%{!?ffmpegsuffix:1}
+%if 0%{!?progs_suffix:1}
install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
@@ -320,27 +322,30 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%if 0%{!?ffmpegsuffix:1}
%files
%doc COPYING.* CREDITS README.md doc/ffserver.conf
-%{_bindir}/ffmpeg
-%{_bindir}/ffplay
-%{_bindir}/ffprobe
-%{_bindir}/ffserver
-%{_bindir}/qt-faststart
+%{_bindir}/ffmpeg%{?progs_suffix}
+%{_bindir}/ffplay%{?progs_suffix}
+%{_bindir}/ffprobe%{?progs_suffix}
+%{_bindir}/ffserver%{?progs_suffix}
+%{!?progs_suffix:%{_bindir}/qt-faststart}
+%{!?flavor:
%{_mandir}/man1/ffmpeg*.1*
%{_mandir}/man1/ffplay*.1*
%{_mandir}/man1/ffprobe*.1*
%{_mandir}/man1/ffserver*.1*
+}
%{_datadir}/%{name}
%endif
%files libs
%{_libdir}/lib*.so.*
-%exclude %{_libdir}/libavdevice.so.*
-%{_mandir}/man3/lib*.3.gz
+%exclude %{_libdir}/libavdevice%{?build_suffix}.so.*
+%{!?flavor:%{_mandir}/man3/lib*.3.gz
%exclude %{_mandir}/man3/libavdevice.3*
+}
%files -n libavdevice%{?flavor}
-%{_libdir}/libavdevice.so.*
-%{_mandir}/man3/libavdevice.3*
+%{_libdir}/libavdevice%{?build_suffix}.so.*
+%{!?flavor:%{_mandir}/man3/libavdevice.3*}
%files devel
%doc MAINTAINERS doc/APIchanges doc/*.txt
7 years, 10 months
[ffmpeg] Enable flavor RPM Macros
by Dominik Mierzejewski
commit 0c4321c7529a8bb352c8b2769719865ce9dbcd45
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 15 15:25:16 2016 +0100
Enable flavor RPM Macros
This is intented to have alternatives flavor of ffmpeg packages
Alternates library name is handled by another change
ffmpeg.spec | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 77818bb..da71297 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -38,15 +38,15 @@
%endif
Summary: Digital VCR and streaming server
-Name: ffmpeg
+Name: ffmpeg%{?flavor}
Version: 3.2.2
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
-Source0: %{name}-%{?branch}%{date}.tar.bz2
+Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
+Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
@@ -142,10 +142,10 @@ VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
This package contains the libraries for %{name}
-%package -n libavdevice
+%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
-%description -n libavdevice
+%description -n libavdevice%{?flavor}
Libavdevice is a complementary library to libavf "libavformat". It provides
various "special" platform-specific muxers and demuxers, e.g. for grabbing
devices, audio capture and playback etc.
@@ -153,7 +153,7 @@ devices, audio capture and playback etc.
%package devel
Summary: Development package for %{name}
Requires: %{name}-libs%{_isa} = %{version}-%{release}
-Requires: libavdevice%{_isa} = %{version}-%{release}
+Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -177,6 +177,7 @@ This package contains development files for %{name}
--optflags="%{optflags}" \\\
--extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags}" \\\
--extra-cflags="%{?nvenc_cflags} %{?cuda_cflags}" \\\
+ %{?flavor:--disable-manpages} \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
@@ -249,7 +250,7 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
-%setup -q -n %{name}-%{?branch}%{date}
+%setup -q -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q
@@ -312,9 +313,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%postun libs -p /sbin/ldconfig
-%post -n libavdevice -p /sbin/ldconfig
+%post -n libavdevice%{?flavor} -p /sbin/ldconfig
-%postun -n libavdevice -p /sbin/ldconfig
+%postun -n libavdevice%{?flavor} -p /sbin/ldconfig
%if 0%{!?ffmpegsuffix:1}
%files
@@ -337,7 +338,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%{_mandir}/man3/lib*.3.gz
%exclude %{_mandir}/man3/libavdevice.3*
-%files -n libavdevice
+%files -n libavdevice%{?flavor}
%{_libdir}/libavdevice.so.*
%{_mandir}/man3/libavdevice.3*
7 years, 10 months
[aqualung/f24: 7/7] Update to 1.0-0.6.rc1git72c1ab1
by Martin Gansser
commit ad8fdd8b9bf16cf1ef3d6638d26eaa20d536a7cc
Merge: 6d308ed 2b23b4d
Author: Martin Gansser <mgansser(a)alice.de>
Date: Mon Jan 2 19:54:57 2017 +0100
Update to 1.0-0.6.rc1git72c1ab1
.gitignore | 4 ++++
aqualung.spec | 18 +++++++++++++++---
sources | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index a043d00,1ff5a3f..96ca6d1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,6 @@@
aqualung-export-r1309.tar.bz2
/aqualung-05dfcb7.tar.gz
++<<<<<<< HEAD
++=======
+ /aqualung-72c1ab1.tar.gz
++>>>>>>> master
7 years, 10 months
[aqualung/f24] (7 commits) ...Update to 1.0-0.6.rc1git72c1ab1
by Martin Gansser
Summary of changes:
c398be7... Switched from svn to git (*)
732518f... Rebuilt for ffmpeg-3.1.1 (*)
b224300... Rebuilt for ffmpeg-3.1.1 (*)
8ae4016... Rebuilt for ffmpeg-3.1.1 (*)
31c59e2... Rebuilt for libcdio-0.94 (*)
2b23b4d... Update to 1.0-0.6.rc1git72c1ab1 (*)
ad8fdd8... Update to 1.0-0.6.rc1git72c1ab1
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[aqualung] Update to 1.0-0.6.rc1git72c1ab1
by Martin Gansser
commit 2b23b4d2b34bfff1ffdbed08c8a007e184ef15ab
Author: Martin Gansser <mgansser(a)alice.de>
Date: Mon Jan 2 19:48:59 2017 +0100
Update to 1.0-0.6.rc1git72c1ab1
.gitignore | 1 +
aqualung.spec | 9 ++++++---
clog | 2 --
sources | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a043d00..1ff5a3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
aqualung-export-r1309.tar.bz2
/aqualung-05dfcb7.tar.gz
+/aqualung-72c1ab1.tar.gz
diff --git a/aqualung.spec b/aqualung.spec
index 7612fc3..255a4a3 100644
--- a/aqualung.spec
+++ b/aqualung.spec
@@ -1,5 +1,5 @@
-#https://github.com/jeremyevans/aqualung/commit/05dfcb75ddb1b9f413b80b3d42a7ca96a8ef3906
-%global commit0 05dfcb75ddb1b9f413b80b3d42a7ca96a8ef3906
+#https://github.com/jeremyevans/aqualung/commit/72c1ab19fc8cd3294d5d0a7fd676099cd26d72db
+%global commit0 72c1ab19fc8cd3294d5d0a7fd676099cd26d72db
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global nonfree 0
%global free 1
@@ -18,7 +18,7 @@
Name: aqualung
Version: 1.0
-Release: 0.5.rc1git%{shortcommit0}%{?dist}
+Release: 0.6.rc1git%{shortcommit0}%{?dist}
Summary: Music Player for GNU/Linux
License: GPLv2+
URL: http://aqualung.jeremyevans.net/
@@ -133,6 +133,9 @@ update-desktop-database &> /dev/null || :
%{_docdir}/%{name}
%changelog
+* Mon Jan 02 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 1.0-0.6.rc1git72c1ab1
+- Update to 1.0-0.6.rc1git72c1ab1
+
* Thu Nov 17 2016 Adrian Reber <adrian(a)lisas.de> - 1.0-0.5.rc1git05dfcb7
- Rebuilt for libcdio-0.94
diff --git a/sources b/sources
index 8d4207d..e5171a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b80f5be22f9823c48f066448ab29c242 aqualung-05dfcb7.tar.gz
+40cf40785b9cf4f792fb76c95abca961 aqualung-72c1ab1.tar.gz
7 years, 10 months
