diff options
32 files changed, 105 insertions, 198 deletions
diff --git a/doc/CHANGES-2011 b/doc/CHANGES-2011 index 96073ebbdd6..116c568e963 100644 --- a/doc/CHANGES-2011 +++ b/doc/CHANGES-2011 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2011,v 1.3163 2011/12/05 17:24:46 joerg Exp $ +$NetBSD: CHANGES-2011,v 1.3164 2011/12/05 17:33:34 joerg Exp $ Changes to the packages collection and infrastructure in 2011: @@ -4980,3 +4980,17 @@ Changes to the packages collection and infrastructure in 2011: Updated devel/eet to 1.5.0 [joerg 2011-12-05] Added devel/ecore version 1.1.0 [joerg 2011-12-05] Removed graphics/evas-xrender-x11 [joerg 2011-12-05] + Updated graphics/evas to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-buffer to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-edb to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-eet to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-gif to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-jpeg to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-pmaps to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-png to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-sdl to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-sdl-16 to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-software-x11 to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-svg to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-tiff to 1.1.0 [joerg 2011-12-05] + Updated graphics/evas-xpm to 1.1.0 [joerg 2011-12-05] diff --git a/graphics/Makefile b/graphics/Makefile index 2c12f7de73d..4a2a312984f 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.619 2011/11/03 06:04:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.620 2011/12/05 17:33:31 joerg Exp $ # COMMENT= Graphics tools and libraries @@ -93,7 +93,6 @@ SUBDIR+= evas-software-x11 SUBDIR+= evas-svg SUBDIR+= evas-tiff SUBDIR+= evas-xpm -SUBDIR+= evas-xrender-x11 SUBDIR+= ewipe SUBDIR+= exif SUBDIR+= exifprobe diff --git a/graphics/evas-buffer/Makefile b/graphics/evas-buffer/Makefile index a1be57bc356..07f210432c5 100644 --- a/graphics/evas-buffer/Makefile +++ b/graphics/evas-buffer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:30 sbd Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/05 17:33:32 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-buffer/} -PKGREVISION= 3 +PKGNAME= evas-buffer-${EVAS_VERSION} COMMENT= Evas buffer engine diff --git a/graphics/evas-buffer/PLIST b/graphics/evas-buffer/PLIST index dbcc84b99c3..01c627bf674 100644 --- a/graphics/evas-buffer/PLIST +++ b/graphics/evas-buffer/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:07 joerg Exp $ -include/Evas_Engine_Buffer.h +@comment $NetBSD: PLIST,v 1.5 2011/12/05 17:33:32 joerg Exp $ +include/evas-1/Evas_Engine_Buffer.h lib/evas/modules/engines/buffer/${MODULE_ARCH}/module.la lib/pkgconfig/evas-software-buffer.pc diff --git a/graphics/evas-buffer/buildlink3.mk b/graphics/evas-buffer/buildlink3.mk index 46a5b5562e0..aecec873cca 100644 --- a/graphics/evas-buffer/buildlink3.mk +++ b/graphics/evas-buffer/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/09/11 22:31:00 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2011/12/05 17:33:32 joerg Exp $ BUILDLINK_TREE+= evas-buffer .if !defined(EVAS_BUFFER_BUILDLINK3_MK) EVAS_BUFFER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.evas-buffer+= evas-buffer>=0.9.9.062 +BUILDLINK_API_DEPENDS.evas-buffer+= evas-buffer>=1.1.0beta BUILDLINK_PKGSRCDIR.evas-buffer?= ../../graphics/evas-buffer .endif # EVAS_BUFFER_BUILDLINK3_MK diff --git a/graphics/evas-edb/Makefile b/graphics/evas-edb/Makefile index d1067771fad..f5fb97ca9e1 100644 --- a/graphics/evas-edb/Makefile +++ b/graphics/evas-edb/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:30 sbd Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/05 17:33:32 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-edb/} -PKGREVISION= 3 +PKGNAME= evas-edb-${EVAS_VERSION} COMMENT= Evas Edb image loader diff --git a/graphics/evas-eet/Makefile b/graphics/evas-eet/Makefile index cb6a6d92851..dac8547c1ef 100644 --- a/graphics/evas-eet/Makefile +++ b/graphics/evas-eet/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:30 sbd Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/05 17:33:32 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-eet/} -PKGREVISION= 3 +PKGNAME= evas-eet-${EVAS_VERSION} COMMENT= Evas EET image loader diff --git a/graphics/evas-gif/Makefile b/graphics/evas-gif/Makefile index 97812efa7c6..f60c8ba6af9 100644 --- a/graphics/evas-gif/Makefile +++ b/graphics/evas-gif/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:30 sbd Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/05 17:33:32 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-gif/} -PKGREVISION= 4 +PKGNAME= evas-gif-${EVAS_VERSION} COMMENT= Evas GIF image loader diff --git a/graphics/evas-jpeg/Makefile b/graphics/evas-jpeg/Makefile index 9c7ecba5e05..37054f2c93e 100644 --- a/graphics/evas-jpeg/Makefile +++ b/graphics/evas-jpeg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/05 17:33:32 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-jpeg/} -PKGREVISION= 3 +PKGNAME= evas-jpeg-${EVAS_VERSION} COMMENT= Evas JPEG image loader diff --git a/graphics/evas-pmaps/Makefile b/graphics/evas-pmaps/Makefile index 88d49e09fa2..0dd13c8502c 100644 --- a/graphics/evas-pmaps/Makefile +++ b/graphics/evas-pmaps/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-pmaps/} -PKGREVISION= 3 +PKGNAME= evas-pmaps-${EVAS_VERSION} COMMENT= Evas PMAPS image loader diff --git a/graphics/evas-png/Makefile b/graphics/evas-png/Makefile index a0380a9d837..12d34cfca33 100644 --- a/graphics/evas-png/Makefile +++ b/graphics/evas-png/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.10 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-png/} -PKGREVISION= 5 +PKGNAME= evas-png-${EVAS_VERSION} COMMENT= Evas PNG image loader diff --git a/graphics/evas-sdl-16/Makefile b/graphics/evas-sdl-16/Makefile index 1eb7ca05715..c4d8285cdbb 100644 --- a/graphics/evas-sdl-16/Makefile +++ b/graphics/evas-sdl-16/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-sdl-16/} -PKGREVISION= 3 +PKGNAME= evas-sdl-16-${EVAS_VERSION} COMMENT= Evas 16-bit SDL engine diff --git a/graphics/evas-sdl-16/PLIST b/graphics/evas-sdl-16/PLIST index 83d22253777..21f4f83c9f2 100644 --- a/graphics/evas-sdl-16/PLIST +++ b/graphics/evas-sdl-16/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $ -include/Evas_Engine_SDL_16.h +@comment $NetBSD: PLIST,v 1.5 2011/12/05 17:33:33 joerg Exp $ +include/evas-1/Evas_Engine_SDL_16.h lib/evas/modules/engines/software_16_sdl/${MODULE_ARCH}/module.la diff --git a/graphics/evas-sdl/Makefile b/graphics/evas-sdl/Makefile index 3c11ffe56a6..f46cb253f32 100644 --- a/graphics/evas-sdl/Makefile +++ b/graphics/evas-sdl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-sdl/} -PKGREVISION= 3 +PKGNAME= evas-sdl-${EVAS_VERSION} COMMENT= Evas SDL engine diff --git a/graphics/evas-sdl/PLIST b/graphics/evas-sdl/PLIST index 9418db23e8f..b1c136f5b19 100644 --- a/graphics/evas-sdl/PLIST +++ b/graphics/evas-sdl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $ -include/Evas_Engine_SDL.h +@comment $NetBSD: PLIST,v 1.5 2011/12/05 17:33:33 joerg Exp $ +include/evas-1/Evas_Engine_SDL.h lib/evas/modules/engines/software_sdl/${MODULE_ARCH}/module.la lib/pkgconfig/evas-software-sdl.pc diff --git a/graphics/evas-software-x11/Makefile b/graphics/evas-software-x11/Makefile index 896fcc67b9b..3f149d61912 100644 --- a/graphics/evas-software-x11/Makefile +++ b/graphics/evas-software-x11/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-software-x11/} -PKGREVISION= 3 +PKGNAME= evas-software-x11-${EVAS_VERSION} COMMENT= Evas software X11 engine diff --git a/graphics/evas-software-x11/PLIST b/graphics/evas-software-x11/PLIST index bf8b9640448..1e926e97952 100644 --- a/graphics/evas-software-x11/PLIST +++ b/graphics/evas-software-x11/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $ -include/Evas_Engine_Software_X11.h +@comment $NetBSD: PLIST,v 1.5 2011/12/05 17:33:33 joerg Exp $ +include/evas-1/Evas_Engine_Software_X11.h lib/evas/modules/engines/software_x11/${MODULE_ARCH}/module.la lib/pkgconfig/evas-software-x11.pc diff --git a/graphics/evas-software-x11/buildlink3.mk b/graphics/evas-software-x11/buildlink3.mk index bfdf5088b04..39b8896bfbf 100644 --- a/graphics/evas-software-x11/buildlink3.mk +++ b/graphics/evas-software-x11/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/09/11 22:31:01 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2011/12/05 17:33:33 joerg Exp $ BUILDLINK_TREE+= evas-software-x11 .if !defined(EVAS_SOFTWARE_X11_BUILDLINK3_MK) EVAS_SOFTWARE_X11_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.evas-software-x11+= evas-software-x11>=0.9.9.062 +BUILDLINK_API_DEPENDS.evas-software-x11+= evas-software-x11>=1.1.0beta BUILDLINK_PKGSRCDIR.evas-software-x11?= ../../graphics/evas-software-x11 .include "../../x11/libX11/buildlink3.mk" diff --git a/graphics/evas-svg/Makefile b/graphics/evas-svg/Makefile index e15d3cb1f8a..c25161ab19d 100644 --- a/graphics/evas-svg/Makefile +++ b/graphics/evas-svg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.12 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-svg/} -PKGREVISION= 7 +PKGNAME= evas-svg-${EVAS_VERSION} COMMENT= Evas SVG image loader @@ -14,6 +13,7 @@ MAKE_FLAGS+= module_la_LIBADD="\$${EINA_LIBS} \$${evas_image_loader_svg_libs} ${ module_la_DEPENDENCIES= .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" diff --git a/graphics/evas-tiff/Makefile b/graphics/evas-tiff/Makefile index a81c8f17881..3e646fad433 100644 --- a/graphics/evas-tiff/Makefile +++ b/graphics/evas-tiff/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-tiff/} -PKGREVISION= 3 +PKGNAME= evas-tiff-${EVAS_VERSION} COMMENT= Evas TIFF image loader diff --git a/graphics/evas-xpm/Makefile b/graphics/evas-xpm/Makefile index 75e4ce1f11f..cb42e271675 100644 --- a/graphics/evas-xpm/Makefile +++ b/graphics/evas-xpm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:31 sbd Exp $ +# $NetBSD: Makefile,v 1.8 2011/12/05 17:33:33 joerg Exp $ -PKGNAME= ${DISTNAME:S/evas/evas-xpm/} -PKGREVISION= 3 +PKGNAME= evas-xpm-${EVAS_VERSION} COMMENT= Evas XPM image loader diff --git a/graphics/evas-xrender-x11/DESCR b/graphics/evas-xrender-x11/DESCR deleted file mode 100644 index 6ff60b23344..00000000000 --- a/graphics/evas-xrender-x11/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -Evas is a clean display canvas API for several target display systems -that can draw anti-aliased text, smooth super and sub-sampled scaled -images, alpha-blend objects, and more. - -This is the Xrender X11 rendering backend of Evas. diff --git a/graphics/evas-xrender-x11/Makefile b/graphics/evas-xrender-x11/Makefile deleted file mode 100644 index 2350afb8f82..00000000000 --- a/graphics/evas-xrender-x11/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2011/11/01 06:01:32 sbd Exp $ - -PKGNAME= ${DISTNAME:S/evas/evas-xrender-x11/} -PKGREVISION= 3 - -COMMENT= Evas Xrender X11 engine - -EVAS_ENGINES= xrender-x11 - -.include "../../graphics/evas/Makefile.common" - -BUILD_DIRS= src/modules/engines/xrender_x11 -MAKE_FLAGS+= module_la_LIBADD="\$${EINA_LIBS} ${BUILDLINK_PREFIX.evas}/lib/libevas.la \$${evas_engine_xrender_xcb_libs} \$${evas_engine_xrender_x11_libs}" \ - module_la_DEPENDENCIES= - -INSTALLATION_DIRS+= lib/pkgconfig -PKGCONFIG_OVERRIDE= evas-xrender-x11.pc.in - -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/evas/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/xproto/buildlink3.mk" - -post-install: - ${INSTALL_DATA} ${WRKSRC}/evas-xrender-x11.pc \ - ${DESTDIR}${PREFIX}/lib/pkgconfig - -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/evas-xrender-x11/PLIST b/graphics/evas-xrender-x11/PLIST deleted file mode 100644 index c02ec16ea1a..00000000000 --- a/graphics/evas-xrender-x11/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2010/01/09 15:33:08 joerg Exp $ -include/Evas_Engine_XRender_X11.h -lib/evas/modules/engines/xrender_x11/${MODULE_ARCH}/module.la -lib/pkgconfig/evas-xrender-x11.pc diff --git a/graphics/evas-xrender-x11/buildlink3.mk b/graphics/evas-xrender-x11/buildlink3.mk deleted file mode 100644 index cd8e4c01024..00000000000 --- a/graphics/evas-xrender-x11/buildlink3.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/09/11 22:31:01 joerg Exp $ - -BUILDLINK_TREE+= evas-xrender-x11 - -.if !defined(EVAS_XRENDER_X11_BUILDLINK3_MK) -EVAS_XRENDER_X11_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.evas-xrender-x11+= evas-xrender-x11>=0.9.9.062 -BUILDLINK_PKGSRCDIR.evas-xrender-x11?= ../../graphics/evas-xrender-x11 -.endif # EVAS_XRENDER_X11_BUILDLINK3_MK - -BUILDLINK_TREE+= -evas-xrender-x11 diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile index 6413f2f3bd1..0b3d0b03673 100644 --- a/graphics/evas/Makefile +++ b/graphics/evas/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:32 sbd Exp $ +# $NetBSD: Makefile,v 1.10 2011/12/05 17:33:32 joerg Exp $ # +PKGNAME= evas-${EVAS_VERSION} COMMENT= Enlightened Canvas Library -PKGREVISION= 3 .include "Makefile.common" @@ -11,7 +11,8 @@ CONFIGURE_ENV+= EET_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.eet}/lib -L$ PKGCONFIG_OVERRIDE= evas.pc.in -INSTALLATION_DIRS= lib/evas/modules/loaders lib/evas/modules/savers +INSTALLATION_DIRS= lib/evas/modules/loaders lib/evas/modules/savers \ + share/doc/evas .include "../../mk/bsd.prefs.mk" @@ -20,6 +21,10 @@ PLIST_SRC+= PLIST PLIST_SRC+= PLIST.cserve .endif +post-install: + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \ + ${DESTDIR}${PREFIX}/share/doc/evas + .include "../../devel/eet/buildlink3.mk" .include "../../devel/eina/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common index 20f5f3b2180..34920598898 100644 --- a/graphics/evas/Makefile.common +++ b/graphics/evas/Makefile.common @@ -1,11 +1,13 @@ -# $NetBSD: Makefile.common,v 1.10 2011/05/09 13:06:29 cheusov Exp $ +# $NetBSD: Makefile.common,v 1.11 2011/12/05 17:33:32 joerg Exp $ # used by graphics/evas-png/Makefile -DISTNAME= evas-0.9.9.063 +EVAS_VERSION= 1.1.0 +DISTNAME= evas-${EVAS_VERSION} CATEGORIES= graphics -MASTER_SITES= http://download.enlightenment.org/snapshots/2009-12-02/ +MASTER_SITES= http://download.enlightenment.org/releases/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= yazzy@yazzy.org +MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://enlightenment.org/ PKG_DESTDIR_SUPPORT= user-destdir @@ -19,7 +21,7 @@ USE_TOOLS+= gmake pkg-config .for mod in software-ddraw software-16-ddraw direct3d software-16-wince \ software-xlib software-16-x11 software-xcb directfb sdl \ - sdl-primitive fb buffer software-qtopia gl-x11 quartz gl-glew \ + sdl-primitive fb buffer software-qtopia gl-xlib quartz gl-glew \ xrender-x11 xrender-xcb glitz-x11 . if defined(EVAS_ENGINES) && !empty(EVAS_ENGINES:M${mod}) CONFIGURE_ARGS+= --enable-${mod} @@ -42,7 +44,7 @@ CONFIGURE_ARGS+= --disable-image-loader-${mod} CONFIGURE_ARGS+= --enable-cpu-altivec .endif -MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH} +MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-1.1.0 PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } diff --git a/graphics/evas/PLIST b/graphics/evas/PLIST index e9769bd7ca4..a3ae3d8627b 100644 --- a/graphics/evas/PLIST +++ b/graphics/evas/PLIST @@ -1,7 +1,32 @@ -@comment $NetBSD: PLIST,v 1.6 2010/01/09 15:33:07 joerg Exp $ -include/Evas.h +@comment $NetBSD: PLIST,v 1.7 2011/12/05 17:33:32 joerg Exp $ +include/evas-1/Evas.h lib/evas/modules/engines/software_generic/${MODULE_ARCH}/module.la +lib/evas/modules/loaders/bmp/${MODULE_ARCH}/module.la +lib/evas/modules/loaders/generic/${MODULE_ARCH}/module.la +lib/evas/modules/loaders/ico/${MODULE_ARCH}/module.la +lib/evas/modules/loaders/psd/${MODULE_ARCH}/module.la +lib/evas/modules/loaders/tga/${MODULE_ARCH}/module.la +lib/evas/modules/loaders/wbmp/${MODULE_ARCH}/module.la lib/libevas.la lib/pkgconfig/evas.pc +share/doc/evas/AUTHORS +share/doc/evas/COPYING +share/evas/examples/aspect.edc +share/evas/examples/cube1.png +share/evas/examples/enlightenment.png +share/evas/examples/evas-aspect-hints.c +share/evas/examples/evas-box.c +share/evas/examples/evas-buffer-simple.c +share/evas/examples/evas-events.c +share/evas/examples/evas-hints.c +share/evas/examples/evas-images.c +share/evas/examples/evas-images2.c +share/evas/examples/evas-init-shutdown.c +share/evas/examples/evas-map-utils.c +share/evas/examples/evas-object-manipulation.c +share/evas/examples/evas-smart-object.c +share/evas/examples/evas-stacking.c +share/evas/examples/evas-text.c +share/evas/examples/im1.png +share/evas/examples/red.png @pkgdir lib/evas/modules/savers -@pkgdir lib/evas/modules/loaders diff --git a/graphics/evas/buildlink3.mk b/graphics/evas/buildlink3.mk index a5a301b1960..a4f671f955a 100644 --- a/graphics/evas/buildlink3.mk +++ b/graphics/evas/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2011/11/01 06:01:32 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2011/12/05 17:33:32 joerg Exp $ BUILDLINK_TREE+= evas .if !defined(EVAS_BUILDLINK3_MK) EVAS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.evas+= evas>=0.9.9.062 -BUILDLINK_ABI_DEPENDS.evas?= evas>=0.9.9.063nb3 +BUILDLINK_API_DEPENDS.evas+= evas>=1.1.0beta BUILDLINK_PKGSRCDIR.evas?= ../../graphics/evas .include "../../devel/eet/buildlink3.mk" diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo index 6f290b05366..ee864aa61e9 100644 --- a/graphics/evas/distinfo +++ b/graphics/evas/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.7 2011/10/13 13:17:34 hans Exp $ +$NetBSD: distinfo,v 1.8 2011/12/05 17:33:32 joerg Exp $ -SHA1 (evas-0.9.9.063.tar.gz) = b729028600dcdbd3d567725497cd0b174667a368 -RMD160 (evas-0.9.9.063.tar.gz) = 58e867827b4180f4f4f71b7296221a4cfb0a4123 -Size (evas-0.9.9.063.tar.gz) = 4946611 bytes -SHA1 (patch-aa) = 40f243c8a07006f13535e8eb5cb784214b4590ee -SHA1 (patch-configure) = a8f29058d0e460d5ec12063efcf7583ae61e74e7 +SHA1 (evas-1.1.0.tar.bz2) = e09daebd5aa14ecdff94bca0ff30a4cf70b3b84b +RMD160 (evas-1.1.0.tar.bz2) = ebad0e5b4f3987ee9a29b39f329afb650eafeb20 +Size (evas-1.1.0.tar.bz2) = 9235732 bytes diff --git a/graphics/evas/patches/patch-aa b/graphics/evas/patches/patch-aa deleted file mode 100644 index 777bf9e1bb8..00000000000 --- a/graphics/evas/patches/patch-aa +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2011/01/31 10:17:41 wiz Exp $ - -Fix build with png-1.5. - ---- src/modules/savers/png/evas_image_save_png.c.orig 2009-06-18 08:02:54.000000000 +0000 -+++ src/modules/savers/png/evas_image_save_png.c -@@ -40,7 +40,7 @@ save_image_png(RGBA_Image *im, const cha - png_structp png_ptr; - png_infop info_ptr; - DATA32 *ptr, *data = NULL; -- int x, y, j; -+ int x, y, j, p_interlace; - png_bytep row_ptr, png_data = NULL; - png_color_8 sig_bit; - int num_passes = 1, pass; -@@ -68,11 +68,11 @@ save_image_png(RGBA_Image *im, const cha - goto close_file; - } - -+ p_interlace = PNG_INTERLACE_NONE; - if (interlace) - { - #ifdef PNG_WRITE_INTERLACING_SUPPORTED -- png_ptr->interlaced = PNG_INTERLACE_ADAM7; -- num_passes = png_set_interlace_handling(png_ptr); -+ p_interlace = PNG_INTERLACE_ADAM7; - #endif - } - -@@ -89,7 +89,7 @@ save_image_png(RGBA_Image *im, const cha - evas_common_convert_argb_unpremul(data, im->cache_entry.w * im->cache_entry.h); - png_init_io(png_ptr, f); - png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8, -- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced, -+ PNG_COLOR_TYPE_RGB_ALPHA, p_interlace, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - #ifdef WORDS_BIGENDIAN - png_set_swap_alpha(png_ptr); -@@ -102,7 +102,7 @@ save_image_png(RGBA_Image *im, const cha - data = im->image.data; - png_init_io(png_ptr, f); - png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8, -- PNG_COLOR_TYPE_RGB, png_ptr->interlaced, -+ PNG_COLOR_TYPE_RGB, p_interlace, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - png_data = alloca(im->cache_entry.w * 3 * sizeof(char)); - } -@@ -117,6 +117,10 @@ save_image_png(RGBA_Image *im, const cha - png_set_shift(png_ptr, &sig_bit); - png_set_packing(png_ptr); - -+#ifdef PNG_WRITE_INTERLACING_SUPPORTED -+ num_passes = png_set_interlace_handling(png_ptr); -+#endif -+ - for (pass = 0; pass < num_passes; pass++) - { - ptr = data; diff --git a/graphics/evas/patches/patch-configure b/graphics/evas/patches/patch-configure deleted file mode 100644 index c19ee9a3123..00000000000 --- a/graphics/evas/patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2011/10/13 13:17:34 hans Exp $ - ---- configure.orig 2011-10-12 14:43:51.090292814 +0200 -+++ configure 2011-10-12 14:52:52.470584549 +0200 -@@ -20296,6 +20296,7 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - #include <sys/types.h> -+#include <sys/stat.h> - #include <sys/mman.h> - #include <fcntl.h> - |