r12872 - packages/trunk/yabause/debian/patches

[Evgeni Golov]

Author: evgeni
Date: 2011-11-28 09:36:29 +0000 (Mon, 28 Nov 2011)
New Revision: 12872

Added:
   packages/trunk/yabause/debian/patches/01_link_with_libm.patch
Removed:
   packages/trunk/yabause/debian/patches/01_link_with_pthread.patch
Modified:
   packages/trunk/yabause/debian/patches/series
Log:
update binutils-gold patch


Copied: packages/trunk/yabause/debian/patches/01_link_with_libm.patch (from rev 12867, packages/trunk/yabause/debian/patches/01_link_with_pthread.patch)
===================================================================
--- packages/trunk/yabause/debian/patches/01_link_with_libm.patch	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/01_link_with_libm.patch	2011-11-28 09:36:29 UTC (rev 12872)
@@ -0,0 +1,18 @@
+From: Guillaume Duhamel <guillaume.duhamel at gmail.com>
+Subject: Fix building with binutils-gold by linking libm
+Origin: upstream, http://yabause.svn.sourceforge.net/viewvc/yabause/trunk/yabause/src/CMakeLists.txt?view=patch&r1=2720&r2=2719&pathrev=2720
+
+--- yabause/src/CMakeLists.txt	2011/11/28 00:57:56	2719
++++ yabause/src/CMakeLists.txt	2011/11/28 09:08:41	2720
+@@ -24,6 +24,11 @@
+ 	set(yabause_SOURCES ${yabause_SOURCES} scsp.c)
+ endif()
+ 
++# math library
++if (UNIX)
++    set(YABAUSE_LIBRARIES ${YABAUSE_LIBRARIES} "m")
++endif()
++
+ # Bigendian
+ include(TestBigEndian)
+ test_big_endian(WORDS_BIGENDIAN)

Deleted: packages/trunk/yabause/debian/patches/01_link_with_pthread.patch
===================================================================
--- packages/trunk/yabause/debian/patches/01_link_with_pthread.patch	2011-11-28 09:32:50 UTC (rev 12871)
+++ packages/trunk/yabause/debian/patches/01_link_with_pthread.patch	2011-11-28 09:36:29 UTC (rev 12872)
@@ -1,24 +0,0 @@
-From: Guillaume Duhamel <guillaume.duhamel at gmail.com>
-Subject: Fix building with binutils-gold by linking pthread
-Origin: upstream, http://yabause.svn.sourceforge.net/viewvc/yabause/branches/branch_0_9_10/yabause/configure.in?view=patch&r1=2055&r2=2441&pathrev=2441
-Bug-Debian: http://bugs.debian.org/556767
-
---- yabause/configure.in	2009/05/18 03:55:53	2055
-+++ yabause/configure.in	2009/11/18 23:57:34	2441
-@@ -185,7 +185,7 @@
- 
- # checking for OpenAL (can be used for sound)
- use_openal=yes
--AC_ARG_WITH(openal, AC_HELP_STRING(--without-openal, don't use OpenAL), [use_openal=$withval])
-+AC_ARG_WITH(openal, AC_HELP_STRING(--without-openal, "don't use OpenAL"), [use_openal=$withval])
- 
- if test x$use_openal = xyes ; then
- 	case $host in
-@@ -198,6 +198,7 @@
- 			# won't work right now.
- 			;;
- 		*)
-+			AC_CHECK_LIB(pthread, main)
- 			AC_CHECK_LIB(openal, alBufferData, [
- 				LIBS="$LIBS -lopenal"
- 				AC_DEFINE(HAVE_LIBAL)

Modified: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	2011-11-28 09:32:50 UTC (rev 12871)
+++ packages/trunk/yabause/debian/patches/series	2011-11-28 09:36:29 UTC (rev 12872)
@@ -1,2 +1,2 @@
-#01_link_with_pthread.patch
+01_link_with_libm.patch
 02_typos.patch