Revert "ffmpeg: add faac and fdk_aac build options (off)"

This reverts commit c698ba3613.
This commit is contained in:
Alessio Sergi 2016-06-10 18:36:06 +02:00
parent c698ba3613
commit 1b69aeb69b
3 changed files with 18 additions and 21 deletions

View file

@ -11,8 +11,6 @@ desc_option_dri2="Enable support for the DRI2 extension"
desc_option_dri="Enable support for the DRI extension"
desc_option_efi="Enable support for EFI"
desc_option_expat="Enable support for XML via expat"
desc_option_faac="Enable support for FAAC codec"
desc_option_fdk_aac="Enable support for Fraunhofer FDK AAC codec"
desc_option_framebuffer="Enable support for the Framebuffer"
desc_option_gdk_pixbuf="Enable support to use transparency via gdk-pixbuf"
desc_option_geoclue2="Enable support for geolocation (v2)"

View file

@ -1,7 +1,7 @@
# Template file for 'ffmpeg'
pkgname=ffmpeg
version=2.8.7
revision=2
revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
@ -11,15 +11,15 @@ checksum=8777ce4a335640fdd13680ba423ef6da330ff5071bfbe27cdbb452379167efe5
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel
libXext-devel libXvMC-devel faac-devel faad2-devel lame-devel libtheora-devel
gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel
libcdio-paranoia-devel libvpx-devel librtmp-devel freetype-devel libmodplug-devel
speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel
ocl-icd-devel $(vopt_if x265 x265-devel) $(vopt_if vaapi libva-devel)
$(vopt_if vdpau libvdpau-devel) $(vopt_if v4l2 v4l-utils-devel) libbs2b-devel
libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)"
libvidstab-devel"
build_options="x265 v4l2 vaapi vdpau faac fdk_aac"
build_options="x265 v4l2 vaapi vdpau nonfree_possible"
build_options_default="v4l2"
case "$XBPS_TARGET_MACHINE" in
@ -48,8 +48,7 @@ do_configure() {
--enable-libpulse --enable-libfreetype --enable-libmodplug \
--enable-libspeex --enable-libcelt --enable-libass \
--enable-libopus --enable-librtmp --enable-libmodplug \
$(vopt_if faac '--enable-nonfree --enable-libfaac') \
$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
$(vopt_if nonfree_possible --enable-libfaac\ --enable-nonfree) \
--disable-libopencore_amrnb --disable-libopencore_amrwb \
--disable-libschroedinger --disable-libopenjpeg \
--enable-postproc --enable-opencl ${_args} \

View file

@ -2,36 +2,36 @@
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
pkgname=handbrake
version=0.10.5
revision=1
version=0.10.2
revision=2
wrksrc="HandBrake-${version}"
build_options="fdk_aac"
hostmakedepends="automake libtool cmake pkg-config intltool
python yasm wget m4 gettext-devel glib-devel"
python yasm wget m4 gettext-devel"
makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel
gst-plugins-base1-devel webkitgtk-devel libgudev-devel x264-devel x265-devel
gst-plugins-base1-devel webkitgtk-devel libgudev-devel x264-devel
dbus-glib-devel fribidi-devel libass-devel fontconfig-devel libxml2-devel
libogg-devel libdvdnav-devel libdvdread-devel libtheora-devel lame-devel
libsamplerate-devel libbluray-devel librsvg-devel libvpx-devel ffmpeg-devel
$(vopt_if fdk_aac fdk-aac-devel)"
libsamplerate-devel libbluray-devel librsvg-devel"
depends="gst-plugins-good1 desktop-file-utils hicolor-icon-theme"
short_desc="Multithreaded video transcoder"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://handbrake.fr/"
distfiles="https://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2>HandBrake-${version}.tar.bz2"
checksum=fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0
checksum=4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699
CFLAGS="-msse"
pre_configure() {
# use system libraries in place of bundled ones
for module in ffmpeg libvpx libdvdread libdvdnav libbluray x265 fdk-aac; do
sed -i "/MODULES += contrib\/${module}/d" make/include/main.defs
done
# Use more system libs
sed -i \
-e '/MODULES += contrib\/libbluray/d' \
-e '/MODULES += contrib\/libdvdnav/d' \
-e '/MODULES += contrib\/libdvdread/d' \
make/include/main.defs
}
do_configure() {
./configure --prefix=/usr --force --disable-gtk-update-checks $(vopt_enable fdk_aac fdk-aac)
./configure --prefix=/usr --force --disable-gtk-update-checks
}
do_build() {
unset AS LD