cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update eina to 1.0.0 (the rest will follow sometime later)

Browse Source 
ok laurent@ (MAINTAINER)
This commit is contained in:
jasper 2011-03-06 21:35:41 +00:00
parent 194fb0a9f4
commit 6af5ad9f9d
7 changed files with 8 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/e17/eina/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2011/01/16 11:09:37 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2011/03/06 21:35:41 jasper Exp $
COMMENT = EFL API for data types
DISTNAME = eina-1.0.0.beta2
DISTNAME = eina-1.0.0
REVISION = 0
EPOCH= 0
EPOCH= 1
SHARED_LIBS += eina 1.0 # 1.0

10
x11/e17/eina/distinfo
View File

@ -1,5 +1,5 @@
MD5 (e17/eina-1.0.0.beta2.tar.gz) = YaNczSCY5ncdgbbh0oD2XQ==
RMD160 (e17/eina-1.0.0.beta2.tar.gz) = TYEE5vTs7eWJsojt4XNg3+FQTMU=
SHA1 (e17/eina-1.0.0.beta2.tar.gz) = kcegfUsEx8cP4o8rbxvmq6xgi44=
SHA256 (e17/eina-1.0.0.beta2.tar.gz) = ZbtCmcBjbrlPyC8KI567N7apOhTzmP/2nz0tu0V80+8=
SIZE (e17/eina-1.0.0.beta2.tar.gz) = 679074
MD5 (e17/eina-1.0.0.tar.gz) = IHtkplSWQjksSgdg33jfWQ==
RMD160 (e17/eina-1.0.0.tar.gz) = xbfwRIBbGNi/MldZIC9St8sDeks=
SHA1 (e17/eina-1.0.0.tar.gz) = vPUopIzvmllFGd8wIW868tHLK0w=
SHA256 (e17/eina-1.0.0.tar.gz) = deB5XgyyfmJ4RBsJ5Sme5Oj7rK8qHXpKK4aoLwWbUgs=
SIZE (e17/eina-1.0.0.tar.gz) = 798874

25
x11/e17/eina/patches/patch-Makefile_in
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2011/01/16 00:31:30 laurent Exp $
make -C is not supported under bsd make, cd then make so
we can generate doc and run benchmark.
--- Makefile.in.orig Sun Nov 21 00:11:39 2010
+++ Makefile.in Sun Nov 21 02:55:34 2010
@@ -875,7 +875,7 @@ uninstall-am: uninstall-pkgconfigDATA
doc:
@echo "entering doc/"
- make -C doc doc
+ cd doc && make doc
# Unit tests
@@ -915,7 +915,7 @@ doc:
@EFL_ENABLE_COVERAGE_FALSE@ @echo "reconfigure with --enable-tests --enable-coverage"
@EFL_ENABLE_BENCHMARK_TRUE@benchmark:
-@EFL_ENABLE_BENCHMARK_TRUE@ @make -C src benchmark
+@EFL_ENABLE_BENCHMARK_TRUE@ @cd src && make benchmark
@EFL_ENABLE_BENCHMARK_TRUE@ @mkdir result || true
@EFL_ENABLE_BENCHMARK_TRUE@ @cd result && ../src/tests/eina_bench `date +%F_%s`

34
x11/e17/eina/patches/patch-configure
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2011/01/16 00:31:30 laurent Exp $
Fix pthread detection.
--- configure.orig Sat Nov 20 22:50:54 2010
+++ configure Sat Nov 20 23:39:20 2010
@@ -11792,12 +11792,12 @@ case "$host_os" in
mingw*)
;;
solaris*)
- _efl_thread_cflags="-mt"
- _efl_thread_libs="-mt"
+ _efl_threads_cflags="-mt"
+ _efl_threads_libs="-mt"
;;
*)
- _efl_thread_cflags="-pthread"
- _efl_thread_libs="-pthread"
+ _efl_threads_cflags="-pthread"
+ _efl_threads_libs="-pthread"
;;
esac
@@ -11849,8 +11849,8 @@ fi
EFL_PTHREAD_CFLAGS=""
EFL_PTHREAD_LIBS=""
if test "x${_efl_have_posix_threads}" = "xyes" ; then
- EFL_PTHREAD_CFLAGS=${_efl_thread_cflags}
- EFL_PTHREAD_LIBS=${_efl_thread_libs}
+ EFL_PTHREAD_CFLAGS=${_efl_threads_cflags}
+ EFL_PTHREAD_LIBS=${_efl_threads_libs}
fi

16
x11/e17/eina/patches/patch-src_Makefile_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2011/01/16 00:31:30 laurent Exp $
make -C is not supported under bsd make, cd then make so
we can run benchmark.
--- src/Makefile.in.orig Sun Nov 21 00:11:50 2010
+++ src/Makefile.in Sun Nov 21 02:55:22 2010
@@ -609,7 +609,7 @@ uninstall-am:
.PHONY: benchmark
@EFL_ENABLE_BENCHMARK_TRUE@benchmark: all
-@EFL_ENABLE_BENCHMARK_TRUE@ make -C tests eina_bench
+@EFL_ENABLE_BENCHMARK_TRUE@ cd tests && make eina_bench
@EFL_ENABLE_BENCHMARK_FALSE@benchmark:
@EFL_ENABLE_BENCHMARK_FALSE@ @echo "reconfigure with --enable-benchmark"

36
x11/e17/eina/patches/patch-src_lib_eina_quadtree_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_lib_eina_quadtree_c,v 1.1 2011/01/16 00:31:30 laurent Exp $
Fix eina_quadtree_init() with --enable-default-mempool.
--- src/lib/eina_quadtree.c.orig Thu Nov 11 14:05:44 2010
+++ src/lib/eina_quadtree.c Sun Nov 21 06:17:06 2010
@@ -882,6 +882,8 @@ eina_quadtree_increase(Eina_QuadTree_Item *object)
Eina_Bool
eina_quadtree_init(void)
{
+ const char *choice, *tmp;
+
_eina_log_qd_dom = eina_log_domain_register("eina_quadtree",
EINA_LOG_COLOR_DEFAULT);
if (_eina_log_qd_dom < 0)
@@ -896,9 +898,18 @@ eina_quadtree_init(void)
EMS(EINA_MAGIC_QUADTREE_ITEM);
#undef EMS
- items_mp = eina_mempool_add("chained_mempool", "QuadTree Item", NULL,
+#ifdef EINA_DEFAULT_MEMPOOL
+ choice = "pass_through";
+#else
+ choice = "chained_mempool";
+#endif
+ tmp = getenv("EINA_MEMPOOL");
+ if (tmp && tmp[0])
+ choice = tmp;
+
+ items_mp = eina_mempool_add(choice, "QuadTree Item", NULL,
sizeof (Eina_QuadTree_Item), 320);
- root_mp = eina_mempool_add("chained_mempool", "QuadTree Root", NULL,
+ root_mp = eina_mempool_add(choice, "QuadTree Root", NULL,
sizeof (Eina_QuadTree_Root), 32);
return EINA_TRUE;

15
x11/e17/eina/patches/patch-src_tests_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_tests_Makefile_in,v 1.1 2011/01/16 00:31:30 laurent Exp $
Add strlog in AXTAR_DIST, enable e17 benchmark
--- src/tests/Makefile.in.orig Sun Nov 21 14:37:57 2010
+++ src/tests/Makefile.in Sun Nov 21 14:38:03 2010
@@ -442,7 +442,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/
@EFL_ENABLE_BENCHMARK_TRUE@eina_bench_quad.c
@EFL_ENABLE_BENCHMARK_TRUE@eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la
-EXTRA_DIST = eina_bench.h eina_suite.h Ecore_Data.h Evas_Data.h evas_mempool.h
+EXTRA_DIST = eina_bench.h eina_suite.h Ecore_Data.h Evas_Data.h evas_mempool.h strlog
all: all-am
.SUFFIXES: