summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2010-12-15 04:10:53 +0000
committerStanislav Sedov <stas@FreeBSD.org>2010-12-15 04:10:53 +0000
commit2b8acb7b5c5b3df255514488230f4df0d0bc33cd (patch)
tree57cddc9f7570542b9f75afb8a43519e26fac993b
parentc5f6c3111c33c0b000deb62b5b819fb512e4c27f (diff)
downloadfreebsd-ports-2b8acb7b5c5b3df255514488230f4df0d0bc33cd.zip
- Update imlib2 and imlib2_loaders to 1.4.4. This version mainly contains
bugfixes compared to 1.4.1 with some new functions added. I'm also dropping .la files, so port revisions of dependent library ports have been bumped accordingly.
Diffstat
-rw-r--r--devel/libast/Makefile2
-rw-r--r--graphics/giblib/Makefile2
-rw-r--r--graphics/imlib2/Makefile9
-rw-r--r--graphics/imlib2/distinfo5
-rw-r--r--graphics/imlib2/files/patch-CVE-2008-518714
-rw-r--r--graphics/imlib2/files/patch-amd64_blend20
-rw-r--r--graphics/imlib2/files/patch-loader_png.c11
-rw-r--r--graphics/imlib2/files/patch-src_lib_common.h19
-rw-r--r--graphics/imlib2/pkg-plist34
-rw-r--r--graphics/imlib2_loaders/Makefile10
-rw-r--r--graphics/imlib2_loaders/distinfo5
-rw-r--r--graphics/imlib2_loaders/pkg-plist10
-rw-r--r--graphics/libcaca/Makefile2
-rw-r--r--multimedia/camserv/Makefile2
14 files changed, 37 insertions, 108 deletions
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 207cce8f6c13..0f76d804ec1a 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libast
PORTVERSION= 0.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= http://www.eterm.org/download/ \
CRITICAL
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 47a686890ce0..1aeba5a0136f 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giblib
PORTVERSION= 1.2.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index afbcfa023d68..071cf72c16d2 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= imlib2
-PORTVERSION= 1.4.1.000
-PORTREVISION= 9
+PORTVERSION= 1.4.4
+PORTREVISION= 0
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= The next generation graphics library for Enlightenment
@@ -21,6 +21,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig gnometarget
+USE_EFL= libtool_hack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 2faacbf8c264..a6b9d3516b32 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,2 @@
-MD5 (imlib2-1.4.1.000.tar.bz2) = cbb3180c80f12db01decd2ad4ae3a94a
-SHA256 (imlib2-1.4.1.000.tar.bz2) = bfd6871c19ca26b23116b5418962844b0db179bccbb0465176464780d483be79
-SIZE (imlib2-1.4.1.000.tar.bz2) = 861125
+SHA256 (imlib2-1.4.4.tar.bz2) = 6441fb1e88a31533791c40ea4b3310b6d5d46233ca69d9f731a2846e4e423404
+SIZE (imlib2-1.4.4.tar.bz2) = 888878
diff --git a/graphics/imlib2/files/patch-CVE-2008-5187 b/graphics/imlib2/files/patch-CVE-2008-5187
deleted file mode 100644
index 52238dcaf155..000000000000
--- a/graphics/imlib2/files/patch-CVE-2008-5187
+++ /dev/null
@@ -1,14 +0,0 @@
-Obtained from: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505714#15
-
---- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c
-@@ -246,8 +246,8 @@
- return 0;
- }
- ptr = im->data;
-- end = ptr + (sizeof(DATA32) * w * h);
- pixels = w * h;
-+ end = ptr + pixels;
- }
- else
- {
diff --git a/graphics/imlib2/files/patch-amd64_blend b/graphics/imlib2/files/patch-amd64_blend
deleted file mode 100644
index 9bfaeab7bc3a..000000000000
--- a/graphics/imlib2/files/patch-amd64_blend
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lib/amd64_blend.S.orig 2010-08-18 09:19:53.000000000 +0000
-+++ src/lib/amd64_blend.S 2010-08-18 09:20:01.000000000 +0000
-@@ -11,6 +11,7 @@
-
- /*\ Some useful masks \*/
- .data
-+.align 16
- m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0
- .byte 0, 0, 0, 0, 0, 0, 255, 0
- m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1
---- src/lib/amd64_blend_cmod.S.orig 2010-08-18 09:20:09.000000000 +0000
-+++ src/lib/amd64_blend_cmod.S 2010-08-18 09:20:16.000000000 +0000
-@@ -11,6 +11,7 @@
-
- /*\ Some useful masks \*/
- .data
-+.align 16
- m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0
- .byte 0, 0, 0, 0, 0, 0, 255, 0
- m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1
diff --git a/graphics/imlib2/files/patch-loader_png.c b/graphics/imlib2/files/patch-loader_png.c
deleted file mode 100644
index ce76ad89d42e..000000000000
--- a/graphics/imlib2/files/patch-loader_png.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/loaders/loader_png.c.orig 2007-08-25 04:33:10.000000000 +0200
-+++ src/modules/loaders/loader_png.c 2010-03-28 16:18:53.000000000 +0200
-@@ -38,7 +38,7 @@
-
- /* if we haven't read the header before, set the header data */
- fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;
diff --git a/graphics/imlib2/files/patch-src_lib_common.h b/graphics/imlib2/files/patch-src_lib_common.h
new file mode 100644
index 000000000000..247214ca492e
--- /dev/null
+++ b/graphics/imlib2/files/patch-src_lib_common.h
@@ -0,0 +1,19 @@
+--- src/lib/common.h.orig 2010-12-14 19:39:16.000000000 -0800
++++ src/lib/common.h 2010-12-14 19:39:34.000000000 -0800
+@@ -16,10 +16,12 @@
+ #include <sys/types.h>
+ #endif
+
+-#if defined(__GNUC__) && (__GNUC__ >= 4)
+-#define __hidden __attribute__((visibility("hidden")))
+-#else
+-#define __hidden
++#ifndef __hidden
++# if defined(__GNUC__) && (__GNUC__ >= 4)
++# define __hidden __attribute__((visibility("hidden")))
++# else
++# define __hidden
++# endif
+ #endif
+
+ #define DATABIG unsigned long long
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 1398068d4b68..692dcf3878e2 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -8,56 +8,22 @@ bin/imlib2_conv
%%X11%%bin/imlib2_test
%%X11%%bin/imlib2_view
include/Imlib2.h
-lib/imlib2/filters/bumpmap.a
-lib/imlib2/filters/bumpmap.la
lib/imlib2/filters/bumpmap.so
-lib/imlib2/filters/colormod.a
-lib/imlib2/filters/colormod.la
lib/imlib2/filters/colormod.so
-lib/imlib2/filters/testfilter.a
-lib/imlib2/filters/testfilter.la
lib/imlib2/filters/testfilter.so
-lib/imlib2/loaders/argb.a
-lib/imlib2/loaders/argb.la
lib/imlib2/loaders/argb.so
-lib/imlib2/loaders/bmp.a
-lib/imlib2/loaders/bmp.la
lib/imlib2/loaders/bmp.so
-lib/imlib2/loaders/bz2.a
-lib/imlib2/loaders/bz2.la
lib/imlib2/loaders/bz2.so
-%%GIF%%lib/imlib2/loaders/gif.a
-%%GIF%%lib/imlib2/loaders/gif.la
%%GIF%%lib/imlib2/loaders/gif.so
-%%ID3%%lib/imlib2/loaders/id3.a
-%%ID3%%lib/imlib2/loaders/id3.la
%%ID3%%lib/imlib2/loaders/id3.so
-%%JPEG%%lib/imlib2/loaders/jpeg.a
-%%JPEG%%lib/imlib2/loaders/jpeg.la
%%JPEG%%lib/imlib2/loaders/jpeg.so
-lib/imlib2/loaders/lbm.a
-lib/imlib2/loaders/lbm.la
lib/imlib2/loaders/lbm.so
-%%PNG%%lib/imlib2/loaders/png.a
-%%PNG%%lib/imlib2/loaders/png.la
%%PNG%%lib/imlib2/loaders/png.so
-lib/imlib2/loaders/pnm.a
-lib/imlib2/loaders/pnm.la
lib/imlib2/loaders/pnm.so
-lib/imlib2/loaders/tga.a
-lib/imlib2/loaders/tga.la
lib/imlib2/loaders/tga.so
-%%TIFF%%lib/imlib2/loaders/tiff.a
-%%TIFF%%lib/imlib2/loaders/tiff.la
%%TIFF%%lib/imlib2/loaders/tiff.so
-lib/imlib2/loaders/xpm.a
-lib/imlib2/loaders/xpm.la
lib/imlib2/loaders/xpm.so
-lib/imlib2/loaders/zlib.a
-lib/imlib2/loaders/zlib.la
lib/imlib2/loaders/zlib.so
-lib/libImlib2.a
-lib/libImlib2.la
lib/libImlib2.so
lib/libImlib2.so.5
libdata/pkgconfig/imlib2.pc
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 7e180332c7a7..5d7915955fc7 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= imlib2_loaders
-PORTVERSION= 1.4.1.000
-PORTREVISION= 4
+PORTVERSION= 1.4.4
+PORTREVISION= 0
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Extra image loader plugins for Imlib 2
@@ -19,7 +19,7 @@ COMMENT= Extra image loader plugins for Imlib 2
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget
-USE_EFL= edb eet imlib2
+USE_EFL= edb eet imlib2 libtool_hack
OPTIONS= EDB "Enable edb loader" on \
EET "Enable eet loader" on \
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index 88b6fed43ac1..11eca2349ff8 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,2 @@
-MD5 (imlib2_loaders-1.4.1.000.tar.bz2) = 4b04b6b11e0e7ae8494fdc554a880429
-SHA256 (imlib2_loaders-1.4.1.000.tar.bz2) = b95c4e29328b1d2210ad51c516959aa50a94787ba115277ed9c9b695b6542381
-SIZE (imlib2_loaders-1.4.1.000.tar.bz2) = 256470
+SHA256 (imlib2_loaders-1.4.4.tar.bz2) = 846f1bdd7e1b86aa11e0225056700eff6f40eef65dcf0ab93178ada34e571231
+SIZE (imlib2_loaders-1.4.4.tar.bz2) = 263710
diff --git a/graphics/imlib2_loaders/pkg-plist b/graphics/imlib2_loaders/pkg-plist
index 5a873f8db68a..b6abf93bc19d 100644
--- a/graphics/imlib2_loaders/pkg-plist
+++ b/graphics/imlib2_loaders/pkg-plist
@@ -1,17 +1,7 @@
-lib/imlib2/loaders/ani.a
-lib/imlib2/loaders/ani.la
lib/imlib2/loaders/ani.so
-%%EDB%%lib/imlib2/loaders/db.a
-%%EDB%%lib/imlib2/loaders/db.la
%%EDB%%lib/imlib2/loaders/db.so
-%%EET%%lib/imlib2/loaders/eet.a
-%%EET%%lib/imlib2/loaders/eet.la
%%EET%%lib/imlib2/loaders/eet.so
-lib/imlib2/loaders/ico.a
-lib/imlib2/loaders/ico.la
lib/imlib2/loaders/ico.so
-%%XCF%%lib/imlib2/loaders/xcf.a
-%%XCF%%lib/imlib2/loaders/xcf.la
%%XCF%%lib/imlib2/loaders/xcf.so
@dirrmtry lib/imlib2/loaders
@dirrmtry lib/imlib2
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 7437665d06f6..6166f6c63b8c 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libcaca
DISTVERSION= 0.99.beta17
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 907f3358b625..1dfc34943ba0 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= camserv
PORTVERSION= 0.5.1
-PORTREVISION= 14
+PORTREVISION= 15
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 21:49:44 +0000