Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/imlib2/Manifest14
-rw-r--r--media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch27
-rw-r--r--media-libs/imlib2/files/imlib2-1.2.0-loaders.patch79
3 files changed, 3 insertions, 117 deletions
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index e64f39bf94d9..1a5d3e84aa61 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,14 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX imlib-1.2.0-bounds-check.patch 1076 RMD160 5676337f31727e78ea429d5c3b7154dfbe742b5e SHA1 37c2f2f93a58173ffa75623f0f17f9f81da1dc26 SHA256 260ce370e2056f59d58626f68274fab79cf08c751bd19dcf57c558db7d1eb6c6
-MD5 540efed058c6dccad80586ddd3af9604 files/imlib-1.2.0-bounds-check.patch 1076
-RMD160 5676337f31727e78ea429d5c3b7154dfbe742b5e files/imlib-1.2.0-bounds-check.patch 1076
-SHA256 260ce370e2056f59d58626f68274fab79cf08c751bd19dcf57c558db7d1eb6c6 files/imlib-1.2.0-bounds-check.patch 1076
-AUX imlib2-1.2.0-loaders.patch 2613 RMD160 4a92a7b877dfd7c7e6ca6b0317f8e286e66bdb96 SHA1 abc1a049b9b6299757a12968c92548ceaef079e0 SHA256 c0e0c99452b0ddff60c0e85391a971b49b4e3238c52205ad6709ba6ece868918
-MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
-RMD160 4a92a7b877dfd7c7e6ca6b0317f8e286e66bdb96 files/imlib2-1.2.0-loaders.patch 2613
-SHA256 c0e0c99452b0ddff60c0e85391a971b49b4e3238c52205ad6709ba6ece868918 files/imlib2-1.2.0-loaders.patch 2613
DIST imlib2-1.2.1.009.tar.gz 915132 RMD160 171c6cff84b5ac547e09931a993abfa1c73d00c0 SHA1 2cfa87e6a0b42a153e4d5a7271680b91b7d4d66f SHA256 eeaf62dca09414c723478f7ef288fac5efdc3091a2c89684fe98d4d4b52589ca
DIST imlib2-1.2.2.001.tar.gz 944824 RMD160 947b8fcdca0851e655b20071bb44656dc0d56598 SHA1 4c8c2497bb55ffbcd1105459aadb2c15c7ed5e3c SHA256 beb929f4ceff865375a9e56c0156ffbfb197dff82299071bdb641bb60299f84b
EBUILD imlib2-1.2.1.009.ebuild 1390 RMD160 b8520de7fc58a6a3c18b8c5cd69f690c6acf9489 SHA1 76d95b3975e083735a4daae4ee43b9905aaa3b42 SHA256 e193f2705e81122c16720df0909de3ad7e3c753e626e447953247a1b06930a75
@@ -43,7 +35,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
-iD8DBQFEucwbamhnQswr0vIRAmqsAKCoiXST9mtixOedUtqE/HJXWPqotQCgmkJo
-wEs+eN9zAZvslqJLNhx8+io=
-=MaYM
+iD8DBQFEuc2mamhnQswr0vIRAhVFAJ4jQQp+Hd1fp9PJnbpWw7hbeY0RygCdFkgN
+pZN0EUljvl59EIXN345Fwlw=
+=9tmG
-----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch b/media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch
deleted file mode 100644
index fcf03be8b0bc..000000000000
--- a/media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=96065
-http://bugs.kde.org/show_bug.cgi?id=100894
-http://xcomputerman.com/bugs/view.php?id=275
-
-Index: src/lib/rend.c
-===================================================================
-RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/rend.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -r1.1 -r1.2
---- src/lib/rend.c 1 Nov 2004 09:45:31 -0000 1.1
-+++ src/lib/rend.c 28 Jul 2005 03:10:16 -0000 1.2
-@@ -431,11 +431,11 @@ __imlib_RenderImage(Display * d, ImlibIm
- free(back);
- return;
- }
-- memcpy(buf, im->data + ((y + sy) * im->w) + sx,
-+ memcpy(buf, im->data + ((y + sy) * im->w),
- im->w * hh * sizeof(DATA32));
- __imlib_DataCmodApply(buf, dw, hh, im->w - dw, NULL, cmod);
-- pointer = buf;
-- jump = 0;
-+ pointer = buf + sx;
-+ jump = im->w - sw;
- }
- else
- {
diff --git a/media-libs/imlib2/files/imlib2-1.2.0-loaders.patch b/media-libs/imlib2/files/imlib2-1.2.0-loaders.patch
deleted file mode 100644
index 2651f4141e0c..000000000000
--- a/media-libs/imlib2/files/imlib2-1.2.0-loaders.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- imlib2-1.2.0.orig/src/modules/loaders/Makefile.in
-+++ imlib2-1.2.0/src/modules/loaders/Makefile.in
-@@ -113,52 +113,52 @@
-
-
- jpeg_la_SOURCES = loader_jpeg.c
--jpeg_la_LDFLAGS = -module -avoid-version
--jpeg_la_LIBADD = @JPEGLIBS@
-+jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2
-
- png_la_SOURCES = loader_png.c
--png_la_LDFLAGS = -module -avoid-version
--png_la_LIBADD = @PNGLIBS@
-+png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+png_la_LIBADD = @PNGLIBS@ -lImlib2
-
- tiff_la_SOURCES = loader_tiff.c
--tiff_la_LDFLAGS = -module -avoid-version
--tiff_la_LIBADD = @TIFFLIBS@
-+tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+tiff_la_LIBADD = @TIFFLIBS@ -lImlib2
-
- gif_la_SOURCES = loader_gif.c
--gif_la_LDFLAGS = -module -avoid-version
--gif_la_LIBADD = @GIFLIBS@
-+gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+gif_la_LIBADD = @GIFLIBS@ -lImlib2
-
- zlib_la_SOURCES = loader_zlib.c
--zlib_la_LDFLAGS = -module -avoid-version
--zlib_la_LIBADD = @ZLIBLIBS@
-+zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+zlib_la_LIBADD = @ZLIBLIBS@ -lImlib2
-
- bz2_la_SOURCES = loader_bz2.c
--bz2_la_LDFLAGS = -module -avoid-version
--bz2_la_LIBADD = @BZ2LIBS@
-+bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+bz2_la_LIBADD = @BZ2LIBS@ -lImlib2
-
- pnm_la_SOURCES = loader_pnm.c
--pnm_la_LDFLAGS = -module -avoid-version
--pnm_la_LIBADD =
-+pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+pnm_la_LIBADD = -lImlib2
-
- argb_la_SOURCES = loader_argb.c
--argb_la_LDFLAGS = -module -avoid-version
--argb_la_LIBADD =
-+argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+argb_la_LIBADD = -lImlib2
-
- bmp_la_SOURCES = loader_bmp.c
--bmp_la_LDFLAGS = -module -avoid-version
--bmp_la_LIBADD =
-+bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+bmp_la_LIBADD = -lImlib2
-
- xpm_la_SOURCES = loader_xpm.c
--xpm_la_LDFLAGS = -module -avoid-version
--xpm_la_LIBADD =
-+xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+xpm_la_LIBADD = -lImlib2
-
- tga_la_SOURCES = loader_tga.c
--tga_la_LDFLAGS = -module -avoid-version
--tga_la_LIBADD =
-+tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+tga_la_LIBADD = -lImlib2
-
- lbm_la_SOURCES = loader_lbm.c
--lbm_la_LDFLAGS = -module -avoid-version
--lbm_la_LIBADD =
-+lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-+lbm_la_LIBADD = -lImlib2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =