imlib2: updates spec file (1.2.0). fix for x86_64 build
This commit is contained in:
Dams Nadé
parent
a2ec1dbc34
commit
4ee064a2a9
|
|
@ -0,0 +1,11 @@
|
|||
--- configure.old 2005-01-09 18:36:09.314185880 +0100
|
||||
+++ configure 2005-01-09 18:37:15.840072408 +0100
|
||||
@@ -20262,7 +20262,7 @@
|
||||
if test "x$have_x" = "xyes"; then
|
||||
x_dir="/usr/X11R6";
|
||||
x_cflags="-I"$x_dir"/include"
|
||||
- x_libs="-L"$x_dir"/lib -lX11 -lXext"
|
||||
+ x_libs="-L"$x_dir"/lib64 -lX11 -lXext"
|
||||
echo "$as_me:$LINENO: result: enabling X11 support" >&5
|
||||
echo "${ECHO_T}enabling X11 support" >&6
|
||||
|
||||
72
imlib2.spec
72
imlib2.spec
|
|
@ -1,15 +1,19 @@
|
|||
Summary: A graphic library for file loading, saving, rendering, and manipulation
|
||||
Name: imlib2
|
||||
Version: 1.1.2
|
||||
Release: 1
|
||||
Version: 1.2.0
|
||||
Release: 3
|
||||
Epoch: 0
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.enlightenment.org/pages/imlib2.html
|
||||
Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
|
||||
Patch0: imlib2-1.2.0-configure-xlib64.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel
|
||||
BuildRequires: libungif-devel freetype-devel libtool bzip2-devel
|
||||
%ifarch x86_64
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
Summary: Development package for %{name}
|
||||
|
|
@ -39,33 +43,45 @@ long description of the differences.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%ifarch x86_64
|
||||
%patch0 -b .patch0
|
||||
%endif
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%build
|
||||
%configure \
|
||||
%ifarch %{ix86} x86_64 ia64
|
||||
--x-libraries=%{_prefix}/X11R6/%{_lib} \
|
||||
--with-pic \
|
||||
%ifarch %{ix86} ia64
|
||||
--enable-mmx
|
||||
%else
|
||||
--disable-mmx
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
|
||||
# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz":
|
||||
perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags}
|
||||
make -C demo
|
||||
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT __doc
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT -C demo
|
||||
make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
|
||||
|
||||
cp -a doc __doc
|
||||
rm -f __doc/Makefile*
|
||||
|
||||
rm -f \
|
||||
$RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
|
||||
$RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \
|
||||
$RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.*a \
|
||||
$RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test}
|
||||
|
||||
# ship .la files due to a bug in kdelibs (see changelog):
|
||||
# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%clean
|
||||
|
|
@ -79,22 +95,56 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING AUTHORS README ChangeLog TODO __doc/*
|
||||
%{_bindir}/imconvert
|
||||
%{_bindir}/imlib2_view
|
||||
%{_bindir}/imlib2_bumpmap
|
||||
%{_bindir}/imlib2_colorspace
|
||||
%{_bindir}/imlib2_conv
|
||||
%{_bindir}/imlib2_poly
|
||||
%{_bindir}/imlib2_show
|
||||
%{_libdir}/libImlib2.so.*
|
||||
%{_libdir}/imlib2_loaders
|
||||
%{_datadir}/imlib2/data/
|
||||
%dir %{_libdir}/imlib2/filters/
|
||||
%{_libdir}/imlib2/filters/*.so
|
||||
%dir %{_libdir}/imlib2/loaders/
|
||||
%{_libdir}/imlib2/loaders/*.so
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/imlib2-config
|
||||
%{_includedir}/Imlib2.h
|
||||
%{_libdir}/libImlib2.a
|
||||
%{_libdir}/libImlib2.la
|
||||
%{_libdir}/libImlib2.so
|
||||
%{_libdir}/pkgconfig/imlib2.pc
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Fri Jan 14 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info - 0:1.2.0-3
|
||||
- Move filters and loaders back into main package where they belong
|
||||
|
||||
* Mon Jan 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info - 0:1.2.0-2
|
||||
- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/
|
||||
|
||||
* Sun Jan 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info - 0:1.2.0-1
|
||||
- Ship .la files ue to a bug in kdelibs; see
|
||||
https://bugzilla.fedora.us/show_bug.cgi?id=2284
|
||||
http://bugzilla.redhat.com/bugzilla/142244
|
||||
http://bugs.kde.org/93359
|
||||
- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64
|
||||
- fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
|
||||
returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz"
|
||||
- Update to 1.2.0 -- fixes several security issues
|
||||
- remove explicit libdir=_libdir - 1.2.9 does not need it anymore
|
||||
- removeddemo compile/install;
|
||||
- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix
|
||||
"cannot find -lX11"
|
||||
|
||||
* Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info - 0:1.1.2-2
|
||||
- Disable mmx on x86_64 (fixes Build error)
|
||||
- Add explicit libdir=_libdir to make calls to avoid install errors on x86_64
|
||||
- Add --with-pic configure option (taken from Matthias Saou's package)
|
||||
|
||||
* Sat Sep 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.2-0.fdr.1
|
||||
- Update to 1.1.2, fixes CAN-2004-0802.
|
||||
- Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected.
|
||||
|
|
|
|||
Loading…
Reference in New Issue