[Midnightbsd-cvs] mports [19399] trunk/graphics/imlib2/pkg-plist: imlib2 1.4.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 9 08:53:02 EDT 2015
Revision: 19399
http://svnweb.midnightbsd.org/mports/?rev=19399
Author: laffer1
Date: 2015-06-09 08:53:02 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
imlib2 1.4.6
Modified Paths:
--------------
trunk/graphics/imlib2/Makefile
trunk/graphics/imlib2/distinfo
trunk/graphics/imlib2/files/patch-imlib2-config.in
trunk/graphics/imlib2/pkg-descr
trunk/graphics/imlib2/pkg-plist
Added Paths:
-----------
trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
Removed Paths:
-------------
trunk/graphics/imlib2/files/patch-imlib2.pc.in
Property Changed:
----------------
trunk/graphics/imlib2/files/patch-imlib2-config.in
trunk/graphics/imlib2/files/patch-src_lib_common.h
trunk/graphics/imlib2/pkg-descr
Modified: trunk/graphics/imlib2/Makefile
===================================================================
--- trunk/graphics/imlib2/Makefile 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/Makefile 2015-06-09 12:53:02 UTC (rev 19399)
@@ -1,35 +1,37 @@
# $MidnightBSD$
PORTNAME= imlib2
-PORTVERSION= 1.4.5
-PORTREVISION= 1
+PORTVERSION= 1.4.6
+PORTREVISION= 6
PORTEPOCH= 2
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+CATEGORIES= graphics enlightenment
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
COMMENT= The next generation graphics library for Enlightenment
LICENSE= unknown
-LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= imlib2
+LICENSE_NAME= imlib2 license
+LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+
GNU_CONFIGURE= yes
-USE_BZIP2= yes
-USE_GNOME= gnomehack pkgconfig
-USE_EFL= libtool_hack
+USE_LDCONFIG= yes
+USES= libtool pathfix pkgconfig tar:bzip2
+
+CONFIGURE_ARGS+= --enable-visibility-hiding --disable-static
+CONFIGURE_ENV+= ac_cv_lib_dl_dlopen=no
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= yes
+MAKE_ENV+= INSTALL_STRIP_FLAG="${STRIP}"
-OPTIONS= JPEG "Enable jpeg image support" on \
- PNG "Enable png image support" on \
- TIFF "Enable tiff image support" on \
- GIF "Enable GIF image support" on \
- ID3 "Enable IDv3 tags support" on \
- X11 "Enable X11 support" on
+OPTIONS_DEFINE= JPEG PNG TIFF GIF ID3 X11
+OPTIONS_DEFAULT= JPEG PNG TIFF GIF ID3 X11
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
CONFIGURE_ARGS+= --enable-mmx
@@ -43,9 +45,8 @@
CONFIGURE_ARGS+= --disable-amd64
.endif
-.if defined(WITHOUT_X11)
+.if ! ${PORT_OPTIONS:MX11}
CONFIGURE_ARGS+= --without-x
-PKGNAMESUFFIX+= -nox11
PLIST_SUB= X11="@comment "
.else
USE_XORG= x11 sm xext
@@ -52,8 +53,8 @@
PLIST_SUB= X11=""
.endif
-.if !defined(WITHOUT_JPEG)
-LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
+.if ${PORT_OPTIONS:MJPEG}
+LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= JPEG=""
.else
CONFIGURE_ARGS+= --without-jpeg
@@ -60,8 +61,8 @@
PLIST_SUB+= JPEG="@comment "
.endif
-.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+= --without-png
@@ -68,8 +69,8 @@
PLIST_SUB+= PNG="@comment "
.endif
-.if !defined(WITHOUT_TIFF)
-LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
+.if ${PORT_OPTIONS:MTIFF}
+LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff
PLIST_SUB+= TIFF=""
.else
CONFIGURE_ARGS+= --without-tiff
@@ -76,21 +77,16 @@
PLIST_SUB+= TIFF="@comment "
.endif
-.if !defined(WITHOUT_GIF)
-. if exists(${LOCALBASE}/lib/libgif.so)
-LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
+.if ${PORT_OPTIONS:MGIF}
+LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib
PLIST_SUB+= GIF=""
-. else
-LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
-PLIST_SUB+= GIF=""
-. endif
.else
CONFIGURE_ARGS+= --without-gif
PLIST_SUB+= GIF="@comment "
.endif
-.if !defined(WITHOUT_ID3)
-LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag
+.if ${PORT_OPTIONS:MID3}
+LIB_DEPENDS+= libid3tag.so:${PORTSDIR}/audio/libid3tag
PLIST_SUB+= ID3=""
.else
CONFIGURE_ARGS+= --without-id3
@@ -97,4 +93,12 @@
PLIST_SUB+= ID3="@comment "
.endif
-.include <bsd.port.post.mk>
+.if ! ${PORT_OPTIONS:MX11}
+post-patch:
+ @${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \
+ ${WRKSRC}/src/lib/Makefile.in
+ @${REINPLACE_CMD} -e '/# ifndef X_DISPLAY_MISSING/,/# endif/ d' \
+ ${WRKSRC}/src/lib/Imlib2.h
+.endif
+
+.include <bsd.port.mk>
Modified: trunk/graphics/imlib2/distinfo
===================================================================
--- trunk/graphics/imlib2/distinfo 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/distinfo 2015-06-09 12:53:02 UTC (rev 19399)
@@ -1,3 +1,2 @@
-SHA256 (imlib2-1.4.5.tar.bz2) = 24700d93931838d2149cc2b4b58b9355cc81ec11d297f101a98dbb8d1c5c945a
-RMD160 (imlib2-1.4.5.tar.bz2) = 3b8fd51a854f628f8e8b38612da6c99a0609c6aa
-SIZE (imlib2-1.4.5.tar.bz2) = 895624
+SHA256 (imlib2-1.4.6.tar.bz2) = af51be727d62cfcff7457c753f355e44848fb997f33a7e1d43775276a9073274
+SIZE (imlib2-1.4.6.tar.bz2) = 872717
Modified: trunk/graphics/imlib2/files/patch-imlib2-config.in
===================================================================
--- trunk/graphics/imlib2/files/patch-imlib2-config.in 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/files/patch-imlib2-config.in 2015-06-09 12:53:02 UTC (rev 19399)
@@ -1,11 +1,11 @@
---- imlib2-config.in.orig Sun Jul 3 07:35:44 2005
-+++ imlib2-config.in Sun Jul 3 07:36:02 2005
-@@ -42,7 +42,7 @@
- if test @includedir@ != /usr/include ; then
- includes=-I at includedir@
- fi
-- echo $includes
-+ echo $includes @my_includes@
+--- imlib2-config.in.orig 2014-02-06 19:05:15.000000000 -0500
++++ imlib2-config.in 2014-02-06 19:05:35.000000000 -0500
+@@ -46,7 +46,7 @@
;;
--libs)
libdirs=-L at libdir@
+- echo $libdirs -lImlib2 @my_libs@
++ echo $libdirs -lImlib2
+ ;;
+ *)
+ echo "${usage}" 1>&2
Property changes on: trunk/graphics/imlib2/files/patch-imlib2-config.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/graphics/imlib2/files/patch-imlib2.pc.in
===================================================================
--- trunk/graphics/imlib2/files/patch-imlib2.pc.in 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/files/patch-imlib2.pc.in 2015-06-09 12:53:02 UTC (rev 19399)
@@ -1,9 +0,0 @@
---- imlib2.pc.in.orig Mon Feb 26 02:38:45 2007
-+++ imlib2.pc.in Mon Feb 26 02:38:57 2007
-@@ -8,5 +8,5 @@
- Requires: @requirements@
- Version: @VERSION@
- Libs: -L${libdir} -lImlib2
--Cflags: -I${includedir}
-+Cflags: -I${includedir} @my_includes@
-
Index: trunk/graphics/imlib2/files/patch-src_lib_common.h
===================================================================
--- trunk/graphics/imlib2/files/patch-src_lib_common.h 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/files/patch-src_lib_common.h 2015-06-09 12:53:02 UTC (rev 19399)
Property changes on: trunk/graphics/imlib2/files/patch-src_lib_common.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
===================================================================
--- trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c (rev 0)
+++ trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c 2015-06-09 12:53:02 UTC (rev 19399)
@@ -0,0 +1,14 @@
+--- src/modules/loaders/loader_gif.c.orig 2013-12-21 10:16:10 UTC
++++ src/modules/loaders/loader_gif.c
+@@ -36,7 +36,11 @@ load(ImlibImage * im, ImlibProgressFunct
+ #endif
+ if (fd < 0)
+ return 0;
++#if GIFLIB_MAJOR >= 5
++ gif = DGifOpenFileHandle(fd, NULL);
++#else
+ gif = DGifOpenFileHandle(fd);
++#endif
+ if (!gif)
+ {
+ close(fd);
Property changes on: trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/imlib2/pkg-descr
===================================================================
--- trunk/graphics/imlib2/pkg-descr 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/pkg-descr 2015-06-09 12:53:02 UTC (rev 19399)
@@ -1,3 +1,3 @@
The next generation graphic library for enlightenment package.
-WWW: http://enlightenment.sourceforge.net/Libraries/Imlib2/
+WWW: http://docs.enlightenment.org/api/imlib2/html/
Property changes on: trunk/graphics/imlib2/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/imlib2/pkg-plist
===================================================================
--- trunk/graphics/imlib2/pkg-plist 2015-06-09 12:44:52 UTC (rev 19398)
+++ trunk/graphics/imlib2/pkg-plist 2015-06-09 12:53:02 UTC (rev 19399)
@@ -25,7 +25,8 @@
lib/imlib2/loaders/xpm.so
lib/imlib2/loaders/zlib.so
lib/libImlib2.so
-lib/libImlib2.so.5
+lib/libImlib2.so.1
+lib/libImlib2.so.1.4.6
libdata/pkgconfig/imlib2.pc
%%DATADIR%%/data/fonts/cinema.ttf
%%DATADIR%%/data/fonts/grunge.ttf
@@ -49,10 +50,3 @@
%%DATADIR%%/data/images/sh3.png
%%DATADIR%%/data/images/stop.png
%%DATADIR%%/data/images/tnt.png
- at dirrm %%DATADIR%%/data/images
- at dirrm %%DATADIR%%/data/fonts
- at dirrm %%DATADIR%%/data
- at dirrm %%DATADIR%%
- at dirrm lib/imlib2/loaders
- at dirrm lib/imlib2/filters
- at dirrm lib/imlib2
More information about the Midnightbsd-cvs
mailing list