From e3b1be17b67b3fd9feb1313d75f623f2d3571441 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 3 Dec 2014 11:39:09 +0000 Subject: [PATCH] graphics/cairo --- graphics/cairo/Makefile | 4 ++ graphics/cairo/PLIST | 6 +- graphics/cairo/distinfo | 3 + graphics/cairo/patches/patch-zz-minix-a | 11 +++ graphics/cairo/patches/patch-zz-minix-b | 94 +++++++++++++++++++++++++ graphics/cairo/patches/patch-zz-minix-c | 11 +++ 6 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 graphics/cairo/patches/patch-zz-minix-a create mode 100644 graphics/cairo/patches/patch-zz-minix-b create mode 100644 graphics/cairo/patches/patch-zz-minix-c diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index f4f2e1d3c..78663d4b1 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -17,5 +17,9 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 #.include "../../print/libspectre/buildlink3.mk" BUILDLINK_API_DEPENDS.pixman+= pixman>=0.30.0 .include "../../x11/pixman/buildlink3.mk" +.if (${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix") +CPPFLAGS+= -DCAIRO_NO_MUTEX=1 +.else .include "../../mk/pthread.buildlink3.mk" +.endif # !(${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix") .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index 90c83a51e..5ad12604c 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,5 +1,5 @@ @comment $NetBSD: PLIST,v 1.39 2015/11/06 11:15:51 wiz Exp $ -bin/cairo-trace +@comment MINIX: bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h @@ -16,8 +16,8 @@ ${PLIST.xcb}include/cairo/cairo-xcb.h ${PLIST.x11}include/cairo/cairo-xlib-xrender.h ${PLIST.x11}include/cairo/cairo-xlib.h include/cairo/cairo.h -lib/cairo/cairo-fdr.la -lib/cairo/libcairo-trace.la +@comment MINIX: lib/cairo/cairo-fdr.la +@comment MINIX: Requires pthreads: lib/cairo/libcairo-trace.la lib/libcairo-script-interpreter.la lib/libcairo.la lib/pkgconfig/cairo-fc.pc diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index b8cea0d6b..61d6962d3 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -8,3 +8,6 @@ SHA1 (patch-aa) = b01bc60f77a7122b0c0d0d9b25ad512bac7c190c SHA1 (patch-ab) = 11f7e0e59bd5c51a8fdacb48dcf2f2fefdf3b768 SHA1 (patch-ac) = 1785bbef6bcab4781bf89e1b986a7eb96e5f2b64 SHA1 (patch-ad) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530 +SHA1 (patch-zz-minix-a) = 00cca3cea1b87d50e8107dde6903cd689cdfefb3 +SHA1 (patch-zz-minix-b) = 575867453a2ceb81ae0ed30e16181305d3d9e0b7 +SHA1 (patch-zz-minix-c) = 05546ac5b75f90d14d65b5a010117b6415179dfe diff --git a/graphics/cairo/patches/patch-zz-minix-a b/graphics/cairo/patches/patch-zz-minix-a new file mode 100644 index 000000000..7b1e9cdb9 --- /dev/null +++ b/graphics/cairo/patches/patch-zz-minix-a @@ -0,0 +1,11 @@ +--- perf/cairo-perf.c.orig Wed Dec 3 11:26:55 2014 ++++ perf/cairo-perf.c Wed Dec 3 11:27:19 2014 +@@ -90,7 +90,7 @@ + DosSleep (0); + #elif defined(_WIN32) + SleepEx(0, TRUE); +-#elif defined(_POSIX_PRIORITY_SCHEDULING) ++#elif defined(_POSIX_PRIORITY_SCHEDULING) && !defined(__minix) + sched_yield (); + #else + sleep (0); diff --git a/graphics/cairo/patches/patch-zz-minix-b b/graphics/cairo/patches/patch-zz-minix-b new file mode 100644 index 000000000..fd24eebcd --- /dev/null +++ b/graphics/cairo/patches/patch-zz-minix-b @@ -0,0 +1,94 @@ +--- configure.orig Mon Oct 26 13:04:35 2015 ++++ configure Mon Oct 26 13:06:31 2015 +@@ -6153,7 +6153,7 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +@@ -6644,7 +6644,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++minix* | netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -10309,7 +10309,7 @@ + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ minix* | netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -10940,7 +10940,7 @@ + link_all_deplibs=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ minix* | netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -11969,6 +11969,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++minix*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Minix ld.elf_so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -15986,7 +15998,7 @@ + esac + ;; + +- netbsd*) ++ minix* | netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -16745,7 +16757,7 @@ + ;; + esac + ;; +- netbsd* | netbsdelf*-gnu) ++ minix* | netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -17743,6 +17755,18 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ ++minix*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Minix ld.elf_so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes + ;; + + netbsd*) diff --git a/graphics/cairo/patches/patch-zz-minix-c b/graphics/cairo/patches/patch-zz-minix-c new file mode 100644 index 000000000..9524d703c --- /dev/null +++ b/graphics/cairo/patches/patch-zz-minix-c @@ -0,0 +1,11 @@ +--- ./build/ltmain.sh.orig Mon Oct 26 13:08:01 2015 ++++ ./build/ltmain.sh Mon Oct 26 13:08:24 2015 +@@ -7633,7 +7633,7 @@ + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; +- *-*-netbsd*) ++ *-*-minix* | *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)