[svn] r6403 - in trunk/rpms: cairo cairomm clamav directfb
gstreamer-plugins-bad gstreamer-plugins-ugly httptunnel
mplayer perl-Cairo perl-MRO-Compat python-paramiko swfdec vlc
xine-lib
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sat Jul 12 13:57:10 CEST 2008
Author: dag
Date: 2008-07-12 12:57:08 +0100 (Sat, 12 Jul 2008)
New Revision: 6403
Modified:
trunk/rpms/cairo/cairo.spec
trunk/rpms/cairomm/cairomm.spec
trunk/rpms/clamav/clamav.spec
trunk/rpms/directfb/directfb.spec
trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
trunk/rpms/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec
trunk/rpms/httptunnel/httptunnel.spec
trunk/rpms/mplayer/mplayer.spec
trunk/rpms/perl-Cairo/perl-Cairo.spec
trunk/rpms/perl-MRO-Compat/perl-MRO-Compat.spec
trunk/rpms/python-paramiko/python-paramiko.spec
trunk/rpms/swfdec/swfdec.spec
trunk/rpms/vlc/vlc.spec
trunk/rpms/xine-lib/xine-lib.spec
Log:
Updates
Modified: trunk/rpms/cairo/cairo.spec
===================================================================
--- trunk/rpms/cairo/cairo.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/cairo/cairo.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -8,10 +8,10 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag:%define _with_modxorg 1}
-%{?fc7: %define _with_modxorg 1}
-%{?el5: %define _with_modxorg 1}
-%{?fc6: %define _with_modxorg 1}
-%{?fc5: %define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
%{?rh9:%define _without_directfb 1}
%{?rh7:%define _without_directfb 1}
@@ -25,7 +25,7 @@
Summary: Anti-aliased vector-based rendering for X
Name: cairo
Version: 1.2.4
-Release: 1
+Release: 2
License: MIT
Group: System Environment/Libraries
URL: http://cairo.freedesktop.org/
@@ -68,6 +68,7 @@
%{?_without_pkgconfig:export png_REQUIRES=" "}
%configure \
+ --disable-static \
%{!?_without_directfb:--enable-directfb}
%{__make} %{?_smp_mflags}
@@ -90,13 +91,18 @@
%defattr(-, root, root, 0755)
%doc %{_datadir}/gtk-doc/html/cairo/
%{_includedir}/cairo/
-%{_libdir}/libcairo.a
-%exclude %{_libdir}/libcairo.la
%{_libdir}/libcairo.so
%{_libdir}/pkgconfig/cairo.pc
%{_libdir}/pkgconfig/cairo-*.pc
+%exclude %{_libdir}/libcairo.la
%changelog
+* Fri Jul 04 2008 Dag Wieers <dag at wieers.com> - 1.2.4-2
+- Rebuild against directfb-1.0.1.
+
+* Sun Mar 25 2007 Dag Wieers <dag at wieers.com> - 1.2.4-1
+- Updated to release 1.2.4
+
* Sun Jan 02 2005 Dag Wieers <dag at wieers.com> - 0.2.0-1
- Updated to release 0.2.0.
Modified: trunk/rpms/cairomm/cairomm.spec
===================================================================
--- trunk/rpms/cairomm/cairomm.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/cairomm/cairomm.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -4,7 +4,7 @@
Summary: Cairomm is the C++ API for the cairo graphics library
Name: cairomm
Version: 1.2.4
-Release: 1
+Release: 2
License: LGPL
Group: System Environment/Libraries
URL: http://www.cairographics.org/
@@ -13,6 +13,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: cairo-devel >= 1.2.0, pkgconfig
+BuildRequires: directfb-devel
%description
Cairomm is the C++ API for the cairo graphics library. It offers all the power
@@ -35,8 +36,8 @@
%build
%configure \
- --enable-docs="no" \
- --enable-static="no"
+ --enable-docs="no" \
+ --enable-static="no"
%{__make} %{?_smp_mflags}
%install
@@ -63,5 +64,8 @@
%exclude %{_libdir}/libcairomm-1.0.la
%changelog
+* Sat Jul 05 2008 Dag Wieers <dag at wieers.com> - 1.2.4-2
+- Rebuild against directfb-1.0.1.
+
* Thu May 24 2007 Dag Wieers <dag at wieers.com> - 1.2.4-1
- Initial package. (using DAR)
Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/clamav/clamav.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -11,7 +11,7 @@
Summary: Anti-virus software
Name: clamav
-Version: 0.93.1
+Version: 0.93.3
Release: 1
License: GPL
Group: Applications/System
@@ -372,6 +372,12 @@
%exclude %{_libdir}/libclamunrar_iface.la
%changelog
+* Wed Jul 09 2008 Dag Wieers <dag at wieers.com> - 0.93.3-1
+- Updated to release 0.93.3.
+
+* Mon Jul 07 2008 Dag Wieers <dag at wieers.com> - 0.93.2-1
+- Updated to release 0.93.2.
+
* Mon Jun 09 2008 Dag Wieers <dag at wieers.com> - 0.93.1-1
- Updated to release 0.93.1.
Modified: trunk/rpms/directfb/directfb.spec
===================================================================
--- trunk/rpms/directfb/directfb.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/directfb/directfb.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -4,12 +4,21 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{?el5:%define _with_sysfs 1}
+%{?dtag: %{expand: %%define %dtag 1}}
+%{?fc4:%define _without_modxorg 1}
+%{?el4:%define _without_modxorg 1}
+%{?fc3:%define _without_modxorg 1}
+%{?fc2:%define _without_modxorg 1}
+%{?fc1:%define _without_modxorg 1}
+%{?el3:%define _without_modxorg 1}
+%{?el2:%define _without_modxorg 1}
+
%define real_name DirectFB
-%define real_version 0.9.25
+%define real_version 1.0-0
Summary: Hardware graphics acceleration library
Name: directfb
-Version: 0.9.25.1
+Version: 1.0.1
Release: 1
License: GPL
Group: System Environment/Libraries
@@ -48,24 +57,28 @@
%prep
%setup -n %{real_name}-%{version}
-%patch0 -p1 -b .types
-%patch1 -p1 -b .linux-compiler
+#patch0 -p1 -b .types
+#patch1 -p1 -b .linux-compiler
%patch2 -p1 -b .ppc
%patch3 -p1 -b .sysfs
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure
+
%build
%configure \
- --disable-dependency-tracking \
- --disable-fast-install \
- --disable-maintainer-mode \
+%{!?_without_modxorg:--x-libraries="%{_libdir}"} \
+%{?_without_modxorg:--x-libraries="%{_prefix}/X11R6/%{_lib}"} \
+ --disable-dependency-tracking \
+ --disable-fast-install \
+ --disable-maintainer-mode \
%ifarch x86_64
- --disable-mmx \
+ --disable-mmx \
%endif
- --enable-fbdev \
- --enable-linux-input \
- --enable-static \
- --enable-video4linux2 \
- --enable-zlib
+ --disable-static \
+ --enable-fbdev \
+ --enable-linux-input \
+ --enable-video4linux2 \
+ --enable-zlib
%{__make} %{?_smp_mflags}
%install
@@ -75,12 +88,12 @@
### Clean up the docs
%{__rm} -f docs/html/Makefile*
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%clean
%{__rm} -rf %{buildroot}
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING docs/README.screenshots fb.modes NEWS README
@@ -94,12 +107,12 @@
%{_bindir}/dfbpenmount
%{_bindir}/dfbscreen
%{_bindir}/dfbsummon
-%{_datadir}/directfb-%{real_version}/
+%{_bindir}/mkdfiff
+%{_bindir}/mkdgiff
+%{_datadir}/directfb-%{version}/
%dir %{_libdir}/directfb-%{real_version}/
%dir %{_libdir}/directfb-%{real_version}/*/
%dir %{_libdir}/directfb-%{real_version}/*/*/
-%{_libdir}/directfb-%{real_version}/*/*.o
-%{_libdir}/directfb-%{real_version}/*/*/*.o
%{_libdir}/directfb-%{real_version}/*/*.so
%{_libdir}/directfb-%{real_version}/*/*/*.so
%{_libdir}/libdirect-*.so.*
@@ -114,19 +127,6 @@
%{_bindir}/directfb-csource
%{_includedir}/directfb/
%{_includedir}/directfb-internal/
-%dir %{_libdir}/directfb-%{real_version}/
-%dir %{_libdir}/directfb-%{real_version}/*/
-%dir %{_libdir}/directfb-%{real_version}/*/*/
-%{_libdir}/directfb-%{real_version}/*/*.a
-%{_libdir}/directfb-%{real_version}/*/*/*.a
-%exclude %{_libdir}/directfb-%{real_version}/*/*.la
-%exclude %{_libdir}/directfb-%{real_version}/*/*/*.la
-%{_libdir}/libdirectfb.a
-%{_libdir}/libdirect.a
-%{_libdir}/libfusion.a
-%exclude %{_libdir}/libdirectfb.la
-%exclude %{_libdir}/libdirect.la
-%exclude %{_libdir}/libfusion.la
%{_libdir}/libdirectfb.so
%{_libdir}/libdirect.so
%{_libdir}/libfusion.so
@@ -134,8 +134,16 @@
%{_libdir}/pkgconfig/directfb.pc
%{_libdir}/pkgconfig/directfb-internal.pc
%{_libdir}/pkgconfig/fusion.pc
+%exclude %{_libdir}/directfb-%{real_version}/*/*.la
+%exclude %{_libdir}/directfb-%{real_version}/*/*/*.la
+%exclude %{_libdir}/libdirectfb.la
+%exclude %{_libdir}/libdirect.la
+%exclude %{_libdir}/libfusion.la
%changelog
+* Fri Jul 04 2008 Dag Wieers <dag at wieers.com> - 1.0.1-1
+- Updated to release 1.0.1.
+
* Sun Mar 25 2007 Dag Wieers <dag at wieers.com> - 0.9.25.1-1
- Updated to release 0.9.25.1.
Modified: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
===================================================================
--- trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -13,7 +13,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.3
-Release: 6
+Release: 7
License: LGPL
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -32,7 +32,7 @@
Buildrequires: libXt-devel
BuildRequires: liboil-devel
-BuildRequires: directfb-devel
+BuildRequires: directfb-devel >= 1.0.1
BuildRequires: libdca-devel
BuildRequires: faac-devel
BuildRequires: faad2-devel
@@ -120,6 +120,9 @@
%exclude %{_libdir}/gstreamer-%{majorminor}/*.la
%changelog
+* Wed Jul 09 2008 Dag Wieers <dag at wieers.com> - 0.10.3-7
+- Rebuild against directfb-1.0.1.
+
* Mon Dec 17 2007 Dag Wieers <dag at wieers.com> - 0.10.3-6
- Rebuild against libmpcdec 1.2.6.
Modified: trunk/rpms/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec
===================================================================
--- trunk/rpms/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/gstreamer-plugins-ugly/gstreamer-plugins-ugly.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -13,7 +13,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.5
-Release: 2
+Release: 3
License: LGPL
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -34,7 +34,7 @@
BuildRequires: libid3tag-devel >= 0.15.0
BuildRequires: libmad-devel >= 0.15.0
BuildRequires: mpeg2dec-devel >= 0.4.0
-BuildRequires: amrnb-devel
+BuildRequires: amrnb-devel >= 7.0.0.2
BuildRequires: liboil-devel
BuildRequires: PyXML
@@ -107,6 +107,9 @@
%changelog
+* Wed Jul 09 2008 Dag Wieers <dag at wieers.com> - 0.10.5-3
+- Rebuild against amrnb-7.0.0.2.
+
* Wed Mar 30 2007 Matthias Saou <http://freshrpms.net/> 0.10.5-2
- Remove gtk-doc entirely, do devel package too.
Modified: trunk/rpms/httptunnel/httptunnel.spec
===================================================================
--- trunk/rpms/httptunnel/httptunnel.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/httptunnel/httptunnel.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -5,7 +5,7 @@
Summary: Tunnels tcp/ip connections over http
Name: httptunnel
Version: 3.0.5
-Release: 1.2
+Release: 2
License: GPL
Group: Applications/Internet
URL: http://www.nocrew.org/software/httptunnel.html
@@ -29,7 +29,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%clean
%{__rm} -rf %{buildroot}
@@ -37,9 +37,14 @@
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog DISCLAIMER FAQ HACKING NEWS README TODO
-%doc %{_mandir}/man?/*
-%{_bindir}/*
+%doc %{_mandir}/man1/htc.1*
+%doc %{_mandir}/man1/hts.1*
+%{_bindir}/htc
+%{_bindir}/hts
%changelog
+* Mon Jul 07 2008 Dag Wieers <dag at wieers.com> - 3.0.5-2
+- Updated to release 3.0.5.
+
* Sun Mar 28 2004 Dag Wieers <dag at wieers.com> - 3.0.5-1
- Initial package. (using DAR)
Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/mplayer/mplayer.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -81,7 +81,7 @@
Summary: MPlayer, the Movie Player for Linux
Name: mplayer
Version: 1.0
-Release: 0.38%{?rcver:.%{rcver}}%{?date:.%{date}}try2
+Release: 0.39%{?rcver:.%{rcver}}%{?date:.%{date}}try2
License: GPL
Group: Applications/Multimedia
URL: http://mplayerhq.hu/
@@ -117,6 +117,7 @@
%{?_with_dvdread:BuildRequires: libdvdread-devel}
%{!?_without_dv:BuildRequires: libdv-devel}
%{!?_without_ladspa:BuildRequires: ladspa-devel}
+%{!?_without_directfb:BuildRequires: directfb-devel >= 1.0.1}
%{!?_without_alsa:BuildRequires: alsa-lib-devel}
%{!?_without_fribidi:BuildRequires: fribidi-devel}
%{!?_without_aalib:BuildRequires: aalib-devel}
@@ -333,6 +334,9 @@
%changelog
+* Wed Jul 09 2008 Dag Wieers <dag at wieers.com> - 1.0-0.39.rc1try2
+- Rebuild against directfb-1.0.1.
+
* Mon Dec 17 2007 Dag Wieers <dag at wieers.com> - 1.0-0.38.rc1try2
- Build against libmpcdec 1.2.6 and libupnp 1.6.x.
Modified: trunk/rpms/perl-Cairo/perl-Cairo.spec
===================================================================
--- trunk/rpms/perl-Cairo/perl-Cairo.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/perl-Cairo/perl-Cairo.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -10,7 +10,7 @@
Summary: Perl interface to the cairo library
Name: perl-Cairo
Version: 1.060
-Release: 1
+Release: 2
License: Artistic/GPL
Group: Applications/CPAN
URL: http://search.cpan.org/dist/Cairo/
@@ -20,6 +20,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: cairo-devel
+BuildRequires: directfb-devel
BuildRequires: perl >= 2:5.8.0
BuildRequires: perl(ExtUtils::Depends)
BuildRequires: perl(ExtUtils::PkgConfig)
@@ -60,6 +61,9 @@
%{perl_vendorarch}/Cairo.pm
%changelog
+* Sat Jul 05 2008 Dag Wieers <dag at wieers.com> - 1.060-2
+- Rebuild against directfb-1.0.1.
+
* Sat May 03 2008 Dag Wieers <dag at wieers.com> - 1.060-1
- Updated to release 1.060.
Modified: trunk/rpms/perl-MRO-Compat/perl-MRO-Compat.spec
===================================================================
--- trunk/rpms/perl-MRO-Compat/perl-MRO-Compat.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/perl-MRO-Compat/perl-MRO-Compat.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -1,6 +1,6 @@
# $Id$
# Authority: dag
-# Upstream: Brandon L. Black, <blblack at gmail.com>
+# Upstream: Brandon L. Black <blblack$gmail,com>
%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
@@ -9,7 +9,7 @@
Summary: mro::* interface compatibility for Perls < 5.9.5
Name: perl-MRO-Compat
-Version: 0.05
+Version: 0.09
Release: 1
License: Artistic/GPL
Group: Applications/CPAN
@@ -53,5 +53,8 @@
%{perl_vendorlib}/MRO/Compat.pm
%changelog
+* Tue Jul 01 2008 Dag Wieers <dag at wieers.com> - 0.09-1
+- Updated to release 0.09.
+
* Sun Dec 30 2007 Dag Wieers <dag at wieers.com> - 0.05-1
- Initial package. (using DAR)
Modified: trunk/rpms/python-paramiko/python-paramiko.spec
===================================================================
--- trunk/rpms/python-paramiko/python-paramiko.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/python-paramiko/python-paramiko.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -7,7 +7,7 @@
Summary: SSH2 protocol for Python
Name: python-paramiko
-Version: 1.7.2
+Version: 1.7.4
Release: 1
License: GPL
Group: System Environment/Libraries
@@ -54,6 +54,9 @@
%ghost %{python_sitelib}/paramiko/*.pyo
%changelog
+* Mon Jul 07 2008 Dag Wieers <dag at wieers.com> - 1.7.4-1
+- Updated to release 1.7.4.
+
* Tue Jan 22 2008 Dag Wieers <dag at wieers.com> - 1.7.2-1
- Updated to release 1.7.2.
Modified: trunk/rpms/swfdec/swfdec.spec
===================================================================
--- trunk/rpms/swfdec/swfdec.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/swfdec/swfdec.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -5,30 +5,31 @@
%{?fedora: %{expand: %%define fc%{fedora} 1}}
%{!?dtag: %define _without_gstreamer 1}
-%{?el5: %define _without_gstreamer 1}
-%{?fc6: %define _without_gstreamer 1}
-%{?fc5: %define _without_gstreamer 1}
+%{?el5: %define _without_gstreamer 1}
+%{?fc6: %define _without_gstreamer 1}
+%{?fc5: %define _without_gstreamer 1}
+
%{!?dtag: %define _with_modxorg 1}
-%{?el5: %define _with_modxorg 1}
-%{?fc6: %define _with_modxorg 1}
-%{?fc5: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
%{!?dtag: %define gimp_plugin 1}
-%{?el5: %define gimp_plugin 1}
-%{?fc6: %define gimp_plugin 1}
-%{?fc5: %define gimp_plugin 1}
-%{?fc4: %define gimp_plugin 1}
-%{?el4: %define gimp_plugin 1}
-%{?fc3: %define gimp_plugin 1}
-%{?fc2: %define gimp_plugin 1}
-%{?yd4: %define gimp_plugin 1}
+%{?el5: %define gimp_plugin 1}
+%{?fc6: %define gimp_plugin 1}
+%{?fc5: %define gimp_plugin 1}
+%{?fc4: %define gimp_plugin 1}
+%{?el4: %define gimp_plugin 1}
+%{?fc3: %define gimp_plugin 1}
+%{?fc2: %define gimp_plugin 1}
+%{?yd4: %define gimp_plugin 1}
%{!?dtag: %define _without_mozilla 1}
-%{?fc6: %define _without_mozilla 1}
-%{?fc5: %define _without_mozilla 1}
-%{?fc1: %define _without_mozilla 1}
+%{?fc6: %define _without_mozilla 1}
+%{?fc5: %define _without_mozilla 1}
+%{?fc1: %define _without_mozilla 1}
### Can't figure out why only EL5 produces swfdec-mozilla-player
-%{?el5:%define _with_mozilla_player 1}
+%{?el5: %define _with_mozilla_player 1}
%define mozilla seamonkey
%{!?dtag:%define mozilla firefox}
@@ -45,7 +46,7 @@
Summary: Flash animations rendering library
Name: swfdec
Version: 0.3.6
-Release: 2
+Release: 3
License: LGPL
Group: System Environment/Libraries
URL: http://swfdec.freedesktop.org/wiki/
@@ -153,6 +154,9 @@
%changelog
+* Sat Jul 05 2008 Dag Wieers <dag at wieers.com> - 0.3.6-3
+- Rebuild against directfb-1.0.1.
+
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 0.3.6-2
- Release bump to drop the disttag number in FC5 build.
Modified: trunk/rpms/vlc/vlc.spec
===================================================================
--- trunk/rpms/vlc/vlc.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/vlc/vlc.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -10,6 +10,16 @@
%{!?dtag:%define _with_modxorg 1}
%{!?dtag:%define _with_avahi 1}
+### Firefox 3 xulrunner not supported.
+%{?el5:%undefine _with_mozilla}
+
+### Problems with dirac
+%define _without_dirac 1
+
+%ifarch %{ix86}
+%define _with_loader 1
+%endif
+
%{?fc7:%define _with_modxorg 1}
%{?el5:%define _with_modxorg 1}
%{?fc6:%define _with_modxorg 1}
@@ -21,8 +31,10 @@
%{?fc5:%define _with_avahi 1}
%{?el5:%define _without_jack 1}
+%{?el5:%define mozilla xulrunner-devel nspr-devel}
%{?el4:%define _without_jack 1}
+%{?el4:%define mozilla seamonkey-devel}
%{?el4:%define _without_sysfs 1}
%{?el4:%define _without_upnp 1}
@@ -49,6 +61,7 @@
%{?el3:%define _without_fribidi 1}
%{?el3:%define _without_hal 1}
%{?el3:%define _without_jack 1}
+%{?el3:%define mozilla seamonkey-devel}
%{?el3:%define _without_sysfs 1}
%{?el3:%define _without_theora 1}
#{?el3:#define _without_upnp 1}
@@ -84,6 +97,7 @@
%{?el2:%define _without_glx 1}
%{?el2:%define _without_hal 1}
%{?el2:%define _without_jack 1}
+%{?el2:%define mozilla seamonkey-devel}
%{?el2:%define _without_sysfs 1}
%{?el2:%define _without_theora 1}
#{?el2:#define _without_upnp 1}
@@ -96,82 +110,95 @@
%{?yd3:%define _without_fribidi 1}
%define desktop_vendor rpmforge
-%define ffmpeg_date 20061215
-%define live_date 2006.12.08
+#define ffmpeg_date 20061215
+#define ffmpeg_date 20071121
+#define ffmpeg_date 20080113
+%define ffmpeg_date 20080225
+%define live_date 2006.12.08
Summary: The VideoLAN client, also a very good standalone video player
Name: vlc
Version: 0.8.6h
-Release: 1
+Release: 2
License: GPL
Group: Applications/Multimedia
URL: http://www.videolan.org/
+
Source0: http://downloads.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.bz2
-Source1: http://downloads.videolan.org/pub/videolan/vlc/%{version}/contrib/ffmpeg-%{ffmpeg_date}.tar.bz2
+#Source1: http://downloads.videolan.org/pub/videolan/vlc/%{version}/contrib/ffmpeg-%{ffmpeg_date}.tar.bz2
+Source1: http://rpm.greysector.net/livna/ffmpeg-%{ffmpeg_date}.tar.bz2
Source2: http://www.live555.com/liveMedia/public/live.%{live_date}.tar.gz
Patch0: vlc-0.8.6-ffmpegX11.patch
Patch1: vlc-0.8.6-wx28.patch
#Patch2: vlc-0.8.6a-faad2.patch
+Patch21: vlc-0.8.6e-directfb.patch
+Patch80: vlc-0.8.6e-xulrunner.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
BuildRequires: gcc-c++, libpng-devel, libxml2-devel, libtiff-devel
BuildRequires: libgcrypt-devel, gnutls-devel, libtar-devel
BuildRequires: libjpeg-devel
Buildrequires: autoconf, automake, libtool
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+%{?_with_avahi:BuildRequires: avahi-devel}
+%{?_with_avahi:BuildRequires: avahi-devel}
+%{?_with_cddax:BuildRequires: cdparanoia-devel}
+%{?_with_glide:BuildRequires: Glide3-devel}
+%{?_with_hal:BuildRequires: hal-devel}
%{?_with_modxorg:BuildRequires: libGLU-devel, libXt-devel, libXv-devel, libXinerama-devel, libXxf86vm-devel}
%{!?_with_modxorg:BuildRequires: XFree86-devel}
-%{!?_without_dvdread:BuildRequires: libdvdread-devel}
-%{!?_without_dvdnav:BuildRequires: libdvdnav-devel}
-%{!?_without_smb:BuildRequires: samba-common}
-%{!?_without_dvbpsi:BuildRequires: libdvbpsi-devel}
-%{!?_without_ogg:BuildRequires: libogg-devel}
-%{!?_without_mkv:BuildRequires: libebml-devel >= 0.7.6, libmatroska-devel}
-%{!?_without_modplug:BuildRequires: libmodplug-devel}
-%{!?_without_mad:BuildRequires: libmad-devel}
-%{!?_without_id3tag:BuildRequires: libid3tag-devel}
-%{!?_without_ffmpeg:BuildRequires: lame-devel, faac-devel}
-%{!?_without_faad2:BuildRequires: faad2-devel >= 2.5}
+%{?_with_mozilla:BuildRequires: %{mozilla}}
+%{?_with_portaudio:BuildRequires: portaudio-devel}
%{!?_without_a52:BuildRequires: a52dec-devel}
-%{!?_without_flac:BuildRequires: flac-devel}
-%{!?_without_mpeg2dec:BuildRequires: mpeg2dec-devel}
-%{!?_without_vorbis:BuildRequires: libvorbis-devel}
-%{!?_without_speex:BuildRequires: speex-devel}
-%{!?_without_theora:BuildRequires: libtheora-devel}
-%{!?_without_x264:BuildRequires: x264-devel}
-%{!?_without_sdl:BuildRequires: SDL-devel, SDL_image-devel}
-%{!?_without_fribidi:BuildRequires: fribidi-devel}
%{!?_without_aa:BuildRequires: aalib-devel}
+%{!?_without_alsa:BuildRequires: alsa-lib-devel}
+%{!?_without_amr:BuildRequires: amrnb-devel amrwb-devel}
+%{!?_without_arts:BuildRequires: arts-devel}
%{!?_without_caca:BuildRequires: libcaca-devel}
-%{!?_without_esd:BuildRequires: esound-devel}
-%{?_with_portaudio:BuildRequires: portaudio-devel}
-%{!?_without_arts:BuildRequires: arts-devel}
-%{!?_without_alsa:BuildRequires: alsa-lib-devel}
-%{!?_without_wxwidgets:BuildRequires: wxGTK-devel}
-%{!?_without_xosd:BuildRequires: xosd-devel}
-%{!?_without_lirc:BuildRequires: lirc-devel}
-%{?_with_mozilla:BuildRequires: mozilla-devel}
-%{?_with_ncurses:BuildRequires: ncurses-devel}
-%{?_with_glide:BuildRequires: Glide3-devel}
+%{!?_without_cddb:BuildRequires: libcddb-devel}
%{!?_without_cdio:BuildRequires: libcdio-devel}
-# Added in 0.8.4
-%{!?_without_gnomevfs:BuildRequires: gnome-vfs2-devel}
-%{?_with_hal:BuildRequires: hal-devel}
-%{!?_without_vcd:BuildRequires: vcdimager-devel}
-%{?_with_avahi:BuildRequires: avahi-devel}
%{!?_without_daap:BuildRequires: libopendaap-devel}
-%{!?_without_upnp:BuildRequires: libupnp-devel}
-%{?_with_avahi:BuildRequires: avahi-devel}
-# Added in 0.8.5
-%{!?_without_hal:BuildRequires: hal-devel}
-%{!?_without_mpcdec:BuildRequires: libmpcdec-devel}
-%{!?_without_cddb:BuildRequires: libcddb-devel}
+#{!?_without_dc1394:BuildRequires: libdc1394-devel}
%{!?_without_dca:BuildRequires: libdca-devel}
-# Add in 0.8.6
-%{!?_without_upnp:BuildRequires: libupnp-devel}
+%{!?_without_dirac:BuildRequires: dirac-devel >= 0.6.0}
+%{!?_without_directfb:BuildRequires: directfb-devel >= 1.0.0}
+%{!?_without_dvbpsi:BuildRequires: libdvbpsi-devel}
+%{!?_without_dvdnav:BuildRequires: libdvdnav-devel}
+%{!?_without_dvdread:BuildRequires: libdvdread-devel}
+%{!?_without_esd:BuildRequires: esound-devel}
+%{!?_without_faad2:BuildRequires: faad2-devel >= 2.5}
+%{!?_without_ffmpeg:BuildRequires: lame-devel, faac-devel}
+%{!?_without_flac:BuildRequires: flac-devel}
+%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+%{!?_without_fribidi:BuildRequires: fribidi-devel}
+%{!?_without_gnomevfs:BuildRequires: gnome-vfs2-devel}
#{!?_without_goom:BuildRequires: goom-devel}
+%{!?_without_gsm:BuildRequires: gsm-devel}
+%{!?_without_hal:BuildRequires: hal-devel}
+%{!?_without_id3tag:BuildRequires: libid3tag-devel}
%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{!?_without_lirc:BuildRequires: lirc-devel}
+%{!?_without_mad:BuildRequires: libmad-devel}
+%{!?_without_mkv:BuildRequires: libebml-devel >= 0.7.6, libmatroska-devel}
+%{!?_without_modplug:BuildRequires: libmodplug-devel}
+%{!?_without_mpcdec:BuildRequires: libmpcdec-devel}
+%{!?_without_mpeg2dec:BuildRequires: mpeg2dec-devel}
+%{!?_without_ncurses:BuildRequires: ncurses-devel}
+%{!?_without_ogg:BuildRequires: libogg-devel}
+%{!?_without_sdl:BuildRequires: SDL-devel, SDL_image-devel}
+%{!?_without_shout:BuildRequires: libshout-devel >= 2.2.2}
+%{!?_without_smb:BuildRequires: samba-common}
+%{!?_without_speex:BuildRequires: speex-devel}
+%{!?_without_svgalib:BuildRequires: svgalib-devel}
%{!?_without_sysfs:BuildRequires: libsysfs-devel}
-#{!?_without_dc1394:BuildRequires: libdc1394-devel}
+%{!?_without_theora:BuildRequires: libtheora-devel}
+%{!?_without_twolame:BuildRequires: twolame-devel}
+%{!?_without_upnp:BuildRequires: libupnp-devel}
+%{!?_without_upnp:BuildRequires: libupnp-devel}
+%{!?_without_vcd:BuildRequires: vcdimager-devel}
+%{!?_without_vorbis:BuildRequires: libvorbis-devel}
+%{!?_without_wxwidgets:BuildRequires: wxGTK-devel}
+%{!?_without_x264:BuildRequires: x264-devel}
+%{!?_without_xosd:BuildRequires: xosd-devel}
Obsoletes: videolan-client < 0.8.5-4
Provides: videolan-client = %{version}-%{release}
@@ -188,7 +215,7 @@
gnomevfs vcd daap upnp pvr live
Options that would need not yet existing add-on packages :
---with tremor tarkin svgalib ggi
+--with loader ggi tarkin tremor
%package devel
@@ -204,7 +231,21 @@
Install this package if you need to build Videolan Client plugins or intend
to link statically to it.
+%package -n mozilla-vlc
+Summary: VLC Media Player plugin for Mozilla compatible web browsers
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+%description -n mozilla-vlc
+This package contains a VLC Media Player plugin for Mozilla compatible
+web browsers.
+
+VLC (initially VideoLAN Client) is a highly portable multimedia player
+for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX,
+mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
+It can also be used as a server to stream in unicast or multicast in
+IPv4 or IPv6 on a high-bandwidth network.
+
%prep
%setup -a 1 -a 2
%patch0 -p1 -b .ffmpegX11
@@ -214,10 +255,14 @@
#patch2 -p1 -b .faad2
%{__perl} -pi -e 's|\bfaacDec\B|NeAACDec|g' modules/codec/faad.c
+%patch21 -p1 -b .directfb
+%patch80 -p1 -b .libxul
-# Fix PLUGIN_PATH path for lib64
+### Fix PLUGIN_PATH path for lib64
%{__perl} -pi -e 's|/lib/vlc|/%{_lib}/vlc|g' vlc-config.in.in configure*
+### Fix ffmpeg to find libgsm
+%{__perl} -pi -e 's|\bgsm.h|gsm/gsm.h|g' ffmpeg-%{ffmpeg_date}/configure ffmpeg-%{ffmpeg_date}/libavcodec/libgsm.c
%build
export CFLAGS="%{optflags}"
@@ -226,12 +271,37 @@
%if 0%{!?_without_ffmpeg:1}
pushd ffmpeg-%{ffmpeg_date}
./configure \
- --enable-mp3lame \
- --enable-faac \
+ --extra-cflags="-fPIC -DPIC" \
+ --disable-ffmpeg \
+ --disable-ffplay \
+ --disable-ffserver \
+ --disable-optimizations \
+ --disable-protocols \
+ --disable-strip \
+ --disable-vhook \
+%{!?_without_a52:--enable-liba52} \
+%{!?_without_amr:--enable-libamr-nb --enable-libamr-wb} \
+ --enable-gpl \
+ --enable-libmp3lame \
+%{!?_without_gsm:--enable-libgsm} \
+ --enable-libfaac \
+%{!?_without_theora:--enable-libtheora} \
+%{!?_without_vorbis:--enable-libvorbis} \
+%{!?_without_x246:--enable-libx264} \
+ --enable-libxvid \
+ --enable-nonfree \
--enable-pp \
- --enable-gpl
+ --enable-pthreads \
+ --enable-static
+# --enable-shared
+# --enable-libdc1394 \
+# --enable-libfaad \
%{__make} %{?_smp_mflags}
popd
+
+for pkgconfig in theora vorbis vorbisenc ogg ;do
+ %{__ln_s} -f %{_libdir}/pkgconfig/$pkgconfig.pc
+done
%endif
# Then bundled live555
@@ -252,81 +322,103 @@
### Workaround to make -lX11 work on 64bit
export LDFLAGS="-L/usr/X11R6/%{_lib}"
%configure \
+ --disable-dependency-tracking \
+ --disable-rpath \
--disable-static \
+ --with-PIC \
--enable-release \
- %{!?_without_dvdread:--enable-dvdread} \
- %{?_without_dvdnav:--disable-dvdnav} \
- %{?_without_smb:--disable-smb} \
- %{!?_without_dvbpsi:--enable-dvbpsi} \
- %{!?_without_v4l:--enable-v4l} \
- %{!?_without_pvr:--enable-pvr} \
- %{?_without_cdio--disable-libcdio} \
- %{?_without_ogg:--disable-ogg} \
- %{?_without_mkv:--disable-mkv} \
- %{?_without_modplug:--disable-mod} \
- %{?_without_mad:--disable-mad} \
- %{!?_without_ffmpeg:--enable-ffmpeg} \
- %{!?_without_ffmpeg:--with-ffmpeg-mp3lame --with-ffmpeg-faac} \
- %{!?_without_ffmpeg:--with-ffmpeg-tree=ffmpeg-%{ffmpeg_date}} \
- %{!?_without_faad2:--enable-faad} \
- %{?_without_a52:--disable-a52} \
- %{!?_without_flac:--enable-flac} \
- %{?_without_mpeg2dec:--disable-libmpeg2} \
- %{?_without_vorbis:--disable-vorbis} \
- %{?_without_speex:--disable-speex} \
- %{!?_without_theora:--enable-theora} \
- %{?_without_x264:--disable-x264} \
- %{?_without_sdl:--disable-sdl} \
- %{?_without_fribidi:--disable-fribidi} \
- %{!?_without_aa:--enable-aa} \
- %{!?_without_caca:--enable-caca} \
- %{!?_without_esd:--enable-esd} \
- %{?_with_portaudio:--enable-portaudio} \
- %{!?_without_arts:--enable-arts} \
- %{!?_without_alsa:--enable-alsa} \
- %{?_without_wxwidgets:--disable-wxwidgets --disable-skins2} \
- %{!?_without_xosd:--enable-xosd} \
- %{!?_without_lirc:--enable-lirc} \
- %{?_with_mozilla:--enable-mozilla} \
- %{?_with_tremor:--enable-tremor} \
- %{?_with_tarkin:--enable-tarkin} \
- %{?_without_glx:--disable-glx} \
- %{?_with_mga:--enable-mga} \
- %{?_with_svgalib:--enable-svgalib} \
- %{?_with_ggi:--enable-ggi} \
- %{?_with_glide:--enable-glide} \
- %{?_with_ncurses:--enable-ncurses} \
- %{?_without_slp:--disable-slp} \
- %{?_with_pth:--enable-pth} \
- %{!?_without_upnp:--enable-upnp} \
- %{!?_without_live:--enable-live555 --with-live555-tree="`pwd`/live"} \
- %{!?_without_jack:--enable-jack}
- #{!?_without_dc1394:--enable-dc1394}
- #{!?_without_goom:--enable-goom} \
+%{?_without_a52:--disable-a52} \
+%{!?_without_aa:--enable-aa} \
+%{!?_without_alsa:--enable-alsa} \
+%{!?_without_arts:--enable-arts} \
+%{!?_without_caca:--enable-caca} \
+%{?_with_cddax:--enable-cddax} \
+%{?_without_cdio--disable-libcdio} \
+%{!?_without_dirac:--enable-dirac} \
+%{!?_without_directfb:--enable-directfb} \
+%{!?_without_directfb:--with-directfb="%{_includedir}"} \
+%{!?_without_dvbpsi:--enable-dvbpsi} \
+%{?_without_dvdnav:--disable-dvdnav} \
+%{!?_without_dvdread:--enable-dvdread} \
+%{!?_without_esd:--enable-esd} \
+%{!?_without_faad2:--enable-faad} \
+ --enable-fbosd \
+%{!?_without_flac:--enable-flac} \
+%{!?_without_ffmpeg:--enable-ffmpeg} \
+%{!?_without_ffmpeg:--with-ffmpeg-tree="ffmpeg-%{ffmpeg_date}"} \
+%{!?_without_ffmpeg:--with-ffmpeg-a52 --with-ffmpeg-faac --with-ffmpeg-mp3lame} \
+%{!?_without_ffmpeg:--enable-libamr-nb --enable-libamr-wb --with-ffmpeg-ogg} \
+%{!?_without_ffmpeg:--with-ffmpeg-theora --with-ffmpeg-vorbis --with--ffmpeg-zlib} \
+%{?_without_fribidi:--disable-fribidi} \
+ --enable-galaktos \
+%{?_with_ggi:--enable-ggi} \
+%{?_with_glide:--enable-glide} \
+%{?_without_glx:--disable-glx} \
+%{!?_without_gnomevfs:--enable-gnomevfs} \
+%{!?_without_jack:--enable-jack} \
+%{!?_without_lirc:--enable-lirc} \
+%{!?_without_live:--enable-live555 --with-live555-tree="$(pwd)/live"} \
+%{?_with_loader:--enable-loader} \
+%{?_without_mad:--disable-mad} \
+%{?_with_mga:--enable-mga} \
+%{?_without_mkv:--disable-mkv} \
+%{?_without_modplug:--disable-mod} \
+%{?_with_mozilla:--enable-mozilla} \
+%{?_without_mpeg2dec:--disable-libmpeg2} \
+ --enable-musicbrainz \
+%{!?_without_ncurses:--enable-ncurses} \
+%{?_without_ogg:--disable-ogg} \
+ --enable-opencv \
+%{?_with_portaudio:--enable-portaudio} \
+%{?_with_pth:--enable-pth} \
+ --enable-pulse \
+%{!?_without_pvr:--enable-pvr} \
+ --enable-real \
+ --enable-realrtsp \
+%{?_without_sdl:--disable-sdl} \
+%{!?_without_shout:--enable-shout} \
+%{?_without_slp:--disable-slp} \
+%{?_without_smb:--disable-smb} \
+ --enable-snapshot \
+%{?_without_speex:--disable-speex} \
+ --enable-svg \
+%{!?_without_svgalib:--enable-svgalib} \
+ --enable-switcher \
+%{?_with_tarkin:--enable-tarkin} \
+%{!?_without_theora:--enable-theora} \
+%{?_with_tremor:--enable-tremor} \
+%{!?_without_twolame:--enable-twolame} \
+%{!?_without_upnp:--enable-upnp} \
+%{!?_without_v4l:--enable-v4l} \
+%{?_without_vorbis:--disable-vorbis} \
+%{?_without_wxwidgets:--disable-wxwidgets --disable-skins2} \
+%{?_without_x264:--disable-x264} \
+%{!?_without_xosd:--enable-xosd} \
+ --enable-xvmc
+#{!?_without_dc1394:--enable-dc1394} \
+#{!?_without_goom:--enable-goom} \
%{__make} %{?_smp_mflags}
-
%install
%{__rm} -rf %{buildroot} _docs
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
# Include the docs below, our way
%{__mv} %{buildroot}%{_docdir}/vlc _docs
# So that the icon gets themable (still required in 0.8.6)
%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
-%{__cp} -ap %{buildroot}%{_datadir}/vlc/vlc48x48.png \
- %{buildroot}%{_datadir}/pixmaps/vlc.png
+%{__cp} -ap %{buildroot}%{_datadir}/vlc/vlc48x48.png %{buildroot}%{_datadir}/pixmaps/vlc.png
-
%clean
%{__rm} -rf %{buildroot}
-
%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING ChangeLog MAINTAINERS README THANKS
%doc _docs/*
-%{_bindir}/*vlc
+%{_bindir}/svlc
+%{_bindir}/vlc
+%{_bindir}/wxvlc
%{_libdir}/vlc/
#exclude %{_libdir}/vlc/*.a
%{_datadir}/applications/vlc.desktop
@@ -340,8 +432,17 @@
%{_includedir}/vlc/
%exclude %{_libdir}/libvlc.a
+%if %{?_with_mozilla:1}0
+%files -n mozilla-vlc
+%defattr(-, root, root, 0755)
+%{_libdir}/mozilla/plugins/libvlcplugin.so
+%endif
%changelog
+* Thu Jul 03 2008 Dag Wieers <dag at wieers.com> - 0.8.6h-2
+- Recompiled statically against ffmpeg-20080113.
+- Rebuild against directfb-1.0.1.
+
* Sun Jun 08 2008 Dag Wieers <dag at wieers.com> - 0.8.6h-1
- Updated to release 0.8.6h.
Modified: trunk/rpms/xine-lib/xine-lib.spec
===================================================================
--- trunk/rpms/xine-lib/xine-lib.spec 2008-07-10 08:44:16 UTC (rev 6402)
+++ trunk/rpms/xine-lib/xine-lib.spec 2008-07-12 11:57:08 UTC (rev 6403)
@@ -60,7 +60,7 @@
Summary: Core library of the xine multimedia player
Name: xine-lib
Version: 1.1.13
-Release: 1
+Release: 2
License: GPL
Group: Applications/Multimedia
URL: http://xinehq.de/
@@ -180,12 +180,12 @@
# Remove all those unused docs
%{__rm} -rf %{buildroot}%{_docdir}/xine/ || :
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%clean
%{__rm} -rf %{buildroot}
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
%files -f %{libname}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
@@ -212,6 +212,9 @@
%exclude %{_libdir}/libxine.la
%changelog
+* Fri Jul 04 2008 Dag Wieers <dag at wieers.com> - 1.1.13-2
+- Rebuild against directfb-1.0.1.
+
* Mon Jun 16 2008 Dag Wieers <dag at wieers.com> - 1.1.13-1
- Updated to release 1.1.13.
More information about the svn-commits
mailing list