NetBSD Problem Report #19144

Received: (qmail 4970 invoked by uid 605); 23 Nov 2002 11:59:16 -0000
Message-Id: <200211231204.gANC4TF15119@darkstar.local>
Date: Sat, 23 Nov 2002 13:04:29 +0100 (CET)
From: Julio Merino <jmmv@menta.net>
Sender: gnats-bugs-owner@netbsd.org
Reply-To: jmmv@menta.net
To: gnats-bugs@gnats.netbsd.org
Subject: Update graphics/imlib2 to 1.0.6
X-Send-Pr-Version: 3.95

>Number:         19144
>Category:       pkg
>Synopsis:       Update graphics/imlib2 to 1.0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jmmv
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 23 12:00:00 +0000 2002
>Closed-Date:    Sat Feb 15 12:02:12 +0000 2003
>Last-Modified:  Sat Feb 15 12:02:12 +0000 2003
>Originator:     Julio Merino
>Release:        NetBSD 1.6K
>Organization:
HispaBSD
>Environment:


System: NetBSD darkstar.local 1.6K NetBSD 1.6K (DARKSTAR) #133: Sun Nov 17 21:31:10 CET 2002 sysbuild@darkstar.local:/var/sysbuild/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	pkgsrc currently provides imlib2 version 1.0.3, while 1.0.6 is out.
	This should be updated because some programs (not yet packaged) rely
	on this version (for example a window manager, whose name I can't
	remember now).

	Another thing... the current Makefile defines a variable,
	IMLIB2_USE_MMX. I think this variable should be defined inside
	bsd.pkg.defaults.mk, as many other variables.
>How-To-Repeat:

>Fix:
	This patch updates the package to 1.0.6. It also moves IMBLIB2_USE_MMX
	to bsd.pkg.defaults.mk.

	Note: I am not sure about the new patch-ab stuff (maybe it is useless
	and can be fixed in a better way)... but I haven't found any other way
	to get the package working properly.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- Makefile	2002/10/21 15:10:18	1.4
+++ Makefile	2002/11/23 11:52:53
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2002/10/21 15:10:18 wiz Exp $
 #

-DISTNAME=		imlib2-1.0.3
-PKGREVISION=		1
+DISTNAME=		imlib2-1.0.6
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}

@@ -15,11 +14,9 @@
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES

-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool

 .include "../../mk/bsd.prefs.mk"
-
-IMLIB2_USE_MMX?=	NO

 .if ${MACHINE_ARCH} == "i386" && ${IMLIB2_USE_MMX} != "NO"
 CONFIGURE_ARGS+=	--enable-mmx
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/PLIST,v
retrieving revision 1.1
diff -u -u -r1.1 PLIST
--- PLIST	2001/10/31 23:51:34	1.1
+++ PLIST	2002/11/23 11:52:53
@@ -5,7 +5,7 @@
 lib/libImlib2.la
 lib/libImlib2.so
 lib/libImlib2.so.1
-lib/libImlib2.so.1.3
+lib/libImlib2.so.1.4
 lib/loaders/filter/bump_map.a
 lib/loaders/filter/bump_map.la
 lib/loaders/filter/bump_map.so
@@ -21,9 +21,6 @@
 lib/loaders/image/bmp.a
 lib/loaders/image/bmp.la
 lib/loaders/image/bmp.so
-lib/loaders/image/db.a
-lib/loaders/image/db.la
-lib/loaders/image/db.so
 lib/loaders/image/gif.a
 lib/loaders/image/gif.la
 lib/loaders/image/gif.so
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/buildlink2.mk,v
retrieving revision 1.2
diff -u -u -r1.2 buildlink2.mk
--- buildlink2.mk	2002/08/25 19:22:49	1.2
+++ buildlink2.mk	2002/11/23 11:52:53
@@ -4,7 +4,7 @@
 IMLIB2_BUILDLINK2_MK=	# defined

 BUILDLINK_PACKAGES+=		imlib2
-BUILDLINK_DEPENDS.imlib2?=	imlib2>=1.0.3nb1
+BUILDLINK_DEPENDS.imlib2?=	imlib2>=1.0.6
 BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2

 EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib2=imlib2
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo	2001/11/14 23:17:10	1.2
+++ distinfo	2002/11/23 11:52:53
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.2 2001/11/14 23:17:10 enami Exp $

-SHA1 (imlib2-1.0.3.tar.gz) = ca0cc0285af6e38e41d26c0b379d09c95e7f1f45
-Size (imlib2-1.0.3.tar.gz) = 688197 bytes
+SHA1 (imlib2-1.0.6.tar.gz) = 79bd982eef1a18bf5df0407b50d1a38a6c57fd58
+Size (imlib2-1.0.6.tar.gz) = 688521 bytes
 SHA1 (patch-aa) = 41fab46215fb0c4ca305ba2c958990589279a073
-SHA1 (patch-ab) = 262216bcafefa06885eea24999547cef82ee6744
+SHA1 (patch-ab) = 605bdf9f45c26929a15826ac5a86a4b8787e2f9c
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/patches/patch-ab,v
retrieving revision 1.1
diff -u -u -r1.1 patch-ab
--- patch-ab	2001/11/14 23:17:10	1.1
+++ patch-ab	2002/11/23 11:52:53
@@ -1,13 +1,62 @@
 $NetBSD: patch-ab,v 1.1 2001/11/14 23:17:10 enami Exp $

---- loaders/Makefile.in.orig	Sun Apr 29 14:54:41 2001
+--- loaders/Makefile.in.orig	Fri Apr 26 01:45:29 2002
 +++ loaders/Makefile.in
-@@ -93,7 +93,7 @@
+@@ -92,7 +92,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
  # A list of all the files in the current directory which can be regenerated
  MAINTAINERCLEANFILES = Makefile.in

--LDFLAGS = -L/usr/X11R6/lib -L$(top_srcdir)/src
-+LDFLAGS = @LDFLAGS@ -L$(top_srcdir)/src
+-LDFLAGS = -L/usr/X11R6/lib -L$(top_builddir)/src
++LDFLAGS = @LDFLAGS@ -L$(top_builddir)/src
  INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl                        $(X_CFLAGS) -I$(prefix)/include -I$(includedir) 		       -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders


+@@ -108,39 +108,39 @@ pkg_LTLIBRARIES =  $(JPEG_L) $(PNG_L) $(
+ 
+ jpeg_la_SOURCES = loader_jpeg.c
+ jpeg_la_LDFLAGS = -no-undefined -module -avoid-version
+-jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src -lImlib2
++jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src/.libs -lImlib2
+ 
+ png_la_SOURCES = loader_png.c
+ png_la_LDFLAGS = -no-undefined -module -avoid-version
+-png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src -lImlib2
++png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src/.libs -lImlib2
+ 
+ tiff_la_SOURCES = loader_tiff.c
+ tiff_la_LDFLAGS = -no-undefined -module -avoid-version
+-tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src -lImlib2
++tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src/.libs -lImlib2
+ 
+ gif_la_SOURCES = loader_gif.c
+ gif_la_LDFLAGS = -no-undefined -module -avoid-version
+-gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src -lImlib2
++gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src/.libs -lImlib2
+ 
+ pnm_la_SOURCES = loader_pnm.c
+ pnm_la_LDFLAGS = -no-undefined -module -avoid-version
+-pnm_la_LIBADD = -L$(top_builddir)/src -lImlib2
++pnm_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
+ 
+ argb_la_SOURCES = loader_argb.c
+ argb_la_LDFLAGS = -no-undefined -module -avoid-version
+-argb_la_LIBADD = -L$(top_builddir)/src -lImlib2
++argb_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
+ 
+ bmp_la_SOURCES = loader_bmp.c
+ bmp_la_LDFLAGS = -no-undefined -module -avoid-version
+-bmp_la_LIBADD = -L$(top_builddir)/src -lImlib2
++bmp_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
+ 
+ xpm_la_SOURCES = loader_xpm.c
+ xpm_la_LDFLAGS = -no-undefined -module -avoid-version
+-xpm_la_LIBADD = -L$(top_builddir)/src -lImlib2
++xpm_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
+ 
+ tga_la_SOURCES = loader_tga.c
+ tga_la_LDFLAGS = -no-undefined -module -avoid-version
+-tga_la_LIBADD = -L$(top_builddir)/src -lImlib2
++tga_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
Index: bsd.pkg.defaults.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.defaults.mk,v
retrieving revision 1.107
diff -u -u -r1.107 bsd.pkg.defaults.mk
--- bsd.pkg.defaults.mk	2002/11/17 08:58:49	1.107
+++ bsd.pkg.defaults.mk	2002/11/23 11:53:16
@@ -668,6 +668,11 @@
 # Possible: any valid location
 # Default: /var/dict 

+IMLIB2_USE_MMX?= NO
+# Enable MMX instruction support when compiling imlib2.
+# Possible: YES, NO
+# Default: NO
+
 INN_DATA_DIR?= /var/news
 # Used by inn to specify the data directory.
 # Possible: any path you like


	Thanks :)
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->jmmv 
Responsible-Changed-By: wiz 
Responsible-Changed-When: Fri Feb 14 10:28:03 PST 2003 
Responsible-Changed-Why:  
Julio is a developer now! 

From: Julio Merino <jmmv@netbsd.org>
To: gnats-bugs@gnats.netbsd.org
Cc:  
Subject: pr/19144 CVS commit: pkgsrc/graphics/imlib2
Date: Sat, 15 Feb 2003 14:00:42 +0200 (EET)

 Module Name:	pkgsrc
 Committed By:	jmmv
 Date:		Sat Feb 15 12:00:42 UTC 2003

 Modified Files:
 	pkgsrc/graphics/imlib2: Makefile PLIST distinfo
 	pkgsrc/graphics/imlib2/patches: patch-ab

 Log Message:
 Update to 1.0.6.  Author only maintains a CVS ChangeLog that is very difficult
 to track for differences since 1.0.3...  anyway, most changes seem to be
 bugfixes and performance improvements.

 This closes my own PR pkg/19144.


 To generate a diff of this commit:
 cvs rdiff -r1.6 -r1.7 pkgsrc/graphics/imlib2/Makefile
 cvs rdiff -r1.1 -r1.2 pkgsrc/graphics/imlib2/PLIST
 cvs rdiff -r1.2 -r1.3 pkgsrc/graphics/imlib2/distinfo
 cvs rdiff -r1.1 -r1.2 pkgsrc/graphics/imlib2/patches/patch-ab

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed 
State-Changed-By: jmmv 
State-Changed-When: Sat Feb 15 04:01:46 PST 2003 
State-Changed-Why:  
The package has been updated to 1.0.6. 
>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.