Request 4005 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

This request supersedes: request 3998 (Show diff)

Overview

Request 4005 (accepted)

- Use clang instead of gcc if the openSUSE version is Tumbleweed ARM
Gcc7 can't build faac on openSUSE Tumbleweed ARM.

- Add faac-1.29.7.8-disable-sse2.patch
* Fix build for ARM.

- Update to 1.29.7.8.
* SSE quantizer
* modified functioning of ABR mode (-b option)
* improved autotools support
* allowed even higher bitrates, including ADTS
* framebuffer size bug fixed
* removed broken object types: Main and LTP
* some mp4 atoms fixed for better compalibility
* stdin seek bug fixed
* quantizer tweaked to better support high bitrates
* allow higher quality for mp4 files (-q 5000 max)
* removed mid frequency boost (it turned out useless)
* cutoff frequency adjusted to fully utilize upper band
* --help-long option removed, it was just an alias for -H
* -b option bug fixed
* quality related bug fixed
* updated manpage
* check if output file exists; --overwrite option added
* help/usage options reorganized
* block switching is now tuned to match quality/bitrate
* give more quality to lower frequancies (less to highs)
* quantizer updated again
1.29.4:
* rewritten quantizer: faster, diffrerent quality, different bitrates

Created by hillwood over 6 years ago
In state accepted
Package maintainers: detrei and mantre
Supersedes 3998

Submit faac

Submit package home:hillwood:branches:Essentials / faac to package Essentials / faac

faac.changes Changed

@@ -1,4 +1,62 @@
 -------------------------------------------------------------------
+Tue Oct 10 06:48:39 UTC 2017 - hillwood@opensuse.org
+
+- Use clang instead of gcc if the openSUSE version is Tumbleweed ARM
+  Gcc7 can't build faac on openSUSE Tumbleweed ARM.
+
+-------------------------------------------------------------------
+Mon Oct  9 08:59:43 UTC 2017 - hillwood@opensuse.org
+
+- Add faac-1.29.7.8-disable-sse2.patch
+  * Fix build for ARM.
+
+-------------------------------------------------------------------
+Mon Oct  9 06:34:36 UTC 2017 - hillwood@opensuse.org
+
+- Update to 1.29.7.8. 
+  * SSE quantizer
+  * modified functioning of ABR mode (-b option)
+  * improved autotools support
+  * allowed even higher bitrates, including ADTS
+  * framebuffer size bug fixed
+  * removed broken object types: Main and LTP
+  * some mp4 atoms fixed for better compalibility
+  * stdin seek bug fixed
+  * quantizer tweaked to better support high bitrates
+  * allow higher quality for mp4 files (-q 5000 max)
+  * removed mid frequency boost (it turned out useless)
+  * cutoff frequency adjusted to fully utilize upper band
+  * --help-long option removed, it was just an alias for -H
+  * -b option bug fixed
+  * quality related bug fixed
+  * updated manpage
+  * check if output file exists; --overwrite option added
+  * help/usage options reorganized
+  * block switching is now tuned to match quality/bitrate
+  * give more quality to lower frequancies (less to highs)
+  * quantizer updated again
+    1.29.4:
+  * rewritten quantizer: faster, diffrerent quality, different bitrates
+  * ftyp atom: set brands like itunes does, shoud be more compatible
+    with picky tools
+  * new option(--tag) to add named tags (iTunes '----')
+  * faster and better short/long window type switch
+  * Don't build DRM(Digital Radio Mondiale) by default.
+    Use ./configure --enable-drm to build DRM version.
+  *  fixed bugs
+  * rounding in QuantizeReflectionCoeffs (tns.c)
+  * use +60 value for scalefactor.
+  * use clipped diff instead of original value (huffman.c)
+    1.29.3:
+  *  MP4 tag options improved
+  *  fixed MP4 'meta' atom bug
+  *  new option to set verbosity (-v0 to silence output)
+  1.29.2:
+  *  new mp4 output code
+  1.29:
+  *  various patches applied and bugs fixed
+
+-------------------------------------------------------------------
 Fri Feb 24 08:19:18 UTC 2017 - scarabeus@opensuse.org
 
 - Disable mp4v2 it is used by the cli frontend only and it ain't

faac.spec Changed

@@ -16,23 +16,31 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define major     0
 %define lib       libfaac
 %define libname   %{lib}%{major}
+
 Name:           faac
-Version:        1.28
+Version:        1.29.7.8
 Release:        0
 Summary:        Frontend for encoding MPEG2/4 AAC
 # Original Code was free to use but restricted. Modifications are LGPL-2.1+
 License:        SUSE-Freeware and LGPL-2.1+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.audiocoding.com/
-Source0:        faac-%{version}.tar.bz2
+Source0:        https://sourceforge.net/projects/faac/files/faac-src/faac-1.29/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix strict-aliasing-punning warning.
 Patch0:         faac-1.28-strict-aliasing-punning.patch
+# PATCH-FIX-UPSTREAM faac-1.29.7.8-disable-sse2.patch hillwood@opensuse.org - fix build for ARM
+Patch1:         faac-1.29.7.8-disable-sse2.patch
+# Use clang instead of gcc if the openSUSE version is Tumbleweed.
+# Gcc7 can't build faac on openSUSE Tumbleweed ARM.
+%if 0%{?suse_version} > 1320 
+BuildRequires:  clang
+%else
 BuildRequires:  gcc-c++
+%endif
 Requires:       %{libname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -66,11 +74,19 @@
 Header files and static library for the faac library
 
 %prep
-%setup -q -n faac-%{version}
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%configure --without-mp4v2 --enable-shared --disable-static
+%if 0%{?suse_version} > 1320
+export CC=clang
+export CXX=clang++
+export CFLAGS="%{optflags} -fPIC -fno-strict-aliasing"
+%endif
+%configure --without-mp4v2 \
+           --enable-shared \
+           --disable-static
 make %{?_smp_mflags}
 
 %install

faac-1.29.7.8-disable-sse2.patch Added

@@ -0,0 +1,62 @@
+diff -Nur faac-1.29.7.8/libfaac/Makefile.am faac-1.29.7.8-new/libfaac/Makefile.am
+--- faac-1.29.7.8/libfaac/Makefile.am	2017-10-05 14:55:48.000000000 +0800
++++ faac-1.29.7.8-new/libfaac/Makefile.am	2017-10-09 22:35:34.243608500 +0800
+@@ -1,7 +1,7 @@
+ common_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c blockswitch.c util.c channels.c filtbank.c huffman.c tns.c quantize.c
+ common_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h blockswitch.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h util.h quantize.h version.h
+ common_LIBADD = -lm
+-common_CFLAGS = -fvisibility=hidden -msse2
++common_CFLAGS = -fvisibility=hidden
+ 
+ if USE_DRM
+ lib_LTLIBRARIES = libfaac_drm.la
+diff -Nur faac-1.29.7.8/libfaac/Makefile.in faac-1.29.7.8-new/libfaac/Makefile.in
+--- faac-1.29.7.8/libfaac/Makefile.in	2017-10-05 20:31:51.000000000 +0800
++++ faac-1.29.7.8-new/libfaac/Makefile.in	2017-10-09 22:35:21.713357700 +0800
+@@ -366,7 +366,7 @@
+ common_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c blockswitch.c util.c channels.c filtbank.c huffman.c tns.c quantize.c
+ common_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h blockswitch.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h util.h quantize.h version.h
+ common_LIBADD = -lm
+-common_CFLAGS = -fvisibility=hidden -msse2
++common_CFLAGS = -fvisibility=hidden
+ @USE_DRM_FALSE@lib_LTLIBRARIES = libfaac.la
+ @USE_DRM_TRUE@lib_LTLIBRARIES = libfaac_drm.la
+ @USE_DRM_TRUE@libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
+diff -Nur faac-1.29.7.8/libfaac/quantize.c faac-1.29.7.8-new/libfaac/quantize.c
+--- faac-1.29.7.8/libfaac/quantize.c	2017-10-05 14:55:48.000000000 +0800
++++ faac-1.29.7.8-new/libfaac/quantize.c	2017-10-09 22:26:53.347399200 +0800
+@@ -126,34 +126,7 @@
+ #ifdef __GNUC__
+ typedef float v4sf __attribute__ ((vector_size (16)));
+ typedef int v4si __attribute__ ((vector_size (16)));
+-      if (__builtin_cpu_supports("sse2"))
+-      {
+-          static const v4sf zero = {0, 0, 0, 0};
+-          static const v4sf magic = {MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER};
+ 
+-          for (cnt = start; cnt < end; cnt += 4)
+-          {
+-              float fin[4];
+-              fin[0] = xr[cnt];
+-              fin[1] = xr[cnt+1];
+-              fin[2] = xr[cnt+2];
+-              fin[3] = xr[cnt+3];
+-
+-              v4sf x = __builtin_ia32_loadups(fin);
+-              x = __builtin_ia32_maxps(x, __builtin_ia32_subps(zero, x));
+-
+-              v4sf fix = {sfacfix, sfacfix, sfacfix, sfacfix};
+-              x = __builtin_ia32_mulps(x, fix);
+-              x = __builtin_ia32_mulps(x , __builtin_ia32_sqrtps(x));
+-              x = __builtin_ia32_sqrtps(x);
+-
+-              x = __builtin_ia32_addps(x, magic);
+-              v4si vi = __builtin_ia32_cvttps2dq(x);
+-              memcpy(xi+cnt,&vi,16);
+-          }
+-
+-          continue;
+-      }
+ #endif
+ 
+       for (cnt = start; cnt < end; cnt++)