From 2aaa3e11933ea18f427d7dcdf8e9bc76fc3e45ba Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 11 Jan 2010 15:04:49 +0000 Subject: [PATCH] - update evas to 0.9.9.061 with feedback and tweaks by me. committing on behalf of laurent@ --- x11/e17/evas/Makefile | 61 +++++++++++++------- x11/e17/evas/distinfo | 10 ++-- x11/e17/evas/patches/patch-configure | 23 ++++++++ x11/e17/evas/pkg/PFRAG.shared | 37 +++++++------ x11/e17/evas/pkg/PLIST | 83 ++++++++++++++++------------ 5 files changed, 137 insertions(+), 77 deletions(-) create mode 100644 x11/e17/evas/patches/patch-configure diff --git a/x11/e17/evas/Makefile b/x11/e17/evas/Makefile index 9cbb45bb671..5daad55c7ad 100644 --- a/x11/e17/evas/Makefile +++ b/x11/e17/evas/Makefile @@ -1,32 +1,53 @@ -# $OpenBSD: Makefile,v 1.8 2009/08/11 08:42:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2010/01/11 15:04:49 jasper Exp $ -COMMENT= canvas API for X -DISTNAME= evas-20071211 -PKGNAME= ${DISTNAME}p0 +COMMENT = canvas API for X +DISTNAME = evas-0.9.9.061 +PKGNAME = ${DISTNAME}v0 -SHARED_LIBS += evas 0.0 # .9.9 +SHARED_LIBS += evas 0.0 \ + evas-ver-svn-02 0.0 # BSD -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes -WANTLIB= X11 Xau Xdmcp Xext Xrender expat fontconfig freetype \ - jpeg png m z pthread-stubs xcb +USE_X11 = Yes -USE_X11= Yes -USE_LIBTOOL= Yes +USE_LIBTOOL = Yes -LIB_DEPENDS= gif::graphics/libungif \ - png::graphics/png \ +WANTLIB += GL GLU X11 Xau Xdmcp Xext Xrender crypto eina expat +WANTLIB += fontconfig freetype jpeg m pixman-1 pthread pthread-stubs +WANTLIB += ssl xcb xcb-image xcb-render xcb-shm z + +LIB_DEPENDS = png::graphics/png \ + gif::graphics/libungif \ tiff::graphics/tiff \ - edb::x11/e17/edb \ eet::x11/e17/eet -CONFIGURE_STYLE= autoconf automake -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS= --disable-image-loader-svg --enable-image-loader-edb +# Eventually more loaders will be enabled, +# -enable-gl-x11 might be added for some arch +CONFIGURE_ARGS += --disable-fribidi \ + --disable-image-loader-svg \ + --disable-image-loader-edb \ + --enable-image-loader-jpeg \ + --enable-image-loader-png \ + --enable-image-loader-gif \ + --enable-gl-x11 \ + --enable-software-x11 \ + --enable-buffer \ + --enable-software-x11 \ + --enable-xrender-x11 \ + --enable-gl-x11 \ + --enable-software-xcb \ + --enable-xrender-xcb \ + --enable-gl-glew \ + --enable-software-16-x11 +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + +FULLARCH = ${MACHINE_ARCH:S/amd64/x86_64/} +SUBST_VARS += FULLARCH .include diff --git a/x11/e17/evas/distinfo b/x11/e17/evas/distinfo index 7516c6124d3..ebf472e01e2 100644 --- a/x11/e17/evas/distinfo +++ b/x11/e17/evas/distinfo @@ -1,5 +1,5 @@ -MD5 (e17/evas-20071211.tar.gz) = YSQ7kiJBlYWWynp5Q//8tw== -RMD160 (e17/evas-20071211.tar.gz) = m9WrQBPMeu9aUPz5ujDJApCzwdE= -SHA1 (e17/evas-20071211.tar.gz) = vZlNSpdTriQc+Bs6p2XdxQ/z8ms= -SHA256 (e17/evas-20071211.tar.gz) = OCHnhssu7d7Vy7+r1eEPuLylyRkEJqJDKWGq3QtrjuA= -SIZE (e17/evas-20071211.tar.gz) = 4117508 +MD5 (e17/evas-0.9.9.061.tar.gz) = G7+eJp86+gnPCgpkVliL7Q== +RMD160 (e17/evas-0.9.9.061.tar.gz) = fxvLcX5jTh9qGVy8IZfygy9SpLI= +SHA1 (e17/evas-0.9.9.061.tar.gz) = n/duDwHpryW7B8hVLv6VEvc5fpI= +SHA256 (e17/evas-0.9.9.061.tar.gz) = cQAJV+qAsjJivTVuuSWM2+hwe7KNlCfZ8+pyAtlocj0= +SIZE (e17/evas-0.9.9.061.tar.gz) = 4837222 diff --git a/x11/e17/evas/patches/patch-configure b/x11/e17/evas/patches/patch-configure new file mode 100644 index 00000000000..0f953443d71 --- /dev/null +++ b/x11/e17/evas/patches/patch-configure @@ -0,0 +1,23 @@ +$OpenBSD: patch-configure,v 1.1 2010/01/11 15:04:49 jasper Exp $ +--- configure.orig Mon Jun 15 06:39:54 2009 ++++ configure Fri Jul 24 18:14:21 2009 +@@ -1962,8 +1962,8 @@ cat <<_ASUNAME + + hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` + uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` ++##uname -r = `(uname -r) 2>/dev/null || echo unknown` ++##uname -s = `(uname -s) 2>/dev/null || echo unknown` + uname -v = `(uname -v) 2>/dev/null || echo unknown` + + /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +@@ -17478,7 +17478,7 @@ case "$host_os" in + ;; + *) + release_info="-release $release" +- MODULE_ARCH="$host_os-$host_cpu-$release" ++ MODULE_ARCH="$host_cpu-$release" + ;; + esac + diff --git a/x11/e17/evas/pkg/PFRAG.shared b/x11/e17/evas/pkg/PFRAG.shared index aa0c0f61d23..e64c5acdbf6 100644 --- a/x11/e17/evas/pkg/PFRAG.shared +++ b/x11/e17/evas/pkg/PFRAG.shared @@ -1,18 +1,21 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2007/12/06 19:47:08 bernd Exp $ -lib/evas/modules/engines/buffer/module.so -lib/evas/modules/engines/software_generic/module.so -lib/evas/modules/engines/software_x11/module.so -lib/evas/modules/engines/xrender_x11/module.so -lib/evas/modules/loaders/edb/module.so -lib/evas/modules/loaders/eet/module.so -lib/evas/modules/loaders/gif/module.so -lib/evas/modules/loaders/jpeg/module.so -lib/evas/modules/loaders/png/module.so -lib/evas/modules/loaders/tiff/module.so -lib/evas/modules/loaders/xpm/module.so -lib/evas/modules/savers/edb/module.so -lib/evas/modules/savers/eet/module.so -lib/evas/modules/savers/jpeg/module.so -lib/evas/modules/savers/png/module.so -lib/evas/modules/savers/tiff/module.so +@comment $OpenBSD: PFRAG.shared,v 1.3 2010/01/11 15:04:49 jasper Exp $ +lib/evas/modules/engines/buffer/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/engines/gl_x11/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/engines/software_16/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/engines/software_16_x11/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/engines/software_generic/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/engines/software_x11/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/engines/xrender_x11/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/eet/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/gif/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/jpeg/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/pmaps/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/png/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/tiff/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/loaders/xpm/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/savers/eet/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/savers/jpeg/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/savers/png/${FULLARCH}-ver-svn-02/module.so +lib/evas/modules/savers/tiff/${FULLARCH}-ver-svn-02/module.so +@lib lib/libevas-ver-svn-02.so.${LIBevas-ver-svn-02_VERSION} @lib lib/libevas.so.${LIBevas_VERSION} diff --git a/x11/e17/evas/pkg/PLIST b/x11/e17/evas/pkg/PLIST index df0da67c457..800fc81b70e 100644 --- a/x11/e17/evas/pkg/PLIST +++ b/x11/e17/evas/pkg/PLIST @@ -1,66 +1,79 @@ -@comment $OpenBSD: PLIST,v 1.3 2007/12/16 18:24:56 laurent Exp $ +@comment $OpenBSD: PLIST,v 1.4 2010/01/11 15:04:49 jasper Exp $ %%SHARED%% include/Evas.h +include/Evas_Data.h include/Evas_Engine_Buffer.h +include/Evas_Engine_GL_X11.h +include/Evas_Engine_Software_16_X11.h include/Evas_Engine_Software_X11.h include/Evas_Engine_XRender_X11.h lib/evas/ lib/evas/modules/ lib/evas/modules/engines/ lib/evas/modules/engines/buffer/ -lib/evas/modules/engines/buffer/module.a -lib/evas/modules/engines/buffer/module.la +lib/evas/modules/engines/buffer/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/buffer/${FULLARCH}-ver-svn-02/module.la +lib/evas/modules/engines/gl_x11/ +lib/evas/modules/engines/gl_x11/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/gl_x11/${FULLARCH}-ver-svn-02/module.la +lib/evas/modules/engines/software_16/ +lib/evas/modules/engines/software_16/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/software_16/${FULLARCH}-ver-svn-02/module.la +lib/evas/modules/engines/software_16_x11/ +lib/evas/modules/engines/software_16_x11/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/software_16_x11/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/engines/software_generic/ -lib/evas/modules/engines/software_generic/module.a -lib/evas/modules/engines/software_generic/module.la +lib/evas/modules/engines/software_generic/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/software_generic/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/engines/software_x11/ -lib/evas/modules/engines/software_x11/module.a -lib/evas/modules/engines/software_x11/module.la +lib/evas/modules/engines/software_x11/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/software_x11/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/engines/xrender_x11/ -lib/evas/modules/engines/xrender_x11/module.a -lib/evas/modules/engines/xrender_x11/module.la +lib/evas/modules/engines/xrender_x11/${FULLARCH}-ver-svn-02/ +lib/evas/modules/engines/xrender_x11/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/loaders/ -lib/evas/modules/loaders/edb/ -lib/evas/modules/loaders/edb/module.a -lib/evas/modules/loaders/edb/module.la lib/evas/modules/loaders/eet/ -lib/evas/modules/loaders/eet/module.a -lib/evas/modules/loaders/eet/module.la +lib/evas/modules/loaders/eet/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/eet/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/loaders/gif/ -lib/evas/modules/loaders/gif/module.a -lib/evas/modules/loaders/gif/module.la +lib/evas/modules/loaders/gif/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/gif/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/loaders/jpeg/ -lib/evas/modules/loaders/jpeg/module.a -lib/evas/modules/loaders/jpeg/module.la +lib/evas/modules/loaders/jpeg/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/jpeg/${FULLARCH}-ver-svn-02/module.la +lib/evas/modules/loaders/pmaps/ +lib/evas/modules/loaders/pmaps/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/pmaps/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/loaders/png/ -lib/evas/modules/loaders/png/module.a -lib/evas/modules/loaders/png/module.la +lib/evas/modules/loaders/png/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/png/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/loaders/tiff/ -lib/evas/modules/loaders/tiff/module.a -lib/evas/modules/loaders/tiff/module.la +lib/evas/modules/loaders/tiff/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/tiff/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/loaders/xpm/ -lib/evas/modules/loaders/xpm/module.a -lib/evas/modules/loaders/xpm/module.la +lib/evas/modules/loaders/xpm/${FULLARCH}-ver-svn-02/ +lib/evas/modules/loaders/xpm/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/savers/ -lib/evas/modules/savers/edb/ -lib/evas/modules/savers/edb/module.a -lib/evas/modules/savers/edb/module.la lib/evas/modules/savers/eet/ -lib/evas/modules/savers/eet/module.a -lib/evas/modules/savers/eet/module.la +lib/evas/modules/savers/eet/${FULLARCH}-ver-svn-02/ +lib/evas/modules/savers/eet/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/savers/jpeg/ -lib/evas/modules/savers/jpeg/module.a -lib/evas/modules/savers/jpeg/module.la +lib/evas/modules/savers/jpeg/${FULLARCH}-ver-svn-02/ +lib/evas/modules/savers/jpeg/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/savers/png/ -lib/evas/modules/savers/png/module.a -lib/evas/modules/savers/png/module.la +lib/evas/modules/savers/png/${FULLARCH}-ver-svn-02/ +lib/evas/modules/savers/png/${FULLARCH}-ver-svn-02/module.la lib/evas/modules/savers/tiff/ -lib/evas/modules/savers/tiff/module.a -lib/evas/modules/savers/tiff/module.la +lib/evas/modules/savers/tiff/${FULLARCH}-ver-svn-02/ +lib/evas/modules/savers/tiff/${FULLARCH}-ver-svn-02/module.la lib/libevas.a lib/libevas.la lib/pkgconfig/ +lib/pkgconfig/evas-opengl-x11.pc +lib/pkgconfig/evas-software-16-x11.pc lib/pkgconfig/evas-software-buffer.pc lib/pkgconfig/evas-software-x11.pc +lib/pkgconfig/evas-software-xcb.pc lib/pkgconfig/evas-xrender-x11.pc +lib/pkgconfig/evas-xrender-xcb.pc lib/pkgconfig/evas.pc