OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Nov-2006 23:11:31
Branch: HEAD Handle: 2006111422113100
Modified files:
openpkg-src/imlib imlib.spec
Log:
upgrading package: imlib 1.9.15 -> 1.3.0
Summary:
Revision Changes Path
1.40 +76 -27 openpkg-src/imlib/imlib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imlib/imlib.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 imlib.spec
--- openpkg-src/imlib/imlib.spec 16 Oct 2006 12:37:39 -0000 1.39
+++ openpkg-src/imlib/imlib.spec 14 Nov 2006 22:11:31 -0000 1.40
@@ -23,69 +23,118 @@
##
# package version
-%define V_major 1.9
-%define V_minor 15
+%define V_imlib1_major 1.9
+%define V_imlib1_minor 15
+%define V_imlib2_major 1.3
+%define V_imlib2_minor 0
# package information
Name: imlib
Summary: The Gtk Image Library
-URL: http://www.gnome.org/
+URL: http://www.enlightenment.org/Libraries/Imlib2/
Vendor: Carsten Haitzler
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: EVAL
Group: XWindow
License: GPL
-Version: %{V_major}.%{V_minor}
-Release: 20061016
+Version: %{V_imlib2_major}.%{V_imlib2_minor}
+Release: 20061114
# list of sources
-Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/imlib/%{V_major}/imlib-%{version}.tar.gz
+Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/imlib/%{V_imlib1_major}/imlib-%{V_imlib1_major}.%{V_imlib1_minor}.tar.gz
+Source1:
http://switch.dl.sourceforge.net/enlightenment/imlib2-%{V_imlib2_major}.%{V_imlib2_minor}.tar.gz
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, glib, gtk, tiff, jpeg, png,
giflib, make
-PreReq: OpenPKG, openpkg >= 20040130, glib, gtk, tiff, jpeg, png,
giflib
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: glib, gtk, tiff, jpeg, png, giflib
+PreReq: glib, gtk, tiff, jpeg, png, giflib
AutoReq: no
AutoReqProv: no
%description
- The image library for Gtk.
+ Imlib is an image processing library for use with Gtk. It can
+ load/save image files from/to disk in many formats, render image
+ data onto other images, render images to an X-Windows drawable,
+ produce pixmaps and pixmap masks of images, apply filters to
+ images, rotate images, accept RGBA data for images, scale images,
+ alpha blend images on other images or drawables, apply color
+ correction and modification tables and factors to images, render
+ images onto images with color correction and modification tables,
+ render truetype anti-aliased text at any angle, render anti-aliased
+ lines, render rectangles render linear multi-colored gradients,
+ cache data intelligently for maximum performance, allocate colors
+ automatically, allow full control over caching and color allocation,
+ provide plug-in filter interface, and provide on-the-fly runtime
+ plug-in image loading and saving interface.
+
+ This package contains both the newer Imlib2
%{V_imlib2_major}.%{V_imlib2_minor}
+ and the older Imlib %{V_imlib1_major}.%{V_imlib1_minor}.
%track
- prog imlib = {
- version = %{version}
+ prog imlib:imlib1 = {
+ version = %{V_imlib1_major}.%{V_imlib1_minor}
url = ftp://ftp.gnome.org/pub/GNOME/sources/imlib/
regex = (\d+\.\d+)\b
url = ftp://ftp.gnome.org/pub/GNOME/sources/imlib/__NEWVER__/
regex = imlib-(__VER__)\.tar\.gz
}
+ prog imlib:imlib2 = {
+ version = %{V_imlib2_major}.%{V_imlib2_minor}
+ url = http://sourceforge.net/project/showfiles.php?group_id=2
+ regex = imlib2-(__VER__)\.tar\.gz
+ }
%prep
- %setup -q
+ %setup -q -c
+ %setup -q -D -T -a 1
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
- configure
+ imlib2-%{V_imlib2_major}.%{V_imlib2_minor}/configure \
+ imlib-%{V_imlib1_major}.%{V_imlib1_minor}/configure
%build
- CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags tiff}" \
- CFLAGS="%{l_cflags -O} %{l_cppflags tiff}" \
- LDFLAGS="%{l_ldflags}" \
- ./configure \
- --prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/imlib \
- --with-gtk-prefix=%{l_prefix} \
- --with-glib-prefix=%{l_prefix} \
- --disable-shared \
- --disable-nls \
- --enable-shm
- %{l_make} %{l_mflags -O}
+ ( cd imlib2-%{V_imlib2_major}.%{V_imlib2_minor}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags tiff} -I`%{l_rc} --query x11_incdir`" \
+ LDFLAGS="%{l_ldflags} -L`%{l_rc} --query x11_libdir`" \
+ LIBS="-ljpeg -lz -lm" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --without-zlib \
+ --without-bzip2 \
+ --without-id3 \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+ ( cd imlib-%{V_imlib1_major}.%{V_imlib1_minor}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags tiff}" \
+ CPPFLAGS="%{l_cppflags tiff}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/imlib \
+ --with-gtk-prefix=%{l_prefix} \
+ --with-glib-prefix=%{l_prefix} \
+ --disable-shared \
+ --disable-nls \
+ --enable-shm
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ( cd imlib2-%{V_imlib2_major}.%{V_imlib2_minor}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
+ ( cd imlib-%{V_imlib1_major}.%{V_imlib1_minor}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
