[svn] r3167 - trunk/rpms/libquicktime

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu Apr 28 22:02:56 CEST 2005


Author: thias
Date: 2005-04-28 22:02:55 +0200 (Thu, 28 Apr 2005)
New Revision: 3167

Added:
   trunk/rpms/libquicktime/libquicktime-0.9.4-gcc4.patch
Modified:
   trunk/rpms/libquicktime/libquicktime.spec
Log:
Add gcc4 patch and disable ffmpeg usage for FC4.


Added: trunk/rpms/libquicktime/libquicktime-0.9.4-gcc4.patch
===================================================================
--- trunk/rpms/libquicktime/libquicktime-0.9.4-gcc4.patch	2005-04-28 19:40:52 UTC (rev 3166)
+++ trunk/rpms/libquicktime/libquicktime-0.9.4-gcc4.patch	2005-04-28 20:02:55 UTC (rev 3167)
@@ -0,0 +1,47 @@
+diff -Naupr libquicktime-0.9.4.orig/plugins/Makefile.am libquicktime-0.9.4/plugins/Makefile.am
+--- libquicktime-0.9.4.orig/plugins/Makefile.am	2004-07-01 00:27:41.000000000 +0200
++++ libquicktime-0.9.4/plugins/Makefile.am	2005-04-22 01:33:22.000000000 +0200
+@@ -2,8 +2,7 @@
+ 
+ base_subdirs = audiocodec \
+ videocodec \
+-opendivx \
+-rtjpeg
++opendivx
+ 
+ if HAVE_LIBJPEG
+ jpeg_subdirs = mjpeg
+diff -Naupr libquicktime-0.9.4.orig/plugins/Makefile.in libquicktime-0.9.4/plugins/Makefile.in
+--- libquicktime-0.9.4.orig/plugins/Makefile.in	2005-01-12 23:17:38.000000000 +0100
++++ libquicktime-0.9.4/plugins/Makefile.in	2005-04-22 01:33:50.000000000 +0200
+@@ -58,7 +58,7 @@ RECURSIVE_TARGETS = all-recursive check-
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = audiocodec videocodec opendivx rtjpeg mjpeg dv png \
++DIST_SUBDIRS = audiocodec videocodec opendivx mjpeg dv png \
+ 	vorbis ffmpeg lame
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+@@ -240,8 +240,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ base_subdirs = audiocodec \
+ videocodec \
+-opendivx \
+-rtjpeg
++opendivx
+ 
+ @HAVE_LIBJPEG_FALSE at jpeg_subdirs = 
+ @HAVE_LIBJPEG_TRUE at jpeg_subdirs = mjpeg
+diff -Naupr libquicktime-0.9.4.orig/quicktime1394/libdv.h libquicktime-0.9.4/quicktime1394/libdv.h
+--- libquicktime-0.9.4.orig/quicktime1394/libdv.h	2002-04-15 08:03:13.000000000 +0200
++++ libquicktime-0.9.4/quicktime1394/libdv.h	2005-04-21 18:49:04.000000000 +0200
+@@ -16,7 +16,7 @@ extern "C" {
+ #define DV_PAL 1
+ 
+ #ifndef u_int64_t
+-#define u_int64_t unsigned long long
++#define u_int64_t long long
+ #endif
+ 
+ #include <libdv/dv.h>

Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec	2005-04-28 19:40:52 UTC (rev 3166)
+++ trunk/rpms/libquicktime/libquicktime.spec	2005-04-28 20:02:55 UTC (rev 3167)
@@ -4,6 +4,8 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{?fc4:%define _without_ffmpeg 1}
+
 %{?fc1:%define _without_alsa 1}
 %{?el3:%define _without_alsa 1}
 %{?rh9:%define _without_alsa 1}
@@ -29,6 +31,7 @@
 Group: System Environment/Libraries
 URL: http://libquicktime.sourceforge.net/
 Source: http://dl.sf.net/libquicktime/libquicktime-%{version}%{?prever}.tar.gz
+Patch: libquicktime-0.9.4-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, libdv-devel, libvorbis-devel, lame-devel
 BuildRequires: libpng-devel >= 1.0.8, libjpeg-devel, gcc-c++
@@ -71,6 +74,7 @@
 
 %prep
 %setup -n %{name}-%{version}%{?prever}
+%patch -p1 -b .gcc4
 
 %{__perl} -pi.orig -e '
     s|\$exec_prefix/lib|\$libdir|g;
@@ -130,6 +134,10 @@
 
 
 %changelog
+* Thu Apr 21 2005 Matthias Saou <http://freshrpms.net/> 0.9.4-3
+- Add _without_ffmpeg on FC4 for now, current ffmpeg doesn't work here anyway.
+- Add gcc4 patch, where rt-jpeg is disabled :-/
+
 * Fri Feb  4 2005 Matthias Saou <http://freshrpms.net/> 0.9.4-2
 - Added alsa-lib-devel and lame-devel build requirement.
 - Fixed missing libtool and autotools build reqs for autogen.sh to work.




More information about the commits mailing list