[vlc-devel] commit: Contrib: Fix liboil cpu detection (Jean-Baptiste Kempf )

git version control git at videolan.org
Tue Aug 18 11:03:27 CEST 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 18 11:01:07 2009 +0200| [623024c83ca84a9201221bd91ea9044b31e6c331] | committer: Jean-Baptiste Kempf 

Contrib: Fix liboil cpu detection

Fix provided by NightStrike from mingw-w64 project

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=623024c83ca84a9201221bd91ea9044b31e6c331
---

 extras/contrib/src/Makefile                      |    2 ++
 extras/contrib/src/Patches/liboil-Xcompile.patch |   12 ++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d038276..96fa02e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2463,6 +2463,8 @@ liboil-$(OIL_VERSION).tar.gz:
 liboil: liboil-$(OIL_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -d liboil -p1 < Patches/liboil-noshared.patch
+	patch -d liboil -p1 < Patches/liboil-Xcompile.patch
+
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS
diff --git a/extras/contrib/src/Patches/liboil-Xcompile.patch b/extras/contrib/src/Patches/liboil-Xcompile.patch
new file mode 100644
index 0000000..313a3e8
--- /dev/null
+++ b/extras/contrib/src/Patches/liboil-Xcompile.patch
@@ -0,0 +1,12 @@
+diff -ruN liboil.new/m4/as-unaligned-access.m4 liboil/m4/as-unaligned-access.m4
+--- liboil.new/m4/as-unaligned-access.m4	2009-08-18 10:59:02.000000000 +0200
++++ liboil/m4/as-unaligned-access.m4	2009-08-18 10:59:32.000000000 +0200
+@@ -4,7 +4,7 @@
+ AC_DEFUN([AS_UNALIGNED_ACCESS], [
+   AC_MSG_CHECKING([if unaligned memory access works correctly])
+   if test x"$as_cv_unaligned_access" = x ; then
+-    case $host in
++    case $host_cpu in
+       alpha*|arm*|hp*|mips*|sh*|sparc*|ia64*)
+         _AS_ECHO_N([(blacklisted) ])
+         as_cv_unaligned_access=no




More information about the vlc-devel mailing list