Author: qboosh Date: Sun Apr 29 18:15:03 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- eeh, use internal libmpeg3 (old version needed)
- don't package static ffmpeg or libmpeg3 in pkglibdir
---- Files affected:
SPECS:
gimp-plugin-gap.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/gimp-plugin-gap.spec
diff -u SPECS/gimp-plugin-gap.spec:1.5 SPECS/gimp-plugin-gap.spec:1.6
--- SPECS/gimp-plugin-gap.spec:1.5 Sun Apr 29 19:41:23 2007
+++ SPECS/gimp-plugin-gap.spec Sun Apr 29 20:14:58 2007
@@ -1,10 +1,12 @@
# $Revision$, $Date$
+# TODO:
+# - try to use update to current libmpeg3 API
+# - try to use system ffmpeg (some old snap here)
#
# Conditional build:
-%bcond_without ffmpeg # without libavformat/libavcodec
-%bcond_without libmpeg3 # without libmpeg3
%bcond_without xvid # without xvid support
%bcond_with gdkpixbuf # use GdkPixbuf thumbnail rendering (default=no)
+%bcond_with libmpeg3 # use system libmpeg3 (1.5.x only)
#
Summary: The GIMP Animation Package
Summary(pl.UTF-8): Pakiet animacyjny dla GIMP-a
@@ -22,7 +24,8 @@
BuildRequires: gimp-devel >= 2.2.0
BuildRequires: intltool
BuildRequires: libjpeg-devel
-%{?with_libmpeg3:BuildRequires: libmpeg3-devel}
+%{?with_libmpeg3:BuildRequires: libmpeg3-devel >= 1.5}
+%{?with_libmpeg3:BuildRequires: libmpeg3-devel < 1.6}
BuildRequires: nasm
BuildRequires: pkgconfig
BuildRequires: xvid-devel >= 1:1.0.0
@@ -51,12 +54,10 @@
%{__automake}
%{__autoconf}
%configure \
- %{!?with_ffmpeg:--disable-libavformat} \
- %{!?with_libmpeg3:--disable-libmpeg3} \
%{!?with_xvid:--disable-libxvidcore} \
%{?with_gdkpixbuf:--enable-gdkpixbuf-pview} \
- --with-preinstalled-libmpeg3incdir=%{_includedir}/libmpeg3 \
- --with-preinstalled-libmpeg3=%{_libdir}/libmpeg3.so
+
%{?with_libmpeg3:--with-preinstalled-libmpeg3incdir=%{_includedir}/libmpeg3} \
+ %{?with_libmpeg3:--with-preinstalled-libmpeg3=%{_libdir}/libmpeg3.so}
%{__make}
@@ -66,6 +67,8 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/gimp-gap-2.2/*.a
+
%find_lang %{name} --all-name
%clean
@@ -75,9 +78,9 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%dir %{_libdir}/gimp-gap-2.2
-%attr(755,root,root) %{_libdir}/gimp-gap-2.2/*
-%attr(755,root,root) %{gimpplugindir}/*
-%{gimpscriptdir}/*
+%attr(755,root,root) %{_libdir}/gimp-gap-2.2/audioconvert_to_wav.sh
+%attr(755,root,root) %{gimpplugindir}/gap_*
+%{gimpscriptdir}/*.scm
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -85,6 +88,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2007/04/29 18:14:58 qboosh
+- eeh, use internal libmpeg3 (old version needed)
+- don't package static ffmpeg or libmpeg3 in pkglibdir
+
Revision 1.5 2007/04/29 17:41:23 qboosh
- fixed libmpeg3 options
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gimp-plugin-gap.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
