This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit 10e349f70ca40d127f2f9c2e32fa240443794585 Author: Jordi Mallach <[email protected]> Date: Fri Jul 15 18:44:47 2016 +0200 Add kfreebsd-* build fixes from Steven Chamberlain. --- debian/changelog | 2 ++ debian/patches/kfreebsd.patch | 74 +++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 77 insertions(+) diff --git a/debian/changelog b/debian/changelog index 916bb9f..87044d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ mame (0.175-2) unstable; urgency=medium * Add an empty override_dh_auto_build-indep rule, so arch-independent don't actually build the whole thing. Also rename dh_auto_test to their -arch variants. + * Add kfreebsd.patch to solve a lot more build issues on kfreebsd-*. + Many thanks to Steven Chamberlain! -- Cesare Falco <[email protected]> Fri, 08 Jul 2016 13:08:40 +0200 diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch new file mode 100644 index 0000000..95c7725 --- /dev/null +++ b/debian/patches/kfreebsd.patch @@ -0,0 +1,74 @@ +diff --git a/3rdparty/bx/include/bx/thread.h b/3rdparty/bx/include/bx/thread.h +index add66ab..9e105db 100644 +--- a/3rdparty/bx/include/bx/thread.h ++++ b/3rdparty/bx/include/bx/thread.h +@@ -8,7 +8,7 @@ + + #if BX_PLATFORM_POSIX + # include <pthread.h> +-# if BX_PLATFORM_BSD ++# if defined(BX_PLATFORM_BSD) && !defined(__GLIBC__) + # include <pthread_np.h> + # endif + # if defined(__GLIBC__) && !( (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) ) ) +@@ -157,12 +157,10 @@ namespace bx + { + #if BX_PLATFORM_OSX || BX_PLATFORM_IOS + pthread_setname_np(_name); +-#elif BX_PLATFORM_LINUX +-# if defined(__GLIBC__) && (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) ) ++#elif defined(__GLIBC__) && (__GLIBC__ > 2) || ( (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12) ) + pthread_setname_np(m_handle, _name); +-# else ++#elif BX_PLATFORM_LINUX + prctl(PR_SET_NAME,_name, 0, 0, 0); +-# endif // defined(__GLIBC__) ... + #elif BX_PLATFORM_BSD + #ifdef __NetBSD__ + pthread_setname_np(m_handle, "%s", (void *)_name); +diff --git a/3rdparty/bx/include/compat/freebsd/alloca.h b/3rdparty/bx/include/compat/freebsd/alloca.h +index c8b49f2..12a69ea 100644 +--- a/3rdparty/bx/include/compat/freebsd/alloca.h ++++ b/3rdparty/bx/include/compat/freebsd/alloca.h +@@ -1 +1,5 @@ ++#ifdef __GLIBC__ ++#include_next <alloca.h> ++#else + #include <stdlib.h> ++#endif +diff --git a/3rdparty/bx/include/compat/freebsd/signal.h b/3rdparty/bx/include/compat/freebsd/signal.h +index fd7d90f..3040b56 100644 +--- a/3rdparty/bx/include/compat/freebsd/signal.h ++++ b/3rdparty/bx/include/compat/freebsd/signal.h +@@ -1 +1,5 @@ ++#ifdef __GLIBC__ ++#include_next <signal.h> ++#else + #include <sys/signal.h> ++#endif +diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua +index 4094e48..ce45034 100644 +--- a/scripts/src/osd/sdl.lua ++++ b/scripts/src/osd/sdl.lua +@@ -340,7 +340,7 @@ project ("qtdbg_" .. _OPTIONS["osd"]) + MAME_DIR .. "src/osd/modules/render", + MAME_DIR .. "3rdparty", + } +- configuration { "linux-*" } ++ configuration { "linux-* or freebsd" } + buildoptions { + "-fPIC", + } +diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp +index 164c2fc..3eab9e4 100644 +--- a/src/osd/modules/file/posixptty.cpp ++++ b/src/osd/modules/file/posixptty.cpp +@@ -19,7 +19,7 @@ + #include <unistd.h> + #include <stdlib.h> + +-#if defined(__FreeBSD__) || defined(__DragonFly__) ++#if defined(__FreeBSD_kernel__) || defined(__DragonFly__) + #include <termios.h> + #include <libutil.h> + #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__) diff --git a/debian/patches/series b/debian/patches/series index e1567ea..4a70cfb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ remove-m64_flag_for_mips64el_alpha.patch genie_freebsd_target.patch +kfreebsd.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
