goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* up version to 1.0.1 - will do minor release real soon. 

* fix build so loaders build if u have no imlib2 installed
* fix requires and buildrequires in spec file for freetype & edb to be correct


SVN revision: 4105
This commit is contained in:
Carsten Haitzler 2001-01-07 22:02:08 +00:00
parent 4a57d3b10a
commit cea6638e08
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess \
ltconfig ltmain.sh missing mkinstalldirs \ ltconfig ltmain.sh missing mkinstalldirs \
stamp-h.in stamp-h.in
SUBDIRS = libltdl loaders src filters doc SUBDIRS = libltdl src filters doc loaders
bin_SCRIPTS = imlib2-config bin_SCRIPTS = imlib2-config

2
configure.in
View File

@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
AC_INIT(src/Imlib2.h) AC_INIT(src/Imlib2.h)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(imlib2, 1.0.0) AM_INIT_AUTOMAKE(imlib2, 1.0.1)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)

13
imlib2.spec.in
View File

@ -9,11 +9,12 @@ Version: %{ver}
Release: %{rel} Release: %{rel}
Copyright: BSD Copyright: BSD
Group: System/Libraries Group: System/Libraries
Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{ver}.tar.bz2 Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{ver}.tar.gz
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
Packager: Lyle Kempler <term@kempler.net>, Joakim Bodin <bodin@dreamhosted.com> Packager: Lyle Kempler <term@kempler.net>, Joakim Bodin <bodin@dreamhosted.com>
URL: http://www.rasterman.com/raster/imlib.html URL: http://www.rasterman.com/raster/imlib.html
Requires: freetype >= 1.2 Requires: freetype >= 1.2
Requires: freetype < 2.0
Requires: XFree86 Requires: XFree86
Requires: imlib2-loader_jpeg Requires: imlib2-loader_jpeg
Requires: imlib2-loader_png Requires: imlib2-loader_png
@ -21,9 +22,10 @@ Requires: imlib2-loader_db
Requires: imlib2-loader_argb Requires: imlib2-loader_argb
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: edb-devel BuildRequires: edb-devel >= 1.0.2
BuildRequires: XFree86-devel BuildRequires: XFree86-devel
BuildRequires: freetype-devel >= 1.2 BuildRequires: freetype-devel >= 1.2
BuildRequires: freetype-devel < 2.0
%description %description
Imlib2 is an advanced replacement library for libraries like libXpm that Imlib2 is an advanced replacement library for libraries like libXpm that
provides many more features with much greater flexibility and speed than provides many more features with much greater flexibility and speed than
@ -65,8 +67,8 @@ PNG image loader/saver for Imlib2
%package loader_db %package loader_db
Summary: Imlib2 DB loader Summary: Imlib2 DB loader
Group: System/Libraries Group: System/Libraries
Requires: edb Requires: edb >= 1.0.2
BuildRequires: edb-devel BuildRequires: edb-devel >= 1.0.2
%description loader_db %description loader_db
DB image loader/saver for Imlib2 DB image loader/saver for Imlib2
@ -203,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/loaders/image/xpm.* %attr(755,root,root) %{_libdir}/loaders/image/xpm.*
%changelog %changelog
* Mon Jan 8 2001 The Rasterman <raster@rasterman.com>
- Fix Requires & BuildRequires for freetype.
* Sat Sep 30 2000 Lyle Kempler <term@kempler.net> * Sat Sep 30 2000 Lyle Kempler <term@kempler.net>
- Bring back building imlib2 as root via autogen.sh for the lazy (me) - Bring back building imlib2 as root via autogen.sh for the lazy (me)
- Some minor changes - Some minor changes

20
loaders/Makefile.am
View File

@ -39,43 +39,43 @@ pnm.la argb.la bmp.la xpm.la tga.la #xcf.la
jpeg_la_SOURCES = loader_jpeg.c jpeg_la_SOURCES = loader_jpeg.c
jpeg_la_LDFLAGS = -no-undefined -module -avoid-version jpeg_la_LDFLAGS = -no-undefined -module -avoid-version
jpeg_la_LIBADD = -lImlib2 @JPEGLIBS@ jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src/.libs -lImlib2
png_la_SOURCES = loader_png.c png_la_SOURCES = loader_png.c
png_la_LDFLAGS = -no-undefined -module -avoid-version png_la_LDFLAGS = -no-undefined -module -avoid-version
png_la_LIBADD = -lImlib2 @PNGLIBS@ png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src/.libs -lImlib2
db_la_SOURCES = loader_db.c db_la_SOURCES = loader_db.c
db_la_LDFLAGS = -no-undefined -module -avoid-version db_la_LDFLAGS = -no-undefined -module -avoid-version
db_la_LIBADD = @EDBLIBS@ -lz db_la_LIBADD = @EDBLIBS@ -lz -L$(top_builddir)/src/.libs -lImlib2
tiff_la_SOURCES = loader_tiff.c tiff_la_SOURCES = loader_tiff.c
tiff_la_LDFLAGS = -no-undefined -module -avoid-version tiff_la_LDFLAGS = -no-undefined -module -avoid-version
tiff_la_LIBADD = @TIFFLIBS@ tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src/.libs -lImlib2
gif_la_SOURCES = loader_gif.c gif_la_SOURCES = loader_gif.c
gif_la_LDFLAGS = -no-undefined -module -avoid-version gif_la_LDFLAGS = -no-undefined -module -avoid-version
gif_la_LIBADD = @GIFLIBS@ gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src/.libs -lImlib2
pnm_la_SOURCES = loader_pnm.c pnm_la_SOURCES = loader_pnm.c
pnm_la_LDFLAGS = -no-undefined -module -avoid-version pnm_la_LDFLAGS = -no-undefined -module -avoid-version
pnm_la_LIBADD = pnm_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
argb_la_SOURCES = loader_argb.c argb_la_SOURCES = loader_argb.c
argb_la_LDFLAGS = -no-undefined -module -avoid-version argb_la_LDFLAGS = -no-undefined -module -avoid-version
argb_la_LIBADD = argb_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
bmp_la_SOURCES = loader_bmp.c bmp_la_SOURCES = loader_bmp.c
bmp_la_LDFLAGS = -no-undefined -module -avoid-version bmp_la_LDFLAGS = -no-undefined -module -avoid-version
bmp_la_LIBADD = bmp_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
xpm_la_SOURCES = loader_xpm.c xpm_la_SOURCES = loader_xpm.c
xpm_la_LDFLAGS = -no-undefined -module -avoid-version xpm_la_LDFLAGS = -no-undefined -module -avoid-version
xpm_la_LIBADD = xpm_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
tga_la_SOURCES = loader_tga.c tga_la_SOURCES = loader_tga.c
tga_la_LDFLAGS = -no-undefined -module -avoid-version tga_la_LDFLAGS = -no-undefined -module -avoid-version
tga_la_LIBADD = tga_la_LIBADD = -L$(top_builddir)/src/.libs -lImlib2
#xcf_la_SOURCES = loader_xcf.c loader_xcf_pixelfuncs.c #xcf_la_SOURCES = loader_xcf.c loader_xcf_pixelfuncs.c
#xcf_la_LDFLAGS = -no-undefined -module -avoid-version #xcf_la_LDFLAGS = -no-undefined -module -avoid-version

2
src/Makefile.am
View File

@ -26,7 +26,7 @@ libImlib2_la_SOURCES = scale.c image.c blend.c file.c rgbadraw.c api.c \
EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c \ EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c \
context.c color.h context.h draw.h grab.h rend.h \ context.c color.h context.h draw.h grab.h rend.h \
rgba.h ximage.h $(MMX_SRCS) rgba.h ximage.h $(MMX_SRCS)
libImlib2_la_LDFLAGS = -version-info 1:0:0 libImlib2_la_LDFLAGS = -version-info 1:1:0
if HAVE_MMX if HAVE_MMX
libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \ libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \