- one more fix in x32 patch: despite 32-bit architecture, assume CPU as x86_64; fixes...

- release 6

diff --git a/flac.spec b/flac.spec
index 7834f4e9e22c2e5f11ec82eca3b41ffe2a41b625..000140161726454b72c82f49871536ecc10f7ffe 100644 (file)
--- a/flac.spec
+++ b/flac.spec
@@ -7,7 +7,7 @@ Summary:        Free Lossless Audio Codec
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
 Version:       1.3.1
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
 Version:       1.3.1

-Release:       5
+Release:       6

 License:       BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:         Libraries
 Source0:       http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
 License:       BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:         Libraries
 Source0:       http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz

diff --git a/x32.patch b/x32.patch
index b4c05ba607861a9f0d2c1ef295ef7a1facea82c8..c364c6bbdd074d5ddfadb2c35752f39fe1eaf448 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,5 +1,29 @@
 --- flac-1.3.1/configure.ac~   2014-12-25 12:11:41.000000000 +0000
 +++ flac-1.3.1/configure.ac    2014-12-25 12:28:28.561894846 +0000
 --- flac-1.3.1/configure.ac~   2014-12-25 12:11:41.000000000 +0000
 +++ flac-1.3.1/configure.ac    2014-12-25 12:28:28.561894846 +0000

+@@ -105,6 +105,14 @@
+ asm_optimisation=no
+ case "$host_cpu" in
+       x86_64)
++              case "$host" in
++                      *gnux32)
++                              cpu_x86_64=true
++                              AC_DEFINE(FLAC__CPU_X86_64)
++                              AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
++                              asm_optimisation=$asm_opt
++                              ;;
++                      *)
+               if test $ac_cv_sizeof_voidp = 4 ; then
+                       # This must be a 32 bit user space running on 64 bit kernel so treat
+                       # this as ia32.
+@@ -118,6 +126,8 @@
+                       AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
+                       fi
+               asm_optimisation=$asm_opt
++                              ;;
++              esac
+               ;;
+       i*86)
+               cpu_ia32=true

 @@ -150,6 +150,7 @@
        *-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;;
        *-*-darwin*) OBJ_FORMAT=macho ;;
 @@ -150,6 +150,7 @@
        *-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;;
        *-*-darwin*) OBJ_FORMAT=macho ;;