On Sun Sep 24, 2017 at 07:49:53PM +0000, Jérôme KASPER wrote:
> Hi ports,
>
> last but not least, here is the DevIL update as inline diff
>
> index be97b71d8db..0493338c806 100644
> --- Makefile
> +++ Makefile
> @@ -1,12 +1,14 @@
> -# $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:23 sthen Exp $
> +# $OpenBSD: Makefile,v 1.24 2017/09/24 17:53:23 jkasper Exp $
>
> COMMENT= library for powerful image loading capabilities
>
> -DISTNAME= DevIL-1.7.8
> -REVISION= 13
> -SHARED_LIBS+= IL 1.0 # 2.0
> -SHARED_LIBS+= ILU 1.0 # 2.0
> -SHARED_LIBS+= ILUT 1.0 # 2.0
> +GH_ACCOUNT= DentonW
> +GH_PROJECT= DevIL
> +GH_TAGNAME= v1.8.0
> +
Sourceforge provide the same version. No reason to switch from
sourceforge to github.
> +DISTNAME= ${GH_PROJECT}-1.8.0
> +
> +WRKDIST= ${WRKDIR}/${DISTNAME}/DevIL
>
> CATEGORIES= graphics devel
>
> @@ -15,55 +17,45 @@ HOMEPAGE= http://openil.sourceforge.net/
> # LGPLv2.1
> PERMIT_PACKAGE_CDROM= Yes
>
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openil/}
> -EXTRACT_SUFX= .zip
> -
> WANTLIB += GL GLU Half ICE Iex IexMath IlmImf IlmThread Imath
> -WANTLIB += SDL SM X11 X11-xcb Xdamage Xext Xfixes Xi
> +WANTLIB += SDL2 SM X11 X11-xcb Xdamage Xext Xfixes Xi
> WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm c drm glapi glut iconv jasper
> -WANTLIB += jpeg lcms m mng png pthread sndio ${COMPILER_LIBCXX}
> +WANTLIB += jpeg lcms2 m mng png pthread sndio ${COMPILER_LIBCXX}
> WANTLIB += tiff usbhid xcb xcb-dri2 xcb-glx z expat
Remove WANTLIB and regen with 'make port-lib-depends-check'
>
> LIB_DEPENDS= converters/libiconv \
> - devel/sdl \
> + devel/sdl2 \
> graphics/freeglut \
> graphics/ilmbase \
> graphics/jasper \
> graphics/libmng \
> - graphics/lcms \
> + graphics/lcms2 \
> graphics/openexr \
> - graphics/openjpeg \
> graphics/tiff \
> graphics/png
>
> +SHARED_LIBS+= IL 2.0
> +SHARED_LIBS+= ILU 2.0
> +SHARED_LIBS+= ILUT 2.0
You bump all shared libs, have you checked with nm(1).
More infos: https://www.openbsd.org/faq/ports/specialtopics.html
You have to test all consumers.
>
> -AUTOCONF_VERSION= 2.61
> -CONFIGURE_STYLE= autoconf
> -CONFIGURE_ARGS+= --with-squish=no \
> - --with-zlib=yes \
> - --enable-ILU \
> - --enable-ILUT \
> - --disable-allegro
> +MODULES= devel/cmake
> +
> +CONFIGURE_STYLE= cmake
CONFIGURE_STYLE will set by cmake.port.mk
>
> -# This would only install three binary examples, we'll install it manually.
> -CONFIGURE_ARGS+= --with-examples=no
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lz"
>
> -WRKDIST= ${WRKDIR}/${DISTNAME:L}
> -
> # Too many Linuxisms in testing tools
> NO_TEST= Yes
>
> +#include doc for later post-install
> post-extract:
> - chmod +x ${WRKSRC}/configure
> - ${SUBST_CMD} ${WRKSRC}/test/Makefile.in
> -
> -post-configure:
> - chmod +x ${WRKDIST}/build-aux/install-sh
> + cp ${WRKDIR}/${DISTNAME}/DevIL-docs/*.pdf ${WRKDIST}/docs/
> + cp ${WRKDIR}/${DISTNAME}/DevIL-docs/*.doc ${WRKDIST}/docs/
>
> post-install:
> - @cd ${WRKSRC}; tar cf - examples | tar xf - -C \
> + mkdir ${PREFIX}/share/devil/
> + cd ${WRKSRC}; tar cf - examples docs | tar xf - -C \
> ${PREFIX}/share/devil/
>
> .include <bsd.port.mk>
> diff --git distinfo distinfo
> index b948923e386..1101ed9b781 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (DevIL-1.7.8.zip) = Q2jYOzAWter+iYTw1/hszudriZPPkA06jL1JAbUvZOs=
> -SIZE (DevIL-1.7.8.zip) = 3452549
> +SHA256 (DevIL-1.8.0.tar.gz) = UhKfJHsm/LVVRkPJ5rvudcS5cXc1/b88br/wjO44rTc=
> +SIZE (DevIL-1.8.0.tar.gz) = 2949100
> diff --git patches/patch-configure_ac patches/patch-configure_ac
> deleted file mode 100644
> index f5cbb5a5cec..00000000000
> --- patches/patch-configure_ac
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-configure_ac,v 1.1 2017/05/07 12:49:54 espie Exp $
> -separate CFLAGS that don't work in C++
> -
> -Index: configure.ac
> ---- configure.ac.orig
> -+++ configure.ac
> -@@ -433,6 +433,7 @@ AM_CONDITIONAL([WINDOWS_BUILD],
> -
> - dnl Final substitution
> - AC_SUBST([GENERAL_CFLAGS])
> -+AC_SUBST([ONLY_CFLAGS])
> - AC_SUBST([IL_CFLAGS])
> - AC_SUBST([IL_LIBS])
> - AC_SUBST([ILU_CFLAGS])
> diff --git patches/patch-docs_DevIL_manual_texi patches/patch-docs_DevIL_manual_texi
> deleted file mode 100644
> index 79070e73aa0..00000000000
> --- patches/patch-docs_DevIL_manual_texi
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-docs_DevIL_manual_texi,v 1.1 2011/08/28 17:26:07 jasper Exp $
> -
> -Add missing INFO-DIR-SECTION to silence install-info(1)
> -
> ---- docs/DevIL_manual.texi.orig Sun Aug 28 19:21:00 2011
> -+++ docs/DevIL_manual.texi Sun Aug 28 19:24:02 2011
> -@@ -13,6 +13,15 @@
> - @c version.texi is generated automatically
> - @include version.texi
> -
> -+@ifinfo
> -+@format
> -+INFO-DIR-SECTION Libraries
> -+START-INFO-DIR-ENTRY
> -+* DevIL_manual: (devil_manual). IL part of DevIL - handling images
> -+END-INFO-DIR-ENTRY
> -+@end format
> -+@end ifinfo
> -+
> - @copying
> - This is @code{DevIL @value{VERSION}} manual.
> - Last update is from @value{UPDATED}.
> diff --git patches/patch-include_IL_il_h patches/patch-include_IL_il_h
> deleted file mode 100644
> index 82acae97371..00000000000
> --- patches/patch-include_IL_il_h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-include_IL_il_h,v 1.1 2017/05/07 12:49:54 espie Exp $
> -restrict doesn't exist in C++
> -
> -Index: include/IL/il.h
> ---- include/IL/il.h.orig
> -+++ include/IL/il.h
> -@@ -63,7 +63,7 @@ extern "C" {
> -
No comments:
Post a Comment