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

(-)ffmpeg.spec~ (-4 / +14 lines)
Lines 14-21 Link Here
14
%def_enable postproc
14
%def_enable postproc
15
%def_enable libmp3lame
15
%def_enable libmp3lame
16
%def_enable libvorbis
16
%def_enable libvorbis
17
%def_disable libfaac
17
%def_disable libfaac
18
%def_disable nonfree
18
%def_disable libaacplus
19
%def_disable nonfree
19
%def_enable libgsm
20
%def_enable libgsm
20
%def_enable libdc1394
21
%def_enable libdc1394
21
%def_enable shared
22
%def_enable shared
Lines 55-60 Link Here
55
56
56
%if_disabled nonfree
57
%if_disabled nonfree
57
%set_disable libfaac
58
%set_disable libfaac
59
%set_disable libaacplus
58
%endif
60
%endif
59
61
60
%if_enabled mmx
62
%if_enabled mmx
Lines 75-81 License: %{!?_enable_gpl:L}GPL%{?_enable Link Here
75
Group: Video
77
Group: Video
76
Url: http://ffmpeg.mplayerhq.hu
78
Url: http://ffmpeg.mplayerhq.hu
77
79
78
Source0: %name-%version-%release.tar
80
Source0: %name-%version-%release.tar
81
%if_enabled libaacplus
82
Patch10: ffmpeg-aacp.diff
83
%endif
79
84
80
# We surely need this:
85
# We surely need this:
81
Requires: libavcodec52 = %epoch:%version-%release
86
Requires: libavcodec52 = %epoch:%version-%release
Lines 99-104 BuildRequires: perl-podlators Link Here
99
%{?_enable_libmp3lame:BuildRequires: liblame-devel}
104
%{?_enable_libmp3lame:BuildRequires: liblame-devel}
100
%{?_enable_libvorbis:BuildRequires: libvorbis-devel}
105
%{?_enable_libvorbis:BuildRequires: libvorbis-devel}
101
%{?_enable_libfaac:BuildRequires: libfaac-devel}
106
%{?_enable_libfaac:BuildRequires: libfaac-devel}
107
%{?_enable_libaacplus:BuildRequires: libaacplus-devel libfftw3-devel}
102
%{?_enable_libgsm:BuildRequires: libgsm-devel}
108
%{?_enable_libgsm:BuildRequires: libgsm-devel}
103
%{?_enable_libxvid:BuildRequires: libxvid-devel}
109
%{?_enable_libxvid:BuildRequires: libxvid-devel}
104
%{?_enable_libx264:BuildRequires: libx264-devel >= 0.0-alt54}
110
%{?_enable_libx264:BuildRequires: libx264-devel >= 0.0-alt54}
Lines 415-421 This package contains static development Link Here
415
421
416
# {{{ Prep
422
# {{{ Prep
417
%prep
423
%prep
418
%setup
424
%setup
425
%if_enabled libaacplus
426
%patch10 -p0
427
%endif
419
sed -i 's/UNKNOWN/%version/' version.sh
428
sed -i 's/UNKNOWN/%version/' version.sh
420
# }}}
429
# }}}
421
430
Lines 442-447 sed -i 's/UNKNOWN/%version/' version.sh Link Here
442
    %{subst_enable static} \
451
    %{subst_enable static} \
443
    %{subst_enable libvorbis} \
452
    %{subst_enable libvorbis} \
444
    %{subst_enable libfaac} \
453
    %{subst_enable libfaac} \
454
    %{?_enable_libaacplus: --enable-libaacplus} \
445
    %{subst_enable libxvid} \
455
    %{subst_enable libxvid} \
446
    %{subst_enable libx264} \
456
    %{subst_enable libx264} \
447
    %{subst_enable libmp3lame} \
457
    %{subst_enable libmp3lame} \

Return to bug 24730