diff --git a/ClanLib-1.0.0-use-pthread_mutexattr_settype.patch b/ClanLib-1.0.0-use-pthread_mutexattr_settype.patch new file mode 100644 index 0000000..6315ec1 --- /dev/null +++ b/ClanLib-1.0.0-use-pthread_mutexattr_settype.patch @@ -0,0 +1,39 @@ +diff -up ClanLib-1.0.0/Sources/Core/System/Unix/mutex_pthread.cpp~ ClanLib-1.0.0/Sources/Core/System/Unix/mutex_pthread.cpp +--- ClanLib-1.0.0/Sources/Core/System/Unix/mutex_pthread.cpp~ 2008-11-13 17:09:02.000000000 +0100 ++++ ClanLib-1.0.0/Sources/Core/System/Unix/mutex_pthread.cpp 2022-03-06 19:06:28.886408533 +0100 +@@ -36,17 +36,6 @@ + #include + #include "mutex_pthread.h" + +-// We need to do this because the posix threads library under linux obviously +-// suck: +-extern "C" +-{ +-#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__) +- int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind); +-#else +- int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind); +-#endif +-} +- + CL_Mutex *CL_Mutex::create() + { + return new CL_Mutex; +@@ -60,16 +49,7 @@ CL_Mutex::CL_Mutex() + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + +-#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__) +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); +-#else +-#if PTHREAD_MUTEX_RECURSIVE_NP +-// cygwin +- pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE); +-#else +- pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); +-#endif +-#endif ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + pthread_mutex_init(&impl->mutex, &attr); + pthread_mutexattr_destroy(&attr); + diff --git a/ClanLib1.spec b/ClanLib1.spec index a021c70..8157ddb 100644 --- a/ClanLib1.spec +++ b/ClanLib1.spec @@ -3,7 +3,7 @@ Summary: Cross platform C++ game library Name: ClanLib1 Version: 1.0.0 -Release: 36%{?dist} +Release: 37%{?dist} License: zlib URL: http://www.clanlib.org/ Source0: http://www.clanlib.org/download/releases-1.0/%{realname}-%{version}.tgz @@ -17,6 +17,7 @@ Patch1: ClanLib-1.0.0-fullscreen-viewport.patch Patch2: ClanLib-1.0.0-libpng15.patch Patch3: ClanLib-1.0.0-gcc6.patch Patch4: ClanLib-1.0.0-NULL-not-defined.patch +Patch5: ClanLib-1.0.0-use-pthread_mutexattr_settype.patch BuildRequires: make gcc-c++ BuildRequires: libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel BuildRequires: libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel @@ -59,6 +60,8 @@ sed -i 's|Libs: -L${libdir}|Libs: -L${libdir}/%{realname}-1.0|' \ %build %configure --disable-dependency-tracking --disable-static --enable-dyn \ --disable-docs +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -96,6 +99,10 @@ done %changelog +* Sun Mar 6 2022 Hans de Goede - 1.0.0-37 +- Stop using obsolete pthread_mutexattr_setkind_np, fixing FTBFS of dependend + packages + * Wed Jan 19 2022 Fedora Release Engineering - 1.0.0-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild