View | Details | Raw Unified | Return to bug 33760
Collapse All | Expand All

(-)a/.gear/ffmpeg.spec (-15 / +29 lines)
Lines 6-11 Link Here
6
%define subst_enable_with() %{expand:%%{?_enable_%{1}:--enable-%{2}} } %{expand:%%{?_disable_%{1}:--disable-%{2}} }
6
%define subst_enable_with() %{expand:%%{?_enable_%{1}:--enable-%{2}} } %{expand:%%{?_disable_%{1}:--disable-%{2}} }
7
7
8
# Enable/Disable stuff
8
# Enable/Disable stuff
9
%def_enable doc
9
%def_enable gpl
10
%def_enable gpl
10
%def_enable version3
11
%def_enable version3
11
%def_enable ffplay
12
%def_enable ffplay
Lines 57-76 Link Here
57
Name:		ffmpeg
58
Name:		ffmpeg
58
Epoch:		2
59
Epoch:		2
59
Version:	3.3.3
60
Version:	3.3.3
60
Release:	alt1
61
Release:	alt2
61
62
62
Url:		http://ffmpeg.org
63
Summary:	A command line toolbox to manipulate, convert and stream multimedia content
63
Summary:	A command line toolbox to manipulate, convert and stream multimedia content
64
License:	GPLv3
64
License:	GPLv3
65
66
Group:		Video
65
Group:		Video
67
66
67
Url:		http://ffmpeg.org
68
68
Source:		%name-%version.tar
69
Source:		%name-%version.tar
69
BuildRequires:	libX11-devel libXext-devel libXvMC-devel libXfixes-devel
70
BuildRequires:	libX11-devel libXext-devel libXvMC-devel libXfixes-devel
70
BuildRequires:	yasm
71
BuildRequires:	libalsa-devel
71
BuildRequires:	libalsa-devel libpulseaudio-devel
72
BuildRequires:	libbluray-devel libass-devel
72
BuildRequires:	libbluray-devel libass-devel
73
%if_with doc
73
BuildRequires:	perl-podlators texi2html
74
BuildRequires:	perl-podlators texi2html
75
%endif
76
%ifarch %ix86 x86_64
77
BuildRequires:	yasm
78
%endif
74
79
75
%{?_enable_ffplay:BuildRequires: libSDL2-devel}
80
%{?_enable_ffplay:BuildRequires: libSDL2-devel}
76
%{?_enable_gnutls:BuildRequires: libgnutls-devel}
81
%{?_enable_gnutls:BuildRequires: libgnutls-devel}
Lines 492-502 xz Changelog Link Here
492
%make_build
497
%make_build
493
498
494
%install
499
%install
495
mkdir -p %buildroot
500
%makeinstall_std
496
%make_install \
497
	DESTDIR=%buildroot \
498
	install \
499
	#
500
501
501
%files
502
%files
502
%doc README.md
503
%doc README.md
Lines 504-513 mkdir -p %buildroot Link Here
504
%doc Changelog*
505
%doc Changelog*
505
%doc LICENSE.md
506
%doc LICENSE.md
506
%_bindir/ffmpeg
507
%_bindir/ffmpeg
507
%_man1dir/ffmpeg*
508
%{?_with_doc:%_man1dir/ffmpeg*}
508
%_datadir/ffmpeg
509
%_datadir/ffmpeg
509
%exclude %_datadir/ffmpeg/examples
510
%exclude %_datadir/ffmpeg/examples
510
511
512
%if_with doc
511
%files doc
513
%files doc
512
%doc doc/ffmpeg*.html
514
%doc doc/ffmpeg*.html
513
%doc doc/faq.html
515
%doc doc/faq.html
Lines 518-550 mkdir -p %buildroot Link Here
518
%doc doc/nut.html
520
%doc doc/nut.html
519
%doc doc/platform.html
521
%doc doc/platform.html
520
%_man3dir/*
522
%_man3dir/*
523
%endif
521
524
522
%if_enabled ffplay
525
%if_enabled ffplay
523
%files -n ffplay
526
%files -n ffplay
524
%_bindir/ffplay
527
%_bindir/ffplay
525
%_man1dir/ffplay*
528
%{?_with_doc:%_man1dir/ffplay*}
526
529
530
%if_with doc
527
%files -n ffplay-doc
531
%files -n ffplay-doc
528
%doc doc/ffplay*.html
532
%doc doc/ffplay*.html
529
%endif
533
%endif
534
%endif
530
535
531
%if_enabled ffprobe
536
%if_enabled ffprobe
532
%files -n ffprobe
537
%files -n ffprobe
533
%_bindir/ffprobe
538
%_bindir/ffprobe
534
%_man1dir/ffprobe*
539
%{?_with_doc:%_man1dir/ffprobe*}
535
540
541
%if_with doc
536
%files -n ffprobe-doc
542
%files -n ffprobe-doc
537
%doc doc/ffprobe*.html
543
%doc doc/ffprobe*.html
538
%endif
544
%endif
545
%endif
539
546
540
%if_enabled ffserver
547
%if_enabled ffserver
541
%files -n ffserver
548
%files -n ffserver
542
%_bindir/ffserver
549
%_bindir/ffserver
543
%_man1dir/ffserver*
550
%{?_with_doc:%_man1dir/ffserver*}
544
551
552
%if_with doc
545
%files -n ffserver-doc
553
%files -n ffserver-doc
546
%doc doc/ffserver*.html
554
%doc doc/ffserver*.html
547
%endif
555
%endif
556
%endif
548
557
549
%files -n libavcodec57
558
%files -n libavcodec57
550
%_libdir/libavcodec.so.57*
559
%_libdir/libavcodec.so.57*
Lines 650-655 mkdir -p %buildroot Link Here
650
%endif
659
%endif
651
660
652
%changelog
661
%changelog
662
* Thu Aug 03 2017 Michael Shigorin <mike@altlinux.org> 2:3.3.3-alt2
663
- x86-only BR: yasm
664
- fix libpulse knob
665
- add doc knob
666
- minor spec cleanup
667
653
* Tue Aug 01 2017 Anton Farygin <rider@altlinux.ru> 2:3.3.3-alt1
668
* Tue Aug 01 2017 Anton Farygin <rider@altlinux.ru> 2:3.3.3-alt1
654
- 3.3.3 with fixes for following vulnerabilities:
669
- 3.3.3 with fixes for following vulnerabilities:
655
	* CVE-2017-11399 remote DoS via crafted APE file
670
	* CVE-2017-11399 remote DoS via crafted APE file
656
- 

Return to bug 33760