[mingw-libtheora] Build with the newest toolchain.
František Dvořák
valtri at fedoraproject.org
Sun Jan 4 19:34:55 UTC 2015
commit b3df9ded639e6a7f50b151dea3e1905ae7b19c46
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Sun Jan 4 20:02:03 2015 +0100
Build with the newest toolchain.
mingw-libtheora-1.1.1-rint.patch | 38 ++++++++++++++++++++++++++++++++++++++
mingw-libtheora.spec | 8 +++++++-
2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/mingw-libtheora-1.1.1-rint.patch b/mingw-libtheora-1.1.1-rint.patch
new file mode 100644
index 0000000..5c95fe8
--- /dev/null
+++ b/mingw-libtheora-1.1.1-rint.patch
@@ -0,0 +1,38 @@
+diff --git a/examples/encoder_example.c b/examples/encoder_example.c
+index 4b73b64..e0e08d3 100644
+--- a/examples/encoder_example.c
++++ b/examples/encoder_example.c
+@@ -51,14 +51,6 @@
+ /*supply missing headers and functions to Win32. going to hell, I know*/
+ #include <fcntl.h>
+ #include <io.h>
+-
+-static double rint(double x)
+-{
+- if (x < 0.0)
+- return (double)(int)(x - 0.5);
+- else
+- return (double)(int)(x + 0.5);
+-}
+ #endif
+
+ const char *optstring = "b:e:o:a:A:v:V:s:S:f:F:ck:d:z:\1\2\3\4";
+diff --git a/win32/experimental/transcoder/transcoder_example.c b/win32/experimental/transcoder/transcoder_example.c
+index 28c2b52..3923b44 100644
+--- a/win32/experimental/transcoder/transcoder_example.c
++++ b/win32/experimental/transcoder/transcoder_example.c
+@@ -37,14 +37,6 @@
+ /*supply missing headers and functions to Win32. going to hell, I know*/
+ #include <io.h>
+ #include <fcntl.h>
+-
+-static double rint(double x)
+-{
+- if (x < 0.0)
+- return (double)(int)(x - 0.5);
+- else
+- return (double)(int)(x + 0.5);
+-}
+ #endif
+
+ /*Copied from vorbis/sharedbook.c*/
diff --git a/mingw-libtheora.spec b/mingw-libtheora.spec
index a30ff0f..ad09135 100644
--- a/mingw-libtheora.spec
+++ b/mingw-libtheora.spec
@@ -4,7 +4,7 @@
Name: mingw-%{base}
Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Theora Video Compression Codec
License: BSD
@@ -20,6 +20,8 @@ Patch2: libtheora-1.1.1-libm.patch
# to fix parallel build with -no-undefined in MinGW
# upstream SVN r16712
Patch3: libtheora-1.1.1-libadd.patch
+# https://trac.xiph.org/ticket/2141
+Patch4: mingw-libtheora-1.1.1-rint.patch
BuildArch: noarch
@@ -108,6 +110,7 @@ This package is MinGW compiled theora tools for the Win64 target.
%patch1 -p0
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# no custom CFLAGS please
sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure.ac
@@ -177,5 +180,8 @@ rm -fv %{buildroot}/%{mingw64_libdir}/*.la
%changelog
+* Sun Jan 04 2015 František Dvořák <valtri at civ.zcu.cz> - 1.1.1-2
+- Build with the newest toolchain
+
* Tue Aug 5 2014 František Dvořák <valtri at civ.zcu.cz> - 1.1.1-1
- Initial package
More information about the scm-commits
mailing list