Attachment 4698 Details for Bug 24730 – ffmpeg.spec.libaacplus.patch

[patch] ffmpeg.spec.libaacplus.patch

ffmpeg.spec.libaacplus.patch (text/plain), 1.68 KB, created by Zerg on 2010-12-09 22:55:34 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Zerg

Created: 2010-12-09 22:55:34 MSK

Size: 1.68 KB

patch

obsolete

>--- ffmpeg.spec~	2010-11-30 14:19:14 +0300
>+++ ffmpeg.spec	2010-12-09 22:49:39 +0300
>@@ -14,8 +14,9 @@
> %def_enable postproc
> %def_enable libmp3lame
> %def_enable libvorbis
>-%def_disable libfaac
>-%def_disable nonfree
>+%def_disable libfaac
>+%def_disable libaacplus
>+%def_disable nonfree
> %def_enable libgsm
> %def_enable libdc1394
> %def_enable shared
>@@ -55,6 +56,7 @@
> 
> %if_disabled nonfree
> %set_disable libfaac
>+%set_disable libaacplus
> %endif
> 
> %if_enabled mmx
>@@ -75,7 +77,10 @@ License: %{!?_enable_gpl:L}GPL%{?_enable
> Group: Video
> Url: http://ffmpeg.mplayerhq.hu
> 
>-Source0: %name-%version-%release.tar
>+Source0: %name-%version-%release.tar
>+%if_enabled libaacplus
>+Patch10: ffmpeg-aacp.diff
>+%endif
> 
> # We surely need this:
> Requires: libavcodec52 = %epoch:%version-%release
>@@ -99,6 +104,7 @@ BuildRequires: perl-podlators
> %{?_enable_libmp3lame:BuildRequires: liblame-devel}
> %{?_enable_libvorbis:BuildRequires: libvorbis-devel}
> %{?_enable_libfaac:BuildRequires: libfaac-devel}
>+%{?_enable_libaacplus:BuildRequires: libaacplus-devel libfftw3-devel}
> %{?_enable_libgsm:BuildRequires: libgsm-devel}
> %{?_enable_libxvid:BuildRequires: libxvid-devel}
> %{?_enable_libx264:BuildRequires: libx264-devel >= 0.0-alt54}
>@@ -415,7 +421,10 @@ This package contains static development
> 
> # {{{ Prep
> %prep
>-%setup
>+%setup
>+%if_enabled libaacplus
>+%patch10 -p0
>+%endif
> sed -i 's/UNKNOWN/%version/' version.sh
> # }}}
> 
>@@ -442,6 +451,7 @@ sed -i 's/UNKNOWN/%version/' version.sh
>     %{subst_enable static} \
>     %{subst_enable libvorbis} \
>     %{subst_enable libfaac} \
>+    %{?_enable_libaacplus: --enable-libaacplus} \
>     %{subst_enable libxvid} \
>     %{subst_enable libx264} \
>     %{subst_enable libmp3lame} \

Actions: View | Diff

Attachments on bug 24730: 4698